diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-04-15 19:36:37 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-04-20 22:03:06 +0300 |
| commit | d9783adba73cce9a68fde4ba0ba78add28da4279 (patch) | |
| tree | b68ec0cfd333cacc646954a9939df8ebc13e4731 /indra/newview/llstartup.cpp | |
| parent | c757c29c95f60b174903ced0a9ef9ea352d3bb2f (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) |