summaryrefslogtreecommitdiff
path: root/indra/newview/llstartup.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llstartup.cpp')
-rw-r--r--indra/newview/llstartup.cpp5
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"))