From 27b457f2ce860f7fc36d15e8792bfa89bca5b93f Mon Sep 17 00:00:00 2001 From: Eugene Mutavchi Date: Mon, 12 Apr 2010 17:02:16 +0300 Subject: Implemented major task EXT-6710(Feature request: Allow drag and drop from Inventory panel to Resident Picker) - added handling the drag add drop inventory items to resident picker - added "Share" verb button to the inventory panel which opens resident picker - added "Share" menu item to the individual inventory context menu which acts as verb button Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/215/ --HG-- branch : product-engine --- indra/newview/llfloateravatarpicker.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'indra/newview/llfloateravatarpicker.h') diff --git a/indra/newview/llfloateravatarpicker.h b/indra/newview/llfloateravatarpicker.h index 860f3930ef..e69b814f9f 100644 --- a/indra/newview/llfloateravatarpicker.h +++ b/indra/newview/llfloateravatarpicker.h @@ -37,6 +37,8 @@ #include +class LLScrollListCtrl; + class LLFloaterAvatarPicker : public LLFloater { public: @@ -59,6 +61,11 @@ public: static void processAvatarPickerReply(class LLMessageSystem* msg, void**); + BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, + BOOL drop, EDragAndDropType cargo_type, + void *cargo_data, EAcceptance *accept, + std::string& tooltip_msg); + private: void editKeystroke(class LLLineEditor* caller, void* user_data); @@ -77,6 +84,7 @@ private: void find(); void setAllowMultiple(BOOL allow_multiple); + LLScrollListCtrl* getActiveList(); virtual void draw(); virtual BOOL handleKeyHere(KEY key, MASK mask); -- cgit v1.2.3