diff options
| -rwxr-xr-x | indra/newview/llfloaterwebcontent.cpp | 1 | ||||
| -rwxr-xr-x | indra/newview/llviewermedia.cpp | 23 | ||||
| -rwxr-xr-x | indra/newview/llviewermedia.h | 2 |
3 files changed, 9 insertions, 17 deletions
diff --git a/indra/newview/llfloaterwebcontent.cpp b/indra/newview/llfloaterwebcontent.cpp index eb1717d384..7a65b8d28f 100755 --- a/indra/newview/llfloaterwebcontent.cpp +++ b/indra/newview/llfloaterwebcontent.cpp @@ -241,7 +241,6 @@ void LLFloaterWebContent::open_media(const Params& p) LLViewerMedia::proxyWindowOpened(p.target(), p.id()); mWebBrowser->setHomePageUrl(p.url, "text/html"); mWebBrowser->setTarget(p.target); - LLViewerMedia::setLogURL(p.save_url_history); // Turn logging on/off as requested (flag default is true) mWebBrowser->navigateTo(p.url, "text/html"); mSecureLockIcon->setVisible(false); diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index 8a88a36dda..6453e2348f 100755 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -361,7 +361,6 @@ static bool sAnyMediaShowing = false; static boost::signals2::connection sTeleportFinishConnection; static std::string sUpdatedCookies; static const char *PLUGIN_COOKIE_FILE_NAME = "plugin_cookies.txt"; -static bool sLogURL = true; ////////////////////////////////////////////////////////////////////////////////////////// static void add_media_impl(LLViewerMediaImpl* media) @@ -1624,13 +1623,6 @@ void LLViewerMedia::setOnlyAudibleMediaTextureID(const LLUUID& texture_id) } ////////////////////////////////////////////////////////////////////////////////////////// -// static -void LLViewerMedia::setLogURL(bool do_log) -{ - sLogURL = do_log; -} - -////////////////////////////////////////////////////////////////////////////////////////// // LLViewerMediaImpl ////////////////////////////////////////////////////////////////////////////////////////// LLViewerMediaImpl::LLViewerMediaImpl( const LLUUID& texture_id, @@ -2008,9 +2000,10 @@ void LLViewerMediaImpl::loadURI() "<>#%" ";/?:@&=", false); - if (sLogURL) { - llinfos << "Asking media source to load URI: " << uri << llendl; + // Do not log the query parts + LLURI u(uri); + llinfos << "Asking media source to load URI: " << u.scheme() << "://" << u.authority() << u.path() << llendl; } mMediaSource->loadURI( uri ); @@ -2578,9 +2571,10 @@ void LLViewerMediaImpl::navigateTo(const std::string& url, const std::string& mi if(mPriority == LLPluginClassMedia::PRIORITY_UNLOADED) { // Helpful to have media urls in log file. Shouldn't be spammy. - if (sLogURL) { - llinfos << "NOT LOADING media id= " << mTextureId << " url=" << url << " mime_type=" << mime_type << llendl; + // Do not log the query parts + LLURI u(url); + llinfos << "NOT LOADING media id= " << mTextureId << " url=" << u.scheme() << "://" << u.authority() << u.path() << " mime_type=" << mime_type << llendl; } // This impl should not be loaded at this time. @@ -2596,9 +2590,10 @@ void LLViewerMediaImpl::navigateTo(const std::string& url, const std::string& mi void LLViewerMediaImpl::navigateInternal() { // Helpful to have media urls in log file. Shouldn't be spammy. - if (sLogURL) { - llinfos << "media id= " << mTextureId << " url=" << mMediaURL << " mime_type=" << mMimeType << llendl; + // Do not log the query parts + LLURI u(mMediaURL); + llinfos << "media id= " << mTextureId << " url=" << u.scheme() << "://" << u.authority() << u.path() << " mime_type=" << mMimeType << llendl; } if(mNavigateSuspended) diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h index 75cd77e979..fff5b3fc08 100755 --- a/indra/newview/llviewermedia.h +++ b/indra/newview/llviewermedia.h @@ -160,8 +160,6 @@ public: static void setOnlyAudibleMediaTextureID(const LLUUID& texture_id); - static void setLogURL(bool do_log); - static LLSD getHeaders(); private: |