diff options
| author | callum <none@none> | 2010-11-30 14:07:16 -0800 |
|---|---|---|
| committer | callum <none@none> | 2010-11-30 14:07:16 -0800 |
| commit | 1345cbb0ca715de8bc98a1ccffd93f29d749500a (patch) | |
| tree | 6e6a6d79166fb83ae7aa0ad25cc80d3cc23be910 /indra/llplugin | |
| parent | 60d4abc9d3c35d89b8e30210e855bc0213db75be (diff) | |
SOCIAL-299 FIX Add *.lindenlab.com to trusted certificate authorities in WebKit
Reviewed by CB
Diffstat (limited to 'indra/llplugin')
| -rw-r--r-- | indra/llplugin/llpluginclassmedia.cpp | 7 | ||||
| -rw-r--r-- | indra/llplugin/llpluginclassmedia.h | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/indra/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp index 4001cb183f..61d779b98d 100644 --- a/indra/llplugin/llpluginclassmedia.cpp +++ b/indra/llplugin/llpluginclassmedia.cpp @@ -1219,6 +1219,13 @@ void LLPluginClassMedia::ignore_ssl_cert_errors(bool ignore) sendMessage(message); } +void LLPluginClassMedia::setCertificateFilePath(const std::string& path) +{ + LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA_BROWSER, "set_certificate_file_path"); + message.setValue("path", path); + sendMessage(message); +} + void LLPluginClassMedia::crashPlugin() { LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_INTERNAL, "crash"); diff --git a/indra/llplugin/llpluginclassmedia.h b/indra/llplugin/llpluginclassmedia.h index 562e3620ec..3720455431 100644 --- a/indra/llplugin/llpluginclassmedia.h +++ b/indra/llplugin/llpluginclassmedia.h @@ -203,6 +203,7 @@ public: void proxyWindowOpened(const std::string &target, const std::string &uuid); void proxyWindowClosed(const std::string &uuid); void ignore_ssl_cert_errors(bool ignore); + void setCertificateFilePath(const std::string& path); // This is valid after MEDIA_EVENT_NAVIGATE_BEGIN or MEDIA_EVENT_NAVIGATE_COMPLETE std::string getNavigateURI() const { return mNavigateURI; }; |