summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2024-08-20 13:54:11 +0300
committerAndrey Kleshchev <117672381+akleshchev@users.noreply.github.com>2024-08-20 18:27:29 +0300
commit37dcb67d4204beb79c6eae9f38ffecd0d0d49f6f (patch)
tree4f6185c877c03486c4bb4c7947700a0d9e93c381 /indra/newview
parented6732eda8c80d17e05bbc6563b6ce08ef6b8c72 (diff)
viewer#2338 Don't allow pasting into library from My Environments
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llfloatermyenvironment.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llfloatermyenvironment.cpp b/indra/newview/llfloatermyenvironment.cpp
index df4526e69d..891e16a8ef 100644
--- a/indra/newview/llfloatermyenvironment.cpp
+++ b/indra/newview/llfloatermyenvironment.cpp
@@ -335,6 +335,8 @@ bool LLFloaterMyEnvironment::canAction(const std::string &context)
{
if (!LLClipboard::instance().hasContents())
return false;
+ if (gInventory.isObjectDescendentOf(selected.front(), gInventory.getLibraryRootFolderID()))
+ return false;
std::vector<LLUUID> ids;
LLClipboard::instance().pasteFromClipboard(ids);