History

Merge pull request #12818 from highfidelity/RC66

Merge back RC66 to master

Stephen Birarda committed 8 years ago

Commit 1d76dea2 parents ad191de c8d109810 files · +62 −32Browse files

Showing the changes to interface/src/Application.cpp (1 of 10 files). Show all

Unified · Split

interface/src/Application.cpp+2−10
@@ -3046,7 +3046,6 @@ void Application::handleSandboxStatus(QNetworkReply* reply) { · 3045 unmodified lines
3046 3046
3047 static const QString SENT_TO_PREVIOUS_LOCATION = "previous_location";3047 static const QString SENT_TO_PREVIOUS_LOCATION = "previous_location";
3048 static const QString SENT_TO_ENTRY = "entry";3048 static const QString SENT_TO_ENTRY = "entry";
3049 static const QString SENT_TO_SANDBOX = "sandbox";
3050 3049
3051 QString sentTo;3050 QString sentTo;
3052 3051
@@ -3055,15 +3054,8 @@ void Application::handleSandboxStatus(QNetworkReply* reply) { · 2 unmodified lines
3055#if !defined(Q_OS_ANDROID)3054#if !defined(Q_OS_ANDROID)
3056 showHelp();3055 showHelp();
3057#endif3056#endif
3058 if (sandboxIsRunning) {3057 DependencyManager::get<AddressManager>()->goToEntry();
3059 qCDebug(interfaceapp) << "Home sandbox appears to be running, going to Home.";3058 sentTo = SENT_TO_ENTRY;
3060 DependencyManager::get<AddressManager>()->goToLocalSandbox();
3061 sentTo = SENT_TO_SANDBOX;
3062 } else {
3063 qCDebug(interfaceapp) << "Home sandbox does not appear to be running, going to Entry.";
3064 DependencyManager::get<AddressManager>()->goToEntry();
3065 sentTo = SENT_TO_ENTRY;
3066 }
3067 firstRun.set(false);3059 firstRun.set(false);
3068 3060
3069 } else {3061 } else {