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/floater_tos.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_tos.xml b/indra/newview/skins/default/xui/en/floater_tos.xml
index 6585667c8b..54facbb659 100644
--- a/indra/newview/skins/default/xui/en/floater_tos.xml
+++ b/indra/newview/skins/default/xui/en/floater_tos.xml
@@ -49,7 +49,7 @@
      name="tos_heading"
      top_delta="-399"
      width="552">
-        Please read the following Terms of Service carefully. To continue logging in to Second Life,
+        Please read the following Terms of Service carefully. To continue logging in to [SECOND_LIFE],
 you must accept the agreement.
     </text>
     <text_editor
@@ -64,6 +64,7 @@ you must accept the agreement.
      name="tos_text"
      top_pad="43"
      width="568"
+     handle_edit_keys_directly="true" 
      word_wrap="true">
         TOS_TEXT
     </text_editor>
-- 
cgit v1.2.3