diff options
| author | Kitty Barnett <develop@catznip.com> | 2023-01-02 23:04:02 +0100 |
|---|---|---|
| committer | Kitty Barnett <develop@catznip.com> | 2023-01-02 23:04:42 +0100 |
| commit | 6850b915fe42f5a75fc9d8bb9ca05f961de3244a (patch) | |
| tree | 0921b5e0c74a64ad65d1b5702b00142badb6140c /indra/newview/llfloatercamera.cpp | |
| parent | 89456ec88df01565e2c9a424a0097a5a02e1838c (diff) | |
| parent | f3f3c493ec2a658cf5c1aac6670c54c550e944fd (diff) | |
Merge branch 'master' into texture-preview
Diffstat (limited to 'indra/newview/llfloatercamera.cpp')
| -rw-r--r-- | indra/newview/llfloatercamera.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloatercamera.cpp b/indra/newview/llfloatercamera.cpp index 3b192ff81b..1c69b9d60b 100644 --- a/indra/newview/llfloatercamera.cpp +++ b/indra/newview/llfloatercamera.cpp @@ -453,18 +453,18 @@ void LLFloaterCamera::setMode(ECameraControlMode mode) void LLFloaterCamera::switchMode(ECameraControlMode mode) { - setMode(mode); - switch (mode) { case CAMERA_CTRL_MODE_PRESETS: case CAMERA_CTRL_MODE_PAN: sFreeCamera = false; + setMode(mode); // depends onto sFreeCamera clear_camera_tool(); break; case CAMERA_CTRL_MODE_FREE_CAMERA: sFreeCamera = true; + setMode(mode); activate_camera_tool(); break; |