diff options
Diffstat (limited to 'indra/newview/llmediactrl.cpp')
| -rw-r--r-- | indra/newview/llmediactrl.cpp | 16 |
1 files changed, 3 insertions, 13 deletions
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); } |