diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index c94a18e3fc1393b93211ff4df3d0ac1abb7ac13b..d05aded017ff2bb3a4ae6e2ff400c2ecad0628dd 100644
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -907,9 +907,10 @@ void LLDrawable::updateDistance(LLCamera& camera, bool force_update)
             // MAINT-7926 Handle volumes in an animated object as a special case
             // SL-937: add dynamic box handling for rigged mesh on regular avatars.
             //if (volume->getAvatar() && volume->getAvatar()->isControlAvatar())
-            if (volume->getAvatar())
+			LLVOAvatar* avatarp = volume->getAvatar();
+            if (avatarp)
             {
-                const LLVector3* av_box = volume->getAvatar()->getLastAnimExtents();
+                const LLVector3* av_box = avatarp->getLastAnimExtents();
                 LLVector3 cam_pos_from_agent = LLViewerCamera::getInstance()->getOrigin();
                 LLVector3 cam_to_box_offset = point_to_box_offset(cam_pos_from_agent, av_box);
                 mDistanceWRTCamera = llmax(0.01f, ll_round(cam_to_box_offset.magVec(), 0.01f));