diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-12-04 18:02:04 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-12-04 18:02:04 -0800 |
| commit | a36c4f45b4bf03c707089398bccf62a12ac44f0b (patch) | |
| tree | 8936ad0037900db5961f0596992750695869fc8d /indra/newview/llviewermedia.h | |
| parent | ffff7ef59f43c66f966f259cb30e069a2445aa66 (diff) | |
ACME-1043 : WIP : Add an argument to open trusted content with js and other enabled options, bypassing prefs
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..07125e07e5 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 get_clean_source = 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 ; |