Showing the changes to interface/src/Menu.cpp (1 of 7 files). Show all
Unified · Split
| @@ -34,7 +34,6 @@ · 33 unmodified lines | |||
| 34 | #include "audio/AudioScope.h" | 34 | #include "audio/AudioScope.h" |
| 35 | #include "avatar/AvatarManager.h" | 35 | #include "avatar/AvatarManager.h" |
| 36 | #include "AvatarBookmarks.h" | 36 | #include "AvatarBookmarks.h" |
| 37 | #include "AvatarEntitiesBookmarks.h" | ||
| 38 | #include "devices/DdeFaceTracker.h" | 37 | #include "devices/DdeFaceTracker.h" |
| 39 | #include "MainWindow.h" | 38 | #include "MainWindow.h" |
| 40 | #include "render/DrawStatus.h" | 39 | #include "render/DrawStatus.h" |
| @@ -207,10 +206,6 @@ Menu::Menu() { · 166 unmodified lines | |||
| 207 | auto avatarBookmarks = DependencyManager::get<AvatarBookmarks>(); | 206 | auto avatarBookmarks = DependencyManager::get<AvatarBookmarks>(); |
| 208 | avatarBookmarks->setupMenus(this, avatarMenu); | 207 | avatarBookmarks->setupMenus(this, avatarMenu); |
| 209 | 208 | ||
| 210 | auto avatarEntitiesBookmarks = DependencyManager::get<AvatarEntitiesBookmarks>(); | ||
| 211 | avatarEntitiesBookmarks->setupMenus(this, avatarMenu); | ||
| 212 | |||
| 213 | |||
| 214 | // Display menu ---------------------------------- | 209 | // Display menu ---------------------------------- |
| 215 | // FIXME - this is not yet matching Alan's spec because it doesn't have | 210 | // FIXME - this is not yet matching Alan's spec because it doesn't have |
| 216 | // menus for "2D"/"3D" - we need to add support for detecting the appropriate | 211 | // menus for "2D"/"3D" - we need to add support for detecting the appropriate |