From ead46208b02f31c8ed06242a016501d57c90abfb Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 26 Aug 2010 12:33:31 -0700
Subject: made layoutstack orientation mandatory

---
 indra/newview/skins/default/xui/en/floater_help_browser.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins/default/xui/en/floater_help_browser.xml')

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 214fb6ce54..13017cc803 100644
--- a/indra/newview/skins/default/xui/en/floater_help_browser.xml
+++ b/indra/newview/skins/default/xui/en/floater_help_browser.xml
@@ -24,6 +24,7 @@
      follows="left|right|top|bottom"
      layout="topleft"
      left="5"
+     orientation="vertical" 
      name="stack1"
      top="20"
      width="640">
-- 
cgit v1.2.3


From e66585aa4fce98d4e58656cadfdbb65b3d808cfa Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Fri, 17 Sep 2010 11:47:13 -0700
Subject: EXP-74 FIX Pop-up warning given for links in Home Side Panel in
 Viewer Reviewed by Callum

---
 indra/newview/skins/default/xui/en/floater_help_browser.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins/default/xui/en/floater_help_browser.xml')

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 13017cc803..d8175e20dc 100644
--- a/indra/newview/skins/default/xui/en/floater_help_browser.xml
+++ b/indra/newview/skins/default/xui/en/floater_help_browser.xml
@@ -36,6 +36,7 @@
          user_resize="false"
          width="620">
             <web_browser
+              always_allow_popups="true" 
              bottom="-11"
              follows="left|right|top|bottom"
              layout="topleft"
-- 
cgit v1.2.3


From f3cdc9b01deb6c789d909b39914d11a6184946cd Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Fri, 17 Sep 2010 12:16:07 -0700
Subject: allow_popups is now driven by trusted content flag trusted content is
 now a const attribute of LLMediaCtrl, set in constructor params

---
 indra/newview/skins/default/xui/en/floater_help_browser.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en/floater_help_browser.xml')

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 d8175e20dc..0c90df24f0 100644
--- a/indra/newview/skins/default/xui/en/floater_help_browser.xml
+++ b/indra/newview/skins/default/xui/en/floater_help_browser.xml
@@ -36,7 +36,7 @@
          user_resize="false"
          width="620">
             <web_browser
-              always_allow_popups="true" 
+              trusted_content="true" 
              bottom="-11"
              follows="left|right|top|bottom"
              layout="topleft"
-- 
cgit v1.2.3


From 05043257e45d04820bb72ed919872d1cc4e2baff Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Mon, 27 Sep 2010 17:12:14 +0300
Subject: STORM-228 FIXED 'Loading / Done' text is cropped on the bottom of
 'Find' floater

-Increased space between bottom of the floater and bottom of the web browser (inside floater), so that 'Loading / Done' text
 between bottom of the web browser and bottom of the floater won't be cropped
---
 indra/newview/skins/default/xui/en/floater_help_browser.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en/floater_help_browser.xml')

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 0c90df24f0..837923bcf6 100644
--- a/indra/newview/skins/default/xui/en/floater_help_browser.xml
+++ b/indra/newview/skins/default/xui/en/floater_help_browser.xml
@@ -37,7 +37,7 @@
          width="620">
             <web_browser
               trusted_content="true" 
-             bottom="-11"
+             bottom="-25"
              follows="left|right|top|bottom"
              layout="topleft"
              left="0"
-- 
cgit v1.2.3