Showing the changes to interface/src/Application.cpp (1 of 38 files). Show all
Unified · Split
| @@ -149,6 +149,7 @@ · 148 unmodified lines | |||
| 149 | #include "avatar/AvatarManager.h" | 149 | #include "avatar/AvatarManager.h" |
| 150 | #include "avatar/MyHead.h" | 150 | #include "avatar/MyHead.h" |
| 151 | #include "CrashHandler.h" | 151 | #include "CrashHandler.h" |
| 152 | #include "Crashpad.h" | ||
| 152 | #include "devices/DdeFaceTracker.h" | 153 | #include "devices/DdeFaceTracker.h" |
| 153 | #include "DiscoverabilityManager.h" | 154 | #include "DiscoverabilityManager.h" |
| 154 | #include "GLCanvas.h" | 155 | #include "GLCanvas.h" |
| @@ -668,8 +669,6 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) { · 513 unmodified lines | |||
| 668 | } | 669 | } |
| 669 | #endif | 670 | #endif |
| 670 | 671 | ||
| 671 | Setting::init(); | ||
| 672 | |||
| 673 | // Tell the plugin manager about our statically linked plugins | 672 | // Tell the plugin manager about our statically linked plugins |
| 674 | auto pluginManager = PluginManager::getInstance(); | 673 | auto pluginManager = PluginManager::getInstance(); |
| 675 | pluginManager->setInputPluginProvider([] { return getInputPlugins(); }); | 674 | pluginManager->setInputPluginProvider([] { return getInputPlugins(); }); |
| @@ -921,6 +920,8 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 245 unmodified lines | |||
| 921 | 920 | ||
| 922 | _logger->setSessionID(accountManager->getSessionID()); | 921 | _logger->setSessionID(accountManager->getSessionID()); |
| 923 | 922 | ||
| 923 | setCrashAnnotation("metaverse_session_id", accountManager->getSessionID().toString().toStdString()); | ||
| 924 | |||
| 924 | if (steamClient) { | 925 | if (steamClient) { |
| 925 | qCDebug(interfaceapp) << "[VERSION] SteamVR buildID:" << steamClient->getSteamVRBuildID(); | 926 | qCDebug(interfaceapp) << "[VERSION] SteamVR buildID:" << steamClient->getSteamVRBuildID(); |
| 926 | } | 927 | } |
| @@ -2294,6 +2295,11 @@ void Application::initializeGL() { · 1367 unmodified lines | |||
| 2294 | _renderEngine->addJob<SecondaryCameraRenderTask>("SecondaryCameraJob", cullFunctor, !DISABLE_DEFERRED); | 2295 | _renderEngine->addJob<SecondaryCameraRenderTask>("SecondaryCameraJob", cullFunctor, !DISABLE_DEFERRED); |
| 2295 | #endif | 2296 | #endif |
| 2296 | _renderEngine->addJob<RenderViewTask>("RenderMainView", cullFunctor, !DISABLE_DEFERRED); | 2297 | _renderEngine->addJob<RenderViewTask>("RenderMainView", cullFunctor, !DISABLE_DEFERRED); |
| 2298 | |||
| 2299 | #ifdef Q_OS_OSX | ||
| 2300 | DeadlockWatchdogThread::resume(); | ||
| 2301 | #endif | ||
| 2302 | |||
| 2297 | _renderEngine->load(); | 2303 | _renderEngine->load(); |
| 2298 | _renderEngine->registerScene(_main3DScene); | 2304 | _renderEngine->registerScene(_main3DScene); |
| 2299 | 2305 | ||
| @@ -6293,7 +6299,7 @@ void Application::showAssetServerWidget(QString filePath) { · 3993 unmodified lines | |||
| 6293 | if (!hmd->getShouldShowTablet() && !isHMDMode()) { | 6299 | if (!hmd->getShouldShowTablet() && !isHMDMode()) { |
| 6294 | DependencyManager::get<OffscreenUi>()->show(url, "AssetServer", startUpload); | 6300 | DependencyManager::get<OffscreenUi>()->show(url, "AssetServer", startUpload); |
| 6295 | } else { | 6301 | } else { |
| 6296 | static const QUrl url("../dialogs/TabletAssetServer.qml"); | 6302 | static const QUrl url("hifi/dialogs/TabletAssetServer.qml"); |
| 6297 | tablet->pushOntoStack(url); | 6303 | tablet->pushOntoStack(url); |
| 6298 | } | 6304 | } |
| 6299 | } | 6305 | } |