diff options
author | simon <none@none> | 2014-06-24 10:06:28 -0700 |
---|---|---|
committer | simon <none@none> | 2014-06-24 10:06:28 -0700 |
commit | 05319e6c94f7975281ed38c322f5d1e3bcd3e211 (patch) | |
tree | 74e41a15540d61fcba82241c70a7734c8d919111 /indra/newview/llmediactrl.cpp | |
parent | 190f66ab78e6a2df15e91e80d9863dcc8f030a2c (diff) | |
parent | 527f180dd74d83e478d68402626ca23341cc42e6 (diff) |
Pull downstream viewer-tiger and become version 3.7.11
Diffstat (limited to 'indra/newview/llmediactrl.cpp')
-rwxr-xr-x | indra/newview/llmediactrl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llmediactrl.cpp b/indra/newview/llmediactrl.cpp index 21e5e160e0..f4e08dc790 100755 --- a/indra/newview/llmediactrl.cpp +++ b/indra/newview/llmediactrl.cpp @@ -554,7 +554,7 @@ void LLMediaCtrl::clearCache() //////////////////////////////////////////////////////////////////////////////// // -void LLMediaCtrl::navigateTo( std::string url_in, std::string mime_type) +void LLMediaCtrl::navigateTo( std::string url_in, std::string mime_type, bool clean_browser) { // don't browse to anything that starts with secondlife:// or sl:// const std::string protocol1 = "secondlife://"; @@ -571,7 +571,7 @@ void LLMediaCtrl::navigateTo( std::string url_in, std::string mime_type) { mCurrentNavUrl = url_in; mMediaSource->setSize(mTextureWidth, mTextureHeight); - mMediaSource->navigateTo(url_in, mime_type, mime_type.empty()); + mMediaSource->navigateTo(url_in, mime_type, mime_type.empty(), false, clean_browser); } } |