summaryrefslogtreecommitdiff
path: root/indra/newview/llreflectionmapmanager.cpp
diff options
context:
space:
mode:
authorHoward Stearns <howard.stearns@gmail.com>2022-09-01 13:38:59 -0700
committerHoward Stearns <howard.stearns@gmail.com>2022-09-01 13:38:59 -0700
commit3cf349c4fa1c1879babab23536baff8e4e5421fc (patch)
tree61e6af4eb66a3ed754f14743bd08ece4dcdf6a30 /indra/newview/llreflectionmapmanager.cpp
parent01d03edd8512580575da515401a42021577c3c57 (diff)
parentd2d257cfa99b685160e16ed93c163018e9fe3c50 (diff)
Merge branch 'DRTVWR-559' of bitbucket.org:lindenlab/viewer into SL-17967
Diffstat (limited to 'indra/newview/llreflectionmapmanager.cpp')
-rw-r--r--indra/newview/llreflectionmapmanager.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llreflectionmapmanager.cpp b/indra/newview/llreflectionmapmanager.cpp
index b441236251..dc1fff9a8f 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;
}
}