diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-05-29 16:56:15 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-05-29 16:56:15 -0700 |
| commit | b9407199462c0b56a7d49c2e19657e87ec149d8c (patch) | |
| tree | eda4a3328111f7df3c6ae9163789f32060287b37 /indra/newview/llinventorybridge.h | |
| parent | 22ee6abe0b4cd354ccbcb9055678356e91d009ff (diff) | |
DD-84 : WIP : Get DAMA to display for drag and drop. Note that, because of current SLM issues, it works on version folders, active or not.
Diffstat (limited to 'indra/newview/llinventorybridge.h')
| -rwxr-xr-x | indra/newview/llinventorybridge.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h index 72b92b6911..eeaedc197f 100755 --- a/indra/newview/llinventorybridge.h +++ b/indra/newview/llinventorybridge.h @@ -263,8 +263,10 @@ public: mIsLoading(false) {} - BOOL dragItemIntoFolder(LLInventoryItem* inv_item, BOOL drop, std::string& tooltip_msg); - BOOL dragCategoryIntoFolder(LLInventoryCategory* inv_category, BOOL drop, std::string& tooltip_msg); + BOOL dragItemIntoFolder(LLInventoryItem* inv_item, BOOL drop, std::string& tooltip_msg, BOOL user_confirm = TRUE); + BOOL dragCategoryIntoFolder(LLInventoryCategory* inv_category, BOOL drop, std::string& tooltip_msg, BOOL user_confirm = TRUE); + void callback_dropItemIntoFolder(const LLSD& notification, const LLSD& response, LLInventoryItem* inv_item); + void callback_dropCategoryIntoFolder(const LLSD& notification, const LLSD& response, LLInventoryCategory* inv_category); virtual void buildDisplayName() const; |