diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-10-01 22:52:37 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-10-01 22:52:37 +0100 |
| commit | c98522a40ec6855a11a781301fca7a3943ba5a25 (patch) | |
| tree | bad6bfd113e55526105bc310530733758cdb3a21 /indra/newview/llstartup.cpp | |
| parent | c4941fc182585769e8e3151f98127c9b8c3221f2 (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(); |