diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-04-17 02:42:27 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-04-17 02:42:27 +0000 |
| commit | d85247e63e5ff0b488211b62429a4895b48dee27 (patch) | |
| tree | 0aa2f02aeef6a8133e0d037e95ad5089b20df9eb /indra/newview/llstartup.cpp | |
| parent | d2597d35cf3aeaf0c47a134dfe9119ef7932b98a (diff) | |
QAR-449 Viewer 1.20 RC 0
merge Branch_1-20-Viewer -r 84060 : 84432 -> release
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index fb692d257b..f918403320 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -45,7 +45,6 @@ #include "audioengine_fmod.h" #endif -#include "audiosettings.h" #include "llares.h" #include "llcachename.h" #include "llviewercontrol.h" @@ -1585,11 +1584,11 @@ BOOL idle_startup() if (gSavedSettings.getBOOL("ShowCameraControls")) { - LLFloaterCamera::show(NULL); + LLFloaterCamera::showInstance(); } if (gSavedSettings.getBOOL("ShowMovementControls")) { - LLFloaterMove::show(NULL); + LLFloaterMove::showInstance(); } if (gSavedSettings.getBOOL("ShowActiveSpeakers")) |