merge.

1 files changed, 18 insertions, 11 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 e83bc1555c..be32e917e5 100644
--- a/indra/newview/skins/default/xui/en/floater_help_browser.xml
+++ b/indra/newview/skins/default/xui/en/floater_help_browser.xml
@@ -4,8 +4,8 @@
  can_resize="true"
  height="480"
  layout="topleft"
- min_height="140"
- min_width="467"
+ min_height="150"
+ min_width="500"
  name="floater_help_browser"
  help_topic="floater_help_browser"
  save_rect="true"
@@ -13,37 +13,44 @@
  title="HELP BROWSER"
  width="620">
     <floater.string
-     name="home_page_url">
-        http://www.secondlife.com
+     name="loading_text">
+        Loading...
     </floater.string>
     <floater.string
-     name="support_page_url">
-        http://support.secondlife.com
+     name="done_text">
     </floater.string>
     <layout_stack
      bottom="480"
      follows="left|right|top|bottom"
      layout="topleft"
-     left="10"
+     left="5"
      name="stack1"
      top="20"
-     width="600">
+     width="610">
         <layout_panel
-         height="1"
          layout="topleft"
          left_delta="0"
-         name="external_controls"
          top_delta="0"
+         name="external_controls"
          user_resize="false"
          width="590">
             <web_browser
-             bottom="-4"
+             bottom="-11"
              follows="left|right|top|bottom"
              layout="topleft"
              left="0"
              name="browser"
              top="0"
+             height="500"
              width="590" />
+            <text
+             follows="bottom|left"
+             height="16"
+             layout="topleft"
+             left_delta="2"
+             name="status_text"
+             top_pad="5"
+             width="150" />
         </layout_panel>
     </layout_stack>
 </floater>