summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelmaininventory.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2010-10-08 10:47:25 -0400
committerOz Linden <oz@lindenlab.com>2010-10-08 10:47:25 -0400
commitbb74487c859acccb8f88002630606419761136e4 (patch)
treeeadeabd044a9fa06c789b957d9b2c823c47617dd /indra/newview/llpanelmaininventory.cpp
parent970ce1e1626c205302c4085610819571c1ce79f4 (diff)
parentd25a30e55b7e6a20173c3a53891489adc5610d72 (diff)
Merge fixes for VWR-23047, VWR-20911, and SNOW-748
Diffstat (limited to 'indra/newview/llpanelmaininventory.cpp')
-rw-r--r--indra/newview/llpanelmaininventory.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 27e054af34..5b07e4863b 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -642,7 +642,7 @@ LLFloaterInventoryFinder::LLFloaterInventoryFinder(LLPanelMainInventory* invento
mPanelMainInventory(inventory_view),
mFilter(inventory_view->getPanel()->getFilter())
{
- LLUICtrlFactory::getInstance()->buildFloater(this, "floater_inventory_view_finder.xml", NULL);
+ buildFromFile("floater_inventory_view_finder.xml");
updateElementsFromFilter();
}