Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 13:58:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

try, try again

Browse source
This commit is contained in:
Seth Alves 2017-08-10 14:32:52 -07:00
parent ff83a8158b
commit 1d07bc3b4e
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/src/avatar/MyAvatar.cpp
View file

@ -1382,7 +1382,6 @@ void MyAvatar::useFullAvatarURL(const QUrl& fullAvatarURL, const QString& modelN
} }
if (_fullAvatarURLFromPreferences != fullAvatarURL) { if (_fullAvatarURLFromPreferences != fullAvatarURL) {
qApp->clearAvatarOverrideUrl();
_fullAvatarURLFromPreferences = fullAvatarURL; _fullAvatarURLFromPreferences = fullAvatarURL;
if (modelName.isEmpty()) { if (modelName.isEmpty()) {
QVariantHash fullAvatarFST = FSTReader::downloadMapping(_fullAvatarURLFromPreferences.toString()); QVariantHash fullAvatarFST = FSTReader::downloadMapping(_fullAvatarURLFromPreferences.toString());

2
interface/src/ui/PreferencesDialog.cpp
View file

@ -52,7 +52,7 @@ void setupPreferences() {
{ {
auto getter = [=]()->QString { return myAvatar->getFullAvatarURLFromPreferences().toString(); }; auto getter = [=]()->QString { return myAvatar->getFullAvatarURLFromPreferences().toString(); };
auto setter = [=](const QString& value) { myAvatar->useFullAvatarURL(value, ""); }; auto setter = [=](const QString& value) { myAvatar->useFullAvatarURL(value, ""); qApp->clearAvatarOverrideUrl(); };
auto preference = new AvatarPreference(AVATAR_BASICS, "Appearance", getter, setter); auto preference = new AvatarPreference(AVATAR_BASICS, "Appearance", getter, setter);
preferences->addPreference(preference); preferences->addPreference(preference);
} }