livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SOCIAL-248 FIX Remove HEAD requests from WebKit 

This change makes LLFloaterWebContent always specify a MIME type of "text/html"  when navigating to an URL.  This tells the plugin system to skip the MIME type probe (which is what does the HEAD request) and just use the WebKit plugin.

This means non-web content (such as QuickTime movies) may not work properly in the web content floater.  Hopefully this won't be a problem...
master
Monroe Linden 2010-12-03 15:47:32 -08:00
parent 91fba2bd67
commit b8ec0d25be
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/llfloaterwebcontent.cpp
View File

@ -181,9 +181,10 @@ void LLFloaterWebContent::geometryChanged(S32 x, S32 y, S32 width, S32 height)
void LLFloaterWebContent::open_media(const std::string& web_url, const std::string& target)
{
mWebBrowser->setHomePageUrl(web_url);
// Specifying a mime type of text/html here causes the plugin system to skip the MIME type probe and just open a browser plugin.
mWebBrowser->setHomePageUrl(web_url, "text/html");
mWebBrowser->setTarget(target);
mWebBrowser->navigateTo(web_url);
mWebBrowser->navigateTo(web_url, "text/html");
set_current_url(web_url);
}
@ -324,6 +325,6 @@ void LLFloaterWebContent::onEnterAddress()
// (perhaps this test should be for minimum length of a URL)
if ( mAddressCombo->getValue().asString().length() > 0 )
{
mWebBrowser->navigateTo( mAddressCombo->getValue().asString() );
mWebBrowser->navigateTo( mAddressCombo->getValue().asString(), "text/html");
};
}