History

Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates

Howard Stearns committed 11 years ago

Commit 2ca47682 parents 828509e ff3a04880 files · +2239 −1912Browse files

Showing the changes to interface/src/Application.cpp (1 of 80 files). Show all

Unified · Split

interface/src/Application.cpp+1−0
@@ -4148,6 +4148,7 @@ bool Application::askToSetAvatarUrl(const QString& url) { · 4147 unmodified lines
4148 msgBox.exec();4148 msgBox.exec();
4149 4149
4150 if (msgBox.clickedButton() == bodyAndHeadButton) {4150 if (msgBox.clickedButton() == bodyAndHeadButton) {
4151 _myAvatar->useFullAvatarURL(url, modelName);
4151 emit fullAvatarURLChanged(url, modelName);4152 emit fullAvatarURLChanged(url, modelName);
4152 } else {4153 } else {
4153 qCDebug(interfaceapp) << "Declined to use the avatar: " << url;4154 qCDebug(interfaceapp) << "Declined to use the avatar: " << url;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t