diff options
author | Oz Linden <oz@lindenlab.com> | 2011-06-17 17:32:28 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-06-17 17:32:28 -0400 |
commit | 068c6d45099411d7827db3e50d9c91331fa5c189 (patch) | |
tree | c46cce78e6db0d87c1d9b0da9229ea0cf1d727de /indra/newview/llagentcamera.cpp | |
parent | 5e5be51edebf0fb6a59d4907c9fcaac1b1667ac4 (diff) | |
parent | 806b11c5720e1bd9e9764fcfd896436b8385e8b2 (diff) |
merge mesh branch changes (storm-1390)
Diffstat (limited to 'indra/newview/llagentcamera.cpp')
-rw-r--r-- | indra/newview/llagentcamera.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp index 80085dad9d..c30d3b9aa3 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); |