From 60c410b479b05038a57519ae0cec0203847d2e8d Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Thu, 10 Jun 2021 00:39:46 -0400
Subject: [PATCH] Fix double call of recursive search function for volume to
avatar
---
indra/newview/lldrawable.cpp | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index c94a18e3fc1..d05aded017f 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));
--
GitLab