diff options
author | Dave Parks <davep@lindenlab.com> | 2022-08-31 11:36:00 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2022-08-31 11:36:00 -0500 |
commit | c9f893b1003b2d9db01362430dbbfa59a91d4fd7 (patch) | |
tree | 39f169f9d5d37d88ee007ae5995cbd8cce83c798 /indra/newview/llreflectionmapmanager.cpp | |
parent | e8002dc00f0a043021c16291c2ea6a2de72ff260 (diff) |
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.
Diffstat (limited to 'indra/newview/llreflectionmapmanager.cpp')
-rw-r--r-- | indra/newview/llreflectionmapmanager.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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; } } |