diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-04-18 20:43:49 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-04-18 20:43:49 +0300 |
| commit | 026ad511eaeae74b0273276506ae4b3a29536a5c (patch) | |
| tree | e316418eb30f456bd55d3a59a7bd7771d0f2af28 /indra/newview/llfloatercamera.cpp | |
| parent | a629e845cfff17a9ab7e74dd3930e1fb63ab286b (diff) | |
| parent | d031662435d97101411ae990ed85d6e001ab668a (diff) | |
Merge branch 'master' into DRTVWR-544-maint
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llfloatersearch.cpp
# indra/newview/llgroupactions.cpp
# indra/newview/llvovolume.cpp
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; |