diff options
| author | voidpointer <none@none> | 2012-10-18 15:34:43 -0700 |
|---|---|---|
| committer | voidpointer <none@none> | 2012-10-18 15:34:43 -0700 |
| commit | 88fb47bf84b4e995ca36632fc9154cb5a3763def (patch) | |
| tree | ac984df2807dd321508eb2838b2386a215691b59 /indra/newview/llagentcamera.cpp | |
| parent | 48b2dbcd65e72994054b9e525c0e45e346a981fb (diff) | |
| parent | 9cc1dfd4e6f3859e690da578adde057ec9a82e18 (diff) | |
merge
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); + } } |