diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2022-04-18 15:35:23 -0600 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2022-04-18 15:35:23 -0600 |
| commit | 035b1996df3f357b5060e3eb778588da5b9e7b37 (patch) | |
| tree | 270e46eb85dd46fb6962a36a9357dbf31c3afb29 /indra/newview/llfloatercamera.cpp | |
| parent | 2d63d2044e0a00d1969c3da254e016a6e520c0d5 (diff) | |
| parent | d031662435d97101411ae990ed85d6e001ab668a (diff) | |
Merge branch 'master' into DRTVWR-528
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; |