History

Update ConnectionMonitor to init at end of startup

Ryan Huffman committed 10 years ago

Commit 32b5c841 parent 8481d0b1 file · +2 −2Browse files

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

Unified · Split

interface/src/Application.cpp+2−2
@@ -873,8 +873,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 872 unmodified lines
873 873
874 UserActivityLogger::getInstance().logAction("launch", properties);874 UserActivityLogger::getInstance().logAction("launch", properties);
875 875
876 _connectionMonitor.init();
877
878 // Tell our entity edit sender about our known jurisdictions876 // Tell our entity edit sender about our known jurisdictions
879 _entityEditSender.setServerJurisdictions(&_entityServerJurisdictions);877 _entityEditSender.setServerJurisdictions(&_entityServerJurisdictions);
880 _entityEditSender.setMyAvatar(myAvatar.get());878 _entityEditSender.setMyAvatar(myAvatar.get());
@@ -1367,6 +1365,8 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 486 unmodified lines
1367 }1365 }
1368 }1366 }
1369 1367
1368 _connectionMonitor.init();
1369
1370 // After all of the constructor is completed, then set firstRun to false.1370 // After all of the constructor is completed, then set firstRun to false.
1371 firstRun.set(false);1371 firstRun.set(false);
1372}1372}