From 71a29e347ed09ecb34c0b5b4a44a324e94cdee98 Mon Sep 17 00:00:00 2001 From: Shyotl Date: Sun, 22 Apr 2012 12:52:25 -0500 Subject: [PATCH] Tweaked camera panning into appearance edit mode. --- indra/newview/llagentcamera.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp index 8dc34b6ab..b3b72a356 100644 --- a/indra/newview/llagentcamera.cpp +++ b/indra/newview/llagentcamera.cpp @@ -2418,15 +2418,17 @@ void LLAgentCamera::changeCameraToCustomizeAvatar() gAgentAvatarp->updateMeshTextures(); } } - // if(!gSavedSettings.getBOOL("AppearanceCameraMovement")) { //hmm mCameraAnimating = FALSE; gAgent.endAnimationUpdateUI(); + return; } - /*LLVector3 agent_at = gAgent.getAtAxis(); + // + + LLVector3 agent_at = gAgent.getAtAxis(); agent_at.mV[VZ] = 0.f; agent_at.normalize(); @@ -2441,7 +2443,9 @@ void LLAgentCamera::changeCameraToCustomizeAvatar() camera_offset *= CUSTOMIZE_AVATAR_CAMERA_DEFAULT_DIST; LLVector3d focus_target_global = gAgent.getPosGlobalFromAgent(focus_target); setAnimationDuration(gSavedSettings.getF32("ZoomTime")); - setCameraPosAndFocusGlobal(focus_target_global + camera_offset, focus_target_global, gAgent.getID());*/ + setCameraPosAndFocusGlobal(focus_target_global + camera_offset, focus_target_global, gAgent.getID()); + + }