livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-19496 Thumbnail should be modifiable regardless of permissions

meow-7.2.2
Andrey Kleshchev 2023-03-31 21:23:25 +03:00
parent 29c5bf19f7
commit 6306b1fa6e
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llinventorybridge.cpp
View File

@ -845,13 +845,13 @@ 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 (isLibraryItem())
{
disabled_items.push_back(std::string("thumbnail"));
}
LLViewerInventoryItem *inv_item = gInventory.getItem(mUUID);
if (show_asset_id)
{
items.push_back(std::string("Copy Asset UUID"));

3
indra/newview/llviewerinventory.cpp
View File

@ -1369,7 +1369,8 @@ void update_inventory_category(
LL_DEBUGS(LOG_INV) << "cat_id: [" << cat_id << "] name " << (obj ? obj->getName() : "(NOT FOUND)") << LL_ENDL;
if(obj)
{
if (LLFolderType::lookupIsProtectedType(obj->getPreferredType()))
if (LLFolderType::lookupIsProtectedType(obj->getPreferredType())
&& (updates.size() != 1 || !updates.has("thumbnail")))
{
LLNotificationsUtil::add("CannotModifyProtectedCategories");
return;