diff options
| author | Richard Linden <none@none> | 2010-06-15 10:25:47 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-06-15 10:25:47 -0700 |
| commit | a37e6ce52eb8c0ed6c433a4d2b23647c590f8312 (patch) | |
| tree | 14743f7ece3badf8cce0695afdf4234f1a23f67a /indra/newview/llinventorypanel.cpp | |
| parent | da078d9a35e256a59652f6ed545b3cb09f384bb0 (diff) | |
| parent | 809fea74633bcb3358eed9f80059822c6664bf54 (diff) | |
merge
Diffstat (limited to 'indra/newview/llinventorypanel.cpp')
| -rw-r--r-- | indra/newview/llinventorypanel.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp index 83c57d5bb2..5e88140848 100644 --- a/indra/newview/llinventorypanel.cpp +++ b/indra/newview/llinventorypanel.cpp @@ -110,7 +110,7 @@ LLInventoryPanel::LLInventoryPanel(const LLInventoryPanel::Params& p) : } } -BOOL LLInventoryPanel::postBuild() +void LLInventoryPanel::initFromParams(const LLInventoryPanel::Params& params) { LLMemType mt(LLMemType::MTYPE_INVENTORY_POST_BUILD); @@ -128,6 +128,7 @@ BOOL LLInventoryPanel::postBuild() p.rect = folder_rect; p.parent_panel = this; p.tool_tip = p.name; + p.use_label_suffix = params.use_label_suffix; mFolderRoot = LLUICtrlFactory::create<LLFolderView>(p); mFolderRoot->setAllowMultiSelect(mAllowMultiSelect); } @@ -174,8 +175,6 @@ BOOL LLInventoryPanel::postBuild() setSortOrder(gSavedSettings.getU32(DEFAULT_SORT_ORDER)); } mFolderRoot->setSortOrder(getFilter()->getSortOrder()); - - return TRUE; } LLInventoryPanel::~LLInventoryPanel() |