summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelobjectinventory.cpp
diff options
context:
space:
mode:
authorTodd Stinson <stinson@lindenlab.com>2012-07-27 15:38:03 -0700
committerTodd Stinson <stinson@lindenlab.com>2012-07-27 15:38:03 -0700
commitc1aa0cc4fcd4642a7849b0b56dd1b777536e4f92 (patch)
tree921c8ee2c4ae29210b9c59cdaef01f9c9388be01 /indra/newview/llpanelobjectinventory.cpp
parent0479e8d4ad1212b0028805cd4e39b6fe593b86c7 (diff)
parentca7b9a944b164602cd8b11bf6512f790743964f3 (diff)
Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.
Diffstat (limited to 'indra/newview/llpanelobjectinventory.cpp')
-rw-r--r--indra/newview/llpanelobjectinventory.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp
index 5887f4d244..4f2c515bde 100644
--- a/indra/newview/llpanelobjectinventory.cpp
+++ b/indra/newview/llpanelobjectinventory.cpp
@@ -1563,6 +1563,7 @@ void LLPanelObjectInventory::reset()
p.listener = LLTaskInvFVBridge::createObjectBridge(this, NULL);
p.folder_indentation = -14; // subtract space normally reserved for folder expanders
p.view_model = &mInventoryViewModel;
+ p.root = NULL;
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