diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-01-22 13:17:58 +0200 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-01-22 13:17:58 +0200 |
| commit | 4230c655483b61277bdd4c87e0e2a02a39179c88 (patch) | |
| tree | 15128be0bb7b45a337ea57fc1a49cbcd9db25715 /indra/newview | |
| parent | 11c72472bc54d8479ed03498106706703d0d6a8d (diff) | |
Fixed major bug EXT-4609 Deleting duplicate calling cards also removes a Resident from ur Friends list :(
- removed separate logic for Residents in the Friends list when Calling card is removed
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 12 | ||||
| -rw-r--r-- | indra/newview/llinventorybridge.h | 1 |
2 files changed, 0 insertions, 13 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 | // +=================================================+ diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h index fced0047e8..759d0cba18 100644 --- a/indra/newview/llinventorybridge.h +++ b/indra/newview/llinventorybridge.h @@ -448,7 +448,6 @@ public: EDragAndDropType cargo_type, void* cargo_data); void refreshFolderViewItem(); - BOOL removeItem(); protected: LLCallingCardBridge( LLInventoryPanel* inventory, const LLUUID& uuid ); |