diff options
| author | Oz Linden <oz@lindenlab.com> | 2017-03-16 14:32:12 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2017-03-16 14:32:12 -0400 |
| commit | 2d921e00634c593c15776727e513a2d0f9795f21 (patch) | |
| tree | 6ad74651d30ef7ce27f4914a398bb4b9d5cb04b6 /indra/media_plugins/cef/media_plugin_cef.cpp | |
| parent | d7f5122ee9e12b5aec14b15517c3a4c0021544ce (diff) | |
| parent | bdecc9cce982ab35ce1d74444515f536e66d4356 (diff) | |
merge CEF update and fixes from callum
Diffstat (limited to 'indra/media_plugins/cef/media_plugin_cef.cpp')
| -rw-r--r-- | indra/media_plugins/cef/media_plugin_cef.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/media_plugins/cef/media_plugin_cef.cpp b/indra/media_plugins/cef/media_plugin_cef.cpp index 90bdeb082c..906a5ff6e7 100644 --- a/indra/media_plugins/cef/media_plugin_cef.cpp +++ b/indra/media_plugins/cef/media_plugin_cef.cpp @@ -512,6 +512,9 @@ void MediaPluginCEF::receiveMessage(const char* message_string) settings.user_agent_substring = mCEFLib->makeCompatibleUserAgentString(mUserAgentSubtring); settings.webgl_enabled = true; + std::vector<std::string> custom_schemes(1, "secondlife"); + mCEFLib->setCustomSchemes(custom_schemes); + bool result = mCEFLib->init(settings); if (!result) { |