summaryrefslogtreecommitdiff
path: root/indra/newview/llreflectionmap.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2024-05-16 10:32:03 -0400
committerNat Goodspeed <nat@lindenlab.com>2024-05-16 10:32:03 -0400
commite19cf9aedd0ed775022ce9704127e7958796494a (patch)
tree2a4a590cb1206bee59ab7eb9ccec067ca2fbdd39 /indra/newview/llreflectionmap.cpp
parent0eaca22969fb14402a898325a64276e1c11dff0c (diff)
parentb31789c146aab2e1fe0040f9c3c4cf42526e9c4b (diff)
Merge branch 'release/maint-b' into nat/maint-b-tests
Diffstat (limited to 'indra/newview/llreflectionmap.cpp')
-rw-r--r--indra/newview/llreflectionmap.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llreflectionmap.cpp b/indra/newview/llreflectionmap.cpp
index a26445b4bc..90a2f30c92 100644
--- a/indra/newview/llreflectionmap.cpp
+++ b/indra/newview/llreflectionmap.cpp
@@ -70,12 +70,14 @@ void LLReflectionMap::autoAdjustOrigin()
{
LL_PROFILE_ZONE_SCOPED_CATEGORY_DISPLAY;
- if (mGroup && !mComplete)
+
+ if (mGroup && !mComplete && !mGroup->hasState(LLViewerOctreeGroup::DEAD))
{
const LLVector4a* bounds = mGroup->getBounds();
auto* node = mGroup->getOctreeNode();
+ LLSpatialPartition* part = mGroup->getSpatialPartition();
- if (mGroup->getSpatialPartition()->mPartitionType == LLViewerRegion::PARTITION_VOLUME)
+ if (part && part->mPartitionType == LLViewerRegion::PARTITION_VOLUME)
{
mPriority = 0;
// cast a ray towards 8 corners of bounding box