diff options
| author | skolb <none@none> | 2010-03-08 14:54:19 -0800 |
|---|---|---|
| committer | skolb <none@none> | 2010-03-08 14:54:19 -0800 |
| commit | 454998e5f200aed6c1f9c8f71223504f845d3825 (patch) | |
| tree | 75a1488233f4cf6271b438f90ce3aea8a1407848 /indra/newview/llviewermedia.cpp | |
| parent | 32260e70d0bef8e2a491557c13f0e3d70b0be774 (diff) | |
https://jira.secondlife.com/browse/EXT-5884
Added code to support SLAPPS for Media on a Prim
Reviewed by Monroe and Callum via Code Collab (Review 143).
Diffstat (limited to 'indra/newview/llviewermedia.cpp')
| -rw-r--r-- | indra/newview/llviewermedia.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index c83e79f19a..85efe2724e 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -1091,7 +1091,8 @@ LLViewerMediaImpl::LLViewerMediaImpl( const LLUUID& texture_id, mBackgroundColor(LLColor4::white), mNavigateSuspended(false), mNavigateSuspendedDeferred(false), - mIsUpdated(false) + mIsUpdated(false), + mTrustedBrowser(false) { // Set up the mute list observer if it hasn't been set up already. @@ -2358,7 +2359,7 @@ void LLViewerMediaImpl::handleMediaEvent(LLPluginClassMedia* plugin, LLPluginCla { LL_DEBUGS("Media") << "MEDIA_EVENT_CLICK_LINK_NOFOLLOW, uri is: " << plugin->getClickURL() << LL_ENDL; std::string url = plugin->getClickURL(); - LLURLDispatcher::dispatch(url, NULL, false); + LLURLDispatcher::dispatch(url, NULL, mTrustedBrowser); } break; |