From 5d1c0f6a10d39d61069011be2b128c3a2fe03459 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Tue, 23 Sep 2014 09:59:33 -0700 Subject: DD-196 : Add message to panel when search returns empty --- indra/newview/llfloatermarketplacelistings.cpp | 4 ++++ .../skins/default/xui/en/panel_marketplace_listings_inventory.xml | 2 +- .../skins/default/xui/en/panel_marketplace_listings_listed.xml | 2 +- .../skins/default/xui/en/panel_marketplace_listings_unassociated.xml | 2 +- .../skins/default/xui/en/panel_marketplace_listings_unlisted.xml | 2 +- indra/newview/skins/default/xui/en/strings.xml | 1 + 6 files changed, 9 insertions(+), 4 deletions(-) (limited to 'indra') diff --git a/indra/newview/llfloatermarketplacelistings.cpp b/indra/newview/llfloatermarketplacelistings.cpp index 7784ec597c..bbbc27fe16 100755 --- a/indra/newview/llfloatermarketplacelistings.cpp +++ b/indra/newview/llfloatermarketplacelistings.cpp @@ -74,16 +74,20 @@ void LLPanelMarketplaceListings::buildAllPanels() { LLInventoryPanel* panel; panel = buildInventoryPanel("All Items", "panel_marketplace_listings_inventory.xml"); + panel->getFilter().setEmptyLookupMessage("MarketplaceNoMatchingItems"); panel->getFilter().markDefault(); mAllPanel = panel; panel = buildInventoryPanel("Active Items", "panel_marketplace_listings_listed.xml"); panel->getFilter().setFilterMarketplaceActiveFolders(); + panel->getFilter().setEmptyLookupMessage("MarketplaceNoMatchingItems"); panel->getFilter().markDefault(); panel = buildInventoryPanel("Inactive Items", "panel_marketplace_listings_unlisted.xml"); panel->getFilter().setFilterMarketplaceInactiveFolders(); + panel->getFilter().setEmptyLookupMessage("MarketplaceNoMatchingItems"); panel->getFilter().markDefault(); panel = buildInventoryPanel("Unassociated Items", "panel_marketplace_listings_unassociated.xml"); panel->getFilter().setFilterMarketplaceUnassociatedFolders(); + panel->getFilter().setEmptyLookupMessage("MarketplaceNoMatchingItems"); panel->getFilter().markDefault(); LLTabContainer* tabs_panel = getChild("marketplace_filter_tabs"); diff --git a/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml b/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml index d6922602fb..16e7fbbfeb 100755 --- a/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml @@ -10,7 +10,7 @@ top="16" left="0" start_folder.name="Marketplace listings" - show_empty_message="false" + show_empty_message="true" show_root_folder="true" start_folder.type="merchant" tool_tip="Drag and drop items here to sell them" diff --git a/indra/newview/skins/default/xui/en/panel_marketplace_listings_listed.xml b/indra/newview/skins/default/xui/en/panel_marketplace_listings_listed.xml index 40ffb1b13c..181eee70e2 100755 --- a/indra/newview/skins/default/xui/en/panel_marketplace_listings_listed.xml +++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings_listed.xml @@ -9,7 +9,7 @@ height="370" left_delta="0" start_folder.name="Marketplace listings" - show_empty_message="false" + show_empty_message="true" show_root_folder="true" allow_drop_on_root="false" start_folder.type="merchant" diff --git a/indra/newview/skins/default/xui/en/panel_marketplace_listings_unassociated.xml b/indra/newview/skins/default/xui/en/panel_marketplace_listings_unassociated.xml index 20b1b9fbb7..6ea4784c4c 100755 --- a/indra/newview/skins/default/xui/en/panel_marketplace_listings_unassociated.xml +++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings_unassociated.xml @@ -9,7 +9,7 @@ height="370" left_delta="0" start_folder.name="Marketplace listings" - show_empty_message="false" + show_empty_message="true" show_root_folder="true" start_folder.type="merchant" bg_opaque_color="DkGray2" diff --git a/indra/newview/skins/default/xui/en/panel_marketplace_listings_unlisted.xml b/indra/newview/skins/default/xui/en/panel_marketplace_listings_unlisted.xml index 7c7e706e41..0d19d09918 100755 --- a/indra/newview/skins/default/xui/en/panel_marketplace_listings_unlisted.xml +++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings_unlisted.xml @@ -9,7 +9,7 @@ height="370" left_delta="0" start_folder.name="Marketplace listings" - show_empty_message="false" + show_empty_message="true" show_root_folder="true" allow_drop_on_root="false" start_folder.type="merchant" diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 86129647d0..97d8c3ce5c 100755 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2259,6 +2259,7 @@ For AI Character: Get the closest navigable point to the point provided. Didn't find what you're looking for? Try [secondlife:///app/search/all/[SEARCH_TERM] Search]. Didn't find what you're looking for? Try [secondlife:///app/search/places/[SEARCH_TERM] Search]. Drag a landmark here to add it to your favorites. + No Marketplace Listings item found for this search string. You do not have a copy of this texture in your inventory Your Marketplace purchases will appear here. You may then drag them into your inventory to use them. https://marketplace.[MARKETPLACE_DOMAIN_NAME]/ -- cgit v1.2.3