diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-06-16 15:58:55 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-06-16 15:58:55 -0400 |
| commit | 8114464a729ef54b850a91f3677d78304e9c5648 (patch) | |
| tree | f1054041c54a82e0bcc5be73599d1badda21b8b6 /indra/newview/llagentcamera.cpp | |
| parent | cc6e80412949639f52138adde5b909a298cd2242 (diff) | |
| parent | 9d9d9197a05935a544e585651e7895a366cc6cae (diff) | |
merge
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); |