1 files changed, 9 insertions, 20 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_tos.xml b/indra/newview/skins/default/xui/en/floater_tos.xml
index 6585667c8b..cbfaac958b 100644
--- a/indra/newview/skins/default/xui/en/floater_tos.xml
+++ b/indra/newview/skins/default/xui/en/floater_tos.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
+ legacy_header_height="18"
  can_close="false"
  can_minimize="false"
  height="500"
@@ -10,6 +11,10 @@
      name="real_url">
         http://secondlife.com/app/tos/
     </floater.string>
+    <floater.string
+     name="loading_url">
+        data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody text=%22000000%22%3E%3Ch2%3E Loading %3Ca%20target%3D%22_external%22%20href%3D%22http%3A//secondlife.com/app/tos/%22%3ETerms%20of%20Service%3C/a%3E...%3C/h2%3E %3C/body%3E %3C/html%3E
+    </floater.string>
     <button
      enabled="false"
      height="20"
@@ -32,7 +37,7 @@
     <check_box
      follows="top|right"
      height="16"
-     label="I Agree to the Terms of Service"
+     label="I Agree to the Terms of Service and Privacy Policy"
      layout="topleft"
      left_delta="0"
      name="agree_chk"
@@ -48,32 +53,16 @@
      left_delta="0"
      name="tos_heading"
      top_delta="-399"
+     word_wrap="true"
      width="552">
-        Please read the following Terms of Service carefully. To continue logging in to Second Life,
-you must accept the agreement.
+        Please read the following Terms of Service and Privacy Policy carefully. To continue logging in to [SECOND_LIFE], you must accept the agreement.
     </text>
-    <text_editor
-     type="string"
-     length="1"
-     follows="left|top"
-     font="SansSerif"
-     height="283"
-     layout="topleft"
-     left_delta="0"
-     max_length="65536"
-     name="tos_text"
-     top_pad="43"
-     width="568"
-     word_wrap="true">
-        TOS_TEXT
-    </text_editor>
     <web_browser
      follows="left|top"
      height="340"
      layout="topleft"
      left_delta="0"
      name="tos_html"
-     start_url="data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody text=%22000000%22%3E%3Ch2%3E Loading %3Ca%20target%3D%22_external%22%20href%3D%22http%3A//secondlife.com/app/tos/%22%3ETerms%20of%20Service%3C/a%3E...%3C/h2%3E %3C/body%3E %3C/html%3E"
-     top_delta="-27"
+     top_delta="40"
      width="568" />
 </floater>