summaryrefslogtreecommitdiff
path: root/indra/newview/llfolderview.h
diff options
context:
space:
mode:
authorLeslie Linden <leslie@lindenlab.com>2012-01-17 11:07:11 -0800
committerLeslie Linden <leslie@lindenlab.com>2012-01-17 11:07:11 -0800
commitdc0573be6cff912a20a2eab2ebd6ce61dc687ba6 (patch)
treed6a8012cd845931d994d587cd3f34e1b988175fb /indra/newview/llfolderview.h
parent1f9529c0c2b02c4ceee912f8ecb35181174cc7cc (diff)
parent577479a3e53ef152da191e3a004aeb34f0815658 (diff)
Merge with viewer-dd, attempt #1
Diffstat (limited to 'indra/newview/llfolderview.h')
-rw-r--r--indra/newview/llfolderview.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llfolderview.h b/indra/newview/llfolderview.h
index d4305a2fe2..1d018b5e6a 100644
--- a/indra/newview/llfolderview.h
+++ b/indra/newview/llfolderview.h
@@ -75,6 +75,7 @@ public:
Optional<std::string> title;
Optional<bool> use_label_suffix,
allow_multiselect,
+ show_empty_message,
show_load_status,
use_ellipses;
@@ -281,6 +282,7 @@ protected:
selected_items_t mSelectedItems;
BOOL mKeyboardSelection;
BOOL mAllowMultiSelect;
+ BOOL mShowEmptyMessage;
BOOL mShowFolderHierarchy;
LLUUID mSourceID;