From e732e62b390323ecdc3b49b5b0be08fa52c3820f Mon Sep 17 00:00:00 2001 From: Siana Gearz Date: Wed, 2 Jan 2013 22:56:04 +0100 Subject: [PATCH] Tiny cleanup --- indra/newview/llagentcamera.cpp | 10 +--------- indra/newview/llviewerobject.cpp | 24 ++++++++++-------------- 2 files changed, 11 insertions(+), 23 deletions(-) diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp index 8e940c4f5..5fc5f0504 100644 --- a/indra/newview/llagentcamera.cpp +++ b/indra/newview/llagentcamera.cpp @@ -410,11 +410,7 @@ LLVector3 LLAgentCamera::calcFocusOffset(LLViewerObject *object, LLVector3 origi } LLQuaternion inv_obj_rot = ~obj_rot; // get inverse of rotation - LLVector3 object_extents = object->getScale(); - //this stuff just seems to make camera snapping worse... - //const LLVector4a* oe4 = object->mDrawable->getSpatialExtents(); - //object_extents.set( oe4[1][0], oe4[1][1], oe4[1][2] ); - + LLVector3 object_extents = object->getScale(); // make sure they object extents are non-zero object_extents.clamp(0.001f, F32_MAX); @@ -2314,10 +2310,6 @@ void LLAgentCamera::changeCameraToThirdPerson(BOOL animate) mCameraMode = CAMERA_MODE_THIRD_PERSON; U32 old_flags = gAgent.getControlFlags(); gAgent.clearControlFlags(AGENT_CONTROL_MOUSELOOK); - if (old_flags != gAgent.getControlFlags()) - { - gAgent.setFlagsDirty(); - } } // Remove any pitch from the avatar diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index 3751b6e3a..35f8e6931 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -2116,32 +2116,28 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys, static const LLCachedControl use_new_target_omega ("UseNewTargetOmegaCode", true); if (use_new_target_omega) { // New, experimental code - if (new_rot != getRotation() || new_angv != old_angv) + if ((new_rot != getRotation()) || (new_angv != old_angv)) { - if (new_angv != old_angv) + if (new_rot != mPreviousRotation) { - if (new_rot != mPreviousRotation) + resetRot(); + } + else if (new_angv != old_angv) + { + if (flagUsePhysics()) { resetRot(); } - else if (new_angv != old_angv) + else { - if (flagUsePhysics()) - { - resetRot(); - } - else - { - mRotTime = 0.0f; - } + mRotTime = 0.0f; } } // Remember the last rotation value mPreviousRotation = new_rot; - // Set the rotation of the object followed by adjusting for the - // accumulated angular velocity (llSetTargetOmega) + // Set the rotation of the object followed by adjusting for the accumulated angular velocity (llSetTargetOmega) setRotation(new_rot * mAngularVelocityRot); setChanged(ROTATED | SILHOUETTE); }