diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-12-22 14:06:46 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-12-22 14:06:46 -0800 |
| commit | c86d6a7bbb7c0db7665b76cf52b12b90c6e98c6d (patch) | |
| tree | 1056d6dc941e2aed458b459901fbb448c6e40ef7 /indra/newview/llfloaterhelpbrowser.cpp | |
| parent | ab100825bd0064dc64b9ef8bea1c70bc04090716 (diff) | |
| parent | 6182ded4e9b4ba076add7a840c535589d36ec283 (diff) | |
STORM-808 : merge webkit upgrade to Qt v4.7.1
Diffstat (limited to 'indra/newview/llfloaterhelpbrowser.cpp')
| -rw-r--r-- | indra/newview/llfloaterhelpbrowser.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llfloaterhelpbrowser.cpp b/indra/newview/llfloaterhelpbrowser.cpp index cec98e9992..a650886d89 100644 --- a/indra/newview/llfloaterhelpbrowser.cpp +++ b/indra/newview/llfloaterhelpbrowser.cpp @@ -132,9 +132,10 @@ void LLFloaterHelpBrowser::onClickOpenWebBrowser(void* user_data) void LLFloaterHelpBrowser::openMedia(const std::string& media_url) { - mBrowser->setHomePageUrl(media_url); - //mBrowser->navigateTo("data:text/html;charset=utf-8,I'd really love to be going to:<br><b>" + media_url + "</b>"); // tofu HACK for debugging =:) - mBrowser->navigateTo(media_url); + // explicitly make the media mime type for this floater since it will + // only ever display one type of content (Web). + mBrowser->setHomePageUrl(media_url, "text/html"); + mBrowser->navigateTo(media_url, "text/html"); setCurrentURL(media_url); } |