[RLVa] When trapped in mouselook, avoid potential glitches and excess…

… work if reset_view_final is called
singularity-viewer · Jun 4, 2015 · 96e88b9 · 96e88b9
1 parent 63b67d6
commit 96e88b9
Showing 1 changed file with 2 additions and 0 deletions.
diff --git 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);