diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 8ab7f27e4..f10ca5e6b 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -4045,6 +4045,8 @@ void reset_view_final( BOOL proceed ) return; } + if (gRlvHandler.hasBehaviour(RLV_BHVR_CAMDISTMAX) && gRlvHandler.camPole(RLV_BHVR_CAMDISTMAX) <= 0) return; // RLVa:LF - Trapped in mouselook; avoid extra work (and potential glitches) + if (!gViewerWindow->getLeftMouseDown() && gAgentCamera.cameraThirdPerson() && gSavedSettings.getBOOL("ResetViewTurnsAvatar") && !gSavedSettings.getBOOL("FreezeTime")) { gAgentCamera.setFocusOnAvatar(TRUE, ANIMATE);