Commit ee88ebf9 authored by Andrey Kleshchev's avatar Andrey Kleshchev

SL-13029 Fixed load order

parent 483c459e
......@@ -851,8 +851,6 @@ void LLEnvironment::initSingleton()
}
LLEventPumps::instance().obtain(PUMP_EXPERIENCE).listen(LISTENER_NAME, [this](LLSD message) { listenExperiencePump(message); return false; });
loadFromSettings();
}
void LLEnvironment::cleanupSingleton()
......
......@@ -1878,7 +1878,11 @@ bool idle_startup()
}
display_startup();
// Load stored local environment if needed. Only should be done once at least
// initial region data got loaded to avoid race condition with region's environment
LLEnvironment::instance().loadFromSettings();
// *TODO : Uncomment that line once the whole grid migrated to SLM and suppress it from LLAgent::handleTeleportFinished() (llagent.cpp)
//check_merchant_status();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment