Merge.

1 files changed, 6 insertions, 27 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_help_browser.xml b/indra/newview/skins/default/xui/en/floater_help_browser.xml
index 55a6179afb..e83bc1555c 100644
--- a/indra/newview/skins/default/xui/en/floater_help_browser.xml
+++ b/indra/newview/skins/default/xui/en/floater_help_browser.xml
@@ -2,7 +2,7 @@
 <floater
  legacy_header_height="18"
  can_resize="true"
- height="400"
+ height="480"
  layout="topleft"
  min_height="140"
  min_width="467"
@@ -21,7 +21,7 @@
         http://support.secondlife.com
     </floater.string>
     <layout_stack
-     bottom="400"
+     bottom="480"
      follows="left|right|top|bottom"
      layout="topleft"
      left="10"
@@ -29,42 +29,21 @@
      top="20"
      width="600">
         <layout_panel
-         height="20"
+         height="1"
          layout="topleft"
          left_delta="0"
          name="external_controls"
          top_delta="0"
          user_resize="false"
-         width="570">
+         width="590">
             <web_browser
-             bottom="-10"
+             bottom="-4"
              follows="left|right|top|bottom"
              layout="topleft"
              left="0"
              name="browser"
              top="0"
-             start_url="data:text/html,%3Chtml%3E%3Cbody bgcolor=%22#2A2A2A%22%3E%3C/body%3E%3C/html%3E"
-             width="570" />
-            <button
-             follows="bottom|left"
-             height="20"
-             label="Open in My Web Browser"
-             layout="topleft"
-             left_delta="0"
-             name="open_browser"
-             top_pad="5"
-             width="185" />
-<!--
-            <button
-             follows="bottom|right"
-             height="20"
-             label="Close"
-             layout="topleft"
-             left_pad="290"
-             name="close"
-             top_delta="0"
-             width="70" />
--->
+             width="590" />
         </layout_panel>
     </layout_stack>
 </floater>