From d079c11c99c381a3e9aae292e132c67f39d038ff Mon Sep 17 00:00:00 2001 From: Maxim Nikolenko Date: Mon, 6 Nov 2023 15:28:26 +0200 Subject: SL-20565 Places floater -- allow dragging a folder into a folder (#491) --- indra/newview/llplacesinventorypanel.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'indra/newview/llplacesinventorypanel.h') diff --git a/indra/newview/llplacesinventorypanel.h b/indra/newview/llplacesinventorypanel.h index 5629438415..467eee91af 100644 --- a/indra/newview/llplacesinventorypanel.h +++ b/indra/newview/llplacesinventorypanel.h @@ -53,6 +53,9 @@ public: virtual S32 notify(const LLSD& info) ; + BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, EDragAndDropType cargo_type, void *cargo_data, + EAcceptance *accept, std::string &tooltip_msg) override; + private: LLSaveFolderState* mSavedFolderState; }; -- cgit v1.2.3 From 8262c4201ec2ce2781d917e73597a00c779a7658 Mon Sep 17 00:00:00 2001 From: Maxim Nikolenko Date: Mon, 6 Nov 2023 21:01:03 +0200 Subject: mac build fix --- indra/newview/llplacesinventorypanel.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/llplacesinventorypanel.h') diff --git a/indra/newview/llplacesinventorypanel.h b/indra/newview/llplacesinventorypanel.h index 467eee91af..c6a4cb66b2 100644 --- a/indra/newview/llplacesinventorypanel.h +++ b/indra/newview/llplacesinventorypanel.h @@ -47,11 +47,11 @@ public: LLPlacesInventoryPanel(const Params& p); ~LLPlacesInventoryPanel(); - LLFolderView * createFolderRoot(LLUUID root_id ); + LLFolderView * createFolderRoot(LLUUID root_id ) override; void saveFolderState(); void restoreFolderState(); - virtual S32 notify(const LLSD& info) ; + virtual S32 notify(const LLSD& info) override; BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, EDragAndDropType cargo_type, void *cargo_data, EAcceptance *accept, std::string &tooltip_msg) override; -- cgit v1.2.3