From 4b738a619a475447af8b917644357cb49dc22fb9 Mon Sep 17 00:00:00 2001
From: "Jonathan \"Geenz\" Goodman" <geenz@geenzo.com>
Date: Wed, 6 Mar 2024 18:24:36 -0800
Subject: [PATCH] #681 Small fix for if a viewer object may be dead.
---
indra/newview/llheroprobemanager.cpp | 2 +-
indra/newview/llreflectionmap.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/indra/newview/llheroprobemanager.cpp b/indra/newview/llheroprobemanager.cpp
index 8f1c1848cce..10b743ceefb 100644
--- a/indra/newview/llheroprobemanager.cpp
+++ b/indra/newview/llheroprobemanager.cpp
@@ -434,7 +434,7 @@ void LLHeroProbeManager::updateUniforms()
oa.set(0, 0, 0, 0);
mHeroData.heroProbeCount = 1;
- if (mNearestHero != nullptr)
+ if (mNearestHero != nullptr && !mNearestHero->isDead())
{
if (mNearestHero->getReflectionProbeIsBox())
{
diff --git a/indra/newview/llreflectionmap.cpp b/indra/newview/llreflectionmap.cpp
index 6d5797395cc..30a61144b9f 100644
--- a/indra/newview/llreflectionmap.cpp
+++ b/indra/newview/llreflectionmap.cpp
@@ -166,7 +166,7 @@ void LLReflectionMap::autoAdjustOrigin()
}
}
- else if (mViewerObject)
+ else if (mViewerObject && !mViewerObject->isDead())
{
mPriority = 1;
mOrigin.load3(mViewerObject->getPositionAgent().mV);
--
GitLab