summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorypanel.h
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2010-06-16 15:25:40 +0300
committerVadim Savchuk <vsavchuk@productengine.com>2010-06-16 15:25:40 +0300
commit9cb1fcec6d52933f01426aec4e6a3f1b6774632c (patch)
treeac6b0a5ddb280db610162dece01166905d46b60e /indra/newview/llinventorypanel.h
parentb9a468aff6b4b9bdaf4ac0ab2a309902c6c203ed (diff)
parent9ee5a62332353db6a098628e69732d2723cc5deb (diff)
Merge from default branch
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llinventorypanel.h')
-rw-r--r--indra/newview/llinventorypanel.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h
index 52e9ef799e..84603e8b4f 100644
--- a/indra/newview/llinventorypanel.h
+++ b/indra/newview/llinventorypanel.h
@@ -87,6 +87,7 @@ public:
Optional<bool> show_item_link_overlays;
Optional<Filter> filter;
Optional<std::string> start_folder;
+ Optional<bool> use_label_suffix;
Params()
: sort_order_setting("sort_order_setting"),
@@ -94,7 +95,8 @@ public:
allow_multi_select("allow_multi_select", true),
show_item_link_overlays("show_item_link_overlays", false),
filter("filter"),
- start_folder("start_folder")
+ start_folder("start_folder"),
+ use_label_suffix("use_label_suffix", true)
{}
};
@@ -103,6 +105,7 @@ public:
//--------------------------------------------------------------------
protected:
LLInventoryPanel(const Params&);
+ void initFromParams(const Params&);
friend class LLUICtrlFactory;
public:
virtual ~LLInventoryPanel();
@@ -110,8 +113,6 @@ public:
public:
LLInventoryModel* getModel() { return mInventory; }
- BOOL postBuild();
-
// LLView methods
void draw();
BOOL handleHover(S32 x, S32 y, MASK mask);