diff options
| author | Richard Linden <none@none> | 2012-07-27 14:10:48 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-07-27 14:10:48 -0700 |
| commit | d7b444686f9d5d3ebc13db6389444830369ccf3a (patch) | |
| tree | cdda60929a5a1c2f031a09de623d744712c20207 /indra/newview/llpanelobjectinventory.cpp | |
| parent | f9ccd6bc9d9a1da849ac21913ff870e2db8ad6a1 (diff) | |
| parent | 3ba619053de562fc623263704af2bc2f415e8389 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-chui
Diffstat (limited to 'indra/newview/llpanelobjectinventory.cpp')
| -rw-r--r-- | indra/newview/llpanelobjectinventory.cpp | 1 |
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 |