From 138bf1132262c479dbbd5c95195db46b1efd065f Mon Sep 17 00:00:00 2001
From: Richard Nelson <richard@lindenlab.com>
Date: Mon, 24 Aug 2009 20:04:52 +0000
Subject: merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3

DEV-11254 DEV-11254 DEV-2003: DEV-21567 DEV-37301 EXT-104 EXT-138 EXT-217 EXT-256 EXT-259 EXT-259 EXT-328 EXT-348 EXT-386 EXT-399 EXT-403 EXT-460 EXT-492 EXT-492 EXT-531 EXT-537 EXT-684

improved text editor (handles multiple fonts simultaneously as well as inline widgets)
---
 indra/newview/skins/default/xui/en/panel_status_bar.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_status_bar.xml')

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 82b7e02aeb..3ad5cbe018 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -224,7 +224,7 @@
      left_delta="1"
      name="search_editor"
      tab_group="1"
-     tool_tip="Search Second Life"
+     tool_tip="Search [SECOND_LIFE]"
      top_delta="4"
      width="78" />
     <button
@@ -240,7 +240,7 @@
      name="search_btn"
      picture_style="true"
      scale_image="false"
-     tool_tip="Search Second Life"
+     tool_tip="Search [SECOND_LIFE]"
      top_delta="-4"
      width="16" />
     <text
-- 
cgit v1.2.3