From 6e1a8d894d836e23c5eeb783636c21a992730727 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Fri, 11 Sep 2009 00:00:10 +0000
Subject: svn merge svn merge
 https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1614
 https://svn.aws.productengine.com/secondlife/pe/stable-2@1618 ->
 viewer-2.0.0-3 * EXT-895

---
 indra/newview/skins/default/xui/en/widgets/search_editor.xml | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/widgets/search_editor.xml b/indra/newview/skins/default/xui/en/widgets/search_editor.xml
index 15b23ea9b3..8643f919ec 100644
--- a/indra/newview/skins/default/xui/en/widgets/search_editor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/search_editor.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <search_editor
+  clear_button_visible="false"
   text_pad_left="4" 
   select_on_focus="true"
   background_image="TextField_Search_Off"
@@ -12,4 +13,7 @@
     height="13" 
 	  image_unselected="Search"
 	  image_selected="Search" />
+  <clear_button label="" 
+   image_unselected="Icon_Close_Foreground"
+   image_selected="Icon_Close_Press" />
 </search_editor>
-- 
cgit v1.2.3