diff --git a/autobuild.xml b/autobuild.xml index 9f3a56a688..3cdbb02009 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3282,9 +3282,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 05c4debd4cccfea620fc7e6f9a190924 + f5f4bc956734e53ef99125ae9aae3a87 url - http://3p.firestormviewer.org/slvoice-3.2.0002.10426.302004-linux64-212691952.tar.bz2 + http://3p.firestormviewer.org/slvoice-3.2-linux64_bionic-220651719.tar.bz2 name linux64 diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt index 646ff1cfa2..d63ecfbf3a 100644 --- a/indra/CMakeLists.txt +++ b/indra/CMakeLists.txt @@ -4,7 +4,7 @@ # other commands to guarantee full compatibility # with the version specified ## 3.8 added VS_DEBUGGER_WORKING_DIRECTORY support -cmake_minimum_required(VERSION 3.8.0 FATAL_ERROR) +cmake_minimum_required(VERSION 3.12.0 FATAL_ERROR) set(ROOT_PROJECT_NAME "SecondLife" CACHE STRING "The root project/makefile/solution name. Defaults to SecondLife.") @@ -28,9 +28,9 @@ endif (NOT CMAKE_BUILD_TYPE) # option(OPENSIM "OpenSim support" OFF) if (OPENSIM) - add_definitions(-DOPENSIM=1) + add_compile_definitions(OPENSIM) if (SINGLEGRID) - add_definitions(-DSINGLEGRID=1 -DSINGLEGRID_URI=\"${SINGLEGRID_URI}\") + add_compile_definitions(SINGLEGRID SINGLEGRID_URI=\"${SINGLEGRID_URI}\") message(STATUS "Compiling with OpenSim support - Single Grid version (${SINGLEGRID_URI})") else (SINGLEGRID) message(STATUS "Compiling with OpenSim support") @@ -43,7 +43,7 @@ else (OPENSIM) endif (OPENSIM) if (HAVOK_TPV) - add_definitions(-DHAVOK_TPV=1) + add_compile_definitions(HAVOK_TPV) message(STATUS "Compiling with Havok libraries") endif (HAVOK_TPV) # @@ -51,7 +51,7 @@ endif (HAVOK_TPV) # Support for test builds option(TESTBUILD "Generating test build" OFF) if(TESTBUILD AND TESTBUILDPERIOD) - add_definitions(-DTESTBUILD=1 -DTESTBUILDPERIOD=${TESTBUILDPERIOD}) + add_compile_definitions(TESTBUILD TESTBUILDPERIOD=${TESTBUILDPERIOD}) message(STATUS "Creating test build version; test period: ${TESTBUILDPERIOD} days") endif(TESTBUILD AND TESTBUILDPERIOD) # @@ -63,11 +63,11 @@ if (USE_AVX_OPTIMIZATION) 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) + add_compile_definitions(USE_AVX_OPTIMIZATION) message(STATUS "Compiling with AVX optimizations") endif (USE_AVX2_OPTIMIZATION) elseif (USE_AVX2_OPTIMIZATION) - add_definitions(-DUSE_AVX2_OPTIMIZATION=1) + add_compile_definitions(USE_AVX2_OPTIMIZATION) message(STATUS "Compiling with AVX2 optimizations") else (USE_AVX_OPTIMIZATION) message(STATUS "Compiling without AVX optimizations") diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 519f68b53e..34a7c3f18d 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -223,7 +223,7 @@ elseif(LINUX) set(SHARED_LIB_STAGING_DIR_RELWITHDEBINFO "${SHARED_LIB_STAGING_DIR}") set(SHARED_LIB_STAGING_DIR_RELEASE "${SHARED_LIB_STAGING_DIR}") - set(vivox_lib_dir "${ARCH_PREBUILT_DIRS_RELEASE}") + set(vivox_lib_dir "${ARCH_PREBUILT_DIRS_RELEASE}/../../lib32/") set(vivox_libs libsndfile.so.1 libortp.so @@ -255,6 +255,8 @@ elseif(LINUX) libuuid.so.16.0.22 libfontconfig.so.1.8.0 libfontconfig.so.1 + libaprutil-1.so.0 + libapr-1.so.0 ) else (NOT USESYSTEMLIBS) set(release_files diff --git a/indra/cmake/bugsplat.cmake b/indra/cmake/bugsplat.cmake index ce61b51b9b..0f5f283f6b 100644 --- a/indra/cmake/bugsplat.cmake +++ b/indra/cmake/bugsplat.cmake @@ -36,9 +36,7 @@ if (USE_BUGSPLAT) if( LINUX ) set(BUGSPLAT_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/breakpad) - # Sadly we cannot have the nice things yet and need add_definitions for older cmake - #add_compile_definitions(__STDC_FORMAT_MACROS) - add_definitions(-D__STDC_FORMAT_MACROS) + add_compile_definitions(__STDC_FORMAT_MACROS) else() set(BUGSPLAT_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/bugsplat) endif() diff --git a/indra/llcommon/tests/llerror_test.cpp b/indra/llcommon/tests/llerror_test.cpp index 148c18aabe..d4ca7bce65 100644 --- a/indra/llcommon/tests/llerror_test.cpp +++ b/indra/llcommon/tests/llerror_test.cpp @@ -61,6 +61,9 @@ namespace { #ifdef __clang__ # pragma clang diagnostic ignored "-Wunused-function" +#endif +#if __GNUC__ +#pragma GCC diagnostic ignored "-Wunused-function" #endif void test_that_error_h_includes_enough_things_to_compile_a_message() { diff --git a/indra/llcommon/tests/lleventcoro_test.cpp b/indra/llcommon/tests/lleventcoro_test.cpp index ccc4d82b34..4a1d4b8ba9 100644 --- a/indra/llcommon/tests/lleventcoro_test.cpp +++ b/indra/llcommon/tests/lleventcoro_test.cpp @@ -216,6 +216,7 @@ namespace tut } void test_data::postAndWait1() + { BEGIN { mSync.bump(); diff --git a/indra/newview/fs_resources/EBEDD1D2-A320-43f5-88CF-DD47BBCA5DFB.lsltxt b/indra/newview/fs_resources/EBEDD1D2-A320-43f5-88CF-DD47BBCA5DFB.lsltxt index 11e5ee0ce5..9103d4faf3 100644 --- a/indra/newview/fs_resources/EBEDD1D2-A320-43f5-88CF-DD47BBCA5DFB.lsltxt +++ b/indra/newview/fs_resources/EBEDD1D2-A320-43f5-88CF-DD47BBCA5DFB.lsltxt @@ -7,7 +7,7 @@ // // Bridge platform - string BRIDGE_VERSION = "2.27"; // This should match fslslbridge.cpp + string BRIDGE_VERSION = "2.28"; // This should match fslslbridge.cpp string gLatestURL; integer gViewerIsFirestorm; integer gTryHandshakeOnce = TRUE; @@ -48,8 +48,8 @@ { llReleaseURL(gLatestURL); gLatestURL = ""; - // llRequestSecureURL(); // Uncomment this line and comment next one for HTTPS instead of HTTP (experimental) - llRequestURL(); + llRequestSecureURL(); + // llRequestURL(); -- Uncomment this line and comment the previous one for HTTP instead of HTTPS } detachBridge() diff --git a/indra/newview/fs_viewer_manifest.py b/indra/newview/fs_viewer_manifest.py index 04d75e6c1d..c41620b5be 100644 --- a/indra/newview/fs_viewer_manifest.py +++ b/indra/newview/fs_viewer_manifest.py @@ -194,10 +194,14 @@ class FSViewerManifest: def fs_save_breakpad_symbols(self, osname): from glob import glob import sys - from os.path import isdir + from os.path import isdir, join from shutil import rmtree import tarfile + components = ['Phoenix',self.app_name(),self.args.get('arch'),'.'.join(self.args['version'])] + symbolsName = "_".join(components) + symbolsName = symbolsName + "_" + self.args["viewer_flavor"] + "-" + osname + "-" + str(self.address_size) + ".tar.bz2" + if isdir( "symbols" ): rmtree( "symbols" ) @@ -213,12 +217,7 @@ class FSViewerManifest: if isdir( "symbols" ): for a in self.args: print("%s: %s" % (a, self.args[a])) - symbolsName = "%s/Phoenix_%s_%s_%s_symbols-%s-%d.tar.bz2" % (self.args['configuration'].lower(), - self.fs_channel_legacy_oneword(), - '-'.join( self.args['version'] ), - self.args['viewer_flavor'], - osname, - self.address_size) fTar = tarfile.open( symbolsName, "w:bz2") fTar.add("symbols", arcname=".") + fTar.add( join( self.args["dest"], "build_data.json" ), arcname="build_data.json" ) diff --git a/indra/newview/fsfloaterperformance.cpp b/indra/newview/fsfloaterperformance.cpp index 7e11d1dadc..eaaf5b32df 100644 --- a/indra/newview/fsfloaterperformance.cpp +++ b/indra/newview/fsfloaterperformance.cpp @@ -634,6 +634,7 @@ void FSFloaterPerformance::populateNearbyList() auto overall_appearance = avatar->getOverallAppearance(); if (overall_appearance == LLVOAvatar::AOA_INVISIBLE) { + char_iter++; continue; } diff --git a/indra/newview/fslslbridge.cpp b/indra/newview/fslslbridge.cpp index e8596296cb..2495242dd1 100644 --- a/indra/newview/fslslbridge.cpp +++ b/indra/newview/fslslbridge.cpp @@ -55,7 +55,7 @@ static const std::string FS_BRIDGE_FOLDER = "#LSL Bridge"; static const std::string FS_BRIDGE_CONTAINER_FOLDER = "Landscaping"; static const U32 FS_BRIDGE_MAJOR_VERSION = 2; -static const U32 FS_BRIDGE_MINOR_VERSION = 27; +static const U32 FS_BRIDGE_MINOR_VERSION = 28; static const U32 FS_MAX_MINOR_VERSION = 99; static const std::string UPLOAD_SCRIPT_CURRENT = "EBEDD1D2-A320-43f5-88CF-DD47BBCA5DFB.lsltxt"; static const std::string FS_STATE_ATTRIBUTE = "state="; diff --git a/indra/newview/fsperfstats.cpp b/indra/newview/fsperfstats.cpp index 1238bd786d..e01631be37 100644 --- a/indra/newview/fsperfstats.cpp +++ b/indra/newview/fsperfstats.cpp @@ -123,7 +123,7 @@ namespace FSPerfStats FSPerfStats::tunables.userImpostorDistanceTuningEnabled = gSavedSettings.getBOOL("FSAutoTuneImpostorByDistEnabled"); FSPerfStats::tunables.userFPSTuningStrategy = gSavedSettings.getU32("FSTuningFPSStrategy"); FSPerfStats::tunables.userTargetFPS = gSavedSettings.getU32("FSTargetFPS"); - FSPerfStats::tunables.userTargetReflections = gSavedSettings.getU32("FSUserTargetReflections"); + FSPerfStats::tunables.userTargetReflections = gSavedSettings.getS32("FSUserTargetReflections"); FSPerfStats::tunables.userAutoTuneEnabled = gSavedSettings.getBOOL("FSAutoTuneFPS"); FSPerfStats::tunables.userAutoTuneLock = gSavedSettings.getBOOL("FSAutoTuneLock"); // Note: The Max ART slider is logarithmic and thus we have an intermediate proxy value diff --git a/indra/newview/llmediactrl.cpp b/indra/newview/llmediactrl.cpp index 4a5b6243f3..4626745cb5 100644 --- a/indra/newview/llmediactrl.cpp +++ b/indra/newview/llmediactrl.cpp @@ -1182,6 +1182,11 @@ void LLMediaCtrl::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event) } else { + // Media might be blocked, waiting for a file, + // send an empty response to unblock it + const std::vector empty_response; + self->sendPickFileResponse(empty_response); + LLNotificationsUtil::add("MediaFileDownloadUnsupported"); } }; diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp index 3ef82e5e26..0a412f983b 100644 --- a/indra/newview/llviewercontrol.cpp +++ b/indra/newview/llviewercontrol.cpp @@ -1127,7 +1127,7 @@ void handleUserTargetDrawDistanceChanged(const LLSD& newValue) void handleUserTargetReflectionsChanged(const LLSD& newValue) { - const auto newval = gSavedSettings.getF32("FSUserTargetReflections"); + const auto newval = gSavedSettings.getS32("FSUserTargetReflections"); FSPerfStats::tunables.userTargetReflections = newval; } diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index b9b222e256..15b0918576 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -3262,10 +3262,6 @@ void LLViewerMediaImpl::handleMediaEvent(LLPluginClassMedia* plugin, LLPluginCla case LLViewerMediaObserver::MEDIA_EVENT_FILE_DOWNLOAD: { LL_DEBUGS("Media") << "Media event - file download requested - filename is " << plugin->getFileDownloadFilename() << LL_ENDL; - - //unblock media plugin - const std::vector empty_response; - plugin->sendPickFileResponse(empty_response); } break; diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index a9bad65b56..d8e308b642 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -71,6 +71,8 @@ #include "llmediaentry.h" #include "llmediadataclient.h" #include "llmeshrepository.h" +#include "llnotifications.h" +#include "llnotificationsutil.h" #include "llagent.h" #include "llviewermediafocus.h" #include "lldatapacker.h" @@ -3152,6 +3154,17 @@ void LLVOVolume::mediaEvent(LLViewerMediaImpl *impl, LLPluginClassMedia* plugin, } } break; + + case LLViewerMediaObserver::MEDIA_EVENT_FILE_DOWNLOAD: + { + // Media might be blocked, waiting for a file, + // send an empty response to unblock it + const std::vector empty_response; + plugin->sendPickFileResponse(empty_response); + + LLNotificationsUtil::add("MediaFileDownloadUnsupported"); + } + break; default: break; diff --git a/indra/newview/skins/default/xui/da/notifications.xml b/indra/newview/skins/default/xui/da/notifications.xml index 36968b04fc..704d7b79d2 100644 --- a/indra/newview/skins/default/xui/da/notifications.xml +++ b/indra/newview/skins/default/xui/da/notifications.xml @@ -72,7 +72,7 @@ Fejl detaljer: Beskeden kaldet '[_NAME]' blev ikke fundet i notificati - Kunne ikke tilslutte til [SECOND_LIFE_GRID]. + Kunne ikke tilslutte til [CURRENT_GRID]. '[DIAGNOSTIC]' Check at Internet forbindelsen fungerer korrekt. @@ -477,7 +477,7 @@ Du kan bruge [CURRENT_GRID] normalt og andre personer vil se dig korrekt. Hvis det er første gang du bruger [CURRENT_GRID], skal du først oprette en konto for at logge på. - Der er problemer med at koble på. Der kan være et problem med din Internet forbindelse eller [SECOND_LIFE_GRID]. + Der er problemer med at koble på. Der kan være et problem med din Internet forbindelse eller [CURRENT_GRID]. Du kan enten checke din Internet forbindelse og prøve igen om lidt, klikke på Hjælp for at se [SUPPORT_SITE] siden, eller klikke på Teleport for at forsøge at teleportere hjem. diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml index d32393ee3d..c83c82d10d 100644 --- a/indra/newview/skins/default/xui/de/notifications.xml +++ b/indra/newview/skins/default/xui/de/notifications.xml @@ -86,7 +86,7 @@ Fehlerdetails: The notification called '[_NAME]' was not found in noti - Verbindung nicht möglich zum [SECOND_LIFE_GRID]. + Verbindung nicht möglich zum [CURRENT_GRID]. '[DIAGNOSTIC]' Stellen Sie sicher, dass Ihre Internetverbindung funktioniert. @@ -710,7 +710,7 @@ Das Objekt ist möglicherweise außer Reichweite oder wurde gelöscht. Dateidownload nicht möglich - Sie haben einen Datei-Download angefordert, der in [SECOND_LIFE] nicht unterstützt wird. + Sie haben einen Datei-Download angefordert, der in [APP_NAME] nicht unterstützt wird. @@ -1513,11 +1513,11 @@ Falls Sie [CURRENT_GRID] zum ersten Mal verwenden, müssen Sie zuerst ein Konto - Es gibt Probleme mit der Verbindung. Möglicherweise besteht ein Problem mit Ihrer Internetverbindung oder dem [SECOND_LIFE_GRID]. + Es gibt Probleme mit der Verbindung. Möglicherweise besteht ein Problem mit Ihrer Internetverbindung oder dem [CURRENT_GRID]. Überprüfen Sie Ihre Internetverbindung und versuchen Sie es dann erneut, oder klicken Sie auf Hilfe, um zu [SUPPORT_SITE] zu gelangen, oder klicken Sie auf Teleportieren, um nach Hause zu teleportieren. - http://de.secondlife.com/support/ + https://www.firestormviewer.org/support/