diff options
| author | Vir Linden <60274682+vir-linden@users.noreply.github.com> | 2024-04-24 16:02:42 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-24 16:02:42 -0400 |
| commit | a3602d660c89a10126946d9c789e454fbfbc34bd (patch) | |
| tree | 1cd70015b45a432f599036f181dd93c53c59393a /indra/newview/llplacesinventorypanel.h | |
| parent | 6ca4dfdb56d0107368a09af2b089c24d32e7108d (diff) | |
| parent | d98fc504a1d4bc292ba86acdda053c8b4598a193 (diff) | |
Merge pull request #1323 from secondlife/main
Update from main
Diffstat (limited to 'indra/newview/llplacesinventorypanel.h')
| -rw-r--r-- | indra/newview/llplacesinventorypanel.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llplacesinventorypanel.h b/indra/newview/llplacesinventorypanel.h index 3c27964ec5..81b623b045 100644 --- a/indra/newview/llplacesinventorypanel.h +++ b/indra/newview/llplacesinventorypanel.h @@ -47,11 +47,14 @@ 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; private: LLSaveFolderState* mSavedFolderState; |