Showing the changes to interface/src/Menu.cpp (1 of 5 files). Show all
Unified · Split
| @@ -91,7 +91,7 @@ Menu::Menu() : · 90 unmodified lines | |||
| 91 | _jsConsole(NULL), | 91 | _jsConsole(NULL), |
| 92 | _octreeStatsDialog(NULL), | 92 | _octreeStatsDialog(NULL), |
| 93 | _lodToolsDialog(NULL), | 93 | _lodToolsDialog(NULL), |
| 94 | _userLocationsWindow(NULL), | 94 | _userLocationsDialog(NULL), |
| 95 | _maxVoxels(DEFAULT_MAX_VOXELS_PER_SYSTEM), | 95 | _maxVoxels(DEFAULT_MAX_VOXELS_PER_SYSTEM), |
| 96 | _voxelSizeScale(DEFAULT_OCTREE_SIZE_SCALE), | 96 | _voxelSizeScale(DEFAULT_OCTREE_SIZE_SCALE), |
| 97 | _oculusUIAngularSize(DEFAULT_OCULUS_UI_ANGULAR_SIZE), | 97 | _oculusUIAngularSize(DEFAULT_OCULUS_UI_ANGULAR_SIZE), |
| @@ -1186,13 +1186,13 @@ void Menu::namedLocationCreated(LocationManager::NamedLocationCreateResponse res · 1088 unmodified lines | |||
| 1186 | } | 1186 | } |
| 1187 | 1187 | ||
| 1188 | void Menu::toggleLocationList() { | 1188 | void Menu::toggleLocationList() { |
| 1189 | if (!_userLocationsWindow) { | 1189 | if (!_userLocationsDialog) { |
| 1190 | _userLocationsWindow = new UserLocationsWindow(Application::getInstance()->getWindow()); | 1190 | _userLocationsDialog = new UserLocationsDialog(Application::getInstance()->getWindow()); |
| 1191 | } | 1191 | } |
| 1192 | if (_userLocationsWindow->isVisible()) { | 1192 | if (_userLocationsDialog->isVisible()) { |
| 1193 | _userLocationsWindow->hide(); | 1193 | _userLocationsDialog->hide(); |
| 1194 | } else { | 1194 | } else { |
| 1195 | _userLocationsWindow->show(); | 1195 | _userLocationsDialog->show(); |
| 1196 | } | 1196 | } |
| 1197 | } | 1197 | } |
| 1198 | 1198 | ||