diff options
| author | Brad Linden <brad@lindenlab.com> | 2023-02-02 12:11:40 -0800 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2023-02-02 12:11:40 -0800 |
| commit | 5fabfa50d7135d29c0cb8a553006cf9038f9baae (patch) | |
| tree | 1d0f21551bd443d4e1ba187480c082d612dfaac5 /indra/llui/llfolderview.h | |
| parent | 627e3d51c61778e07e350689ce68ede24afe61ab (diff) | |
| parent | 8d21d29bd7fa038db632ff90fb0e1207d0713ca2 (diff) | |
Merge remote-tracking branch 'origin/main' into DRTVWR-559
Diffstat (limited to 'indra/llui/llfolderview.h')
| -rw-r--r-- | indra/llui/llfolderview.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llui/llfolderview.h b/indra/llui/llfolderview.h index 6bb5e6c02e..7dfa04828a 100644 --- a/indra/llui/llfolderview.h +++ b/indra/llui/llfolderview.h @@ -235,6 +235,7 @@ public: bool showItemLinkOverlays() { return mShowItemLinkOverlays; } void setCallbackRegistrar(LLUICtrl::CommitCallbackRegistry::ScopedRegistrar* registrar) { mCallbackRegistrar = registrar; } + void setEnableRegistrar(LLUICtrl::EnableCallbackRegistry::ScopedRegistrar* registrar) { mEnableRegistrar = registrar; } LLPanel* getParentPanel() { return mParentPanel.get(); } // DEBUG only @@ -272,6 +273,7 @@ protected: protected: LLHandle<LLView> mPopupMenuHandle; + std::string mMenuFileName; selected_items_t mSelectedItems; bool mKeyboardSelection, @@ -327,6 +329,7 @@ protected: LLFolderViewItem* mDraggingOverItem; // See EXT-719 LLUICtrl::CommitCallbackRegistry::ScopedRegistrar* mCallbackRegistrar; + LLUICtrl::EnableCallbackRegistry::ScopedRegistrar* mEnableRegistrar; public: static F32 sAutoOpenTime; |