From 64a0fac783c6282cd8f5b56f2a8f62321183c641 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 23 Nov 2016 12:06:31 -0500 Subject: DRTVWR-418: Don't report anything in new build-vc120-{32,64}. --- .hgignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.hgignore b/.hgignore index 09031ac0fa..0d672e6ebc 100755 --- a/.hgignore +++ b/.hgignore @@ -17,7 +17,8 @@ build-darwin-* build-vc80/ build-vc100/ build-vc120/ -build-vc120_x64/ +build-vc120-32/ +build-vc120-64/ indra/build-vc[0-9]* indra/CMakeFiles indra/lib/mono/1.0/*.dll -- cgit v1.2.3 From b9cc216b9cbded6f4adbc67f58d0fbc464ee0c9f Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 23 Nov 2016 12:07:31 -0500 Subject: DRTVWR-418: Have to #include "llkdumem.h" even when not LL_DARWIN. --- indra/llkdu/tests/llimagej2ckdu_test.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/indra/llkdu/tests/llimagej2ckdu_test.cpp b/indra/llkdu/tests/llimagej2ckdu_test.cpp index ae6138d4c6..e386a9f71b 100644 --- a/indra/llkdu/tests/llimagej2ckdu_test.cpp +++ b/indra/llkdu/tests/llimagej2ckdu_test.cpp @@ -35,6 +35,8 @@ #pragma clang diagnostic ignored "-Wunused-private-field" #include "llkdumem.h" #pragma clang diagnostic pop +#else +#include "llkdumem.h" #endif #include "kdu_block_coding.h" // Tut header -- cgit v1.2.3 From fc4564c415a45001cf2e35776df2be2196af26e0 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 23 Nov 2016 12:08:53 -0500 Subject: DRTVWR-418: Work around missing LLCEFLibSettings::page_zoom_factor. --- indra/media_plugins/cef/media_plugin_cef.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/indra/media_plugins/cef/media_plugin_cef.cpp b/indra/media_plugins/cef/media_plugin_cef.cpp index 4eb29c98f9..d04bc16d4f 100644 --- a/indra/media_plugins/cef/media_plugin_cef.cpp +++ b/indra/media_plugins/cef/media_plugin_cef.cpp @@ -501,7 +501,10 @@ 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"); + // The LLCEFLibSettings struct in the Windows 32-bit + // llceflib's build 500907 does not have a page_zoom_factor + // member. Set below. + //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; @@ -518,6 +521,9 @@ void MediaPluginCEF::receiveMessage(const char* message_string) // if this fails, the media system in viewer will put up a message } + // now we can set page zoom factor + mLLCEFLib->setPageZoom(message_in.getValueReal("factor")); + // Plugin gets to decide the texture parameters to use. mDepth = 4; LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "texture_params"); -- cgit v1.2.3