Showing the changes to interface/src/Application.cpp (1 of 1 file). Show all
Unified · Split
| @@ -5292,6 +5292,11 @@ void Application::nodeActivated(SharedNodePointer node) { · 5291 unmodified lines | ||
| 5292 | 5292 | |
| 5293 | 5293 | if (node->getType() == NodeType::AvatarMixer) { |
| 5294 | 5294 | // new avatar mixer, send off our identity packet on next update loop |
| 5295 | + // Reset skeletonModelUrl if the last server modified our choice. | |
| 5296 | + static const QUrl empty{}; | |
| 5297 | + if (getMyAvatar()->getFullAvatarURLFromPreferences() != getMyAvatar()->cannonicalSkeletonModelURL(empty)) { | |
| 5298 | + getMyAvatar()->resetFullAvatarURL(); | |
| 5299 | + } | |
| 5295 | 5300 | getMyAvatar()->markIdentityDataChanged(); |
| 5296 | 5301 | getMyAvatar()->resetLastSent(); |
| 5297 | 5302 | } |