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

Restore the ability to change avatars from the edit.js marketplace button.

Browse source
This commit is contained in:
Howard Stearns 2015-08-21 16:49:07 -07:00
parent e9047ac891
commit 74fd640f16
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/src/Application.cpp
View file

@ -4125,6 +4125,7 @@ bool Application::askToSetAvatarUrl(const QString& url) {
msgBox.exec(); msgBox.exec();
if (msgBox.clickedButton() == bodyAndHeadButton) { if (msgBox.clickedButton() == bodyAndHeadButton) {
_myAvatar->useFullAvatarURL(url, modelName);
emit fullAvatarURLChanged(url, modelName); emit fullAvatarURLChanged(url, modelName);
} else { } else {
qCDebug(interfaceapp) << "Declined to use the avatar: " << url; qCDebug(interfaceapp) << "Declined to use the avatar: " << url;

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

@ -64,7 +64,6 @@ void PreferencesDialog::fullAvatarURLChanged(const QString& newValue, const QStr
ui.appearanceDescription->setText(newValue); ui.appearanceDescription->setText(newValue);
const QString APPEARANCE_LABEL_TEXT("Appearance: "); const QString APPEARANCE_LABEL_TEXT("Appearance: ");
ui.appearanceLabel->setText(APPEARANCE_LABEL_TEXT + modelName); ui.appearanceLabel->setText(APPEARANCE_LABEL_TEXT + modelName);
DependencyManager::get<AvatarManager>()->getMyAvatar()->useFullAvatarURL(newValue, modelName);
} }
void PreferencesDialog::accept() { void PreferencesDialog::accept() {
@ -78,7 +77,9 @@ void PreferencesDialog::accept() {
} }
void PreferencesDialog::restoreLastGoodAvatar() { void PreferencesDialog::restoreLastGoodAvatar() {
fullAvatarURLChanged(_lastGoodAvatarURL.toString(), _lastGoodAvatarName); const QString& url = _lastGoodAvatarURL.toString();
fullAvatarURLChanged(url, _lastGoodAvatarName);
DependencyManager::get<AvatarManager>()->getMyAvatar()->useFullAvatarURL(url, _lastGoodAvatarName);
} }
void PreferencesDialog::reject() { void PreferencesDialog::reject() {