diff --git a/autobuild.xml b/autobuild.xml index 434c838336..784b19cbfa 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -27,9 +27,9 @@ archive hash - 11f68fef2c94128237baf110bf6e4ee6 + ff2b6c4678ec520b4dd95431fc7d6191 url - http://downloads.phoenixviewer.com/slplugin_x86-4.7.6.48584-darwin-201601201757-r2.tar.bz2 + http://downloads.phoenixviewer.com/slplugin_x86-4.7.6.48693-darwin-201602191441-r3.tar.bz2 name windows @@ -1753,11 +1753,11 @@ archive hash - cb4f8508b0212056c7a67967d668467f + d9a86fe36bada5011c25919715ed83ae hash_algorithm md5 url - http://downloads.phoenixviewer.com/llceflib-1.0-linux-201602081446-r54.tar.bz2 + http://downloads.phoenixviewer.com/llceflib-1.0-linux-201602180356-r57.tar.bz2 name linux diff --git a/indra/media_plugins/cef/CMakeLists.txt b/indra/media_plugins/cef/CMakeLists.txt index f52080c7c9..b8d77246a3 100644 --- a/indra/media_plugins/cef/CMakeLists.txt +++ b/indra/media_plugins/cef/CMakeLists.txt @@ -111,7 +111,7 @@ if (WINDOWS) set_target_properties( media_plugin_cef PROPERTIES - LINK_FLAGS "/MANIFEST:NO /SAFESEH:NO /LTCG /NODEFAULTLIB:LIBCMT" + LINK_FLAGS "/MANIFEST:NO /SAFESEH:NO /NODEFAULTLIB:LIBCMT" LINK_FLAGS_DEBUG "/MANIFEST:NO /SAFESEH:NO /NODEFAULTLIB:LIBCMTD" ) endif (WINDOWS) diff --git a/indra/media_plugins/cef/media_plugin_cef.cpp b/indra/media_plugins/cef/media_plugin_cef.cpp index b4ceef98cf..08e704abef 100644 --- a/indra/media_plugins/cef/media_plugin_cef.cpp +++ b/indra/media_plugins/cef/media_plugin_cef.cpp @@ -891,9 +891,9 @@ void MediaPluginCEF::deserializeKeyboardData(LLSD native_key_data, uint32_t& nat #endif #if LL_LINUX - native_scan_code = (uint32_t)(native_key_data["scan_code"].asInteger()); - native_virtual_key = (uint32_t)(native_key_data["virtual_key"].asInteger()); - native_modifiers = (uint32_t)(native_key_data["cef_modifiers"].asInteger()); + native_scan_code = (uint32_t)(native_key_data["sdl_sym"].asInteger()); + native_virtual_key = (uint32_t)(native_key_data["virtual_key"].asInteger()); + native_modifiers = (uint32_t)(native_key_data["cef_modifiers"].asInteger()); #endif }; }; @@ -929,39 +929,14 @@ void MediaPluginCEF::keyEvent(LLCEFLib::EKeyEvent key_event, int key, LLCEFLib:: mLLCEFLib->nativeKeyboardEvent(msg, wparam, lparam); #endif -// Keyboard handling for Linux, code written by Henri Beauchamp +// Keyboard handling for Linux. #if LL_LINUX - // The incoming values for 'key' will be the ones from indra_constants.h - std::string utf8_text; - - if (key < 128) - { - // Low-ascii characters need to get passed through. - utf8_text = (char)key; - } - - // Any special-case handling we want to do for particular keys... - switch ((KEY)key) - { - // ASCII codes for some standard keys - case KEY_BACKSPACE:utf8_text = (char)8;break; - case KEY_TAB:utf8_text = (char)9;break; - case KEY_RETURN:utf8_text = (char)13;break; - case KEY_PAD_RETURN:utf8_text = (char)13;break; - case KEY_ESCAPE:utf8_text = (char)27;break; - - default: - break; - } - uint32_t native_scan_code = 0; uint32_t native_virtual_key = 0; uint32_t native_modifiers = 0; - deserializeKeyboardData(native_key_data, native_scan_code, - native_virtual_key, native_modifiers); - mLLCEFLib->keyboardEvent(key_event, (uint32_t)key, utf8_text.c_str(), - modifiers_x, native_scan_code, native_virtual_key, - native_modifiers); + deserializeKeyboardData(native_key_data, native_scan_code, native_virtual_key, native_modifiers); + + mLLCEFLib->nativeKeyboardEvent(key_event, native_scan_code, native_virtual_key, native_modifiers); #endif // } @@ -988,20 +963,15 @@ void MediaPluginCEF::unicodeInput(const std::string &utf8str, LLCEFLib::EKeyboar mLLCEFLib->nativeKeyboardEvent(msg, wparam, lparam); #endif -// Keyboard handling for Linux, code written by Henri Beauchamp +// Keyboard handling for Linux. #if LL_LINUX - uint32_t key = KEY_NONE; - - if (utf8str.size() == 1) - key = utf8str[0]; - uint32_t native_scan_code = 0; uint32_t native_virtual_key = 0; uint32_t native_modifiers = 0; deserializeKeyboardData(native_key_data, native_scan_code, native_virtual_key, native_modifiers); - mLLCEFLib->keyboardEvent(LLCEFLib::KE_KEY_DOWN, (uint32_t)key, utf8str.c_str(), modifiers, 0, native_virtual_key, native_modifiers); - mLLCEFLib->keyboardEvent(LLCEFLib::KE_KEY_UP, (uint32_t)key, utf8str.c_str(), modifiers, 0, native_virtual_key, native_modifiers); + mLLCEFLib->nativeKeyboardEvent(LLCEFLib::KE_KEY_DOWN, native_scan_code, native_virtual_key, native_modifiers); + mLLCEFLib->nativeKeyboardEvent(LLCEFLib::KE_KEY_UP, native_scan_code, native_virtual_key, native_modifiers); #endif // }; diff --git a/indra/newview/fonts/fonts.xml b/indra/newview/fonts/fonts.xml index 6a652f45b3..77aaf03dbd 100644 --- a/indra/newview/fonts/fonts.xml +++ b/indra/newview/fonts/fonts.xml @@ -15,6 +15,9 @@ ヒラギノ角ゴシック W3.ttc ヒラギノ角ゴ Pro W3.otf ヒラギノ角ゴ ProN W3.otf + + AppleSDGothicNeo.ttc + AppleGothic.dfont AppleGothic.ttf AppleSDGothicNeo-Regular.otf diff --git a/indra/newview/fs_viewer_manifest.py b/indra/newview/fs_viewer_manifest.py index ca5a9aac60..a661910398 100644 --- a/indra/newview/fs_viewer_manifest.py +++ b/indra/newview/fs_viewer_manifest.py @@ -167,11 +167,11 @@ class FSViewerManifest: def fs_copy_windows_manifest(self): from shutil import copyfile self.fs_strip_windows_manifest( "%s/slplugin.exe" % self.args['configuration'].lower() ) - # self.fs_strip_windows_manifest( "%s/firestorm-bin.exe" % self.args['configuration'].lower() ) + self.fs_strip_windows_manifest( "%s/firestorm-bin.exe" % self.args['configuration'].lower() ) self.fs_strip_windows_manifest( "%s/llplugin/llceflib_host.exe" % self.args['configuration'].lower() ) if self.prefix(src=os.path.join(os.pardir, '..', 'indra', 'tools', 'manifests'), dst=""): self.path( "compatibility.manifest", "slplugin.exe.manifest" ) - # self.path( "compatibility.manifest", "firestorm-bin.exe.manifest" ) + self.path( "compatibility.manifest", "firestorm-bin.exe.manifest" ) self.end_prefix() if self.prefix(src=os.path.join(os.pardir, '..', 'indra', 'tools', 'manifests'), dst="llplugin"): self.path( "compatibility.manifest", "llceflib_host.exe.manifest" ) diff --git a/indra/newview/installers/windows_x64/CheckProcess.dll b/indra/newview/installers/windows_x64/CheckProcess.dll new file mode 100644 index 0000000000..055bdf9e52 Binary files /dev/null and b/indra/newview/installers/windows_x64/CheckProcess.dll differ diff --git a/indra/newview/installers/windows_x64/firestorm.wxs b/indra/newview/installers/windows_x64/firestorm.wxs index 7cfe54628e..2a92c52caf 100644 --- a/indra/newview/installers/windows_x64/firestorm.wxs +++ b/indra/newview/installers/windows_x64/firestorm.wxs @@ -14,6 +14,7 @@ + @@ -43,6 +44,7 @@ + @@ -115,8 +117,11 @@ + + + @@ -135,6 +140,7 @@ + Not Installed Not Installed REMOVE diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 5b41abec33..e200df9756 100755 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -140,11 +140,9 @@ #include "llleap.h" #include "stringize.h" #include "llcoros.h" -// Turn off library for 64-bit OS X too //#if !LL_LINUX -#if !(LL_DARWIN && defined(ND_BUILD64BIT_ARCH)) #include "cef/llceflib.h" -#endif +//#endif // Third party library includes #include @@ -3990,13 +3988,11 @@ LLSD LLAppViewer::getViewerInfo() const { info["VOICE_VERSION"] = LLTrans::getString("NotConnected"); } -// Check for the symbol being defined, not for an OS //#if !LL_LINUX -#if defined(LLCEFLIB_VERSION) info["LLCEFLIB_VERSION"] = LLCEFLIB_VERSION; -#else - info["LLCEFLIB_VERSION"] = "Undefined"; -#endif +//#else +// info["LLCEFLIB_VERSION"] = "Undefined"; +//#endif #if defined( FS_CEFLIB_VERSION ) && FS_CEFLIB_VERSION >= 6 { diff --git a/package_override_gcc.ini b/package_override_gcc.ini index 42b8b3bffb..9daba467ed 100644 --- a/package_override_gcc.ini +++ b/package_override_gcc.ini @@ -104,5 +104,5 @@ linux = http://downloads.phoenixviewer.com/uriparser-0.8.0.1-linux-x64-201502251 linux = [llceflib] -linux = http://downloads.phoenixviewer.com/llceflib-1.0-linux-x64-201602080551-r54.tar.bz2|73b956009a7cdb715050b1173a0a2908 +linux = http://downloads.phoenixviewer.com/llceflib-1.0-linux-x64-201602180255-r57.tar.bz2|4eb86000a408d3a6e8b39b8fb1bc98de