Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 03:04:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

cancel effects of --replaceAvatarURL when avatar is changed with preference dialog

Browse source
This commit is contained in:
Seth Alves 2017-08-10 13:49:48 -07:00
parent cb02ff4026
commit ff83a8158b
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/src/Application.h
View file

@ -297,6 +297,7 @@ public:
QUuid getTabletFrameID() const; // may be an entity or an overlay QUuid getTabletFrameID() const; // may be an entity or an overlay
void setAvatarOverrideUrl(const QUrl& url, bool save); void setAvatarOverrideUrl(const QUrl& url, bool save);
void clearAvatarOverrideUrl() { _avatarOverrideUrl = QUrl(); _saveAvatarOverrideUrl = false; }
QUrl getAvatarOverrideUrl() { return _avatarOverrideUrl; } QUrl getAvatarOverrideUrl() { return _avatarOverrideUrl; }
bool getSaveAvatarOverrideUrl() { return _saveAvatarOverrideUrl; } bool getSaveAvatarOverrideUrl() { return _saveAvatarOverrideUrl; }

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

@ -1382,6 +1382,7 @@ 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());