diff options
author | Richard Nelson <none@none> | 2010-08-02 14:52:09 -0700 |
---|---|---|
committer | Richard Nelson <none@none> | 2010-08-02 14:52:09 -0700 |
commit | 21e8a119cc96b226d7593de16ea7ae990d1da3d9 (patch) | |
tree | 813ae0c48288f3f860529d82e6264537058ec6a2 /indra/newview/llviewermedia.h | |
parent | 5b7031dd83bea0f3201fd45d55ef896227f399ce (diff) |
EXT-8540 - Implement mime type override for web_browser ctrl
reviewed by Monroe
Diffstat (limited to 'indra/newview/llviewermedia.h')
-rw-r--r-- | indra/newview/llviewermedia.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h index f75f24fbf5..01063aae06 100644 --- a/indra/newview/llviewermedia.h +++ b/indra/newview/llviewermedia.h @@ -237,7 +237,7 @@ public: std::string getCurrentMediaURL(); std::string getHomeURL() { return mHomeURL; } std::string getMediaEntryURL() { return mMediaEntryURL; } - void setHomeURL(const std::string& home_url) { mHomeURL = home_url; }; + void setHomeURL(const std::string& home_url, const std::string& mime_type = LLStringUtil::null) { mHomeURL = home_url; mHomeMimeType = mime_type;}; void clearCache(); std::string getMimeType() { return mMimeType; } void scaleMouse(S32 *mouse_x, S32 *mouse_y); @@ -401,6 +401,7 @@ private: bool mMovieImageHasMips; std::string mMediaURL; // The last media url set with NavigateTo std::string mHomeURL; + std::string mHomeMimeType; // forced mime type for home url std::string mMimeType; std::string mCurrentMediaURL; // The most current media url from the plugin (via the "location changed" or "navigate complete" events). std::string mCurrentMimeType; // The MIME type that caused the currently loaded plugin to be loaded. |