diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-05-21 13:16:29 +0300 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-05-21 13:16:29 +0300 |
| commit | 5c370550bf216c24841879b5041f9b9d40fb459c (patch) | |
| tree | 249ab1c7eba580b22380805dc816217a430d8ba3 /indra/newview/llinventorybridge.cpp | |
| parent | c3a352b219380faa722be6f1ac916a7b95eb836c (diff) | |
EXT-6710 WIP Prepare to implementation - "Give inventory" related functionality was moved from the LLToolDragAndDrop to a separate class - LLGiveInventory.
To allow give several inventory items to several selected residents I need some functionality encapsulated in LLToolDragAndDrop class out of it.
No functionality should be changed.
LLToolDragAndDrop was updated to use new LLGiveInventory'methods instead of removed ones.
There were moved methods related to:
- give inventory item
- give inventory category
- log into chat
Such functionality was moved:
- is give acceptable
- do inventory give operation
- send give inventory request to server
- process give inventory for protected items
QA Notes: Functionality related to give inventory via drag and drop should be re-tested closely.
Reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/364/
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index ab7eeae3e8..2c59cee2ee 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -47,6 +47,7 @@ #include "llfloaterworldmap.h" #include "llfriendcard.h" #include "llgesturemgr.h" +#include "llgiveinventory.h" #include "llimfloater.h" #include "llimview.h" #include "llinventoryclipboard.h" @@ -3755,7 +3756,7 @@ BOOL LLCallingCardBridge::dragOrDrop(MASK mask, BOOL drop, rv = TRUE; if(drop) { - LLToolDragAndDrop::giveInventory(item->getCreatorUUID(), + LLGiveInventory::doGiveInventoryItem(item->getCreatorUUID(), (LLInventoryItem*)cargo_data); } } @@ -3776,7 +3777,7 @@ BOOL LLCallingCardBridge::dragOrDrop(MASK mask, BOOL drop, rv = TRUE; if(drop) { - LLToolDragAndDrop::giveInventoryCategory( + LLGiveInventory::doGiveInventoryCategory( item->getCreatorUUID(), inv_cat); } |