History

FB16914 - Avatar bookmarks missing from Avatar Favorites

Alexander Ivash committed 8 years ago

Commit f9107571 parent ac37f471 file · +7 −0Browse files

Showing the changes to interface/src/AvatarBookmarks.cpp (1 of 1 file). Show all

Unified · Split

interface/src/AvatarBookmarks.cpp+7−0
@@ -171,6 +171,13 @@ void AvatarBookmarks::loadBookmark(const QString& bookmarkName) { · 170 unmodified lines
171171
172172 if (bookmarkEntry != _bookmarks.end()) {
173173 QVariantMap bookmark = bookmarkEntry.value().toMap();
174+ if (bookmark.empty()) { // compatibility with bookmarks like this: "Wooden Doll": "http://mpassets.highfidelity.com/7fe80a1e-f445-4800-9e89-40e677b03bee-v1/mannequin.fst?noDownload=false",
175+ auto avatarUrl = bookmarkEntry.value().toString();
176+ if (!avatarUrl.isEmpty()) {
177+ bookmark.insert(ENTRY_AVATAR_URL, avatarUrl);
178+ }
179+ }
180+
174181 if (!bookmark.empty()) {
175182 auto myAvatar = DependencyManager::get<AvatarManager>()->getMyAvatar();
176183 auto treeRenderer = DependencyManager::get<EntityTreeRenderer>();

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