From e2880c049d566c4b3376a405c7aae7112987977b Mon Sep 17 00:00:00 2001 From: Ansariel Date: Thu, 10 Feb 2022 13:41:36 +0100 Subject: [PATCH 01/14] Warn if splash screen URL is manually overridden for testing purposes :)))) --- indra/newview/fspanellogin.cpp | 8 ++++++++ .../newview/skins/default/xui/en/notifications.xml | 13 +++++++++++++ 2 files changed, 21 insertions(+) diff --git a/indra/newview/fspanellogin.cpp b/indra/newview/fspanellogin.cpp index ca6387f036..e36b627b00 100644 --- a/indra/newview/fspanellogin.cpp +++ b/indra/newview/fspanellogin.cpp @@ -873,6 +873,14 @@ void FSPanelLogin::loadLoginPage() std::string force_login_url = gSavedSettings.getString("ForceLoginURL"); if ( force_login_url.length() > 0 ) { + LLNotificationsUtil::add("WarnForceLoginURL", LLSD(), LLSD(), [](const LLSD¬if, const LLSD&resp) + { + S32 opt = LLNotificationsUtil::getSelectedOption(notif, resp); + if (opt == 0) + { + gSavedSettings.setString("ForceLoginURL", ""); + } + }); login_page = LLURI(force_login_url); } diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 7e5a79270a..35367b70e8 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -13745,4 +13745,17 @@ An attachment named "[NAME]" contains rigged mesh but is attached to the HUD poi ignoretext="Warn me when a rigged attachment is worn on a HUD attachment point" name="notifyignore"/> + + +Login splash screen URL is overridden for testing purposes. + +Reset the URL to default? + + From 97cc5590a8f360f51d485474dc5fa48cc679c7ac Mon Sep 17 00:00:00 2001 From: Ansariel Date: Thu, 10 Feb 2022 13:41:47 +0100 Subject: [PATCH 02/14] Update German translation --- indra/newview/skins/default/xui/de/notifications.xml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml index 5b61f14c81..beb47fd231 100644 --- a/indra/newview/skins/default/xui/de/notifications.xml +++ b/indra/newview/skins/default/xui/de/notifications.xml @@ -5527,8 +5527,12 @@ Falls Sie diesen Nutzungsbestimmungen nicht zustimmen, sollten keinerlei finanzi Der Anhang „[NAME]“ enthält geriggtes Mesh, ist aber am HUD-Punkt „[HUD_POINT]“ angehängt. Das bedeutet, dass Sie es korrekt sehen werden, alle anderen werden es hingegen gar nicht sehen. Denken Sie darüber nach, den Anhang zu entfernen und an einem regulären Punkt am Körper anzuhängen. - - + + + + URL der Startseite des Anmeldebildschirms wird für Testzwecke übersteuert. + +URL auf Standard zurücksetzen? + + From 552942eddd57f331c2b81a785d4f3bd40ce42eb4 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Thu, 10 Feb 2022 13:48:10 +0100 Subject: [PATCH 03/14] Reload login splash screen if resetting the URL --- indra/newview/fspanellogin.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/indra/newview/fspanellogin.cpp b/indra/newview/fspanellogin.cpp index e36b627b00..0b6802a406 100644 --- a/indra/newview/fspanellogin.cpp +++ b/indra/newview/fspanellogin.cpp @@ -879,6 +879,7 @@ void FSPanelLogin::loadLoginPage() if (opt == 0) { gSavedSettings.setString("ForceLoginURL", ""); + loadLoginPage(); } }); login_page = LLURI(force_login_url); From e3a9c5ef3b8662fd5f29f8e2f3a4d9efb03fe310 Mon Sep 17 00:00:00 2001 From: Nicky Date: Thu, 10 Feb 2022 21:48:48 +0100 Subject: [PATCH 04/14] Mark third party include directory as system (-isystem) so GCC stops complaining about warnings in those headers. --- indra/llaudio/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/llaudio/CMakeLists.txt b/indra/llaudio/CMakeLists.txt index 92a5cfe22f..804b36b226 100644 --- a/indra/llaudio/CMakeLists.txt +++ b/indra/llaudio/CMakeLists.txt @@ -11,7 +11,7 @@ include(LLMath) include(LLMessage) include(LLFileSystem) -include_directories( +include_directories( SYSTEM ${LLAUDIO_INCLUDE_DIRS} ${LLCOMMON_INCLUDE_DIRS} ${LLMATH_INCLUDE_DIRS} From 5fe342473d56b4c6543326eb61fa5bd5658b0b01 Mon Sep 17 00:00:00 2001 From: Nicky Date: Thu, 10 Feb 2022 22:03:14 +0100 Subject: [PATCH 05/14] Remove unused using. --- indra/newview/fsperfstats.h | 1 - 1 file changed, 1 deletion(-) diff --git a/indra/newview/fsperfstats.h b/indra/newview/fsperfstats.h index 7ada042a6a..d6ff6fffb1 100644 --- a/indra/newview/fsperfstats.h +++ b/indra/newview/fsperfstats.h @@ -202,7 +202,6 @@ namespace FSPerfStats { FSZone; // LL_INFOS("perfstats") << "processing update:" << LL_ENDL; - using ST = StatType_t; // Note: nullptr is used as the key for global stats #ifdef FS_HAS_TELEMETRY_SUPPORT static char avstr[36]; From 6d94e02868b654eaa194a15420cece282222279c Mon Sep 17 00:00:00 2001 From: Nicky Date: Thu, 10 Feb 2022 22:03:56 +0100 Subject: [PATCH 06/14] Rewmove some unused variables. --- indra/newview/llappviewerlinux.cpp | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/indra/newview/llappviewerlinux.cpp b/indra/newview/llappviewerlinux.cpp index 5bdfa0725e..16a181d002 100644 --- a/indra/newview/llappviewerlinux.cpp +++ b/indra/newview/llappviewerlinux.cpp @@ -247,14 +247,14 @@ void viewerappapi_init(ViewerAppAPI *server) gBusNodeInfo = g_dbus_node_info_new_for_xml (DBUS_SERVER, NULL); g_assert (gBusNodeInfo != NULL); - auto owner_id = g_bus_own_name(G_BUS_TYPE_SESSION, - VIEWERAPI_SERVICE, - G_BUS_NAME_OWNER_FLAGS_NONE, - busAcquired, - nameAcquired, - nameLost, - NULL, - NULL); + g_bus_own_name(G_BUS_TYPE_SESSION, + VIEWERAPI_SERVICE, + G_BUS_NAME_OWNER_FLAGS_NONE, + busAcquired, + nameAcquired, + nameLost, + NULL, + NULL); } @@ -272,8 +272,6 @@ bool LLAppViewerLinux::initSLURLHandler() //virtual bool LLAppViewerLinux::sendURLToOtherInstance(const std::string& url) { - bool success = false; - auto *pBus = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, nullptr); if( !pBus ) From 2a03afe85c3f1799ae6aec5100ce8f7e74c2cecc Mon Sep 17 00:00:00 2001 From: Nicky Date: Thu, 10 Feb 2022 22:06:05 +0100 Subject: [PATCH 07/14] Make GCC shut up about some warnings --- indra/llcommon/llsdutil.cpp | 6 ++++++ indra/llmessage/llnamevalue.cpp | 6 ++++++ indra/newview/llurl.cpp | 5 +++++ indra/newview/llviewerjoystick.cpp | 9 +++++++++ 4 files changed, 26 insertions(+) diff --git a/indra/llcommon/llsdutil.cpp b/indra/llcommon/llsdutil.cpp index d5cc14ff55..a1ee1cb7ba 100644 --- a/indra/llcommon/llsdutil.cpp +++ b/indra/llcommon/llsdutil.cpp @@ -47,6 +47,12 @@ #include #include +// Suppress warnings about the string fiddling +#if LL_LINUX +#pragma GCC diagnostic ignored "-Wstringop-truncation" +#endif +// + // U32 LLSD ll_sd_from_U32(const U32 val) { diff --git a/indra/llmessage/llnamevalue.cpp b/indra/llmessage/llnamevalue.cpp index c51883ee3d..6076439518 100644 --- a/indra/llmessage/llnamevalue.cpp +++ b/indra/llmessage/llnamevalue.cpp @@ -35,6 +35,12 @@ #include "llstring.h" #include "llstringtable.h" +// Suppress warnings about the string fiddling +#if LL_LINUX +#pragma GCC diagnostic ignored "-Wstringop-truncation" +#endif +// + // Anonymous enumeration to provide constants in this file. // *NOTE: These values may be used in sscanf statements below as their // value-1, so search for '2047' if you cange NV_BUFFER_LEN or '63' if diff --git a/indra/newview/llurl.cpp b/indra/newview/llurl.cpp index 01a81c5f83..46cdbf9ed3 100644 --- a/indra/newview/llurl.cpp +++ b/indra/newview/llurl.cpp @@ -28,6 +28,11 @@ #include "llurl.h" #include "llerror.h" +#if LL_LINUX +#pragma GCC diagnostic ignored "-Wstringop-truncation" +#endif + + LLURL::LLURL() { init(""); diff --git a/indra/newview/llviewerjoystick.cpp b/indra/newview/llviewerjoystick.cpp index d147560011..c81fa22b13 100644 --- a/indra/newview/llviewerjoystick.cpp +++ b/indra/newview/llviewerjoystick.cpp @@ -493,7 +493,16 @@ void LLViewerJoystick::initDevice(void * preffered_device /*LPDIRECTINPUTDEVICE8 #if LIB_NDOF mLastDeviceUUID = guid; +#ifdef LL_LINUX +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wstringop-truncation" +#endif strncpy(mNdofDev->product, name.c_str(), sizeof(mNdofDev->product)); +#ifdef LL_LINUX +#pragma GCC diagnostic pop +#endif + + mNdofDev->product[ sizeof(mNdofDev->product)-1 ] = 0; mNdofDev->manufacturer[0] = '\0'; initDevice(preffered_device); From 431e4f3358a975079b106170ecee5c566d7b9419 Mon Sep 17 00:00:00 2001 From: PanteraPolnocy Date: Thu, 10 Feb 2022 23:18:41 +0100 Subject: [PATCH 08/14] Polish translation --- indra/newview/skins/default/xui/pl/notifications.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/indra/newview/skins/default/xui/pl/notifications.xml b/indra/newview/skins/default/xui/pl/notifications.xml index 43a1dceffe..a27cfbdf39 100644 --- a/indra/newview/skins/default/xui/pl/notifications.xml +++ b/indra/newview/skins/default/xui/pl/notifications.xml @@ -5166,4 +5166,10 @@ Pamiętaj, że nie można wybrać "otoczenia współdzielonego" i "bazowanego na Dodatek o nazwie "[NAME]" zawiera riggowany mesz, ale jest dołączony do punktu HUD "[HUD_POINT]". Oznacza to, że Ty co prawda zobaczysz go poprawnie wyrenderowany, ale wszyscy inni nie będą mogli. Rozważ zdjęcie go i ponowne dołączenie do zwykłego punktu doczepienia. + + Wygląda na to, że adres URL ekranu logowania jest zastępowany w celach testowych. + +Zresetować adres URL do domyślnego? + + From 7060e24ece373cf179dc4e8db874ecabee580cd7 Mon Sep 17 00:00:00 2001 From: Nicky Date: Sat, 12 Feb 2022 20:21:55 +0100 Subject: [PATCH 09/14] Remove unused variable. --- indra/newview/llmanip.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/indra/newview/llmanip.cpp b/indra/newview/llmanip.cpp index bf4579c756..e974c00c37 100644 --- a/indra/newview/llmanip.cpp +++ b/indra/newview/llmanip.cpp @@ -615,9 +615,11 @@ void LLManip::renderTickValue(const LLVector3& pos, F32 value, const std::string gGL.scalef(inv_zoom_amt, inv_zoom_amt, inv_zoom_amt); } - LLColor4 shadow_color = LLColor4::black; - shadow_color.mV[VALPHA] = color.mV[VALPHA] * 0.5f; - + // Unused and GCC does not like this ... + //LLColor4 shadow_color = LLColor4::black; + //shadow_color.mV[VALPHA] = color.mV[VALPHA] * 0.5f; + // getDecimalPoint(), fractional_portion, suffix.c_str()); From c97777d1060029b3936ba1a063d7533a3f04d912 Mon Sep 17 00:00:00 2001 From: Beq Date: Sat, 12 Feb 2022 20:26:22 +0000 Subject: [PATCH 10/14] don't warn when LL_PATH_NONE was deliberately selected --- indra/llfilesystem/lldir.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/llfilesystem/lldir.cpp b/indra/llfilesystem/lldir.cpp index 9580c846fc..75ce6aa478 100644 --- a/indra/llfilesystem/lldir.cpp +++ b/indra/llfilesystem/lldir.cpp @@ -648,7 +648,7 @@ std::string LLDir::getExpandedFilename(ELLPath location, const std::string& subd llassert(0); } - if (prefix.empty()) + if (prefix.empty() && location != LL_PATH_NONE) // avoid pointless warning when LL_PATH_NONE is used. { LL_WARNS() << ELLPathToString(location) << ", '" << subdir1 << "', '" << subdir2 << "', '" << in_filename From df0cf8cd4410e68725e572568de032334cea9373 Mon Sep 17 00:00:00 2001 From: Mnikolenko ProductEngine Date: Tue, 8 Feb 2022 15:37:56 +0200 Subject: [PATCH 11/14] SL-16757 FIXED [Mac] third-person cursor doesn't return after switching away from app and back --- indra/llwindow/llwindowmacosx.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp index e0ddb6b07b..feb7ebb5e2 100644 --- a/indra/llwindow/llwindowmacosx.cpp +++ b/indra/llwindow/llwindowmacosx.cpp @@ -1708,7 +1708,7 @@ void LLWindowMacOSX::hideCursor() void LLWindowMacOSX::showCursor() { - if(mCursorHidden) + if(mCursorHidden || !isCGCursorVisible()) { // LL_INFOS() << "showCursor: showing" << LL_ENDL; mCursorHidden = FALSE; From cbd21590cedbe41cd8e081ad96daeef6bf39580d Mon Sep 17 00:00:00 2001 From: Nicky Date: Mon, 14 Feb 2022 11:35:19 +0100 Subject: [PATCH 12/14] Make pulse header required --- indra/cmake/MediaPluginBase.cmake | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/indra/cmake/MediaPluginBase.cmake b/indra/cmake/MediaPluginBase.cmake index cde56fb5e4..17890c25fd 100644 --- a/indra/cmake/MediaPluginBase.cmake +++ b/indra/cmake/MediaPluginBase.cmake @@ -6,24 +6,18 @@ if (LINUX) include_directories( ${GLIB_INCLUDE_DIRS} ) - set( PULSE_AUDIO True ) foreach( PULSE_FILE pulse/introspect.h pulse/context.h pulse/subscribe.h pulse/glib-mainloop.h ) - find_path( PULSE_FILE_FOUND ${PULSE_FILE} NO_CACHE) - if( NOT PULSE_FILE_FOUND ) + find_path( PULSE_FILE_${PULSE_FILE}_FOUND ${PULSE_FILE} NO_CACHE) + if( NOT PULSE_FILE_${PULSE_FILE}_FOUND ) message( "Looking for ${PULSE_FILE} ... not found") - set( PULSE_AUDIO False ) + message( FATAL_ERROR "Pulse header not found" ) else() message( "Looking for ${PULSE_FILE} ... found") endif() endforeach() - if( NOT PULSE_AUDIO ) - message( "Building without linux volume catcher" ) - set(LINUX_VOLUME_CATCHER dummy_volume_catcher.cpp) - else() - message( "Building with linux volume catcher" ) - set(LINUX_VOLUME_CATCHER linux_volume_catcher.cpp) - endif() + message( "Building with linux volume catcher" ) + set(LINUX_VOLUME_CATCHER linux_volume_catcher.cpp) endif() From 009afb2f5150135d55eca62eaa8cfb927c97bf11 Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Thu, 10 Feb 2022 18:49:49 +0200 Subject: [PATCH 13/14] SL-16789 FIXED [MAC] only default cursor is shown after nstalling the Viewer in a directory with a non-ASCII name --- indra/llwindow/llwindowmacosx-objc.mm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/llwindow/llwindowmacosx-objc.mm b/indra/llwindow/llwindowmacosx-objc.mm index 7d54bdaee2..41db6ae98e 100644 --- a/indra/llwindow/llwindowmacosx-objc.mm +++ b/indra/llwindow/llwindowmacosx-objc.mm @@ -106,13 +106,13 @@ const unsigned short *copyFromPBoard() CursorRef createImageCursor(const char *fullpath, int hotspotX, int hotspotY) { NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - + // extra retain on the NSCursor since we want it to live for the lifetime of the app. NSCursor *cursor = [[[NSCursor alloc] initWithImage: [[[NSImage alloc] initWithContentsOfFile: - [NSString stringWithFormat:@"%s", fullpath] + [NSString stringWithUTF8String:fullpath] ]autorelease] hotSpot:NSMakePoint(hotspotX, hotspotY) ]retain]; From f6648363400b2b881029a3ccde17bf13a24da548 Mon Sep 17 00:00:00 2001 From: Zi Ree Date: Tue, 15 Feb 2022 17:10:52 +0100 Subject: [PATCH 14/14] Add example for using multithreaded xz compression to linux build instructions --- README_BUILD_FIRESTORM_LINUX.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README_BUILD_FIRESTORM_LINUX.txt b/README_BUILD_FIRESTORM_LINUX.txt index b83c57fb0f..3aa979da25 100755 --- a/README_BUILD_FIRESTORM_LINUX.txt +++ b/README_BUILD_FIRESTORM_LINUX.txt @@ -27,6 +27,12 @@ Other examples: autobuild build -A64 -c ReleaseFS --no-configure -- --clean # Clean rebuild autobuild build -A64 -c ReleaseFS -- --package # Complete a build and package it into a tarball +When using the --package switch you can set the XZ_DEFAULTS variable to -T0 to use all available CPU cores +to create the .tar.xz file. This can significantly reduce the time needed to create the archive, but it will +use a lot more memory. For example: + export XZ_DEFAULTS="-T0" + autobuild build -A64 -c ReleaseFS_open -- --package + If you want to build with clang you can call autobuild like this: CC=clang CXX=clang++ autobuild configure -A64 -c ReleaseFS