Showing the changes to interface/src/AvatarBookmarks.cpp (1 of 3 files). Show all
Unified · Split
| @@ -171,7 +171,7 @@ void AvatarBookmarks::updateAvatarEntities(const QVariantList &avatarEntities) { · 170 unmodified lines | |||
| 171 | // Remove any old entities not in the new list | 171 | // Remove any old entities not in the new list |
| 172 | for (auto& avatarEntityID : currentAvatarEntities.keys()) { | 172 | for (auto& avatarEntityID : currentAvatarEntities.keys()) { |
| 173 | if (newAvatarEntities.find(avatarEntityID) == newAvatarEntities.end()) { | 173 | if (newAvatarEntities.find(avatarEntityID) == newAvatarEntities.end()) { |
| 174 | myAvatar->removeAvatarEntity(avatarEntityID); | 174 | myAvatar->removeWornAvatarEntity(avatarEntityID); |
| 175 | } | 175 | } |
| 176 | } | 176 | } |
| 177 | } | 177 | } |
| @@ -197,7 +197,7 @@ void AvatarBookmarks::loadBookmark(const QString& bookmarkName) { · 19 unmodified lines | |||
| 197 | auto myAvatar = DependencyManager::get<AvatarManager>()->getMyAvatar(); | 197 | auto myAvatar = DependencyManager::get<AvatarManager>()->getMyAvatar(); |
| 198 | auto treeRenderer = DependencyManager::get<EntityTreeRenderer>(); | 198 | auto treeRenderer = DependencyManager::get<EntityTreeRenderer>(); |
| 199 | EntityTreePointer entityTree = treeRenderer ? treeRenderer->getTree() : nullptr; | 199 | EntityTreePointer entityTree = treeRenderer ? treeRenderer->getTree() : nullptr; |
| 200 | myAvatar->clearAvatarEntities(); | 200 | myAvatar->clearWornAvatarEntities(); |
| 201 | const QString& avatarUrl = bookmark.value(ENTRY_AVATAR_URL, "").toString(); | 201 | const QString& avatarUrl = bookmark.value(ENTRY_AVATAR_URL, "").toString(); |
| 202 | myAvatar->useFullAvatarURL(avatarUrl); | 202 | myAvatar->useFullAvatarURL(avatarUrl); |
| 203 | qCDebug(interfaceapp) << "Avatar On"; | 203 | qCDebug(interfaceapp) << "Avatar On"; |