summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorybridge.cpp
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2023-02-21 17:53:47 +0200
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2023-02-21 17:53:52 +0200
commitd6c0e40559fa090495b237bbbacf30578ac10aac (patch)
tree33b1b8dbcac847be5c646875b9021b71c2fe989b /indra/newview/llinventorybridge.cpp
parentd6f1ba31da4a40d62fe781419cdd7db9843f6a30 (diff)
SL-19108 Enabled Image changing floater for folders
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
-rw-r--r--indra/newview/llinventorybridge.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 664ba3e336..986ab88cda 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -881,7 +881,7 @@ void LLInvFVBridge::getClipboardEntries(bool show_asset_id,
LLViewerInventoryItem* inv_item = gInventory.getItem(mUUID);
items.push_back(std::string("thumbnail"));
- if (!inv_item || !inv_item->getPermissions().allowOperationBy(PERM_MODIFY, gAgent.getID()))
+ if (inv_item && !inv_item->getPermissions().allowOperationBy(PERM_MODIFY, gAgent.getID()))
{
disabled_items.push_back(std::string("thumbnail"));
}
@@ -3289,6 +3289,12 @@ void LLFolderBridge::performAction(LLInventoryModel* model, std::string action)
return;
}
+ else if ("thumbnail" == action)
+ {
+ LLSD data(mUUID);
+ LLFloaterReg::showInstance("change_item_thumbnail", data);
+ return;
+ }
else if ("paste" == action)
{
pasteFromClipboard();