From 6d436f152b5a8d5bc2a048bb46000770b23cffd1 Mon Sep 17 00:00:00 2001
From: prep linden <prep@lindenlab.com>
Date: Thu, 16 Jun 2011 15:23:49 -0400
Subject: [PATCH] Fix for camera wonkiness (sh-1654 ...)

---
 indra/newview/llagentcamera.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp
index 80085dad9d2..c30d3b9aa3e 100644
--- a/indra/newview/llagentcamera.cpp
+++ b/indra/newview/llagentcamera.cpp
@@ -392,11 +392,9 @@ LLVector3 LLAgentCamera::calcFocusOffset(LLViewerObject *object, LLVector3 origi
 	}
 	
 	LLQuaternion inv_obj_rot = ~obj_rot; // get inverse of rotation
-	LLVector3 object_extents;	
+	LLVector3 object_extents = object->getScale();	
 	const LLVector4a* oe4 = object->mDrawable->getSpatialExtents();
-	LLVector4a size;
-	size.setSub(oe4[1], oe4[0]);
-	object_extents.set( size[0], size[1], size[2] );
+	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