diff options
| author | dolphin <dolphin@lindenlab.com> | 2013-01-23 13:36:50 -0800 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2013-01-23 13:36:50 -0800 |
| commit | 3e8bc28c88f16c1b8bba496704ec3a6156a25e1d (patch) | |
| tree | aa52be0bc7aa10d578ba000b8cd69d40271477a0 /indra/newview/llagentcamera.cpp | |
| parent | 7e9ac192d779e77cad0a0b785510190215fbe7a6 (diff) | |
| parent | a30a2c492d06c9ef843a43c0ff0be6f2826d6d0b (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); + } } |