diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2015-06-05 16:30:04 +0300 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2015-06-05 16:30:04 +0300 |
| commit | b59770199afae70f8fa14b3f050d5f5d4818cb07 (patch) | |
| tree | 112f4fe9a08eb1700062201482246fe429dfc35c /indra/newview/llinventorypanel.cpp | |
| parent | 77b4f1d51c6e9d2b7d6711bfa38912ba4682c320 (diff) | |
| parent | f3c58f765c0168f25bb13c4427e34b4bdad2f671 (diff) | |
Merge from viewer-release
Diffstat (limited to 'indra/newview/llinventorypanel.cpp')
| -rwxr-xr-x | indra/newview/llinventorypanel.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp index 3546317471..4a230accb6 100755 --- a/indra/newview/llinventorypanel.cpp +++ b/indra/newview/llinventorypanel.cpp @@ -146,7 +146,8 @@ LLInventoryPanel::LLInventoryPanel(const LLInventoryPanel::Params& p) : mShowEmptyMessage(p.show_empty_message), mViewsInitialized(false), mInvFVBridgeBuilder(NULL), - mInventoryViewModel(p.name) + mInventoryViewModel(p.name), + mGroupedItemBridge(new LLFolderViewGroupedItemBridge) { mInvFVBridgeBuilder = &INVENTORY_BRIDGE_BUILDER; @@ -186,6 +187,7 @@ LLFolderView * LLInventoryPanel::createFolderRoot(LLUUID root_id ) NULL, root_id); p.view_model = &mInventoryViewModel; + p.grouped_item_model = mGroupedItemBridge; p.use_label_suffix = mParams.use_label_suffix; p.allow_multiselect = mAllowMultiSelect; p.show_empty_message = mShowEmptyMessage; |