summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMnikolenko Productengine <mnikolenko@productengine.com>2022-12-07 12:55:55 +0200
committerMnikolenko Productengine <mnikolenko@productengine.com>2022-12-07 12:55:55 +0200
commit71926db3a5bed6d4984619b4e587402c9e556516 (patch)
treefa11ce58f38684d76bf4440292347f3de577bfde
parent3d6c4036a605588e0c12c4a09d4d50cd9990ae8e (diff)
SL-18800 fix crash in removeMutedAVsLights
-rw-r--r--indra/newview/pipeline.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 96ba80dacc..b2010cc189 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -1776,7 +1776,9 @@ void LLPipeline::removeMutedAVsLights(LLVOAvatar* muted_avatar)
for (light_set_t::iterator iter = gPipeline.mNearbyLights.begin();
iter != gPipeline.mNearbyLights.end(); iter++)
{
- if (iter->drawable->getVObj()->isAttachment() && iter->drawable->getVObj()->getAvatar() == muted_avatar)
+ const LLViewerObject *vobj = iter->drawable->getVObj();
+ if (vobj && vobj->getAvatar()
+ && vobj->isAttachment() && vobj->getAvatar() == muted_avatar)
{
gPipeline.mLights.erase(iter->drawable);
gPipeline.mNearbyLights.erase(iter);