History

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

samcake committed 10 years ago

Commit 320c7992 parents c5c51f2 4ea5c1113 files · +116 −49Browse files

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

Unified · Split

interface/src/Application.cpp+6−0
@@ -2653,6 +2653,8 @@ void Application::loadSettings() { · 2652 unmodified lines
2653 2653
2654 Menu::getInstance()->loadSettings();2654 Menu::getInstance()->loadSettings();
2655 getMyAvatar()->loadData();2655 getMyAvatar()->loadData();
2656
2657 _settingsLoaded = true;
2656}2658}
2657 2659
2658void Application::saveSettings() {2660void Application::saveSettings() {
@@ -3276,6 +3278,10 @@ int Application::sendNackPackets() { · 617 unmodified lines
3276 3278
3277void Application::queryOctree(NodeType_t serverType, PacketType packetType, NodeToJurisdictionMap& jurisdictions) {3279void Application::queryOctree(NodeType_t serverType, PacketType packetType, NodeToJurisdictionMap& jurisdictions) {
3278 3280
3281 if (!_settingsLoaded) {
3282 return; // bail early if settings are not loaded
3283 }
3284
3279 //qCDebug(interfaceapp) << ">>> inside... queryOctree()... _viewFrustum.getFieldOfView()=" << _viewFrustum.getFieldOfView();3285 //qCDebug(interfaceapp) << ">>> inside... queryOctree()... _viewFrustum.getFieldOfView()=" << _viewFrustum.getFieldOfView();
3280 bool wantExtraDebugging = getLogger()->extraDebugging();3286 bool wantExtraDebugging = getLogger()->extraDebugging();
3281 3287