diff options
author | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-01-22 15:26:20 +0200 |
---|---|---|
committer | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-01-22 15:26:20 +0200 |
commit | a63a1afea649433ae5e50b668fcdd6b43df93c40 (patch) | |
tree | cae7775867ccf342a38b9cd6520e0181e1c2c495 /indra/newview/llinventorybridge.cpp | |
parent | 682fd146b0978363e6264569c74e018f0cb971fa (diff) | |
parent | 951d6e9d8ce636ae01aab37f7e67c7389ebcea11 (diff) |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
-rw-r--r-- | indra/newview/llinventorybridge.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 099f863dc9..2f4f285065 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -3687,18 +3687,6 @@ BOOL LLCallingCardBridge::dragOrDrop(MASK mask, BOOL drop, return rv; } -BOOL LLCallingCardBridge::removeItem() -{ - if (LLFriendCardsManager::instance().isItemInAnyFriendsList(getItem())) - { - LLAvatarActions::removeFriendDialog(getItem()->getCreatorUUID()); - return FALSE; - } - else - { - return LLItemBridge::removeItem(); - } -} // +=================================================+ // | LLNotecardBridge | // +=================================================+ |