Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-23 09:25:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #6865 from ZappoMan/fixPrematureQuery

Browse source 
fix premature octree query before preferences are loaded
This commit is contained in:
Howard Stearns 2016-01-19 19:32:34 -08:00
commit 730640068c
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
interface/src/Application.cpp
View file

@ -2653,6 +2653,8 @@ void Application::loadSettings() {
Menu::getInstance()->loadSettings();
getMyAvatar()->loadData();
_settingsLoaded = true;
}
void Application::saveSettings() {
@ -3276,6 +3278,10 @@ int Application::sendNackPackets() {
void Application::queryOctree(NodeType_t serverType, PacketType packetType, NodeToJurisdictionMap& jurisdictions) {
if (!_settingsLoaded) {
return; // bail early if settings are not loaded
}
//qCDebug(interfaceapp) << ">>> inside... queryOctree()... _viewFrustum.getFieldOfView()=" << _viewFrustum.getFieldOfView();
bool wantExtraDebugging = getLogger()->extraDebugging();

2
interface/src/Application.h
View file

@ -510,6 +510,8 @@ private:
bool _reticleClickPressed { false };
int _avatarAttachmentRequest = 0;
bool _settingsLoaded { false };
};
#endif // hifi_Application_h