Automated merge with ssh://bitbucket.org/lindenlab/viewer-bugsplat

1 files changed, 32 insertions, 26 deletions

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"