diff options
Diffstat (limited to 'indra/newview/llfloatercamera.cpp')
| -rw-r--r-- | indra/newview/llfloatercamera.cpp | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/indra/newview/llfloatercamera.cpp b/indra/newview/llfloatercamera.cpp index 94ea20893a..f4c4f38008 100644 --- a/indra/newview/llfloatercamera.cpp +++ b/indra/newview/llfloatercamera.cpp @@ -77,21 +77,11 @@ bool LLFloaterCamera::inAvatarViewMode() return mCurrMode == CAMERA_CTRL_MODE_AVATAR_VIEW; } -void LLFloaterCamera::resetFreeCameraMode() +void LLFloaterCamera::resetCameraMode() { - if (mCurrMode == CAMERA_CTRL_MODE_FREE_CAMERA) - { - /* Camera Tool can be deselected when we are mouse wheel scrolling into Mouse Look - In such case we are unable to determine that we will be into Mouse Look view */ - if (mPrevMode == CAMERA_CTRL_MODE_AVATAR_VIEW) - { - setMode(CAMERA_CTRL_MODE_ORBIT); - } - else - { - setMode(mPrevMode); - } - } + LLFloaterCamera* floater_camera = LLFloaterCamera::findInstance(); + if (!floater_camera) return; + floater_camera->switchMode(CAMERA_CTRL_MODE_ORBIT); } void LLFloaterCamera::update() |