diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-12-23 19:41:44 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-12-23 19:41:44 -0500 |
| commit | 5a4bb72b8d37ca51deb84e1490fdefe2908d2d59 (patch) | |
| tree | 9a22b0583bb290a242df3c619665fdb692e1ecef /indra/newview/llfloaterhelpbrowser.cpp | |
| parent | 86380bb177b9e18e345bc302efb3a84b2c5758a9 (diff) | |
| parent | 49de8add8355455da4b6ec5aaa55427fafa94322 (diff) | |
Automated merge with ssh://bitbucket.org/aleric/viewer-development-aleric-export
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); } |