summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelobjectinventory.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2012-06-28 23:30:36 -0700
committerRichard Linden <none@none>2012-06-28 23:30:36 -0700
commit604bbb22783d2460384e340592ca1781908f6dd8 (patch)
tree42afa4894daf9a09e3935e32885c42f83f508162 /indra/newview/llpanelobjectinventory.cpp
parented7173c987cf4a5de2f3c9b9d792e5ac4006e833 (diff)
CHUI-101 WIP Make LLFolderview general purpose
cleaned up ownership of viewmodel more filtering fixes
Diffstat (limited to 'indra/newview/llpanelobjectinventory.cpp')
-rw-r--r--indra/newview/llpanelobjectinventory.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp
index 6a232a26f7..d0b9072ade 100644
--- a/indra/newview/llpanelobjectinventory.cpp
+++ b/indra/newview/llpanelobjectinventory.cpp
@@ -1562,7 +1562,7 @@ void LLPanelObjectInventory::reset()
p.tool_tip= LLTrans::getString("PanelContentsTooltip");
p.listener = LLTaskInvFVBridge::createObjectBridge(this, NULL);
p.folder_indentation = -14; // subtract space normally reserved for folder expanders
- p.view_model = new LLFolderViewModelInventory();
+ p.view_model = &mInventoryViewModel;
mFolders = LLUICtrlFactory::create<LLFolderView>(p);
// this ensures that we never say "searching..." or "no items found"
//TODO RN: make this happen by manipulating filter object directly