From c9f893b1003b2d9db01362430dbbfa59a91d4fd7 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Wed, 31 Aug 2022 11:36:00 -0500
Subject: SL-18065 WIP -- Adjust max virtual size to keep debug floater
 readable.  Make assert on shutdown less frequent (still not gone, likely race
 condition).  Fix unrelated assertion in reflection probes.

---
 indra/newview/llreflectionmapmanager.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'indra/newview/llreflectionmapmanager.cpp')

diff --git a/indra/newview/llreflectionmapmanager.cpp b/indra/newview/llreflectionmapmanager.cpp
index b285cc531e..d349b7e024 100644
--- a/indra/newview/llreflectionmapmanager.cpp
+++ b/indra/newview/llreflectionmapmanager.cpp
@@ -166,7 +166,7 @@ void LLReflectionMapManager::update()
 
         if (realtime && 
             closestDynamic == nullptr && 
-            probe->mCubeArray.notNull() &&
+            probe->mCubeIndex != -1 &&
             probe->getIsDynamic())
         {
             closestDynamic = probe;
@@ -324,6 +324,7 @@ S32 LLReflectionMapManager::allocateCubeIndex()
         {
             S32 ret = mProbes[i]->mCubeIndex;
             mProbes[i]->mCubeIndex = -1;
+            mProbes[i]->mCubeArray = nullptr;
             return ret;
         }
     }
-- 
cgit v1.2.3