diff options
author | Callum Prentice <callum@gmail.com> | 2020-05-20 14:21:31 -0700 |
---|---|---|
committer | Callum Prentice <callum@gmail.com> | 2020-05-20 14:21:31 -0700 |
commit | b1e063fe8c339c339a5d154e2f48fb8accf6f71c (patch) | |
tree | 02322319b2106e1cb9d6d998e23d3fcd753dadd1 /indra/newview/llviewermenu.cpp | |
parent | 09802fa8ea9c8459e13a32720088f6d6fb1ad42d (diff) | |
parent | ed3d9abdd01304b5a9708880d9b150fb6568256b (diff) |
Merge branch 'master' into DRTVWR-512
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(); } |