summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorCosmic Linden <cosmic@lindenlab.com>2023-03-07 13:04:03 -0800
committerCosmic Linden <cosmic@lindenlab.com>2023-03-07 13:04:03 -0800
commitdd8569823d97ef243661bf46400c0a92f2ae79e5 (patch)
tree8a5de10be3978288267e66c8318f86675f69f42d /indra
parent917932549fe40f02bf393f22ec1af12aa2245264 (diff)
SL-19128: Fix adding material to face sometimes not respecting protections
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llselectmgr.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index 55cf6795fe..30a7f34ea8 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();
}