diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-03-25 10:22:10 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-03-25 10:22:10 -0700 |
| commit | f813a25224081e68d4772676909d2cff14407486 (patch) | |
| tree | 8c8fe1b0fbff8e7374787ded3c57354cd9929c11 | |
| parent | 5b0882872871a5601b216655ea408a2a9675f159 (diff) | |
DD-10 : WIP : Some XUI clean up, menu still not working
| -rwxr-xr-x | indra/newview/llfloateroutbox.cpp | 2 | ||||
| -rwxr-xr-x | indra/newview/skins/default/xui/en/menu_marketplace_view.xml | 4 | ||||
| -rwxr-xr-x | indra/newview/skins/default/xui/en/panel_marketplace_listings.xml (renamed from indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml) | 0 |
3 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llfloateroutbox.cpp b/indra/newview/llfloateroutbox.cpp index 0d87cf63e8..9ea83e9621 100755 --- a/indra/newview/llfloateroutbox.cpp +++ b/indra/newview/llfloateroutbox.cpp @@ -900,7 +900,7 @@ void LLFloaterMarketplaceListings::setup() llassert(mCategoriesObserver); // Set up the marketplace listings inventory view - LLPanel* inventory_panel = LLUICtrlFactory::createFromFile<LLPanel>("panel_marketplace_listings_inventory.xml", mInventoryPlaceholder->getParent(), LLInventoryPanel::child_registry_t::instance()); + LLPanel* inventory_panel = LLUICtrlFactory::createFromFile<LLPanel>("panel_marketplace_listings.xml", mInventoryPlaceholder->getParent(), LLInventoryPanel::child_registry_t::instance()); LLInventoryPanel* items_panel = inventory_panel->getChild<LLInventoryPanel>("All Items"); mInventoryPanel = items_panel->getInventoryPanelHandle(); llassert(mInventoryPanel.get() != NULL); diff --git a/indra/newview/skins/default/xui/en/menu_marketplace_view.xml b/indra/newview/skins/default/xui/en/menu_marketplace_view.xml index 36c73b9f4b..9ed93e2f11 100755 --- a/indra/newview/skins/default/xui/en/menu_marketplace_view.xml +++ b/indra/newview/skins/default/xui/en/menu_marketplace_view.xml @@ -32,10 +32,10 @@ </menu_item_check> <menu_item_check name="show_active" label="Show Active Listings and Folders Only"> <menu_item_check.on_click - function="People.Nearby.ViewSort.Action" + function="Marketplace.ViewSort.Action" parameter="show_active" /> <menu_item_check.on_check - function="People.Nearby.ViewSort.CheckItem" + function="Marketplace.ViewSort.CheckItem" parameter="show_active" /> </menu_item_check> <menu_item_check name="show_inactive_listings" label="Show Inactive Listings Only"> diff --git a/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml b/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml index 54fc3a0c0f..54fc3a0c0f 100755 --- a/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml |