Merged in lindenlab/viewer-release

3 files changed, 43 insertions, 27 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_tos.xml b/indra/newview/skins/default/xui/en/floater_tos.xml
index 8976d2a78f..a8db0aca4e 100644
--- a/indra/newview/skins/default/xui/en/floater_tos.xml
+++ b/indra/newview/skins/default/xui/en/floater_tos.xml
@@ -86,7 +86,7 @@
      layout="topleft"
      left="484"
      name="Continue"
-     top_delta="35"
+     top_delta="55"
      width="100" />
     <button
      height="20"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 7dc3d6b08f..cc57e1375a 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -616,6 +616,16 @@ Save all changes to clothing/body parts?
 
   <notification
    icon="alertmodal.tga"
+   name="AllowMultipleViewers"
+   type="alertmodal">
+    Running multiple Second Life viewers is not supported. It can lead to texture cache collisions, corruption and degraded visuals and performance.
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
    name="GrantModifyRights"
    type="alertmodal">
 Granting modify rights to another Resident allows them to change, delete or take ANY objects you may have in-world. Be VERY careful when handing out this permission.
diff --git a/indra/newview/skins/default/xui/en/panel_notify_textbox.xml b/indra/newview/skins/default/xui/en/panel_notify_textbox.xml
index a679ca7f8c..6dc1bf9e9e 100644
--- a/indra/newview/skins/default/xui/en/panel_notify_textbox.xml
+++ b/indra/newview/skins/default/xui/en/panel_notify_textbox.xml
@@ -11,33 +11,39 @@
   <string
      name="message_max_lines_count"
      value="14" />
+  <!-- THIS PANEL CONTROLS TOAST HEIGHT? -->
   <panel
-     bevel_style="none"
-     follows="all"
-     height="120"
-     label="info_panel"
-     layout="topleft"
-     left="0"
-     name="info_panel"
-     top="0"
-     width="305">
-    <text
-     follows="all"
-     font="SansSerif"
-     height="110" 
-     layout="topleft"
-     left="10"
-     mouse_opaque="false"
-     name="text_editor_box"
-     read_only="true"
-     text_color="white"
-     text_readonly_color="white"
-     top="0"
-     width="285"
-     wrap="true"
-     parse_highlights="true"
-     parse_urls="true"/>
-  </panel> 
+      bevel_style="none"
+      follows="all"
+      height="120"
+      label="info_panel"
+      layout="topleft"
+      left="0"
+      name="info_panel"
+      top="0"
+      width="305">
+    <text_editor
+      bg_readonly_color="Transparent"
+      border_visible="false"
+      embedded_items="false"
+      enabled="true"
+      follows="all"
+      font="SansSerif"
+      height="120" 
+      layout="topleft"
+      left="10"
+      mouse_opaque="false"
+      name="text_editor_box"
+      read_only="true"
+      text_color="White"
+      text_readonly_color="White"
+      top="0"
+      visible="true"
+      width="285"
+      wrap="true"
+      parse_highlights="true"
+      parse_urls="true"/>
+  </panel>
   <panel
      bevel_style="none"
      follows="left|right|bottom"