From 6f806fb9cc96c1979d776a8cd0ce5b0f5166c1f3 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com>
Date: Tue, 6 Jan 2026 23:58:16 +0200
Subject: #5217 Small cleanup and const declarations

---
 indra/newview/llspatialpartition.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp
index f3cfbd9565..4326bd549c 100644
--- a/indra/newview/llspatialpartition.cpp
+++ b/indra/newview/llspatialpartition.cpp
@@ -135,9 +135,10 @@ void LLSpatialGroup::clearDrawMap()
     mDrawMap.clear();
 }
 
-bool LLSpatialGroup::isHUDGroup()
+bool LLSpatialGroup::isHUDGroup() const
 {
-    return getSpatialPartition() && getSpatialPartition()->isHUDPartition() ;
+    LLSpatialPartition* part = (LLSpatialPartition*)mSpatialPartition;
+    return part && part->isHUDPartition();
 }
 
 void LLSpatialGroup::validate()
-- 
cgit v1.3


From c7e1d9f5d985bce651de23fb0a6c0a62bf843324 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Thu, 22 Jan 2026 19:45:05 +0200
Subject: #5157 fix crash in isHUDGroup

---
 indra/newview/llspatialpartition.cpp | 3 +++
 indra/newview/pipeline.cpp           | 4 ++++
 2 files changed, 7 insertions(+)

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

diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp
index 4326bd549c..6e18bb979a 100644
--- a/indra/newview/llspatialpartition.cpp
+++ b/indra/newview/llspatialpartition.cpp
@@ -137,6 +137,9 @@ void LLSpatialGroup::clearDrawMap()
 
 bool LLSpatialGroup::isHUDGroup() const
 {
+    if (hasState(DEAD))
+        return false;
+
     LLSpatialPartition* part = (LLSpatialPartition*)mSpatialPartition;
     return part && part->isHUDPartition();
 }
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index d1ea8c2ee5..c9d53bbcbc 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -2734,6 +2734,10 @@ void LLPipeline::clearRebuildGroups()
     {
         LLSpatialGroup* group = *iter;
 
+        if (!group || group->isDead())
+        {
+            continue;
+        }
         // If the group contains HUD objects, save the group
         if (group->isHUDGroup())
         {
-- 
cgit v1.3