From 54a90871906bcb72f9cd216ea437d59893b099aa Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Sat, 19 Apr 2014 02:56:24 +0100
Subject: Show 'No results' in Experiences Search for ACME-1313

---
 indra/newview/llfloaterexperiencepicker.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llfloaterexperiencepicker.cpp b/indra/newview/llfloaterexperiencepicker.cpp
index b82257ee56..f68bf7f9a6 100644
--- a/indra/newview/llfloaterexperiencepicker.cpp
+++ b/indra/newview/llfloaterexperiencepicker.cpp
@@ -416,8 +416,16 @@ void LLFloaterExperiencePicker::filterContent()
 	if (search_results->isEmpty())
 	{
 		LLStringUtil::format_map_t map;
-		map["[TEXT]"] = childGetText(TEXT_EDIT);
-		getChild<LLScrollListCtrl>(LIST_RESULTS)->setCommentText(getString("not_found", map));
+		std::string search_text = childGetText(TEXT_EDIT);
+		map["[TEXT]"] = search_text;
+		if (search_text.empty())
+		{
+			getChild<LLScrollListCtrl>(LIST_RESULTS)->setCommentText(getString("no_results"));
+		}
+		else
+		{
+			getChild<LLScrollListCtrl>(LIST_RESULTS)->setCommentText(getString("not_found", map));
+		}
 		search_results->setEnabled(false);
 		getChildView(BTN_OK)->setEnabled(false);
 		getChildView(BTN_PROFILE)->setEnabled(false);
-- 
cgit v1.2.3