diff options
author | Richard Linden <none@none> | 2010-09-17 12:16:07 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2010-09-17 12:16:07 -0700 |
commit | f3cdc9b01deb6c789d909b39914d11a6184946cd (patch) | |
tree | f8eb19badaee0f27ef48a9624464d964faa4ebbf /indra | |
parent | e66585aa4fce98d4e58656cadfdbb65b3d808cfa (diff) |
allow_popups is now driven by trusted content flag
trusted content is now a const attribute of LLMediaCtrl, set in constructor params
Diffstat (limited to 'indra')
-rw-r--r-- | indra/newview/llfloatersearch.cpp | 6 | ||||
-rw-r--r-- | indra/newview/llmediactrl.cpp | 16 | ||||
-rw-r--r-- | indra/newview/llmediactrl.h | 7 | ||||
-rw-r--r-- | indra/newview/llpanelhome.cpp | 1 | ||||
-rw-r--r-- | indra/newview/llpanellogin.cpp | 7 | ||||
-rw-r--r-- | indra/newview/skins/default/xui/en/floater_buy_currency_html.xml | 2 | ||||
-rw-r--r-- | indra/newview/skins/default/xui/en/floater_help_browser.xml | 2 | ||||
-rw-r--r-- | indra/newview/skins/default/xui/en/floater_lsl_guide.xml | 1 | ||||
-rw-r--r-- | indra/newview/skins/default/xui/en/floater_search.xml | 2 | ||||
-rw-r--r-- | indra/newview/skins/default/xui/en/floater_tos.xml | 2 | ||||
-rw-r--r-- | indra/newview/skins/default/xui/en/panel_login.xml | 3 | ||||
-rw-r--r-- | indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml | 2 |
12 files changed, 13 insertions, 38 deletions
diff --git a/indra/newview/llfloatersearch.cpp b/indra/newview/llfloatersearch.cpp index 7661e50eba..3ed4aec89a 100644 --- a/indra/newview/llfloatersearch.cpp +++ b/indra/newview/llfloatersearch.cpp @@ -96,11 +96,7 @@ LLFloaterSearch::LLFloaterSearch(const LLSD& key) : BOOL LLFloaterSearch::postBuild() { mBrowser = getChild<LLMediaCtrl>("browser"); - if (mBrowser) - { - mBrowser->addObserver(this); - mBrowser->setTrusted(true); - } + mBrowser->addObserver(this); return TRUE; } diff --git a/indra/newview/llmediactrl.cpp b/indra/newview/llmediactrl.cpp index 0fd18303bb..e6577a7ab8 100644 --- a/indra/newview/llmediactrl.cpp +++ b/indra/newview/llmediactrl.cpp @@ -70,7 +70,7 @@ LLMediaCtrl::Params::Params() caret_color("caret_color"), initial_mime_type("initial_mime_type"), media_id("media_id"), - always_allow_popups("always_allow_popups", false) + trusted_content("trusted_content", false) { tab_stop(false); } @@ -97,7 +97,7 @@ LLMediaCtrl::LLMediaCtrl( const Params& p) : mTextureHeight ( 1024 ), mClearCache(false), mHomePageMimeType(p.initial_mime_type), - mAlwaysAllowPopups(p.always_allow_popups) + mTrusted(p.trusted_content) { { LLColor4 color = p.caret_color().get(); @@ -170,16 +170,6 @@ void LLMediaCtrl::setTakeFocusOnClick( bool take_focus ) } //////////////////////////////////////////////////////////////////////////////// -void LLMediaCtrl::setTrusted( bool valIn ) -{ - if(mMediaSource) - { - mMediaSource->setTrustedBrowser(valIn); - } - mTrusted = valIn; -} - -//////////////////////////////////////////////////////////////////////////////// // BOOL LLMediaCtrl::handleHover( S32 x, S32 y, MASK mask ) { @@ -1049,7 +1039,7 @@ void LLMediaCtrl::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event) notify_params.payload = LLSD().with("target", target).with("url", url).with("uuid", uuid); notify_params.functor.function = boost::bind(&LLMediaCtrl::onPopup, this, _1, _2); - if (mAlwaysAllowPopups) + if (mTrusted) { LLNotifications::instance().forceResponse(notify_params, 0); } diff --git a/indra/newview/llmediactrl.h b/indra/newview/llmediactrl.h index dc18a1130e..f010e5f4c8 100644 --- a/indra/newview/llmediactrl.h +++ b/indra/newview/llmediactrl.h @@ -52,7 +52,7 @@ public: ignore_ui_scale, hide_loading, decouple_texture_size, - always_allow_popups; + trusted_content; Optional<S32> texture_width, texture_height; @@ -105,8 +105,6 @@ public: // Javascript or some other mechanism. However, we need the search // floater and login page to handle these URLs. Those are safe // because we control the page content. See DEV-9530. JC. - void setTrusted( bool valIn ); - void setHomePageUrl( const std::string& urlIn, const std::string& mime_type = LLStringUtil::null ); std::string getHomePageUrl(); @@ -177,7 +175,7 @@ public: LLViewBorder* mBorder; bool mFrequentUpdates; bool mForceUpdate; - bool mTrusted; + const bool mTrusted; std::string mHomePageUrl; std::string mHomePageMimeType; std::string mCurrentNavUrl; @@ -194,7 +192,6 @@ public: S32 mTextureWidth; S32 mTextureHeight; bool mClearCache; - bool mAlwaysAllowPopups; boost::shared_ptr<class LLNotification> mCurNotification; }; diff --git a/indra/newview/llpanelhome.cpp b/indra/newview/llpanelhome.cpp index 93c4e0c9c7..b03bab3127 100644 --- a/indra/newview/llpanelhome.cpp +++ b/indra/newview/llpanelhome.cpp @@ -61,7 +61,6 @@ BOOL LLPanelHome::postBuild() std::string url = LLViewerHome::getHomeURL(); mBrowser->addObserver(this); - mBrowser->setTrusted(true); mBrowser->setHomePageUrl(url); } diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index f1bd861f1d..7c93d8a1f9 100644 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -257,13 +257,6 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect, // Clear the browser's cache to avoid any potential for the cache messing up the login screen. web_browser->clearCache(); - // Need to handle login secondlife:///app/ URLs - web_browser->setTrusted( true ); - - // don't make it a tab stop until SL-27594 is fixed - web_browser->setTabStop(FALSE); - // web_browser->navigateToLocalPage( "loading", "loading.html" ); - reshapeBrowser(); // kick off a request to grab the url manually 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]&sum=[SUM]&msg=[MSG]&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" |