summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterhelpbrowser.cpp
diff options
context:
space:
mode:
authorcallum <none@none>2010-11-16 15:11:32 -0800
committercallum <none@none>2010-11-16 15:11:32 -0800
commit5397edebbccd2df41db51804c4e2fa529ac96132 (patch)
tree22f8556a1985ad17e028c2f3b75d12907fdedec7 /indra/newview/llfloaterhelpbrowser.cpp
parentb4efcccce7438a72078c02dd404080d6dee37622 (diff)
SOCIAL-265 FIX Help floater in client should bypass the usual media MIME type detection
Diffstat (limited to 'indra/newview/llfloaterhelpbrowser.cpp')
-rw-r--r--indra/newview/llfloaterhelpbrowser.cpp7
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);
}