diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-11-08 14:23:34 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-11-08 14:23:34 -0600 |
| commit | ccad8c9411977287f1c42b288bf796308de81094 (patch) | |
| tree | d114771df8469e4c9df6a9ecdd22edcbba7f24a0 /indra/newview/llagentcamera.cpp | |
| parent | c431ddf629b7f1149c44b2063d216dd34bcd2b12 (diff) | |
| parent | 2126cdb9a25da4dcc4c81659038b85bcff17c4ee (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-lion
Diffstat (limited to 'indra/newview/llagentcamera.cpp')
| -rw-r--r-- | indra/newview/llagentcamera.cpp | 6 |
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); + } } |