diff options
| author | Rider Linden <rider@lindenlab.com> | 2017-10-13 17:17:49 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2017-10-13 17:17:49 -0700 |
| commit | cc22ffc6d799544e8f2a9dfed6813081d908c88d (patch) | |
| tree | 0b02af15c41104fb253cd7a9e705fa1f3f9fd829 /indra/newview/llstartup.cpp | |
| parent | e4b035d0cd3eaa76fd82643c17e3631c67387a54 (diff) | |
Watter settings active and start of new joystick button type.
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 485b88e4c7..e50a4a0b5d 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -180,7 +180,6 @@ #include "llnamebox.h" #include "llnameeditor.h" #include "llpostprocess.h" -#include "llwlparammanager.h" #include "llwaterparammanager.h" #include "llagentlanguage.h" #include "llwearable.h" @@ -197,6 +196,9 @@ #include "llexperiencelog.h" #include "llcleanup.h" +#include "llenvironment.h" +#include "llenvmanager.h" + #include "llstacktrace.h" #if LL_WINDOWS @@ -1461,7 +1463,7 @@ bool idle_startup() LLGLState::checkStates(); LLGLState::checkTextureChannels(); - LLEnvManagerNew::getInstance()->usePrefs(); // Load all presets and settings + LLEnvironment::instance().loadPreferences(); gSky.init(initial_sun_direction); LLGLState::checkStates(); |