summaryrefslogtreecommitdiff
path: root/indra/newview/llagentcamera.cpp
diff options
context:
space:
mode:
authorGilbert Gonzales <gilbert@lindenlab.com>2013-04-04 15:57:35 -0700
committerGilbert Gonzales <gilbert@lindenlab.com>2013-04-04 15:57:35 -0700
commit38ea63e084362d01deedf07e617b6e2bf85bbb25 (patch)
treeefaa6b41c40f4f6e4096c31e473ec1d68b3de4d2 /indra/newview/llagentcamera.cpp
parent819bbce34a2f265287df1e4e9adde90b5a70c8b6 (diff)
parentdabce05d1eed47944e39438e50b3c788b7df649d (diff)
merging in viewer-chui
Diffstat (limited to 'indra/newview/llagentcamera.cpp')
-rw-r--r--indra/newview/llagentcamera.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp
index 751b73e1eb..9025c7af8b 100644
--- a/indra/newview/llagentcamera.cpp
+++ b/indra/newview/llagentcamera.cpp
@@ -35,6 +35,7 @@
#include "llfloaterreg.h"
#include "llhudmanager.h"
#include "lljoystickbutton.h"
+#include "llmoveview.h"
#include "llselectmgr.h"
#include "llsmoothstep.h"
#include "lltoolmgr.h"
@@ -2113,6 +2114,11 @@ void LLAgentCamera::changeCameraToDefault()
{
changeCameraToThirdPerson();
}
+ if (gSavedSettings.getBOOL("HideUIControls"))
+ {
+ gViewerWindow->setUIVisibility(false);
+ LLPanelStandStopFlying::getInstance()->setVisible(false);
+ }
}