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 | bd20eddd4ecf185d0fe2ff2dc498809ad104cfcc (patch) | |
| tree | 813ae0c48288f3f860529d82e6264537058ec6a2 /indra/newview/llmediactrl.h | |
| parent | 3c27e119b4c2e10faa331e0724bde56c87234024 (diff) | |
EXT-8540 - Implement mime type override for web_browser ctrl
reviewed by Monroe
Diffstat (limited to 'indra/newview/llmediactrl.h')
| -rw-r--r-- | indra/newview/llmediactrl.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llmediactrl.h b/indra/newview/llmediactrl.h index 310492fe02..784b266d1f 100644 --- a/indra/newview/llmediactrl.h +++ b/indra/newview/llmediactrl.h @@ -63,6 +63,8 @@ public: texture_height; Optional<LLUIColor> caret_color; + + Optional<std::string> initial_mime_type; Params(); }; @@ -109,7 +111,7 @@ public: // because we control the page content. See DEV-9530. JC. void setTrusted( bool valIn ); - void setHomePageUrl( const std::string urlIn ); + void setHomePageUrl( const std::string& urlIn, const std::string& mime_type = LLStringUtil::null ); std::string getHomePageUrl(); // set/clear URL to visit when a 404 page is reached @@ -173,6 +175,7 @@ public: bool mForceUpdate; bool mTrusted; std::string mHomePageUrl; + std::string mHomePageMimeType; std::string mCurrentNavUrl; bool mIgnoreUIScale; bool mAlwaysRefresh; |
