SOCIAL-265 FIX Help floater in client should bypass the usual media MIME type detection
parent
b4efcccce7
commit
5397edebbc
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -36,7 +36,8 @@
|
|||
user_resize="false"
|
||||
width="620">
|
||||
<web_browser
|
||||
trusted_content="true"
|
||||
trusted_content="true"
|
||||
initial_mime_type="text/html"
|
||||
bottom="-25"
|
||||
follows="left|right|top|bottom"
|
||||
layout="topleft"
|
||||
|
|
|
|||
Loading…
Reference in New Issue