From 4a6bacea0f8dcff959028f285bc533852da608b5 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Thu, 28 Aug 2008 23:57:41 +0000 Subject: merge viewer/viewer_1-21 94170-94770 -> release merge viewer/viewer_1-21-0 94830-95157 -> release Includes: QAR-786 Sandbox buildme for viewer + server Release Notes on the wiki! QAR-797 teleport failures (DEV-6198 / SVC-972) mergeme --- indra/newview/llagent.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'indra/newview/llagent.cpp') diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index edf8967f46..cb32dfb904 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -337,6 +337,7 @@ LLAgent::LLAgent() mTrackFocusObject(TRUE), mCameraSmoothingLastPositionGlobal(), mCameraSmoothingLastPositionAgent(), + mCameraSmoothingStop(FALSE), mFrameAgent(), @@ -1950,9 +1951,8 @@ void LLAgent::cameraPanLeft(F32 meters) mFocusTargetGlobal += meters * left_axis; mFocusGlobal = mFocusTargetGlobal; - // effectively disable smoothing for camera pan, which causes some residents unhappiness - mCameraSmoothingLastPositionGlobal += meters * left_axis; - mCameraSmoothingLastPositionAgent += meters * left_axis; + // disable smoothing for camera pan, which causes some residents unhappiness + mCameraSmoothingStop = TRUE; cameraZoomIn(1.f); updateFocusOffset(); @@ -1969,9 +1969,8 @@ void LLAgent::cameraPanUp(F32 meters) mFocusTargetGlobal += meters * up_axis; mFocusGlobal = mFocusTargetGlobal; - // effectively disable smoothing for camera pan, which causes some residents unhappiness - mCameraSmoothingLastPositionGlobal += meters * up_axis; - mCameraSmoothingLastPositionAgent += meters * up_axis; + // disable smoothing for camera pan, which causes some residents unhappiness + mCameraSmoothingStop = TRUE; cameraZoomIn(1.f); updateFocusOffset(); @@ -3231,7 +3230,7 @@ void LLAgent::updateCamera() LLVector3d agent_pos = getPositionGlobal(); LLVector3d camera_pos_agent = camera_pos_global - agent_pos; - if (cameraThirdPerson()) // only smooth in third person mode + if (cameraThirdPerson() && !mCameraSmoothingStop) // only smooth in third person mode { const F32 SMOOTHING_HALF_LIFE = 0.02f; @@ -3261,6 +3260,7 @@ void LLAgent::updateCamera() mCameraSmoothingLastPositionGlobal = camera_pos_global; mCameraSmoothingLastPositionAgent = camera_pos_agent; + mCameraSmoothingStop = FALSE; } -- cgit v1.2.3