From 92791e529a0c5968f7100ccf5d95b5aea6e79065 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Fri, 1 Mar 2019 18:08:40 +0100 Subject: [PATCH 01/43] FIRE-23663: Crash on map when using Starlight skins; patch contributed by Lance Corrimal --- indra/newview/skins/starlight/xui/en/floater_world_map.xml | 1 + indra/newview/skins/starlightcui/xui/en/floater_world_map.xml | 1 + 2 files changed, 2 insertions(+) diff --git a/indra/newview/skins/starlight/xui/en/floater_world_map.xml b/indra/newview/skins/starlight/xui/en/floater_world_map.xml index 7fa2db07cb..8ee390c170 100644 --- a/indra/newview/skins/starlight/xui/en/floater_world_map.xml +++ b/indra/newview/skins/starlight/xui/en/floater_world_map.xml @@ -14,6 +14,7 @@ single_instance="true" title="World Map" width="650"> + (Unnamed Parcel) + (Unnamed Parcel) Date: Fri, 1 Mar 2019 19:39:27 +0100 Subject: [PATCH 02/43] Fix merge error. --- indra/newview/viewer_manifest.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 2452341e5f..fc60c66bb2 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -1899,7 +1899,7 @@ class LinuxManifest(ViewerManifest): self.path("firestorm_256.BMP","ll_icon.BMP") # plugins - with self.prefix(src=os.path.join(self.args['build'], os.pardir, 'media_plugins', dst="bin/llplugin")): + with self.prefix(src=os.path.join(self.args['build'], os.pardir, 'media_plugins'), dst="bin/llplugin"): self.path("gstreamer010/libmedia_plugin_gstreamer010.so", "libmedia_plugin_gstreamer.so") self.path2basename("libvlc", "libmedia_plugin_libvlc.so") @@ -2246,6 +2246,10 @@ class Linux_x86_64_Manifest(LinuxManifest): def construct(self): super(Linux_x86_64_Manifest, self).construct() + pkgdir = os.path.join(self.args['build'], os.pardir, 'packages') + relpkgdir = os.path.join(pkgdir, "lib", "release") + debpkgdir = os.path.join(pkgdir, "lib", "debug") + if self.is_packaging_viewer(): with self.prefix(src=os.path.join(pkgdir, 'lib', 'release'), dst="lib"): self.path("libffi*.so*") From ff72f764898fe831b598fcf9d11f8ad211a03c61 Mon Sep 17 00:00:00 2001 From: Nicky Date: Fri, 1 Mar 2019 20:59:10 +0100 Subject: [PATCH 03/43] Linux uses a slightly different directory to save breakpad symbols. --- scripts/configure_firestorm.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/configure_firestorm.sh b/scripts/configure_firestorm.sh index fe085dd267..734d17e60e 100755 --- a/scripts/configure_firestorm.sh +++ b/scripts/configure_firestorm.sh @@ -466,7 +466,11 @@ if [ $WANTS_CONFIG -eq $TRUE ] ; then BUILD_DIR=`pwd` fi # This name is consumed by indra/newview/CMakeLists.txt - VIEWER_SYMBOL_FILE="${BUILD_DIR}/newview/$BTYPE/firestorm-symbols-${PLATFORM}-${AUTOBUILD_ADDRSIZE}.tar.bz2" + if [ $PLATFORM == "linux" ] ; then + VIEWER_SYMBOL_FILE="${BUILD_DIR}/newview/firestorm-symbols-${PLATFORM}-${AUTOBUILD_ADDRSIZE}.tar.bz2" + else + VIEWER_SYMBOL_FILE="${BUILD_DIR}/newview/$BTYPE/firestorm-symbols-${PLATFORM}-${AUTOBUILD_ADDRSIZE}.tar.bz2" + fi CRASH_REPORTING="-DRELEASE_CRASH_REPORTING:BOOL=ON" else CRASH_REPORTING="-DRELEASE_CRASH_REPORTING:BOOL=OFF" From a1302eac2c300809e91c8b4f6c05c1d17efec26e Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sat, 2 Mar 2019 12:43:48 +0100 Subject: [PATCH 04/43] FIRE-23665: Textures in skin themes subfolders are missing --- indra/newview/viewer_manifest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index fc60c66bb2..10d0a92327 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -185,7 +185,7 @@ class ViewerManifest(LLManifest,FSViewerManifest): self.path("*/xui/*/*.xml") self.path("*/xui/*/widgets/*.xml") self.path("*/themes/*/colors.xml") - with self.prefix(src="*/themes/*/textures"): + with self.prefix(src_dst="*/themes/*/textures"): self.path("*/*.tga") self.path("*/*.j2c") self.path("*/*.jpg") From 7ed3c52d63ab44ac997fbf383c4dc4bb914ece89 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sat, 2 Mar 2019 13:14:21 +0100 Subject: [PATCH 05/43] Fix indention --- scripts/configure_firestorm.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/configure_firestorm.sh b/scripts/configure_firestorm.sh index 734d17e60e..164ac6b4b5 100755 --- a/scripts/configure_firestorm.sh +++ b/scripts/configure_firestorm.sh @@ -467,10 +467,10 @@ if [ $WANTS_CONFIG -eq $TRUE ] ; then fi # This name is consumed by indra/newview/CMakeLists.txt if [ $PLATFORM == "linux" ] ; then - VIEWER_SYMBOL_FILE="${BUILD_DIR}/newview/firestorm-symbols-${PLATFORM}-${AUTOBUILD_ADDRSIZE}.tar.bz2" - else - VIEWER_SYMBOL_FILE="${BUILD_DIR}/newview/$BTYPE/firestorm-symbols-${PLATFORM}-${AUTOBUILD_ADDRSIZE}.tar.bz2" - fi + VIEWER_SYMBOL_FILE="${BUILD_DIR}/newview/firestorm-symbols-${PLATFORM}-${AUTOBUILD_ADDRSIZE}.tar.bz2" + else + VIEWER_SYMBOL_FILE="${BUILD_DIR}/newview/$BTYPE/firestorm-symbols-${PLATFORM}-${AUTOBUILD_ADDRSIZE}.tar.bz2" + fi CRASH_REPORTING="-DRELEASE_CRASH_REPORTING:BOOL=ON" else CRASH_REPORTING="-DRELEASE_CRASH_REPORTING:BOOL=OFF" From 84828f813b131916900a6f47b9b19ab0890b407d Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sat, 2 Mar 2019 23:07:33 +0100 Subject: [PATCH 06/43] Fix CMake warning about USE_AVX2_OPTIMIZATION being unsed in AVX builds --- indra/CMakeLists.txt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt index db6bb03a52..96b2a62e62 100644 --- a/indra/CMakeLists.txt +++ b/indra/CMakeLists.txt @@ -47,8 +47,12 @@ endif(TESTBUILD AND TESTBUILDPERIOD) option(USE_AVX_OPTIMIZATION "AVX optimization support" OFF) option(USE_AVX2_OPTIMIZATION "AVX2 optimization support" OFF) if (USE_AVX_OPTIMIZATION) - add_definitions(-DUSE_AVX_OPTIMIZATION=1) - message("compiling with AVX optimizations") + if (USE_AVX2_OPTIMIZATION) + message(FATAL_ERROR "You cannot use AVX and AVX2 at the same time!") + else (USE_AVX2_OPTIMIZATION) + add_definitions(-DUSE_AVX_OPTIMIZATION=1) + message("compiling with AVX optimizations") + endif (USE_AVX2_OPTIMIZATION) elseif (USE_AVX2_OPTIMIZATION) add_definitions(-DUSE_AVX2_OPTIMIZATION=1) message("compiling with AVX2 optimizations") @@ -81,7 +85,6 @@ if (WINDOWS AND EXISTS ${LIBS_CLOSED_DIR}copy_win_scripts) endif (WINDOWS AND EXISTS ${LIBS_CLOSED_DIR}copy_win_scripts) add_custom_target(viewer) - add_subdirectory(${LIBS_OPEN_PREFIX}llcrashlogger) add_subdirectory(${LIBS_OPEN_PREFIX}llplugin) add_subdirectory(${LIBS_OPEN_PREFIX}llui) From 53aeb00712691d6eb1b378493a957b7d15e2f736 Mon Sep 17 00:00:00 2001 From: Nicky Date: Sat, 2 Mar 2019 23:29:35 +0100 Subject: [PATCH 07/43] Test for SINGLEGRID during Havok builds, mostly to make cmake happy about this variable being used. Bonus fact that it also warns now if someone tries to use it for Havok versions. --- indra/CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt index 96b2a62e62..4b7b36735c 100644 --- a/indra/CMakeLists.txt +++ b/indra/CMakeLists.txt @@ -31,6 +31,9 @@ if (OPENSIM) message("compiling with OpenSim support") endif (SINGLEGRID) else (OPENSIM) + if (SINGLEGRID) + message( WARNING "Value for SINGLEGRID is unused during Havok/SecondLife builds" ) + endif() message("compiling without OpenSim support") endif (OPENSIM) # From 5a0cb2e7d042f05e284793a679ce3cee5c07a844 Mon Sep 17 00:00:00 2001 From: Nicky Date: Sun, 3 Mar 2019 02:36:07 +0100 Subject: [PATCH 08/43] Tentative fix for FIRE-23012. There's a feew more cases of boost:regex using \S but there had been no complaints about those so far, with that it seems reasonable to just update this occurence and see if there's any undesired side effects with using [^\s] rather than \S. --- indra/llui/llurlentry.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp index 8e8ab79f8a..10e2cd5172 100644 --- a/indra/llui/llurlentry.cpp +++ b/indra/llui/llurlentry.cpp @@ -241,8 +241,14 @@ LLUrlEntryHTTP::LLUrlEntryHTTP() : LLUrlEntryBase() { // FIRE-1715: Links using FTP protocol are not recognized + // using \S causes FIRE-23012, the obvious strategy would be to update boost (viewer uses 1.57, + // current is 1.69 as of 2019-03-03). + // Unfortunately updating boost is not possible due to the viewer still relying on the old coroutine implementation. + // The second best solution is to use [^\s] for now //mPattern = boost::regex("https?://([^\\s/?\\.#]+\\.?)+\\.\\w+(:\\d+)?(/\\S*)?", - mPattern = boost::regex("(https?|ftp)://([^\\s/?\\.#]+\\.?)+\\.\\w+(:\\d+)?(/\\S*)?", + //mPattern = boost::regex("(https?|ftp)://([^\\s/?\\.#]+\\.?)+\\.\\w+(:\\d+)?(/\\S*)?", + mPattern = boost::regex("(https?|ftp)://([^\\s/?\\.#]+\\.?)+\\.\\w+(:\\d+)?(/[^\\s]*)?", + // // boost::regex::perl|boost::regex::icase); mMenuName = "menu_url_http.xml"; From 4026107f47479e01bc3b9953d78c473c7f3eaf22 Mon Sep 17 00:00:00 2001 From: Nicky Date: Sun, 3 Mar 2019 16:18:06 +0100 Subject: [PATCH 09/43] FIRE-23667; Package swiftshader again. --- indra/newview/viewer_manifest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 10d0a92327..a4b9c0c0ac 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -1925,7 +1925,7 @@ class LinuxManifest(ViewerManifest): self.path( "libcef.so" ) self.path( "libllceflib.so" ) - with self.prefix(src=os.path.join(pkgdir, 'release', 'swiftshader'), dst=os.path.join("bin", "swiftshader") ): + with self.prefix(src=os.path.join(pkgdir, 'lib', 'release', 'swiftshader'), dst=os.path.join("bin", "swiftshader") ): self.path( "*.so" ) with self.prefix(src=os.path.join(pkgdir, 'bin', 'release'), dst="bin"): From b95fcdf3b36113faa665e7dbcd80ba13f64896d5 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Fri, 8 Mar 2019 00:03:30 +0100 Subject: [PATCH 10/43] Some fixes for the build setup: * Fix wrong lookup path for nghttp2.lib on Windows * Fix missing details in output of configure_firestorm.sh script * Fix circular link dependency in LLWindow, causing CMake CMP0038 warning; viewer now builds with CMake 3.13.4 upwards (64bit CMake as well) --- indra/cmake/NGHTTP2.cmake | 4 +++- indra/llwindow/CMakeLists.txt | 7 +------ scripts/configure_firestorm.sh | 5 +++-- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/indra/cmake/NGHTTP2.cmake b/indra/cmake/NGHTTP2.cmake index df191ff3c1..f83c851444 100644 --- a/indra/cmake/NGHTTP2.cmake +++ b/indra/cmake/NGHTTP2.cmake @@ -9,7 +9,9 @@ else (USESYSTEMLIBS) use_prebuilt_binary(nghttp2) if (WINDOWS) set(NGHTTP2_LIBRARIES - ${ARCH_PREBUILT_DIRS_RELEASE}/nghttp2.lib + # ARCH_PREBUILT_DIRS_RELEASE is "." and would cause searching for the lib in the wrong place when not using VS + #${ARCH_PREBUILT_DIRS_RELEASE}/nghttp2.lib + nghttp2.lib ) elseif (DARWIN) set(NGHTTP2_LIBRARIES libnghttp2.dylib) diff --git a/indra/llwindow/CMakeLists.txt b/indra/llwindow/CMakeLists.txt index 259bb20cc4..460e09ad2d 100644 --- a/indra/llwindow/CMakeLists.txt +++ b/indra/llwindow/CMakeLists.txt @@ -75,7 +75,7 @@ if (LINUX) ${LLMATH_LIBRARIES} ${LLRENDER_LIBRARIES} ${LLVFS_LIBRARIES} - ${LLWINDOW_LIBRARIES} + #${LLWINDOW_LIBRARIES} # Don't link to itself - causes CMP0038 ${LLXML_LIBRARIES} ${UI_LIBRARIES} # for GTK ${SDL_LIBRARY} @@ -187,11 +187,6 @@ endif (llwindow_HEADER_FILES) list(APPEND viewer_SOURCE_FILES ${viewer_HEADER_FILES}) - # Turn off complaint about library linking to itself in Cmake 3 - if(POLICY CMP0038) - cmake_policy(SET CMP0038 OLD) - endif(POLICY CMP0038) - add_library (llwindow ${llwindow_SOURCE_FILES} ${viewer_SOURCE_FILES} diff --git a/scripts/configure_firestorm.sh b/scripts/configure_firestorm.sh index 164ac6b4b5..605e1335d6 100755 --- a/scripts/configure_firestorm.sh +++ b/scripts/configure_firestorm.sh @@ -65,8 +65,8 @@ showUsage() echo " --config : Generate a new architecture-specific config" echo " --build : Build Firestorm" echo " --version : Update version number" - echo " --chan [Release|Beta|Private] : Private is the default, sets channel" - echo " --btype [Release|RelWithDebInfo] : Release is default, whether to use symbols" + echo " --chan [Release|Beta|Private] : Private is the default, sets channel" + echo " --btype [Release|RelWithDebInfo|Debug] : Release is default, whether to use symbols" echo " --kdu : Build with KDU" echo " --package : Build installer" echo " --no-package : Build without installer (Overrides --package)" @@ -81,6 +81,7 @@ showUsage() echo " --testbuild : Create time-limited test build (build date + )" echo " --platform : Build for specified platform (darwin | windows | linux)" echo " --jobs : Build with jobs in parallel (Linux and Darwin only)" + echo " --ninja : Build using Ninja (Linux only)" echo echo "All arguments not in the above list will be passed through to LL's configure/build." echo From 7d75401d1a3e98014f999d2f75913afda99153c5 Mon Sep 17 00:00:00 2001 From: Nicky Date: Fri, 8 Mar 2019 20:14:46 +0100 Subject: [PATCH 11/43] fmodstudio update. --- autobuild.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 7914023e2a..337b7f648a 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1006,11 +1006,11 @@ archive hash - 177f3e948368aa09803ffae0884acc12 + 9e3d557d7fb26e20d52ec7502735a1bc hash_algorithm md5 url - file:///opt/firestorm/fmodstudio-1.10.10-darwin-183562214.tar.bz2 + file:///opt/firestorm/fmodstudio-1.10.11-darwin-190671854.tar.bz2 name darwin From a41d93039934cecbfedacd1a9b2ebe66d4f9f51a Mon Sep 17 00:00:00 2001 From: Ansariel Date: Fri, 8 Mar 2019 20:50:57 +0100 Subject: [PATCH 12/43] Correct versions for FMOD Studio and KDU --- autobuild.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 337b7f648a..914d901830 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1073,7 +1073,7 @@ version - 1.10.04 + 1.10.11 fmodex @@ -2069,7 +2069,7 @@ version - 7.A.4 + 7.A.6 libhunspell From 9b9338204722fe893d039fb7daf6f52dcbbb3421 Mon Sep 17 00:00:00 2001 From: "callum@gmail.com" Date: Fri, 8 Mar 2019 12:48:10 -0800 Subject: [PATCH 13/43] pull in updated 3p-cef-bin package: CEF 3.3626.1895.g7001d56 (Chromium 72.0.3626.121) with fix for CVE-2019-5786 --- autobuild.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 9b7ff39334..2bef0ef666 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -580,9 +580,9 @@ archive hash - 118987b1a5b56214cfdbd0c763e180da + bb069c5c6e8d0bc401e43b66ed6d4176 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/15127/97748/dullahan-1.1.1080_3.3325.1750.gaabe4c4-darwin64-513449.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/33604/278468/dullahan-1.1.1300_3.3626.1895.g7001d56-darwin64-525104.tar.bz2 name darwin64 @@ -592,9 +592,9 @@ archive hash - 2ecc71350b30a1057091b9cd7af18b1c + 1c68f5ea0427fb8dd602e99f1d72d608 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/15128/97755/dullahan-1.1.1080_3.3325.1750.gaabe4c4-windows-513449.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/33603/278469/dullahan-1.1.1300_3.3626.1895.g7001d56-windows-525104.tar.bz2 name windows @@ -604,16 +604,16 @@ archive hash - 2ed3e49388514dafb907c59a209d580e + 2d05676d9cb16b42d01f2938d6bdc533 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/15129/97760/dullahan-1.1.1080_3.3325.1750.gaabe4c4-windows64-513449.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/33605/278476/dullahan-1.1.1300_3.3626.1895.g7001d56-windows64-525104.tar.bz2 name windows64 version - 1.1.1080_3.3325.1750.gaabe4c4 + 1.1.1300_3.3626.1895.g7001d56 elfio From f87c04bcc48b34d6b9e7887e6bbf28d4261cb0d1 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sat, 9 Mar 2019 12:54:15 +0100 Subject: [PATCH 14/43] Fix invalid XUI in panel_preferences_colors.xml --- .../newview/skins/default/xui/en/panel_preferences_colors.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml index 567061478b..0de3bd7056 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml @@ -1458,7 +1458,6 @@ name="FSMiniMapWhisperRing" follows="left|top" height="24" - label_height="0" layout="topleft" top_pad="8" left="40" /> @@ -1503,7 +1502,6 @@ name="FSMiniMapChatRing" follows="left|top" height="24" - label_height="0" layout="topleft" left_delta="100" top_pad="-20" /> @@ -1548,7 +1546,6 @@ name="FSMiniMapShoutRing" follows="left|top" height="24" - label_height="0" layout="topleft" left_delta="100" top_pad="-20" /> From 2148b1cd52448681aa878b93c6f3752aef3c0f62 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sat, 9 Mar 2019 13:49:29 +0100 Subject: [PATCH 15/43] Remove the changes from SL-10102 that hasn't been merged into the LL release viewer or any other RC viewer, probably not getting released anytime soon - if ever --- indra/newview/llvoavatar.cpp | 82 ++++++++---------------------------- indra/newview/llvoavatar.h | 2 - indra/newview/llvovolume.cpp | 18 -------- 3 files changed, 18 insertions(+), 84 deletions(-) diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 7caf6b17d6..4c7e2b8200 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -211,9 +211,6 @@ const F32 NAMETAG_VERTICAL_SCREEN_OFFSET = 25.f; const F32 NAMETAG_VERT_OFFSET_WEIGHT = 0.17f; const U32 LLVOAvatar::VISUAL_COMPLEXITY_UNKNOWN = 0; -const F32 LLVOAvatar::VISUAL_COMPLEXITY_UPDATE_SECONDS = 10.0f; -const F32 VISUAL_COMPLEXITY_FRAC_CHANGE_THRESH = 0.05f; // Changes to self will not be displayed unless they exceed this fraction of previous value. -const F32 VISUAL_COMPLEXITY_ABS_CHANGE_THRESH = 1000; // ... and this absolute amount of change. const F64 HUD_OVERSIZED_TEXTURE_DATA_SIZE = 1024 * 1024; enum ERenderName @@ -10922,6 +10919,7 @@ void LLVOAvatar::idleUpdateRenderComplexity() void LLVOAvatar::updateVisualComplexity() { LL_DEBUGS("AvatarRender") << "avatar " << getID() << " appearance changed" << LL_ENDL; + // Set the cache time to in the past so it's updated ASAP mVisualComplexityStale = true; } @@ -11090,13 +11088,7 @@ void LLVOAvatar::calculateUpdateRenderComplexity() // Disable useless diagnostics //static std::set all_textures; - // remove the timer based complexity updates - //bool needs_update = mVisualComplexityStale && - // (mVisualComplexity==VISUAL_COMPLEXITY_UNKNOWN || - // mVisualComplexityUpdateTimer.getElapsedTimeF32()>VISUAL_COMPLEXITY_UPDATE_SECONDS); - bool needs_update = mVisualComplexityStale; - - if (needs_update) + if (mVisualComplexityStale) { // Show per-item complexity in COF @@ -11214,64 +11206,26 @@ void LLVOAvatar::calculateUpdateRenderComplexity() //} // - bool cost_changed = false; - if ( mVisualComplexity == VISUAL_COMPLEXITY_UNKNOWN) - { - LL_DEBUGS("AvatarRender") << "Avatar "<< getID() - << " complexity initialized to " << cost - << " reported " << mReportedVisualComplexity - << LL_ENDL; - cost_changed = true; - } - else - { - if ( cost != mVisualComplexity ) - { - // remove the threshold calcs - // F32 top_val = (1.0f+VISUAL_COMPLEXITY_FRAC_CHANGE_THRESH)*mVisualComplexity; - // F32 bottom_val = (1.0f/(1.0f+VISUAL_COMPLEXITY_FRAC_CHANGE_THRESH))*mVisualComplexity; - // top_val = llmax(top_val, mVisualComplexity + VISUAL_COMPLEXITY_ABS_CHANGE_THRESH); - // bottom_val = llmax(0.f, llmin(bottom_val, mVisualComplexity - VISUAL_COMPLEXITY_ABS_CHANGE_THRESH)); - - // if (isSelf() && cost > bottom_val && cost < top_val) - // { - // LL_DEBUGS("AvatarRender") << "Avatar "<< getID() - // << " self complexity change from " << mVisualComplexity << " to " << cost - // << " is within range " - // << "(" << bottom_val << "," << top_val << ")" - // << ", not updated." - // << " reported " << mReportedVisualComplexity - // << LL_ENDL; - // } - // else - // { - // LL_DEBUGS("AvatarRender") << "Avatar "<< getID() - // << " complexity updated was " << mVisualComplexity << " now " << cost - // << " reported " << mReportedVisualComplexity - // << LL_ENDL; - // cost_changed = true; - // } - //} - //else - //{ - // LL_DEBUGS("AvatarRender") << "Avatar "<< getID() - // << " complexity updated no change " << mVisualComplexity - // << " reported " << mReportedVisualComplexity - // << LL_ENDL; - cost_changed = true; - } - } - if (cost_changed) - { - mVisualComplexity = cost; - } + if ( cost != mVisualComplexity ) + { + LL_DEBUGS("AvatarRender") << "Avatar "<< getID() + << " complexity updated was " << mVisualComplexity << " now " << cost + << " reported " << mReportedVisualComplexity + << LL_ENDL; + } + else + { + LL_DEBUGS("AvatarRender") << "Avatar "<< getID() + << " complexity updated no change " << mVisualComplexity + << " reported " << mReportedVisualComplexity + << LL_ENDL; + } + mVisualComplexity = cost; mVisualComplexityStale = false; - // Remove the timer for now. - // mVisualComplexityUpdateTimer.reset(); static LLCachedControl show_my_complexity_changes(gSavedSettings, "ShowMyComplexityChanges", 20); - if (isSelf() && cost_changed && show_my_complexity_changes) + if (isSelf() && show_my_complexity_changes) { // Avatar complexity LLAvatarRenderNotifier::getInstance()->updateNotificationAgent(mVisualComplexity); diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h index 247712efa4..85f22c6c86 100644 --- a/indra/newview/llvoavatar.h +++ b/indra/newview/llvoavatar.h @@ -306,7 +306,6 @@ public: // void calculateUpdateRenderComplexity(); static const U32 VISUAL_COMPLEXITY_UNKNOWN; - static const F32 VISUAL_COMPLEXITY_UPDATE_SECONDS; void updateVisualComplexity(); U32 getVisualComplexity() { return mVisualComplexity; }; // Numbers calculated here by rendering AV @@ -486,7 +485,6 @@ public: // the isTooComplex method uses these mutable values to avoid recalculating too frequently mutable U32 mVisualComplexity; mutable bool mVisualComplexityStale; - mutable LLFrameTimer mVisualComplexityUpdateTimer; U32 mReportedVisualComplexity; // from other viewers through the simulator bool mCachedInMuteList; diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 7b7c100b03..2ce47faf8f 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -475,15 +475,6 @@ U32 LLVOVolume::processUpdateMessage(LLMessageSystem *mesgsys, { retval |= MEDIA_FLAGS_CHANGED; } - if (result && getRootEdit()->isAttachment() && getAvatarAncestor()==gAgentAvatarp ) - { -// Reduce log spam -// LL_INFOS("AvatarRender") << "Volume attached to self av has updated TE properties. ARC may change accordingly. Change flags " -// << result << LL_ENDL; - LL_DEBUGS("AvatarRender") << "Volume attached to self av has updated TE properties. ARC may change accordingly. Change flags " - << result << LL_ENDL; -// - } } else { @@ -624,15 +615,6 @@ U32 LLVOVolume::processUpdateMessage(LLMessageSystem *mesgsys, { retval |= MEDIA_FLAGS_CHANGED; } - if (result && getRootEdit()->isAttachment() && getAvatarAncestor()==gAgentAvatarp ) - { - // Reduce log spam - // LL_INFOS("AvatarRender") << "Volume attached to self av has updated TE properties. ARC may change accordingly. Change flags " - // << result << LL_ENDL; - LL_DEBUGS("AvatarRender") << "Volume attached to self av has updated TE properties. ARC may change accordingly. Change flags " - << result << LL_ENDL; - // - } } } } From b28f8cc24048969979c7873c3370f8b6d86b8d3b Mon Sep 17 00:00:00 2001 From: Nicky Date: Sat, 9 Mar 2019 15:16:32 +0100 Subject: [PATCH 16/43] Linux; Viewer was looking in the wrong directory to start SLVoice. --- indra/newview/llvoicevivox.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp index 4565963ffe..b2f3fc66e1 100644 --- a/indra/newview/llvoicevivox.cpp +++ b/indra/newview/llvoicevivox.cpp @@ -824,7 +824,11 @@ bool LLVivoxVoiceClient::startAndLaunchDaemon() { #ifndef VIVOXDAEMON_REMOTEHOST // Launch the voice daemon +#ifdef LL_LINUX + std::string exe_path = gDirUtilp->getExecutableDir(); +#else std::string exe_path = gDirUtilp->getAppRODataDir(); +#endif #if LL_WINDOWS // FIRE-22709: Local voice not working in OpenSim #ifdef OPENSIM From d4198bf380b4478d0599a86322292a3fb1016691 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sat, 9 Mar 2019 20:53:16 +0100 Subject: [PATCH 17/43] Windows SLVoice.exe is in the executable directory as well --- indra/newview/llvoicevivox.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp index b2f3fc66e1..2a3e1595ca 100644 --- a/indra/newview/llvoicevivox.cpp +++ b/indra/newview/llvoicevivox.cpp @@ -824,7 +824,7 @@ bool LLVivoxVoiceClient::startAndLaunchDaemon() { #ifndef VIVOXDAEMON_REMOTEHOST // Launch the voice daemon -#ifdef LL_LINUX +#if defined(LL_WINDOWS) || defined(LL_LINUX) std::string exe_path = gDirUtilp->getExecutableDir(); #else std::string exe_path = gDirUtilp->getAppRODataDir(); From 85b3f1429f7e62b3e1c6236e4cfe11c6a2fd0d5f Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sat, 9 Mar 2019 23:06:25 +0100 Subject: [PATCH 18/43] First aid kit for Mac --- indra/newview/CMakeLists.txt | 2 +- indra/newview/Info-Firestorm.plist | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 3545ef620b..d5c9084d38 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -2539,7 +2539,7 @@ if (DARWIN) # Info-SecondLife.plist file in the configure_file() directive below. set(product "${VIEWER_CHANNEL}") set(MACOSX_EXECUTABLE_NAME "${VIEWER_CHANNEL}") - set(MACOSX_BUNDLE_INFO_STRING "${VIEWER_CHANNEL}") + set(MACOSX_BUNDLE_INFO_STRING "Firestorm Viewer") set(MACOSX_BUNDLE_ICON_FILE "firestorm_icon.icns") set(MACOSX_BUNDLE_GUI_IDENTIFIER "com.phoenixviewer.firestorm.viewer-${ND_VIEWER_FLAVOR}") set(MACOSX_BUNDLE_LONG_VERSION_STRING "${VIEWER_CHANNEL} ${VIEWER_SHORT_VERSION}.${VIEWER_VERSION_REVISION}") diff --git a/indra/newview/Info-Firestorm.plist b/indra/newview/Info-Firestorm.plist index f779ffc3db..9358cae7dc 100644 --- a/indra/newview/Info-Firestorm.plist +++ b/indra/newview/Info-Firestorm.plist @@ -5,7 +5,7 @@ CFBundleDevelopmentRegion English CFBundleExecutable - ${MACOSX_BUNDLE_EXECUTABLE_NAME} + ${MACOSX_EXECUTABLE_NAME} CFBundleGetInfoString ${MACOSX_BUNDLE_INFO_STRING} CFBundleIconFile From b060047290427a1c9274705032773bfc64c218ff Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sat, 9 Mar 2019 23:09:29 +0100 Subject: [PATCH 19/43] Second aid kit... --- indra/newview/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index d5c9084d38..46bef1253c 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -2537,7 +2537,7 @@ if (DARWIN) # These all get set with PROPERTIES. It's not that the property names are # magically known to CMake -- it's that these names are referenced in the # Info-SecondLife.plist file in the configure_file() directive below. - set(product "${VIEWER_CHANNEL}") + set(product "Firestorm") set(MACOSX_EXECUTABLE_NAME "${VIEWER_CHANNEL}") set(MACOSX_BUNDLE_INFO_STRING "Firestorm Viewer") set(MACOSX_BUNDLE_ICON_FILE "firestorm_icon.icns") From d1432a34806f38830b4f93809c3382629499f6f9 Mon Sep 17 00:00:00 2001 From: Tonya Souther Date: Sat, 9 Mar 2019 19:23:03 -0600 Subject: [PATCH 20/43] OS X build and packaging fixes. --- indra/newview/CMakeLists.txt | 1 + indra/newview/viewer_manifest.py | 87 ++++++++++++++++---------------- 2 files changed, 45 insertions(+), 43 deletions(-) diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 46bef1253c..cb6abac7fc 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -2537,6 +2537,7 @@ if (DARWIN) # These all get set with PROPERTIES. It's not that the property names are # magically known to CMake -- it's that these names are referenced in the # Info-SecondLife.plist file in the configure_file() directive below. + #set(product "${VIEWER_CHANNEL}") set(product "Firestorm") set(MACOSX_EXECUTABLE_NAME "${VIEWER_CHANNEL}") set(MACOSX_BUNDLE_INFO_STRING "Firestorm Viewer") diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index a4b9c0c0ac..f3a2228f05 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -215,7 +215,7 @@ class ViewerManifest(LLManifest,FSViewerManifest): self.path("*.tga") # File in the newview/ directory - self.path("gpu_table.txt") + # self.path("gpu_table.txt") #build_data.json. Standard with exception handling is fine. If we can't open a new file for writing, we have worse problems #platform is computed above with other arg parsing @@ -1356,14 +1356,14 @@ class DarwinManifest(ViewerManifest): idnadir = os.path.join(pkgdir, "lib", "python", "idna") with self.prefix(dst="Contents"): # everything goes in Contents - self.path("Info.plist", dst="Info.plist") + # self.path("Info.plist", dst="Info.plist") # copy additional libs in /Contents/MacOS/ self.path(os.path.join(relpkgdir, "libndofdev.dylib"), dst="Resources/libndofdev.dylib") - self.path(os.path.join(relpkgdir, "libhunspell-1.3.0.dylib"), dst="Resources/libhunspell-1.3.0.dylib") + # self.path(os.path.join(relpkgdir, "libhunspell-1.3.0.dylib"), dst="Resources/libhunspell-1.3.0.dylib") # Growl Frameworks - self.path("../packages/Frameworks/Growl", dst="Frameworks/Growl") + # self.path("../packages/Frameworks/Growl", dst="Frameworks/Growl") # most everything goes in the Resources directory with self.prefix(dst="Resources"): @@ -1432,18 +1432,18 @@ class DarwinManifest(ViewerManifest): # in our bundled sub-apps. For each of these we'll create a # symlink from sub-app/Contents/Resources to the real .dylib. # Need to get the llcommon dll from any of the build directories as well. - libfile = "libllcommon.dylib" - dylibs = path_optional(self.find_existing_file(os.path.join(os.pardir, - "llcommon", - self.args['configuration'], - libfile), - os.path.join(relpkgdir, libfile)), - dst=libfile) + # libfile = "libllcommon.dylib" + # dylibs = path_optional(self.find_existing_file(os.path.join(os.pardir, + # "llcommon", + # self.args['configuration'], + # libfile), + # os.path.join(relpkgdir, libfile)), + # dst=libfile) for libfile in ( - "libapr-1.0.dylib", - "libaprutil-1.0.dylib", - "libcollada14dom.dylib", + # "libapr-1.0.dylib", + # "libaprutil-1.0.dylib", + # "libcollada14dom.dylib", "libexpat.1.dylib", "libexception_handler.dylib", "libGLOD.dylib", @@ -1453,17 +1453,18 @@ class DarwinManifest(ViewerManifest): "libnghttp2.*dylib", "libgrowl.dylib", "libgrowl++.dylib", - "libLeap.dylib", + # "libLeap.dylib", ): - dylibs += path_optional(os.path.join(relpkgdir, libfile), libfile) + # dylibs += path_optional(os.path.join(relpkgdir, libfile), libfile) + dylibs = path_optional(os.path.join(relpkgdir, libfile), libfile) # SLVoice and vivox lols, no symlinks needed for libfile in ( - 'libalut.dylib', - 'libopenal.dylib', - 'libortp.dylib', - 'libsndfile.dylib', - 'libvivoxoal.dylib', + # 'libalut.dylib', + # 'libopenal.dylib', + # 'libortp.dylib', + # 'libsndfile.dylib', + # 'libvivoxoal.dylib', 'libvivoxsdk.dylib', 'libvivoxplatform.dylib', 'SLVoice', @@ -1473,8 +1474,8 @@ class DarwinManifest(ViewerManifest): # FIRE-22709: Local voice not working in OpenSim if self.fs_is_opensim(): with self.prefix(src=os.path.join(relpkgdir, 'voice_os'), dst="voice_os"): - self.path('libalut.dylib') - self.path('libopenal.dylib') + # self.path('libalut.dylib') + # self.path('libopenal.dylib') self.path('libortp.dylib') self.path('libsndfile.dylib') self.path('libvivoxoal.dylib') @@ -1498,16 +1499,16 @@ class DarwinManifest(ViewerManifest): dylibs += path_optional(os.path.join(relpkgdir, libfile), libfile) # dylibs that vary based on configuration - if self.args['configuration'].lower() == 'debug': - for libfile in ( - "libfmodexL.dylib", - ): - dylibs += path_optional(os.path.join(debpkgdir, libfile), libfile) - else: - for libfile in ( - "libfmodex.dylib", - ): - dylibs += path_optional(os.path.join(relpkgdir, libfile), libfile) + # if self.args['configuration'].lower() == 'debug': + # for libfile in ( + # "libfmodexL.dylib", + # ): + # dylibs += path_optional(os.path.join(debpkgdir, libfile), libfile) + # else: + # for libfile in ( + # "libfmodex.dylib", + # ): + # dylibs += path_optional(os.path.join(relpkgdir, libfile), libfile) # our apps executable_path = {} @@ -1535,19 +1536,19 @@ class DarwinManifest(ViewerManifest): # Moved from the x86_64 specific version because code # below that does symlinking and path fixup depends on it. - with self.prefix(src=os.path.join(self.args['build'], os.pardir, 'packages', 'bin_x86')): - self.path("SLPlugin.app", "SLPlugin.app") + # with self.prefix(src=os.path.join(self.args['build'], os.pardir, 'packages', 'bin_x86')): + # self.path("SLPlugin.app", "SLPlugin.app") - with self.prefix(src_dst="llplugin"): - self.path("media_plugin_quicktime.dylib", "media_plugin_quicktime.dylib") - self.path("media_plugin_cef.dylib", "media_plugin_cef.dylib") + # with self.prefix(src_dst="llplugin"): + # self.path("media_plugin_quicktime.dylib", "media_plugin_quicktime.dylib") + # self.path("media_plugin_cef.dylib", "media_plugin_cef.dylib") # Dullahan helper apps go inside SLPlugin.app with self.prefix(dst="SLPlugin.app/Contents/Frameworks"): helperappfile = 'DullahanHelper.app' self.path2basename(relpkgdir, helperappfile) - pluginframeworkpath = self.dst_path_of('Chromium Embedded Framework.framework'); + # pluginframeworkpath = self.dst_path_of('Chromium Embedded Framework.framework'); # Putting a Frameworks directory under Contents/MacOS # isn't canonical, but the path baked into Dullahan # Helper.app/Contents/MacOS/DullahanHelper is: @@ -1590,8 +1591,8 @@ class DarwinManifest(ViewerManifest): '"@executable_path/../Frameworks/Chromium Embedded Framework.framework/Chromium Embedded Framework" "%s"' % dylibexecutablepath) # Copy in prebuilt framework if it's there - with self.prefix(src=os.path.join(self.args['build'], os.pardir, 'packages', 'bin_x86', 'Frameworks'), dst="Frameworks"): - self.path("Chromium Embedded Framework.framework") + # with self.prefix(src=os.path.join(self.args['build'], os.pardir, 'packages', 'bin_x86', 'Frameworks'), dst="Frameworks"): + # self.path("Chromium Embedded Framework.framework") # CEF framework goes inside Second Life.app/Contents/Frameworks with self.prefix(dst="Frameworks"): @@ -1625,8 +1626,8 @@ class DarwinManifest(ViewerManifest): # from SLPlugin.app/Contents/Frameworks/Chromium Embedded # Framework.framework back to Second # Life.app/Contents/Frameworks/Chromium Embedded Framework.framework - origin, target = pluginframeworkpath, frameworkpath - symlinkf(target, origin) + # origin, target = pluginframeworkpath, frameworkpath + # symlinkf(target, origin) # from SLPlugin.app/Contents/Frameworks/Dullahan # Helper.app/Contents/MacOS/Frameworks/Chromium Embedded # Framework.framework back to From ded31d7fff577ade704b27d1084194e2c18e044f Mon Sep 17 00:00:00 2001 From: Tonya Souther Date: Sat, 9 Mar 2019 19:39:27 -0600 Subject: [PATCH 21/43] Updating FMOD Studio to 1.10.11 for OS X to quiet complaints. --- autobuild.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 914d901830..0a15e4ec4d 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1006,11 +1006,11 @@ archive hash - 9e3d557d7fb26e20d52ec7502735a1bc + 962f9b146d25b412279f1794bd44a689 hash_algorithm md5 url - file:///opt/firestorm/fmodstudio-1.10.11-darwin-190671854.tar.bz2 + file:///opt/firestorm/fmodstudio-1.10.11-darwin-190690130.tar.bz2 name darwin From 7e324ee16e1542b9ea9ac7e15dfa2309d947bce7 Mon Sep 17 00:00:00 2001 From: Tonya Souther Date: Sat, 9 Mar 2019 22:53:10 -0600 Subject: [PATCH 22/43] More OS X build fixes. --- indra/newview/viewer_manifest.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index f3a2228f05..cdc69476cc 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -1440,9 +1440,10 @@ class DarwinManifest(ViewerManifest): # os.path.join(relpkgdir, libfile)), # dst=libfile) + dylibs = [] for libfile in ( - # "libapr-1.0.dylib", - # "libaprutil-1.0.dylib", + "libapr-1.0.dylib", + "libaprutil-1.0.dylib", # "libcollada14dom.dylib", "libexpat.1.dylib", "libexception_handler.dylib", @@ -1455,8 +1456,7 @@ class DarwinManifest(ViewerManifest): "libgrowl++.dylib", # "libLeap.dylib", ): - # dylibs += path_optional(os.path.join(relpkgdir, libfile), libfile) - dylibs = path_optional(os.path.join(relpkgdir, libfile), libfile) + dylibs += path_optional(os.path.join(relpkgdir, libfile), libfile) # SLVoice and vivox lols, no symlinks needed for libfile in ( @@ -1548,7 +1548,7 @@ class DarwinManifest(ViewerManifest): helperappfile = 'DullahanHelper.app' self.path2basename(relpkgdir, helperappfile) - # pluginframeworkpath = self.dst_path_of('Chromium Embedded Framework.framework'); + pluginframeworkpath = self.dst_path_of('Chromium Embedded Framework.framework'); # Putting a Frameworks directory under Contents/MacOS # isn't canonical, but the path baked into Dullahan # Helper.app/Contents/MacOS/DullahanHelper is: @@ -1626,8 +1626,8 @@ class DarwinManifest(ViewerManifest): # from SLPlugin.app/Contents/Frameworks/Chromium Embedded # Framework.framework back to Second # Life.app/Contents/Frameworks/Chromium Embedded Framework.framework - # origin, target = pluginframeworkpath, frameworkpath - # symlinkf(target, origin) + origin, target = pluginframeworkpath, frameworkpath + symlinkf(target, origin) # from SLPlugin.app/Contents/Frameworks/Dullahan # Helper.app/Contents/MacOS/Frameworks/Chromium Embedded # Framework.framework back to From 2b0e4bcfe5e97bf6d34d51e6a01e7655157b0fb0 Mon Sep 17 00:00:00 2001 From: Tonya Souther Date: Sun, 10 Mar 2019 14:11:14 -0500 Subject: [PATCH 23/43] Still more macOS build fixes. These should do it. --- indra/newview/CMakeLists.txt | 2 +- indra/newview/viewer_manifest.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index cb6abac7fc..165bb7b09d 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -2539,7 +2539,7 @@ if (DARWIN) # Info-SecondLife.plist file in the configure_file() directive below. #set(product "${VIEWER_CHANNEL}") set(product "Firestorm") - set(MACOSX_EXECUTABLE_NAME "${VIEWER_CHANNEL}") + set(MACOSX_EXECUTABLE_NAME "Firestorm") set(MACOSX_BUNDLE_INFO_STRING "Firestorm Viewer") set(MACOSX_BUNDLE_ICON_FILE "firestorm_icon.icns") set(MACOSX_BUNDLE_GUI_IDENTIFIER "com.phoenixviewer.firestorm.viewer-${ND_VIEWER_FLAVOR}") diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index cdc69476cc..1e273d3ad4 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -1345,7 +1345,8 @@ class DarwinManifest(ViewerManifest): def construct(self): # copy over the build result (this is a no-op if run within the xcode script) - self.path(self.args['configuration'] + "/Firestorm.app", dst="") + # self.path(os.path.join(self.args['configuration'], self.channel()+".app"), dst="") + self.path(os.path.join(self.args['configuration'], "Firestorm.app"), dst="") pkgdir = os.path.join(self.args['build'], os.pardir, 'packages') relpkgdir = os.path.join(pkgdir, "lib", "release") From 12abcf0e3e0c1bfbda17131a3181aa1d07c7a6a4 Mon Sep 17 00:00:00 2001 From: PanteraPolnocy Date: Mon, 11 Mar 2019 22:33:34 +0100 Subject: [PATCH 24/43] Just a Polish translation update --- indra/newview/installers/windows/lang_pl.nsi | Bin 13294 -> 13394 bytes .../skins/default/xui/pl/notifications.xml | 14 +++++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/indra/newview/installers/windows/lang_pl.nsi b/indra/newview/installers/windows/lang_pl.nsi index 4a28d591167e188a74df979ee5db16b36cb8da48..b9b03d8264eb32c240ca4fc3e2ffc28b1019cf06 100644 GIT binary patch delta 1196 zcma)5O;1x%5S>STwj$Jm$n(7tyhV&?5%~y-aZxRzkthu$x!UjZvhj~nC7*8_s-0jbLPzV!k2}u-B9=m)u};Q{t@wc z(!a5f6 z=3jw7uIU=?awbn9uYp=cs^aXRY8I99wBfi;4!;H5-Qlz!M;CWF>kfowsLJWi^BsAr zAaWI%D>ja29sjaIWrfokIB0YrF*Z`8mqpx}KJH8ZWz^nqDork6Y;wYmLR`hL(uQe{ zmdMAcWmQ4#A;aPxPn}LYDgiBvYI6G$6-!`}N2PUqD@r4}Mw7r;!SkFRBO-@?CEOij z3iZYf&mf#itOE5&mA_~mg4RuS-X(3ue`yLNe|sYGwS~V$6lbnRc)|~OtG$yq&OYGU zncl=8z=cu~jqe#ll<|fU_&>QbWH+la?YsW!c z9sOzyP8&gl%g1vmZ|1}fv~2m3V4Q zBRC3-#PVXU9BjNK$fWqq@D=Wl4stLS0vP@cf}-b|GD-c4+-P@We`0thDz`@C93}FUxVHv|URvs#wqB zE+S6W+{FSM^exM9oW1MZZYnQ*_4D8M=_vVo_*eZ|rbI!fzJKz1zIq!4rNA>mBaeX=!O?Xn0 zw$!C54RPci-W73mFFvbJ#tV99;#$vxe*^v&-X-yHInohdTzGtZU&h;&$MDt77k$e> z*@WGY3@jVV44&-34$#_CL!={R#I{Uq16&5^*JVyl>#KMYTxRsqV^-q`milmvUFq{Yuqu+%#kgu)uoHu1CJ_hU$WQ}V3&bG>@p&oxcs7_yKP8V z@&s>V$pOf4T5D4rS8{;P86nEL8A@fW9RE7}g7~^0nvGB_k42G|9)_M@Jh2@8!cnZO z&V_F-4(~orW){el=3qbkeT-cZ8R`oC9Zu-mNNaT!6sS`f2ex{%b`>0)^{1ByV|^)w z6@^mOjedWXNx#JsdLgo;-eg?AM2l0NiLDy{SlZD~OJ~hmH+C!5U$eP&FLVB!V`}H3 zy0*&5slQ^oM^GyHtbU9a`=@fj*Kj{JerBTn2zetNFlWX zKeaeodRo z@F2c48jn3k22N9jg#??ri40qKHf$dB+hHiB@8c8d6;?3zF52I6Vu4G6bojQ2{1r6K zXxRh*4-<|Q(Kax)jAy&78=K8TWDaFh%9miUT7jB_2{wbHZ^Fq_S0POrWastem0WKP zVf-W1kfLj#Y!40u33@OXy-~ufa0{aF4`yR25__2}ItFuu2X^+WukXTVLOK4i Do zalogowania się wymagana jest wersja [VERSION]. -Wygląda na to, że nie została ona zaktualizowana. Pobierz ją z https://secondlife.com/support/downloads/ + + Do zalogowania się wymagana jest wersja [VERSION]. +Kliknij OK, aby pobrać i zainstalować. + + + Wersja [VERSION] została pobrana i jest gotowa do zainstalowania. +Kliknij OK, aby zainstalować. + + + Wersja [VERSION] została pobrana i jest gotowa do zainstalowania. +Kontynuować? + + Przepraszamy, ale nie udało się zalogować - powód jest nieznany. Jeśli ciągle widzisz tą wiadomość sprawdź [SUPPORT_SITE]. From fedda5e64d63b0f902e6a6c79262495dbfebc8bb Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Fri, 8 Mar 2019 17:34:49 -0800 Subject: [PATCH 25/43] SL-10702: When attempting a new voice connection, ensure that the voicePump mail drop does not have any outstanding events. --- indra/llcommon/llevents.h | 10 ++++++---- indra/newview/llvoicevivox.cpp | 5 +++++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/indra/llcommon/llevents.h b/indra/llcommon/llevents.h index 5d60c63810..d850cb4fcc 100644 --- a/indra/llcommon/llevents.h +++ b/indra/llcommon/llevents.h @@ -582,11 +582,12 @@ public: /// Generate a distinct name for a listener -- see listen() static std::string inventName(const std::string& pfx="listener"); -private: - friend class LLEventPumps; /// flush queued events virtual void flush() {} +private: + friend class LLEventPumps; + virtual void reset(); @@ -675,8 +676,10 @@ public: virtual ~LLEventMailDrop() {} /// Post an event to all listeners - virtual bool post(const LLSD& event); + virtual bool post(const LLSD& event) override; + /// Remove any history stored in the mail drop. + virtual void flush() override { mEventHistory.clear(); LLEventStream::flush(); }; protected: virtual LLBoundListener listen_impl(const std::string& name, const LLEventListener&, const NameList& after, @@ -703,7 +706,6 @@ public: /// Post an event to all listeners virtual bool post(const LLSD& event); -private: /// flush queued events virtual void flush(); diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp index 2a3e1595ca..69c81c2973 100644 --- a/indra/newview/llvoicevivox.cpp +++ b/indra/newview/llvoicevivox.cpp @@ -1591,6 +1591,11 @@ bool LLVivoxVoiceClient::addAndJoinSession(const sessionStatePtr_t &nextSession) LLSD timeoutResult(LLSDMap("session", "timeout")); + // We are about to start a whole new session. Anything that MIGHT still be in our + // maildrop is going to be stale and cause us much wailing and gnashing of teeth. + // Just flush it all out and start new. + voicePump.flush(); + // It appears that I need to wait for BOTH the SessionGroup.AddSession response and the SessionStateChangeEvent with state 4 // before continuing from this state. They can happen in either order, and if I don't wait for both, things can get stuck. // For now, the SessionGroup.AddSession response handler sets mSessionHandle and the SessionStateChangeEvent handler transitions to stateSessionJoined. From f2f23903f95cfe0bd228cc788ec9db0fe5da78f6 Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Fri, 8 Mar 2019 17:47:11 -0800 Subject: [PATCH 26/43] SL-10702: Mac gets very picky about override. (or MSVC isn't picky enough) --- indra/llcommon/llevents.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/llcommon/llevents.h b/indra/llcommon/llevents.h index d850cb4fcc..62d97007ac 100644 --- a/indra/llcommon/llevents.h +++ b/indra/llcommon/llevents.h @@ -683,7 +683,7 @@ public: protected: virtual LLBoundListener listen_impl(const std::string& name, const LLEventListener&, const NameList& after, - const NameList& before); + const NameList& before) override; private: typedef std::list EventList; From 9203140564245341abfd15f4d7a495f3f134fb87 Mon Sep 17 00:00:00 2001 From: "callum@gmail.com" Date: Fri, 8 Mar 2019 19:12:19 -0800 Subject: [PATCH 27/43] Pick up new version of Dullahan (1.1.1301) that doesn't crash because size change for browser surface was initiated too early --- autobuild.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 2bef0ef666..d2924eca52 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -580,9 +580,9 @@ archive hash - bb069c5c6e8d0bc401e43b66ed6d4176 + 54fccdb81eea7393df0bdfe7bd0af79d url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/33604/278468/dullahan-1.1.1300_3.3626.1895.g7001d56-darwin64-525104.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/33640/279058/dullahan-1.1.1305_3.3626.1895.g7001d56-darwin64-525122.tar.bz2 name darwin64 @@ -592,9 +592,9 @@ archive hash - 1c68f5ea0427fb8dd602e99f1d72d608 + 0516ef9be6377cbdedc1ecef8d7d6b2c url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/33603/278469/dullahan-1.1.1300_3.3626.1895.g7001d56-windows-525104.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/33642/279070/dullahan-1.1.1305_3.3626.1895.g7001d56-windows-525122.tar.bz2 name windows @@ -604,16 +604,16 @@ archive hash - 2d05676d9cb16b42d01f2938d6bdc533 + d9c23b391f627b3773122d84ed7436f8 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/33605/278476/dullahan-1.1.1300_3.3626.1895.g7001d56-windows64-525104.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/33641/279065/dullahan-1.1.1305_3.3626.1895.g7001d56-windows64-525122.tar.bz2 name windows64 version - 1.1.1300_3.3626.1895.g7001d56 + 1.1.1305_3.3626.1895.g7001d56 elfio From c2ff5a28789a6343b445d48373c84096085303f7 Mon Sep 17 00:00:00 2001 From: callum_linden Date: Fri, 8 Mar 2019 21:29:32 -0800 Subject: [PATCH 28/43] Runtime files required by CEF changed in this version of CEF. We add them to the cef-bin and dullahan 3p packages but they were not copied to the right place - now they are --- indra/newview/viewer_manifest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index c0f642c852..fcb97ded8f 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -635,7 +635,7 @@ class WindowsManifest(ViewerManifest): self.path("dullahan_host.exe") self.path("natives_blob.bin") self.path("snapshot_blob.bin") - self.path("widevinecdmadapter.dll") + self.path("v8_context_snapshot.bin") # MSVC DLLs needed for CEF and have to be in same directory as plugin with self.prefix(src=os.path.join(self.args['build'], os.pardir, From 89f99f6ba441e53ab2144e4689f5c95ce10c749e Mon Sep 17 00:00:00 2001 From: "callum@gmail.com" Date: Tue, 12 Mar 2019 13:49:21 -0700 Subject: [PATCH 29/43] Pull in Dullahan 1.1.1309 with fix for macOS version --- autobuild.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index d2924eca52..e6c6803d89 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -580,9 +580,9 @@ archive hash - 54fccdb81eea7393df0bdfe7bd0af79d + 9c219f5fe35161eefb8abe1c6b8524ea url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/33640/279058/dullahan-1.1.1305_3.3626.1895.g7001d56-darwin64-525122.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/33755/280172/dullahan-1.1.1309_3.3626.1895.g7001d56-darwin64-525191.tar.bz2 name darwin64 @@ -592,9 +592,9 @@ archive hash - 0516ef9be6377cbdedc1ecef8d7d6b2c + 4b62b7726ba4b6912711b232539a51ed url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/33642/279070/dullahan-1.1.1305_3.3626.1895.g7001d56-windows-525122.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/33756/280178/dullahan-1.1.1309_3.3626.1895.g7001d56-windows-525191.tar.bz2 name windows @@ -604,16 +604,16 @@ archive hash - d9c23b391f627b3773122d84ed7436f8 + 06c3ae1ac1c0b9ce044ad839d95faff8 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/33641/279065/dullahan-1.1.1305_3.3626.1895.g7001d56-windows64-525122.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/33757/280182/dullahan-1.1.1309_3.3626.1895.g7001d56-windows64-525191.tar.bz2 name windows64 version - 1.1.1305_3.3626.1895.g7001d56 + 1.1.1309_3.3626.1895.g7001d56 elfio From 1f4cc3cf4fbe6a78aa462d8193ba6b81cdf4e1d7 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Fri, 15 Mar 2019 18:02:45 +0100 Subject: [PATCH 30/43] FIRE-23686: Better label for upload option on OXP import floater --- indra/newview/skins/default/xui/de/floater_fs_import.xml | 2 +- indra/newview/skins/default/xui/en/floater_fs_import.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/newview/skins/default/xui/de/floater_fs_import.xml b/indra/newview/skins/default/xui/de/floater_fs_import.xml index 8047bd4c81..0118612c22 100644 --- a/indra/newview/skins/default/xui/de/floater_fs_import.xml +++ b/indra/newview/skins/default/xui/de/floater_fs_import.xml @@ -57,7 +57,7 @@ - +