Skip to content
Snippets Groups Projects
Commit ea10cffd authored by Rye Mutt's avatar Rye Mutt :bread:
Browse files

More inventory link stuff

parent 7eb97e26
No related branches found
No related tags found
No related merge requests found
...@@ -4155,6 +4155,12 @@ void LLFolderBridge::buildContextMenuOptions(U32 flags, menuentry_vec_t& items ...@@ -4155,6 +4155,12 @@ void LLFolderBridge::buildContextMenuOptions(U32 flags, menuentry_vec_t& items
{ {
disabled_items.push_back(std::string("Delete")); disabled_items.push_back(std::string("Delete"));
} }
items.push_back(std::string("Paste As Link"));
if (!isClipboardPasteableAsLink() || (flags & FIRST_SELECTED_ITEM) == 0)
{
disabled_items.push_back(std::string("Paste As Link"));
}
} }
} }
...@@ -4762,6 +4768,9 @@ bool move_task_inventory_callback(const LLSD& notification, const LLSD& response ...@@ -4762,6 +4768,9 @@ bool move_task_inventory_callback(const LLSD& notification, const LLSD& response
// Returns true if the item can be moved to Current Outfit or any outfit folder. // Returns true if the item can be moved to Current Outfit or any outfit folder.
static BOOL can_move_to_outfit(LLInventoryItem* inv_item, BOOL move_is_into_current_outfit) static BOOL can_move_to_outfit(LLInventoryItem* inv_item, BOOL move_is_into_current_outfit)
{ {
if( !inv_item )
return FALSE;
LLInventoryType::EType inv_type = inv_item->getInventoryType(); LLInventoryType::EType inv_type = inv_item->getInventoryType();
if ((inv_type != LLInventoryType::IT_WEARABLE) && if ((inv_type != LLInventoryType::IT_WEARABLE) &&
(inv_type != LLInventoryType::IT_GESTURE) && (inv_type != LLInventoryType::IT_GESTURE) &&
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment