Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 06:18:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

avartar => avatar

Browse source
This commit is contained in:
Howard Stearns 2015-08-13 14:53:12 -07:00
parent 74dc6a3dc5
commit 7d4c96cc29
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/avatar/MyAvatar.h
View file

@ -127,7 +127,7 @@ public:
Q_INVOKABLE void useFullAvatarURL(const QUrl& fullAvatarURL, const QString& modelName = QString()); Q_INVOKABLE void useFullAvatarURL(const QUrl& fullAvatarURL, const QString& modelName = QString());
Q_INVOKABLE const QUrl& getFullAvatarURLFromPreferences() const { return _fullAvatarURLFromPreferences; } Q_INVOKABLE const QUrl& getFullAvatarURLFromPreferences() const { return _fullAvatarURLFromPreferences; }
Q_INVOKABLE const QString& getFullAvartarModelName() const { return _fullAvatarModelName; } Q_INVOKABLE const QString& getFullAvatarModelName() const { return _fullAvatarModelName; }
virtual void setAttachmentData(const QVector<AttachmentData>& attachmentData); virtual void setAttachmentData(const QVector<AttachmentData>& attachmentData);

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

@ -128,7 +128,7 @@ void PreferencesDialog::loadPreferences() {
ui.collisionSoundURLEdit->setText(myAvatar->getCollisionSoundURL()); ui.collisionSoundURLEdit->setText(myAvatar->getCollisionSoundURL());
fullAvatarURLChanged(myAvatar->getFullAvatarURLFromPreferences().toString(), fullAvatarURLChanged(myAvatar->getFullAvatarURLFromPreferences().toString(),
myAvatar->getFullAvartarModelName()); myAvatar->getFullAvatarModelName());
ui.sendDataCheckBox->setChecked(!menuInstance->isOptionChecked(MenuOption::DisableActivityLogger)); ui.sendDataCheckBox->setChecked(!menuInstance->isOptionChecked(MenuOption::DisableActivityLogger));