From 30129ecb2f0fd446a6765d205002a8ca5ec33753 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Tue, 30 Sep 2014 16:13:32 +0200
Subject: [PATCH] Fix search and clear button in menu search box

---
 .../skins/default/xui/en/panel_status_bar.xml | 59 +++++++++++++------
 1 file changed, 41 insertions(+), 18 deletions(-)

diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml
index db035e6803..52536595cd 100755
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -231,24 +231,47 @@
         L$ [AMT]
     </panel.string>
 
-  <panel height="18" left_pad="12" top="0" width="120" follows="right|top" name="menu_search_panel"
-		 background_opaque="true" background_visible="true" bg_opaque_color="MouseGray">
-	<search_editor
-		clear_button_visible="true"
-		follows="left|top"
-		height="18"
-		label="Search Menu"
-		layout="topleft"
-		left="0"
-		max_length_bytes="255"
-		name="search_menu_edit"
-		right="-1"
-		text_pad_left="6"
-		tool_tip="Type the search term you are interested in here. Results will be displayed for partial fulltext matches within the menu."
-		top="0">
-      <search_editor.commit_callback function="UpdateFilter" />
-	</search_editor>
-  </panel>
+	<panel
+	 height="18"
+	 left_pad="12"
+	 top="0"
+	 width="120"
+	 follows="right|top"
+	 name="menu_search_panel"
+	 background_opaque="true"
+	 background_visible="true"
+	 bg_opaque_color="MouseGray">
+		<search_editor
+		 clear_button_visible="true"
+		 follows="left|top"
+		 height="18"
+		 label="Search Menu"
+		 layout="topleft"
+		 left="0"
+		 max_length_bytes="255"
+		 name="search_menu_edit"
+		 right="-1"
+		 text_pad_left="6"
+		 tool_tip="Type the search term you are interested in here. Results will be displayed for partial fulltext matches within the menu."
+		 top="0">
+			<search_button 
+			 top_pad="4"
+			 left_pad="4" 
+			 width="12"
+			 height="12" 
+			 image_unselected="Search"
+			 image_selected="Search"/>
+			<clear_button
+			 bottom="2"
+			 height="12"
+			 image_unselected="Icon_Close_Foreground"
+			 image_selected="Icon_Close_Press"
+			 pad_right="4"
+			 pad_left="4"
+			 width="12"/>
+			<search_editor.commit_callback function="UpdateFilter" />
+		</search_editor>
+	</panel>
 
   <panel
     height="18"