diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-02-02 10:57:09 -0500 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-02-02 10:57:09 -0500 |
commit | b9376ab990707aafb041ef630d321b886bed6128 (patch) | |
tree | 75cb218be1507c60d79ed543a13ca6bcae1d6e54 /indra/newview/llinventorypanel.h | |
parent | b0d94fa706efd7794b4ba5b9160ddcfc33233ca4 (diff) | |
parent | 0e609cc95b08c28bd51f5ab48160fd93df7a6b28 (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 2a24327115..8279163762 100644 --- a/indra/newview/llinventorypanel.h +++ b/indra/newview/llinventorypanel.h @@ -84,6 +84,7 @@ public: Optional<Filter> filter; Optional<std::string> start_folder; Optional<bool> use_label_suffix; + Optional<bool> show_empty_message; Optional<bool> show_load_status; Optional<LLScrollContainer::Params> scroll; Optional<bool> accepts_drag_and_drop; @@ -96,6 +97,7 @@ public: filter("filter"), start_folder("start_folder"), use_label_suffix("use_label_suffix", true), + show_empty_message("show_empty_message", true), show_load_status("show_load_status"), scroll("scroll"), accepts_drag_and_drop("accepts_drag_and_drop") @@ -188,6 +190,7 @@ protected: BOOL mAcceptsDragAndDrop; BOOL mAllowMultiSelect; BOOL mShowItemLinkOverlays; // Shows link graphic over inventory item icons + BOOL mShowEmptyMessage; BOOL mShowLoadStatus; LLFolderView* mFolderRoot; |