Showing the changes to interface/src/Application.cpp (1 of 56 files). Show all
Unified · Split
| @@ -1392,7 +1392,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 1391 unmodified lines | |||
| 1392 | // Make sure we don't time out during slow operations at startup | 1392 | // Make sure we don't time out during slow operations at startup |
| 1393 | updateHeartbeat(); | 1393 | updateHeartbeat(); |
| 1394 | 1394 | ||
| 1395 | |||
| 1396 | QTimer* settingsTimer = new QTimer(); | 1395 | QTimer* settingsTimer = new QTimer(); |
| 1397 | moveToNewNamedThread(settingsTimer, "Settings Thread", [this, settingsTimer]{ | 1396 | moveToNewNamedThread(settingsTimer, "Settings Thread", [this, settingsTimer]{ |
| 1398 | connect(qApp, &Application::beforeAboutToQuit, [this, settingsTimer]{ | 1397 | connect(qApp, &Application::beforeAboutToQuit, [this, settingsTimer]{ |
| @@ -1700,8 +1699,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 301 unmodified lines | |||
| 1700 | lastLeftHandPose = leftHandPose; | 1699 | lastLeftHandPose = leftHandPose; |
| 1701 | lastRightHandPose = rightHandPose; | 1700 | lastRightHandPose = rightHandPose; |
| 1702 | 1701 | ||
| 1703 | properties["local_socket_changes"] = DependencyManager::get<StatTracker>()->getStat(LOCAL_SOCKET_CHANGE_STAT).toInt(); | ||
| 1704 | |||
| 1705 | UserActivityLogger::getInstance().logAction("stats", properties); | 1702 | UserActivityLogger::getInstance().logAction("stats", properties); |
| 1706 | }); | 1703 | }); |
| 1707 | sendStatsTimer->start(); | 1704 | sendStatsTimer->start(); |
| @@ -1825,6 +1822,9 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 117 unmodified lines | |||
| 1825 | // Preload Tablet sounds | 1822 | // Preload Tablet sounds |
| 1826 | DependencyManager::get<TabletScriptingInterface>()->preloadSounds(); | 1823 | DependencyManager::get<TabletScriptingInterface>()->preloadSounds(); |
| 1827 | 1824 | ||
| 1825 | _pendingIdleEvent = false; | ||
| 1826 | _pendingRenderEvent = false; | ||
| 1827 | |||
| 1828 | qCDebug(interfaceapp) << "Metaverse session ID is" << uuidStringWithoutCurlyBraces(accountManager->getSessionID()); | 1828 | qCDebug(interfaceapp) << "Metaverse session ID is" << uuidStringWithoutCurlyBraces(accountManager->getSessionID()); |
| 1829 | } | 1829 | } |
| 1830 | 1830 | ||
| @@ -4516,8 +4516,11 @@ void Application::resetPhysicsReadyInformation() { · 2685 unmodified lines | |||
| 4516 | 4516 | ||
| 4517 | void Application::reloadResourceCaches() { | 4517 | void Application::reloadResourceCaches() { |
| 4518 | resetPhysicsReadyInformation(); | 4518 | resetPhysicsReadyInformation(); |
| 4519 | |||
| 4519 | // Query the octree to refresh everything in view | 4520 | // Query the octree to refresh everything in view |
| 4520 | _lastQueriedTime = 0; | 4521 | _lastQueriedTime = 0; |
| 4522 | _octreeQuery.incrementConnectionID(); | ||
| 4523 | |||
| 4521 | queryOctree(NodeType::EntityServer, PacketType::EntityQuery, _entityServerJurisdictions); | 4524 | queryOctree(NodeType::EntityServer, PacketType::EntityQuery, _entityServerJurisdictions); |
| 4522 | 4525 | ||
| 4523 | DependencyManager::get<AssetClient>()->clearCache(); | 4526 | DependencyManager::get<AssetClient>()->clearCache(); |
| @@ -5578,6 +5581,7 @@ void Application::nodeActivated(SharedNodePointer node) { · 1054 unmodified lines | |||
| 5578 | // so we will do a proper query during update | 5581 | // so we will do a proper query during update |
| 5579 | if (node->getType() == NodeType::EntityServer) { | 5582 | if (node->getType() == NodeType::EntityServer) { |
| 5580 | _lastQueriedTime = 0; | 5583 | _lastQueriedTime = 0; |
| 5584 | _octreeQuery.incrementConnectionID(); | ||
| 5581 | } | 5585 | } |
| 5582 | 5586 | ||
| 5583 | if (node->getType() == NodeType::AudioMixer) { | 5587 | if (node->getType() == NodeType::AudioMixer) { |