From 466914e122f201e62d8e969dcc684791e06333d3 Mon Sep 17 00:00:00 2001
From: Cosmic Linden <cosmic@lindenlab.com>
Date: Fri, 11 Aug 2023 17:18:06 -0700
Subject: SL-20024: Double-check object inventory is not pending when save
 button pressed

---
 indra/newview/llmaterialeditor.cpp | 4 ++++
 1 file changed, 4 insertions(+)

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

diff --git a/indra/newview/llmaterialeditor.cpp b/indra/newview/llmaterialeditor.cpp
index 41df58914b..92042ad49f 100644
--- a/indra/newview/llmaterialeditor.cpp
+++ b/indra/newview/llmaterialeditor.cpp
@@ -1836,6 +1836,10 @@ bool can_use_objects_material(LLSelectedTEGetMatData& func, const std::vector<Pe
         llassert(LLSelectMgr::getInstance()->getSelection()->getFirstObject());
         return false;
     }
+    if (selected_object->isInventoryPending())
+    {
+        return false;
+    }
     for (PermissionBit op : ops)
     {
         if (op == PERM_MODIFY && selected_object->isPermanentEnforced())
-- 
cgit v1.2.3