diff options
| author | Chris Baker <baker@lindenlab.com> | 2014-06-23 22:36:47 +0000 |
|---|---|---|
| committer | Chris Baker <baker@lindenlab.com> | 2014-06-23 22:36:47 +0000 |
| commit | b534562acf4a124ff46d2988e9aded5212ca458a (patch) | |
| tree | 0f83f834e7e8253669a8772460f35ddde2cff419 /indra/newview/llmediactrl.cpp | |
| parent | 845b80a3864093ebed940551d91441e45e4b50b9 (diff) | |
| parent | c7057ef56efc1cca5683ca22e2ad410198d131e8 (diff) | |
viewer-release merge
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 0178512cb5..086bc1c186 100755 --- a/indra/newview/llmediactrl.cpp +++ b/indra/newview/llmediactrl.cpp @@ -544,7 +544,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://"; @@ -561,7 +561,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); } } |