SL-18811 Fix for reflection probes associated with an object not immediately being removed when the object is killed.

1 files changed, 6 insertions, 0 deletions

diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index 2e76103773..e8e7b0b11e 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -520,6 +520,12 @@ void LLViewerObject::markDead()
 			LLFollowCamMgr::getInstance()->removeFollowCamParams(mID);
 		}
 
+        if (mReflectionProbe.notNull())
+        {
+            mReflectionProbe->mViewerObject = nullptr;
+            mReflectionProbe = nullptr;
+        }
+
 		sNumZombieObjects++;
 	}
 }