Merge pull request #8204 from hyperlogic/bug-fix/avatar-url-and-model-name-access-from-js

Fix MyAvatar name and url accessors.
This commit is contained in:
Brad Hefta-Gaub 2016-07-12 15:30:06 -07:00 committed by GitHub
commit 9fcecb6277

View file

@ -212,8 +212,8 @@ public:
virtual void clearJointsData() override;
Q_INVOKABLE void useFullAvatarURL(const QUrl& fullAvatarURL, const QString& modelName = QString());
Q_INVOKABLE const QUrl& getFullAvatarURLFromPreferences() const { return _fullAvatarURLFromPreferences; }
Q_INVOKABLE const QString& getFullAvatarModelName() const { return _fullAvatarModelName; }
Q_INVOKABLE QUrl getFullAvatarURLFromPreferences() const { return _fullAvatarURLFromPreferences; }
Q_INVOKABLE QString getFullAvatarModelName() const { return _fullAvatarModelName; }
void resetFullAvatarURL();