diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-01-11 07:44:12 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-01-11 08:30:32 +0200 |
| commit | 007939f0a76fd2f596d4d4252578af3d30234b33 (patch) | |
| tree | 8354ef28f890a9a49d5b79d4c9980ad329c5e3c2 /indra | |
| parent | 30678472ee9d25a738d71181c2b887f629cae790 (diff) | |
SL-18939 Cannot copy inventory folders with copiable links
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 7793b71f56..7a3b913ed5 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -2140,6 +2140,7 @@ bool LLItemBridge::isItemCopyable(bool can_copy_as_link) const static LLCachedControl<bool> inventory_linking(gSavedSettings, "InventoryLinking", true); return (can_copy_as_link && inventory_linking) + || (mIsLink && inventory_linking) || item->getPermissions().allowCopyBy(gAgent.getID()); } @@ -2346,6 +2347,12 @@ BOOL LLFolderBridge::isUpToDate() const bool LLFolderBridge::isItemCopyable(bool can_copy_as_link) const { + if (can_copy_as_link && !LLFolderType::lookupIsProtectedType(getPreferredType())) + { + // Can copy and paste unprotected folders as links + return true; + } + // Folders are copyable if items in them are, recursively, copyable. // Get the content of the folder |