History

Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist

Zach Fox committed 8 years ago

Commit 7d34b3f2 parents 93c3d53 ed4ec3256 files · +3522 −706Browse files

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

Unified · Split

interface/src/Application.cpp+7−3
@@ -1392,7 +1392,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 1391 unmodified lines
13921392 // Make sure we don't time out during slow operations at startup
13931393 updateHeartbeat();
13941394
1395−
13961395 QTimer* settingsTimer = new QTimer();
13971396 moveToNewNamedThread(settingsTimer, "Settings Thread", [this, settingsTimer]{
13981397 connect(qApp, &Application::beforeAboutToQuit, [this, settingsTimer]{
@@ -1700,8 +1699,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 301 unmodified lines
17001699 lastLeftHandPose = leftHandPose;
17011700 lastRightHandPose = rightHandPose;
17021701
1703− properties["local_socket_changes"] = DependencyManager::get<StatTracker>()->getStat(LOCAL_SOCKET_CHANGE_STAT).toInt();
1704−
17051702 UserActivityLogger::getInstance().logAction("stats", properties);
17061703 });
17071704 sendStatsTimer->start();
@@ -1825,6 +1822,9 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 117 unmodified lines
18251822 // Preload Tablet sounds
18261823 DependencyManager::get<TabletScriptingInterface>()->preloadSounds();
18271824
1825+ _pendingIdleEvent = false;
1826+ _pendingRenderEvent = false;
1827+
18281828 qCDebug(interfaceapp) << "Metaverse session ID is" << uuidStringWithoutCurlyBraces(accountManager->getSessionID());
18291829 }
18301830
@@ -4516,8 +4516,11 @@ void Application::resetPhysicsReadyInformation() { · 2685 unmodified lines
45164516
45174517 void Application::reloadResourceCaches() {
45184518 resetPhysicsReadyInformation();
4519+
45194520 // Query the octree to refresh everything in view
45204521 _lastQueriedTime = 0;
4522+ _octreeQuery.incrementConnectionID();
4523+
45214524 queryOctree(NodeType::EntityServer, PacketType::EntityQuery, _entityServerJurisdictions);
45224525
45234526 DependencyManager::get<AssetClient>()->clearCache();
@@ -5578,6 +5581,7 @@ void Application::nodeActivated(SharedNodePointer node) { · 1054 unmodified lines
55785581 // so we will do a proper query during update
55795582 if (node->getType() == NodeType::EntityServer) {
55805583 _lastQueriedTime = 0;
5584+ _octreeQuery.incrementConnectionID();
55815585 }
55825586
55835587 if (node->getType() == NodeType::AudioMixer) {