Showing the changes to interface/src/Application.cpp (1 of 139 files). Show all
Unified · Split
| @@ -2713,7 +2713,7 @@ bool Application::importFromZIP(const QString& filePath) { · 2712 unmodified lines | ||
| 2713 | 2713 | qDebug() << "A zip file has been dropped in: " << filePath; |
| 2714 | 2714 | QUrl empty; |
| 2715 | 2715 | // handle Blocks download from Marketplace |
| 2716 | − if (filePath.contains("vr.google.com/downloads")) { | |
| 2716 | + if (filePath.contains("poly.google.com/downloads")) { | |
| 2717 | 2717 | addAssetToWorldFromURL(filePath); |
| 2718 | 2718 | } else { |
| 2719 | 2719 | qApp->getFileDownloadInterface()->runUnzip(filePath, empty, true, true, false); |
| @@ -4461,7 +4461,7 @@ void Application::cameraModeChanged() { · 1741 unmodified lines | ||
| 4461 | 4461 | void Application::cameraMenuChanged() { |
| 4462 | 4462 | auto menu = Menu::getInstance(); |
| 4463 | 4463 | if (menu->isOptionChecked(MenuOption::FullscreenMirror)) { |
| 4464 | − if (_myCamera.getMode() != CAMERA_MODE_MIRROR) { | |
| 4464 | + if (!isHMDMode() && _myCamera.getMode() != CAMERA_MODE_MIRROR) { | |
| 4465 | 4465 | _myCamera.setMode(CAMERA_MODE_MIRROR); |
| 4466 | 4466 | getMyAvatar()->reset(false, false, false); // to reset any active MyAvatar::FollowHelpers |
| 4467 | 4467 | } |
| @@ -6259,7 +6259,7 @@ void Application::addAssetToWorldFromURL(QString url) { · 1791 unmodified lines | ||
| 6259 | 6259 | if (url.contains("filename")) { |
| 6260 | 6260 | filename = url.section("filename=", 1, 1); // Filename is in "?filename=" parameter at end of URL. |
| 6261 | 6261 | } |
| 6262 | − if (url.contains("vr.google.com/downloads")) { | |
| 6262 | + if (url.contains("poly.google.com/downloads")) { | |
| 6263 | 6263 | filename = url.section('/', -1); |
| 6264 | 6264 | if (url.contains("noDownload")) { |
| 6265 | 6265 | filename.remove(".zip?noDownload=false"); |
| @@ -6294,7 +6294,7 @@ void Application::addAssetToWorldFromURLRequestFinished() { · 28 unmodified lines | ||
| 6294 | 6294 | if (url.contains("filename")) { |
| 6295 | 6295 | filename = url.section("filename=", 1, 1); // Filename is in "?filename=" parameter at end of URL. |
| 6296 | 6296 | } |
| 6297 | − if (url.contains("vr.google.com/downloads")) { | |
| 6297 | + if (url.contains("poly.google.com/downloads")) { | |
| 6298 | 6298 | filename = url.section('/', -1); |
| 6299 | 6299 | if (url.contains("noDownload")) { |
| 6300 | 6300 | filename.remove(".zip?noDownload=false"); |
| @@ -7295,6 +7295,10 @@ void Application::updateDisplayMode() { · 994 unmodified lines | ||
| 7295 | 7295 | menu->setIsOptionChecked(MenuOption::FirstPerson, true); |
| 7296 | 7296 | cameraMenuChanged(); |
| 7297 | 7297 | } |
| 7298 | + | |
| 7299 | + // Remove the mirror camera option from menu if in HMD mode | |
| 7300 | + auto mirrorAction = menu->getActionForOption(MenuOption::FullscreenMirror); | |
| 7301 | + mirrorAction->setVisible(!isHmd); | |
| 7298 | 7302 | |
| 7299 | 7303 | Q_ASSERT_X(_displayPlugin, "Application::updateDisplayMode", "could not find an activated display plugin"); |
| 7300 | 7304 | } |