diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2018-07-31 21:57:42 +0100 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2018-07-31 21:57:42 +0100 |
| commit | 447aadc37b56190893bbd4e2f527a4683844024b (patch) | |
| tree | 34e94c508334b8243a1edce1759f7df95a172d14 /indra/newview/lldrawable.cpp | |
| parent | 91dfd7e06c8e1e5499ffd4137053b4b238b7eb45 (diff) | |
SL-937 - use dynamic box for rigged mesh attached to normal avatar as well. Still has a 2x error in the radius calc, but gets radius using the dynamic box.
Diffstat (limited to 'indra/newview/lldrawable.cpp')
| -rw-r--r-- | indra/newview/lldrawable.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp index 6d9c2c5eb8..6f48b8a968 100644 --- a/indra/newview/lldrawable.cpp +++ b/indra/newview/lldrawable.cpp @@ -902,8 +902,11 @@ void LLDrawable::updateDistance(LLCamera& camera, bool force_update) } } + // MAINT-7926 Handle volumes in an animated object as a special case - if (volume->getAvatar() && volume->getAvatar()->isControlAvatar()) + // SL-937: add dynamic box handling for rigged mesh on regular avatars. + //if (volume->getAvatar() && volume->getAvatar()->isControlAvatar()) + if (volume->getAvatar()) { const LLVector3* av_box = volume->getAvatar()->getLastAnimExtents(); LLVector3d cam_pos = gAgent.getPosGlobalFromAgent(LLViewerCamera::getInstance()->getOrigin()); |