From 2266a2a6625f14f72c0f8254deeeb93266fe9409 Mon Sep 17 00:00:00 2001 From: Lirusaito Date: Mon, 4 Mar 2019 16:53:22 -0500 Subject: [PATCH] Let's build it with the factory map then. --- indra/newview/llfloatermarketplacelistings.cpp | 5 ++--- .../skins/default/xui/en-us/floater_marketplace_listings.xml | 2 +- .../skins/default/xui/en-us/panel_marketplace_listings.xml | 1 - 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/indra/newview/llfloatermarketplacelistings.cpp b/indra/newview/llfloatermarketplacelistings.cpp index ed46ee78b..95d81027d 100644 --- a/indra/newview/llfloatermarketplacelistings.cpp +++ b/indra/newview/llfloatermarketplacelistings.cpp @@ -358,7 +358,8 @@ LLFloaterMarketplaceListings::LLFloaterMarketplaceListings(const LLSD& key) , mPanelListingsSet(false) { //buildFromFile("floater_marketplace_listings.xml"); - LLUICtrlFactory::instance().buildFloater(this, "floater_marketplace_listings.xml"); + mFactoryMap["panel_marketplace_listing"] = LLCallbackMap([&](void*) { return mPanelListings = new LLPanelMarketplaceListings; }); + LLUICtrlFactory::instance().buildFloater(this, "floater_marketplace_listings.xml", &getFactoryMap()); } LLFloaterMarketplaceListings::~LLFloaterMarketplaceListings() @@ -384,8 +385,6 @@ BOOL LLFloaterMarketplaceListings::postBuild() mInventoryText = mInventoryPlaceholder->getChild("marketplace_listings_inventory_placeholder_text"); mInventoryTitle = mInventoryPlaceholder->getChild("marketplace_listings_inventory_placeholder_title"); - mPanelListings = static_cast(getChild("panel_marketplace_listing")); - LLFocusableElement::setFocusReceivedCallback(boost::bind(&LLFloaterMarketplaceListings::onFocusReceived, this)); // Observe category creation to catch marketplace listings creation (moot if already existing) diff --git a/indra/newview/skins/default/xui/en-us/floater_marketplace_listings.xml b/indra/newview/skins/default/xui/en-us/floater_marketplace_listings.xml index cb70221b1..1839de5c2 100644 --- a/indra/newview/skins/default/xui/en-us/floater_marketplace_listings.xml +++ b/indra/newview/skins/default/xui/en-us/floater_marketplace_listings.xml @@ -67,7 +67,7 @@