History

Merge branch 'master' of https://github.com/highfidelity/hifi into 20301-addPlatformInfo

NissimHadar committed 7 years ago

Commit 4918f7d2 parents 56ee91d 4838a914 files · +36 −22Browse files

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

Unified · Split

interface/src/Application.cpp+1−0
@@ -1079,6 +1079,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 1078 unmodified lines
1079 1079
1080 auto nodeList = DependencyManager::get<NodeList>();1080 auto nodeList = DependencyManager::get<NodeList>();
1081 nodeList->startThread();1081 nodeList->startThread();
1082 nodeList->setFlagTimeForConnectionStep(true);
1082 1083
1083 // move the AddressManager to the NodeList thread so that domain resets due to domain changes always occur1084 // move the AddressManager to the NodeList thread so that domain resets due to domain changes always occur
1084 // before we tell MyAvatar to go to a new location in the new domain1085 // before we tell MyAvatar to go to a new location in the new domain

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t