From 79664c1017175b2cdfdc4b16c5894bdfdf6e8188 Mon Sep 17 00:00:00 2001
From: prep <prep@lindenlab.com>
Date: Thu, 10 Mar 2011 12:09:29 -0500
Subject: [PATCH] Fix for sh-1119: Alt Zooming on assets that contain a pivot
point can at times cause erratic camera movement
---
indra/newview/llagentcamera.cpp | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp
index 2825c32d797..f5fd33d5e02 100644
--- a/indra/newview/llagentcamera.cpp
+++ b/indra/newview/llagentcamera.cpp
@@ -393,10 +393,12 @@ LLVector3 LLAgentCamera::calcFocusOffset(LLViewerObject *object, LLVector3 origi
{
return original_focus_point - obj_pos;
}
-
LLQuaternion inv_obj_rot = ~obj_rot; // get inverse of rotation
- LLVector3 object_extents = object->getScale();
+ LLVector3 object_extents;
+ const LLVector4a* oe4 = object->mDrawable->getSpatialExtents();
+ object_extents.set( oe4[1][0], oe4[1][1], oe4[1][2] );
+
// make sure they object extents are non-zero
object_extents.clamp(0.001f, F32_MAX);
--
GitLab