diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-04-15 19:36:37 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-04-15 19:49:01 +0300 |
| commit | 39cc7084559db78377b28cafa05462b97e3593f9 (patch) | |
| tree | 9aca867d139a63cfa9b4867237f2c7b41b53fab9 /indra/newview/llstartup.cpp | |
| parent | 693791f4ffdf5471b16459ba295a50615bbc7762 (diff) | |
SL-13040 Fixed crash at EnvironmentPersistAcrossLogin
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index a1d1e85492..7673bae725 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -1879,8 +1879,7 @@ 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 + // Load stored local environment if needed. LLEnvironment::instance().loadFromSettings(); // *TODO : Uncomment that line once the whole grid migrated to SLM and suppress it from LLAgent::handleTeleportFinished() (llagent.cpp) |