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_buy_currency_html.xml | 2 +-
 indra/newview/skins/default/xui/en/floater_help_browser.xml      | 2 +-
 indra/newview/skins/default/xui/en/floater_lsl_guide.xml         | 1 -
 indra/newview/skins/default/xui/en/floater_search.xml            | 2 +-
 indra/newview/skins/default/xui/en/floater_tos.xml               | 2 +-
 indra/newview/skins/default/xui/en/panel_login.xml               | 3 ++-
 indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml   | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml
index 0226b75d0a..b9c415633f 100644
--- a/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml
@@ -16,7 +16,7 @@
     https://quick-buy.secondlife.com/[LANGUAGE]/display/?sa=[SPECIFIC_AMOUNT]&amp;sum=[SUM]&amp;msg=[MSG]&amp;bal=[BAL]
   </floater.string>
   <web_browser
-    always_allow_popups="true" 
+    trusted_content="true" 
     follows="all"
     layout="topleft"
     left="1"
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"
diff --git a/indra/newview/skins/default/xui/en/floater_lsl_guide.xml b/indra/newview/skins/default/xui/en/floater_lsl_guide.xml
index 70c278d172..c9d87f158f 100644
--- a/indra/newview/skins/default/xui/en/floater_lsl_guide.xml
+++ b/indra/newview/skins/default/xui/en/floater_lsl_guide.xml
@@ -54,7 +54,6 @@
      top_delta="0"
      width="70" />
     <web_browser
-      always_allow_popups="true" 
      bottom="390"
      follows="left|right|top|bottom"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/floater_search.xml b/indra/newview/skins/default/xui/en/floater_search.xml
index 0b97c363f6..8770ede7e9 100644
--- a/indra/newview/skins/default/xui/en/floater_search.xml
+++ b/indra/newview/skins/default/xui/en/floater_search.xml
@@ -38,7 +38,7 @@
          user_resize="false"
          width="630">
             <web_browser
-              always_allow_popups="true" 
+              trusted_content="true" 
              follows="left|right|top|bottom"
              layout="topleft"
              left="0"
diff --git a/indra/newview/skins/default/xui/en/floater_tos.xml b/indra/newview/skins/default/xui/en/floater_tos.xml
index 70653801e0..af1617eb39 100644
--- a/indra/newview/skins/default/xui/en/floater_tos.xml
+++ b/indra/newview/skins/default/xui/en/floater_tos.xml
@@ -58,7 +58,7 @@
         Please read the following Terms of Service and Privacy Policy carefully. To continue logging in to [SECOND_LIFE], you must accept the agreement.
     </text>
     <web_browser
-      always_allow_popups="true" 
+      trusted_content="true" 
      follows="left|top"
      height="340"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index 6f3e49b2b7..891616b838 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -24,7 +24,8 @@ top="600"
 </panel.string>
 <!-- *NOTE: Custom resize logic for login_html in llpanellogin.cpp -->
 <web_browser
-always_allow_popups="true" 
+  tab_stop="false" 
+trusted_content="true" 
 bg_opaque_color="Black"
 border_visible="false"
 bottom="600"
diff --git a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
index d496f1f5ee..72b2f5e84f 100644
--- a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
+++ b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
@@ -28,7 +28,7 @@
      top_delta="0"
      width="313">
       <web_browser
-        always_allow_popups="true"
+        trusted_content="true"
        border_visible="false"
        follows="all"
        height="550"
-- 
cgit v1.2.3