diff options
| author | Callum Prentice <callum@gmail.com> | 2020-05-04 10:53:11 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@gmail.com> | 2020-05-04 10:53:11 -0700 |
| commit | 691a2d996cb364201d8e73378eab0d3d09eddb08 (patch) | |
| tree | 49c26bb103d30daf398e57c51a424639d80f5b03 /indra/newview/llstartup.cpp | |
| parent | 77d2a05921bdba3ac284350650c5394dcc8e3444 (diff) | |
| parent | 4a7fd0117a43dca9e30c58c6417ebdf6862561f6 (diff) | |
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-512
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) |