diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-05-18 02:02:52 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-05-18 02:02:52 -0500 |
| commit | 4374f53e23c9d999206764b0b38473337720c1c3 (patch) | |
| tree | bc190b8b502bb5a6b019de12c3f1c54a37264f0f /indra | |
| parent | e237f5733ca453fa51a16f9f88da265be201a607 (diff) | |
SH-1586 Fix for bad camera behavior introduced by SH-1119
Diffstat (limited to 'indra')
| -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); |