diff options
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 6 | ||||
| -rw-r--r-- | indra/newview/llviewerinventory.cpp | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 24cbc28359..dadc7bc057 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -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")); diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp index c7819c9a54..c4edc3952b 100644 --- a/indra/newview/llviewerinventory.cpp +++ b/indra/newview/llviewerinventory.cpp @@ -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; |