From ca6f465088be904fa5b85297396227f905792a3b Mon Sep 17 00:00:00 2001
From: Cosmic Linden <cosmic@lindenlab.com>
Date: Mon, 24 Jul 2023 16:16:52 -0700
Subject: SL-20024: Disable material editor on prim when contained material is
 no mod

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

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

diff --git a/indra/newview/llmaterialeditor.cpp b/indra/newview/llmaterialeditor.cpp
index 3a0e64985c..b30f94e145 100644
--- a/indra/newview/llmaterialeditor.cpp
+++ b/indra/newview/llmaterialeditor.cpp
@@ -238,6 +238,7 @@ struct LLSelectedTEGetMatData : public LLSelectedTEFunctor
     LLUUID mTexNormalId;
     LLUUID mObjectId;
     S32 mObjectTE;
+    LLUUID mMaterialId;
     LLPointer<LLGLTFMaterial> mMaterial;
     LLPointer<LLLocalGLTFMaterial> mLocalMaterial;
 };
@@ -259,6 +260,7 @@ bool LLSelectedTEGetMatData::apply(LLViewerObject* objectp, S32 te_index)
         return false;
     }
     LLUUID mat_id = objectp->getRenderMaterialID(te_index);
+    mMaterialId = mat_id;
     bool can_use = mIsOverride ? objectp->permModify() : objectp->permCopy();
     LLTextureEntry *tep = objectp->getTE(te_index);
     // We might want to disable this entirely if at least
@@ -2708,7 +2710,10 @@ bool LLMaterialEditor::setFromSelection()
     if (func.mMaterial.notNull())
     {
         setFromGLTFMaterial(func.mMaterial);
-        setEnableEditing(true);
+        LLViewerObject* selected_object = selected_objects->getFirstSelectedObject(NULL);
+        const LLViewerInventoryItem* item = selected_object->getInventoryItemByAsset(func.mMaterialId);
+        const bool allow_modify = !item || canModify(selected_object, item);
+        setEnableEditing(allow_modify);
     }
     else
     {
-- 
cgit v1.2.3