diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-05-18 09:48:20 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-05-18 09:48:20 -0400 |
| commit | 6f2e77522aded8c386edad8c4fb3a855272b3d3c (patch) | |
| tree | f0853e5bdda5dbc7bc5cfc7651fe0e477b53d081 /indra/newview/llagentcamera.cpp | |
| parent | 7a02501aae8a21f4bf552d47e0799c4abdcd4228 (diff) | |
| parent | 4374f53e23c9d999206764b0b38473337720c1c3 (diff) | |
merge
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); |