diff options
author | Richard Nelson <none@none> | 2010-09-09 11:38:34 -0700 |
---|---|---|
committer | Richard Nelson <none@none> | 2010-09-09 11:38:34 -0700 |
commit | 4f442653dcf302b30d049482900c56b7456f94e8 (patch) | |
tree | bdf3218f3fcb420bde0ea298a3f465e02710f616 /indra/newview/llpanelmaininventory.cpp | |
parent | 9dc0cbf6dabf729d8759f4abcf226ed05bb64055 (diff) | |
parent | e7884bbab54d172957f5ee05df8dad3a4f8931bd (diff) |
Automated merge with ssh://hg.lindenlab.com/monroe/viewer-experience-3
Diffstat (limited to 'indra/newview/llpanelmaininventory.cpp')
-rw-r--r-- | indra/newview/llpanelmaininventory.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp index c5d4f95f08..5b07e4863b 100644 --- a/indra/newview/llpanelmaininventory.cpp +++ b/indra/newview/llpanelmaininventory.cpp @@ -642,6 +642,7 @@ LLFloaterInventoryFinder::LLFloaterInventoryFinder(LLPanelMainInventory* invento mPanelMainInventory(inventory_view), mFilter(inventory_view->getPanel()->getFilter()) { + buildFromFile("floater_inventory_view_finder.xml"); updateElementsFromFilter(); } |