From b4d14ea59cbd14d304898a7e5d0b89e2dd3d4511 Mon Sep 17 00:00:00 2001 From: Hazim Gazov Date: Mon, 3 May 2010 07:04:30 -0300 Subject: [PATCH] added some options back to the inventory view --- indra/newview/llinventorybridge.cpp | 8 ++++++++ indra/newview/llinventorymodel.cpp | 5 +++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 3f4566604..459ac2f07 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -567,6 +567,14 @@ void LLInvFVBridge::getClipboardEntries(bool show_asset_id, std::vector items.push_back(std::string("Copy Separator")); diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp index b363e107f..0a9c80911 100644 --- a/indra/newview/llinventorymodel.cpp +++ b/indra/newview/llinventorymodel.cpp @@ -3489,8 +3489,9 @@ bool LLInventoryCollectFunctor::itemTransferCommonlyAllowed(LLInventoryItem* ite // I don't even think changing this did anything //case LLAssetType::AT_CALLINGCARD: // // not allowed - // break; - + // break; + // + case LLAssetType::AT_OBJECT: my_avatar = gAgent.getAvatarObject(); if(my_avatar && !my_avatar->isWearingAttachment(item->getUUID()))