summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorCosmic Linden <cosmic@lindenlab.com>2023-09-06 11:02:31 -0700
committerCosmic Linden <cosmic@lindenlab.com>2023-09-06 11:02:31 -0700
commitab66df94cb7c4cc9a4530ea547aaf81dddec34de (patch)
tree0c041105aeb8253bbf040eedbbf9e78fbe321d91 /indra/newview
parent05c8ef3f3c002e71805bb04e9eddc3280630fca1 (diff)
SL-20167: Also check permission on paste to be certain
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llpanelface.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index d86956e370..df464bc7e5 100644
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -4344,7 +4344,8 @@ void LLPanelFace::onPasteTexture()
|| objectp->getPCode() != LL_PCODE_VOLUME
|| !objectp->permModify()
|| objectp->isPermanentEnforced()
- || selected_count > 1)
+ || selected_count > 1
+ || !LLMaterialEditor::canClipboardObjectsMaterial())
{
// not supposed to happen
LL_WARNS() << "Failed to paste texture due to missing or wrong selection" << LL_ENDL;