Showing the changes to interface/src/Application.cpp (1 of 31 files). Show all
Unified · Split
| @@ -1400,7 +1400,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 1399 unmodified lines | |||
| 1400 | // Make sure we don't time out during slow operations at startup | 1400 | // Make sure we don't time out during slow operations at startup |
| 1401 | updateHeartbeat(); | 1401 | updateHeartbeat(); |
| 1402 | 1402 | ||
| 1403 | |||
| 1404 | QTimer* settingsTimer = new QTimer(); | 1403 | QTimer* settingsTimer = new QTimer(); |
| 1405 | moveToNewNamedThread(settingsTimer, "Settings Thread", [this, settingsTimer]{ | 1404 | moveToNewNamedThread(settingsTimer, "Settings Thread", [this, settingsTimer]{ |
| 1406 | connect(qApp, &Application::beforeAboutToQuit, [this, settingsTimer]{ | 1405 | connect(qApp, &Application::beforeAboutToQuit, [this, settingsTimer]{ |
| @@ -1843,6 +1842,9 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 436 unmodified lines | |||
| 1843 | // Preload Tablet sounds | 1842 | // Preload Tablet sounds |
| 1844 | DependencyManager::get<TabletScriptingInterface>()->preloadSounds(); | 1843 | DependencyManager::get<TabletScriptingInterface>()->preloadSounds(); |
| 1845 | 1844 | ||
| 1845 | _pendingIdleEvent = false; | ||
| 1846 | _pendingRenderEvent = false; | ||
| 1847 | |||
| 1846 | qCDebug(interfaceapp) << "Metaverse session ID is" << uuidStringWithoutCurlyBraces(accountManager->getSessionID()); | 1848 | qCDebug(interfaceapp) << "Metaverse session ID is" << uuidStringWithoutCurlyBraces(accountManager->getSessionID()); |
| 1847 | } | 1849 | } |
| 1848 | 1850 | ||
| @@ -4499,8 +4501,11 @@ void Application::resetPhysicsReadyInformation() { · 2650 unmodified lines | |||
| 4499 | 4501 | ||
| 4500 | void Application::reloadResourceCaches() { | 4502 | void Application::reloadResourceCaches() { |
| 4501 | resetPhysicsReadyInformation(); | 4503 | resetPhysicsReadyInformation(); |
| 4504 | |||
| 4502 | // Query the octree to refresh everything in view | 4505 | // Query the octree to refresh everything in view |
| 4503 | _lastQueriedTime = 0; | 4506 | _lastQueriedTime = 0; |
| 4507 | _octreeQuery.incrementConnectionID(); | ||
| 4508 | |||
| 4504 | queryOctree(NodeType::EntityServer, PacketType::EntityQuery, _entityServerJurisdictions); | 4509 | queryOctree(NodeType::EntityServer, PacketType::EntityQuery, _entityServerJurisdictions); |
| 4505 | 4510 | ||
| 4506 | DependencyManager::get<AssetClient>()->clearCache(); | 4511 | DependencyManager::get<AssetClient>()->clearCache(); |
| @@ -5561,6 +5566,7 @@ void Application::nodeActivated(SharedNodePointer node) { · 1054 unmodified lines | |||
| 5561 | // so we will do a proper query during update | 5566 | // so we will do a proper query during update |
| 5562 | if (node->getType() == NodeType::EntityServer) { | 5567 | if (node->getType() == NodeType::EntityServer) { |
| 5563 | _lastQueriedTime = 0; | 5568 | _lastQueriedTime = 0; |
| 5569 | _octreeQuery.incrementConnectionID(); | ||
| 5564 | } | 5570 | } |
| 5565 | 5571 | ||
| 5566 | if (node->getType() == NodeType::AudioMixer) { | 5572 | if (node->getType() == NodeType::AudioMixer) { |