diff options
| author | Rider Linden <rider@lindenlab.com> | 2015-04-14 09:34:49 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2015-04-14 09:34:49 -0700 |
| commit | 82ae214f6a367e17dd335e80e2444cf672108821 (patch) | |
| tree | 5a2ebb115b0674698cfb0d9cbd879add63d88ece /indra/newview/llfloatercamera.cpp | |
| parent | fe8dec32dbdd6085dd582c49134551638561ca0e (diff) | |
| parent | a49e11efd9e249cc6d3cf5bcffaafe1e831f2fa9 (diff) | |
Merged lindenlab/viewer-tools-update into default
Diffstat (limited to 'indra/newview/llfloatercamera.cpp')
| -rwxr-xr-x | indra/newview/llfloatercamera.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llfloatercamera.cpp b/indra/newview/llfloatercamera.cpp index 6a82b8c74c..20d650fa37 100755 --- a/indra/newview/llfloatercamera.cpp +++ b/indra/newview/llfloatercamera.cpp @@ -32,6 +32,7 @@ #include "llfloaterreg.h" // Viewer includes +#include "llagent.h" #include "llagentcamera.h" #include "lljoystickbutton.h" #include "llviewercontrol.h" @@ -340,6 +341,8 @@ void LLFloaterCamera::onClose(bool app_quitting) switchMode(CAMERA_CTRL_MODE_PAN); mClosed = TRUE; + + gAgent.setMovementLocked(FALSE); } LLFloaterCamera::LLFloaterCamera(const LLSD& val) |