From dd8569823d97ef243661bf46400c0a92f2ae79e5 Mon Sep 17 00:00:00 2001
From: Cosmic Linden <cosmic@lindenlab.com>
Date: Tue, 7 Mar 2023 13:04:03 -0800
Subject: [PATCH] SL-19128: Fix adding material to face sometimes not
respecting protections
---
indra/newview/llselectmgr.cpp | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index 55cf6795fe4..30a7f34ea8a 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -1938,6 +1938,12 @@ void LLSelectMgr::selectionSetGLTFMaterial(const LLUUID& mat_id)
LLUUID asset_id = mMatId;
if (mItem)
{
+ // If success, the material may be copied into the object's inventory
+ BOOL success = LLToolDragAndDrop::handleDropMaterialProtections(objectp, mItem, LLToolDragAndDrop::SOURCE_AGENT, LLUUID::null);
+ if (!success)
+ {
+ return false;
+ }
asset_id = mItem->getAssetUUID();
}
--
GitLab