summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermedia.cpp
diff options
context:
space:
mode:
authorRichard Nelson <none@none>2010-08-02 14:52:09 -0700
committerRichard Nelson <none@none>2010-08-02 14:52:09 -0700
commitbd20eddd4ecf185d0fe2ff2dc498809ad104cfcc (patch)
tree813ae0c48288f3f860529d82e6264537058ec6a2 /indra/newview/llviewermedia.cpp
parent3c27e119b4c2e10faa331e0724bde56c87234024 (diff)
EXT-8540 - Implement mime type override for web_browser ctrl
reviewed by Monroe
Diffstat (limited to 'indra/newview/llviewermedia.cpp')
-rw-r--r--indra/newview/llviewermedia.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index 99220e288c..77f7740449 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -2196,7 +2196,8 @@ void LLViewerMediaImpl::navigateReload()
//////////////////////////////////////////////////////////////////////////////////////////
void LLViewerMediaImpl::navigateHome()
{
- navigateTo(mHomeURL, "", true, false);
+ bool rediscover_mimetype = mHomeMimeType.empty();
+ navigateTo(mHomeURL, mHomeMimeType, rediscover_mimetype, false);
}
//////////////////////////////////////////////////////////////////////////////////////////