diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-06-01 22:07:12 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-06-01 22:07:12 -0400 |
| commit | 8bfd3201de0d135ef984dc270e83ea88d8f03dd6 (patch) | |
| tree | 040272fc843ed2b00c9b9b162dad9fa503ef078a /indra/newview/llagentcamera.cpp | |
| parent | 68088a27ba92d8a3ce84ee6e5691e9e2e08b7b32 (diff) | |
| parent | 361384ebb9f41dbccbaab779a085edb773f0a734 (diff) | |
merge changes for latest viewer-development
Diffstat (limited to 'indra/newview/llagentcamera.cpp')
| -rw-r--r-- | indra/newview/llagentcamera.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp index c6b5a0113f..80085dad9d 100644 --- a/indra/newview/llagentcamera.cpp +++ b/indra/newview/llagentcamera.cpp @@ -394,7 +394,9 @@ LLVector3 LLAgentCamera::calcFocusOffset(LLViewerObject *object, LLVector3 origi LLQuaternion inv_obj_rot = ~obj_rot; // get inverse of rotation LLVector3 object_extents; const LLVector4a* oe4 = object->mDrawable->getSpatialExtents(); - object_extents.set( oe4[1][0], oe4[1][1], oe4[1][2] ); + LLVector4a size; + size.setSub(oe4[1], oe4[0]); + object_extents.set( size[0], size[1], size[2] ); // make sure they object extents are non-zero object_extents.clamp(0.001f, F32_MAX); |