summaryrefslogtreecommitdiff
path: root/indra/newview/llplacesinventorypanel.h
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2010-10-11 14:33:29 -0700
committerMerov Linden <merov@lindenlab.com>2010-10-11 14:33:29 -0700
commitbf74882b429687b113da9784189790ddb3f8cef4 (patch)
tree51ddcc0a44a43542a446e7a4e75565184628109b /indra/newview/llplacesinventorypanel.h
parent4859a40055fa4b8c15b82466dee1b37884d54902 (diff)
parentc3b9ed68cfa988ddbbcfae36be04d4a8e69c1983 (diff)
STORM-296 : merge to viewer-beta
Diffstat (limited to 'indra/newview/llplacesinventorypanel.h')
-rw-r--r--indra/newview/llplacesinventorypanel.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llplacesinventorypanel.h b/indra/newview/llplacesinventorypanel.h
index 6641871a0b..a44776d18b 100644
--- a/indra/newview/llplacesinventorypanel.h
+++ b/indra/newview/llplacesinventorypanel.h
@@ -70,6 +70,12 @@ public:
*/
/*virtual*/ BOOL handleRightMouseDown( S32 x, S32 y, MASK mask );
+ /*virtual*/ BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
+ EDragAndDropType cargo_type,
+ void* cargo_data,
+ EAcceptance* accept,
+ std::string& tooltip_msg);
+
void setupMenuHandle(LLInventoryType::EType asset_type, LLHandle<LLView> menu_handle);
void setParentLandmarksPanel(LLLandmarksPanel* panel)