From f490bf6463e5b4b46fd940adc6bba19ebc11591d Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Tue, 21 Jan 2025 16:25:01 +0200
Subject: #3442 Crash at LLDrawable::isState

---
 indra/newview/pipeline.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'indra/newview')

diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 38f158c1df..c6e6c454de 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -3855,7 +3855,12 @@ void LLPipeline::renderSelectedFaces(const LLColor4& color)
 
         for (auto facep : mSelectedFaces)
         {
-            if (!facep || facep->getDrawable()->isDead())
+            if (!facep || !facep->getViewerObject())
+            {
+                LLSelectMgr::getInstance()->clearSelections();
+                return;
+            }
+            if (!facep->getDrawable() || facep->getDrawable()->isDead())
             {
                 LL_ERRS() << "Bad face on selection" << LL_ENDL;
                 return;
-- 
cgit v1.2.3