diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2020-05-19 19:33:30 +0100 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2020-05-19 19:33:30 +0100 |
| commit | 37f5e2aab38172df02dfa8875e7e8560f956cd46 (patch) | |
| tree | 9583349a031fb63e9220c6fbca93b25775e1f26b /indra/newview/llviewermenu.cpp | |
| parent | a1cfa9ddb297f5bc66dd363800e69d4a7089467c (diff) | |
| parent | ed3d9abdd01304b5a9708880d9b150fb6568256b (diff) | |
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into SL-12995
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 162acb74f1..b6c7be2ed3 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -4104,8 +4104,7 @@ void handle_reset_view() // switching to outfit selector should automagically save any currently edited wearable LLFloaterSidePanelContainer::showPanel("appearance", LLSD().with("type", "my_outfits")); } - - gAgentCamera.switchCameraPreset(CAMERA_PRESET_REAR_VIEW); + reset_view_final( TRUE ); LLFloaterCamera::resetCameraMode(); } |