diff options
| author | Brad Linden <brad@lindenlab.com> | 2024-04-24 09:55:34 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2024-04-24 09:55:34 -0700 |
| commit | 86c0c1d5536897c925f4e8aa2859a160313d964c (patch) | |
| tree | 9d32be1b0d6a4dd139d8a72b35a94f48046b2ffc /indra/newview/llplacesinventorypanel.h | |
| parent | cadc1a02cc7289dabd368dd1a1d237c042e9f82e (diff) | |
| parent | d98fc504a1d4bc292ba86acdda053c8b4598a193 (diff) | |
Merge remote-tracking branch 'origin/main' into release/materials_featurette
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; |