diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-10-27 21:10:46 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-10-27 21:10:46 +0300 |
| commit | 97c372047c14ce9966a41744c15b79d27ce8fba4 (patch) | |
| tree | c76f295a414ebcfae6e64f85d7ff9d1467e7067d /indra/media_plugins/cef/media_plugin_cef.cpp | |
| parent | 5828d061144fe1d15580dc6f9e00d7dcf93456ea (diff) | |
| parent | 07e78807a8b3657ee2303dc22187d858cf8be625 (diff) | |
Merged in lindenlab/viewer-bear
Diffstat (limited to 'indra/media_plugins/cef/media_plugin_cef.cpp')
| -rw-r--r-- | indra/media_plugins/cef/media_plugin_cef.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/media_plugins/cef/media_plugin_cef.cpp b/indra/media_plugins/cef/media_plugin_cef.cpp index 28a8a5886a..4eb29c98f9 100644 --- a/indra/media_plugins/cef/media_plugin_cef.cpp +++ b/indra/media_plugins/cef/media_plugin_cef.cpp @@ -501,6 +501,7 @@ void MediaPluginCEF::receiveMessage(const char* message_string) LLCEFLib::LLCEFLibSettings settings; settings.initial_width = 1024; settings.initial_height = 1024; + settings.page_zoom_factor = message_in.getValueReal("factor"); settings.plugins_enabled = mPluginsEnabled; settings.media_stream_enabled = false; // MAINT-6060 - WebRTC media removed until we can add granualrity/query UI settings.javascript_enabled = mJavascriptEnabled; |