diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-07-22 15:54:53 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-07-22 15:54:53 -0700 |
| commit | 87a7eee21d986e2a1c8b5fd467b5da06112690b5 (patch) | |
| tree | 609741b2e3d0bfe72843342c19e67b7d78f602f4 /indra/newview/llviewermedia.h | |
| parent | cec79bdb29ac5438c9b9bb0312b4981116f17f61 (diff) | |
| parent | 532433674c9553636af9ea8d433b9da6d6fae587 (diff) | |
Sync merge with lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llviewermedia.h')
| -rwxr-xr-x | indra/newview/llviewermedia.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h index fff5b3fc08..6803adfaa2 100755 --- a/indra/newview/llviewermedia.h +++ b/indra/newview/llviewermedia.h @@ -234,7 +234,7 @@ public: void navigateReload(); void navigateHome(); void unload(); - void navigateTo(const std::string& url, const std::string& mime_type = "", bool rediscover_type = false, bool server_request = false); + void navigateTo(const std::string& url, const std::string& mime_type = "", bool rediscover_type = false, bool server_request = false, bool clean_browser = false); void navigateInternal(); void navigateStop(); bool handleKeyHere(KEY key, MASK mask); @@ -289,7 +289,7 @@ public: void setTarget(const std::string& target) { mTarget = target; } // utility function to create a ready-to-use media instance from a desired media type. - static LLPluginClassMedia* newSourceFromMediaType(std::string media_type, LLPluginClassMediaOwner *owner /* may be NULL */, S32 default_width, S32 default_height, const std::string target = LLStringUtil::null); + static LLPluginClassMedia* newSourceFromMediaType(std::string media_type, LLPluginClassMediaOwner *owner /* may be NULL */, S32 default_width, S32 default_height, const std::string target = LLStringUtil::null, bool clean_browser = false); // Internally set our desired browser user agent string, including // the Second Life version and skin name. Used because we can @@ -464,6 +464,7 @@ private: bool mTrustedBrowser; std::string mTarget; LLNotificationPtr mNotification; + bool mCleanBrowser; // force the creation of a clean browsing target with full options enabled private: BOOL mIsUpdated ; |