diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-10-01 16:12:48 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-10-01 16:12:48 -0700 |
| commit | fdfb60ecb10a35efdc378ae507e1c65114a987a3 (patch) | |
| tree | 05a183987a0fb2464855df1b193b7bb035c61745 /indra/newview/llstartup.cpp | |
| parent | 6e7d794b01673c138a50859c0e513732cb89fc8b (diff) | |
| parent | 1d94f7e9ebd663853c81d60aec796accadf43c70 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 831b9e2d2a..fbb9030700 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -1465,7 +1465,6 @@ bool idle_startup() LLGLState::checkStates(); LLGLState::checkTextureChannels(); - LLEnvironment::instance().loadPreferences(); gSky.init(); LLGLState::checkStates(); |