diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-05-19 12:53:18 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-05-19 12:53:18 -0400 |
| commit | 1c65b8fa44cecea8f38b9944930cbed60d075528 (patch) | |
| tree | 2074515c6ed03c0d8fa2b7e5a912d3bb810bf520 /indra/newview/llagentcamera.cpp | |
| parent | d8183a71d40da61635c05b933368f43b7d4f2a80 (diff) | |
| parent | 66554e2124dc87f61089bf96e2fe9ee5c32613d7 (diff) | |
automated merge mesh-development -> mesh-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); |