diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-09-24 19:53:50 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-09-24 19:53:50 +0100 |
| commit | 5969609c4703cd21e431e05bcb0c48fc241faf11 (patch) | |
| tree | 5b699579b26b1b60b901997aa2da3d333de99ccb /indra/newview/llinventorypanel.h | |
| parent | 501cd7d9022d1ac719fb56d22c6a8e3fd5d122ca (diff) | |
| parent | c1974bf10a5562aed73be2d4d7d5446b668d40cb (diff) | |
Merge
Diffstat (limited to 'indra/newview/llinventorypanel.h')
| -rw-r--r-- | indra/newview/llinventorypanel.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h index e2da06b8d8..90fd659522 100644 --- a/indra/newview/llinventorypanel.h +++ b/indra/newview/llinventorypanel.h @@ -97,6 +97,7 @@ public: Optional<StartFolder> start_folder; Optional<bool> use_label_suffix; Optional<bool> show_empty_message; + Optional<bool> suppress_folder_menu; Optional<bool> show_root_folder; Optional<bool> allow_drop_on_root; Optional<bool> use_marketplace_folders; @@ -111,6 +112,7 @@ public: inventory("", &gInventory), allow_multi_select("allow_multi_select", true), show_item_link_overlays("show_item_link_overlays", false), + suppress_folder_menu("suppress_folder_menu", false), filter("filter"), start_folder("start_folder"), use_label_suffix("use_label_suffix", true), @@ -261,6 +263,7 @@ protected: bool mAllowMultiSelect; bool mShowItemLinkOverlays; // Shows link graphic over inventory item icons bool mShowEmptyMessage; + bool mSuppressFolderMenu; LLHandle<LLFolderView> mFolderRoot; LLScrollContainer* mScroller; |