Tweaked camera panning into appearance edit mode.

This commit is contained in:
Shyotl
2012-04-22 12:52:25 -05:00
parent 6b66c33b47
commit 71a29e347e

View File

@@ -2418,15 +2418,17 @@ void LLAgentCamera::changeCameraToCustomizeAvatar()
gAgentAvatarp->updateMeshTextures();
}
}
// <edit>
if(!gSavedSettings.getBOOL("AppearanceCameraMovement"))
{
//hmm
mCameraAnimating = FALSE;
gAgent.endAnimationUpdateUI();
return;
}
/*LLVector3 agent_at = gAgent.getAtAxis();
// </edit>
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());
}