From a7578e9690b07badd09afab51ff7fdf9dfe01e10 Mon Sep 17 00:00:00 2001 From: Beq Date: Fri, 27 Oct 2023 10:03:43 +0100 Subject: [PATCH 01/24] Update autobuild for Mac fmodstudio 2.02.18 GHA builds already have this, this change keeps the autobuild in step --- autobuild.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 17fd92f2cd..5484b8674a 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1083,11 +1083,11 @@ archive hash - 8ee7c21f3f109cf4e1709e4af0b4bebf + bfcc4acbe6b8dddaf10f0f7a47e4aad8 hash_algorithm md5 url - file:///opt/firestorm/fmodstudio-2.02.17-darwin64-232401806.tar.bz2 + file:///opt/firestorm/fmodstudio-2.02.18-darwin64-232960129.tar.bz2 name darwin64 From a6822ec4265101ec49002aa61f73d1c92adadd46 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Fri, 27 Oct 2023 16:24:05 +0200 Subject: [PATCH 02/24] Update Windows build instructions --- README_BUILD_FIRESTORM_WINDOWS.txt | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/README_BUILD_FIRESTORM_WINDOWS.txt b/README_BUILD_FIRESTORM_WINDOWS.txt index ecbf01a749..bc7909e9f0 100755 --- a/README_BUILD_FIRESTORM_WINDOWS.txt +++ b/README_BUILD_FIRESTORM_WINDOWS.txt @@ -2,11 +2,11 @@ Before you start configuring your Windows build system, be aware of our tested c Memory: You will need at least 2GB RAM, 4GB strongly recommended. CPU: Multiple CPUs are strongly recommended. A build can take over an hour. - Visual Studio 2017 Community Edition. + Visual Studio 2017/2022 Community Edition. Ensure you can build a stock viewer-development try as described in the SL wiki. Before asking for any help compiling Firestorm, make sure you can build the Second Life viewer first. If you try and skip this step, you may -receive much less help. http://wiki.secondlife.com/wiki/Visual_Studio_2013_Viewer_Builds +receive much less help. https://wiki.secondlife.com/wiki/Build_the_Viewer_on_Windows If you want to use licensed FMOD or KDU build libraries (they are optional) you have to provision these yourself. If you're licensing these with Phoenix/Firestorm, ask for the libraries for fmod and kdu. Put them into: @@ -20,11 +20,11 @@ mailing list. We've created a non-KDU build target to make this easier. Everywhe "ReleaseFS_open" instead. This will perform the same build, using OpenJpeg instead of KDU. -To build Firestorm: +To build Firestorm - a more detailed instruction can be found at https://wiki.firestormviewer.org/fs_compiling_firestorm_windows: Open a CMD shell and navigating to your firestorm code repo: - autobuild build -c ReleaseFS + autobuild build -A 64 -c ReleaseFS Other build targets you may use are: @@ -33,22 +33,18 @@ Other build targets you may use are: RelWithDebInfoFS_open (no KDU, no FMOD) Other examples: - autobuild configure -c ReleaseFS # basic configuration step, don't build, just configure - autobuild configure -c ReleaseFS -- --clean # clean the output area first, then configure - autobuild configure -c ReleaseFS -- --chan Private-Yourname # configure with a custom channel + autobuild configure -A 64 -c ReleaseFS # basic configuration step, don't build, just configure + autobuild configure -A 64 -c ReleaseFS -- --clean # clean the output area first, then configure + autobuild configure -A 64 -c ReleaseFS -- --chan Private-Yourname # configure with a custom channel - autobuild build -c ReleaseFS --no-configure # default quick rebuild + autobuild build -A 64 -c ReleaseFS --no-configure # default quick rebuild If you want to set custom configuration, do this in the configure step separately from build, then run "autobuild -build -c ReleaseFS --no-configure" as a secondary step. - -If you want to build the 64bit version, add the parameter -A 64 to the autobuild commands, e.g.: - autobuild configure -A 64 -c ReleaseFS - autobuild build -A 64 -c ReleaseFS --no-configure +build -A 64 -c ReleaseFS --no-configure" as a secondary step. Logs: - Look for logs in build-vc150-32/logs for 32bit builds and build-vc150-64/logs for 64bit + Look for logs in build-vc1x0-64/logs Output: - Look for output in build-vc150-32/newview/Release for 32bit builds and build-vc150-64/newview/Release for 64bit + Look for output in build-vc1x0-32/newview/Release From 242c378df97c2ef155addd6d39f184ae12655dd0 Mon Sep 17 00:00:00 2001 From: RunitaiLinden Date: Mon, 16 Oct 2023 16:21:20 -0500 Subject: [PATCH 03/24] SL-20473 Add GenericStreamingMessage and dummy handler to suppress packet loss and log spam noise when visiting GLTF enabled regions. --- indra/newview/llstartup.cpp | 1 + indra/newview/llviewergenericmessage.cpp | 5 +++++ indra/newview/llviewergenericmessage.h | 1 + scripts/messages/message_template.msg | 19 +++++++++++++++++++ scripts/messages/message_template.msg.sha1 | 2 +- 5 files changed, 27 insertions(+), 1 deletion(-) diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index adb8b40c41..84c57d25cd 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -3665,6 +3665,7 @@ void register_viewer_callbacks(LLMessageSystem* msg) msg->setHandlerFunc("InitiateDownload", process_initiate_download); msg->setHandlerFunc("LandStatReply", LLFloaterTopObjects::handle_land_reply); msg->setHandlerFunc("GenericMessage", process_generic_message); + msg->setHandlerFunc("GenericStreamingMessage", process_generic_streaming_message); msg->setHandlerFunc("LargeGenericMessage", process_large_generic_message); msg->setHandlerFuncFast(_PREHASH_FeatureDisabled, process_feature_disabled_message); diff --git a/indra/newview/llviewergenericmessage.cpp b/indra/newview/llviewergenericmessage.cpp index d3de9d72bf..7d33fc0d84 100644 --- a/indra/newview/llviewergenericmessage.cpp +++ b/indra/newview/llviewergenericmessage.cpp @@ -92,6 +92,11 @@ void process_generic_message(LLMessageSystem* msg, void**) } } +void process_generic_streaming_message(LLMessageSystem* msg, void**) +{ + // placeholder to suppress packet loss reports and log spam (SL-20473) +} + void process_large_generic_message(LLMessageSystem* msg, void**) { LLUUID agent_id; diff --git a/indra/newview/llviewergenericmessage.h b/indra/newview/llviewergenericmessage.h index 170f38a485..96a73a3d5f 100644 --- a/indra/newview/llviewergenericmessage.h +++ b/indra/newview/llviewergenericmessage.h @@ -38,6 +38,7 @@ void send_generic_message(const std::string& method, const LLUUID& invoice = LLUUID::null); void process_generic_message(LLMessageSystem* msg, void**); +void process_generic_streaming_message(LLMessageSystem* msg, void**); void process_large_generic_message(LLMessageSystem* msg, void**); diff --git a/scripts/messages/message_template.msg b/scripts/messages/message_template.msg index fd52e41005..01ba6a9711 100755 --- a/scripts/messages/message_template.msg +++ b/scripts/messages/message_template.msg @@ -5807,6 +5807,25 @@ version 2.0 } } +// GenericStreamingMessage +// Optimized generic message for streaming arbitrary data to viewer +// Avoid payloads over 7KB (8KB ceiling) +// Method -- magic number indicating method to use to decode payload: +// 0x4175 - GLTF material override data +// Payload -- data to be decoded +{ + GenericStreamingMessage High 31 Trusted Unencoded + { + MethodData Single + { Method U16 } + } + + { + DataBlock Single + { Data Variable 2 } + } +} + // LargeGenericMessage // Similar to the above messages, but can handle larger payloads and serialized // LLSD. Uses HTTP transport diff --git a/scripts/messages/message_template.msg.sha1 b/scripts/messages/message_template.msg.sha1 index d36178eee1..ac085310d1 100755 --- a/scripts/messages/message_template.msg.sha1 +++ b/scripts/messages/message_template.msg.sha1 @@ -1 +1 @@ -e61fad776b4d494be0b901922fc75a3317af97ca \ No newline at end of file +9eb8c673c2f6b4e271d50f07823757f98f406f0a \ No newline at end of file From 019d2c6a0c013c8aeb4e7c4212c2c8000804d6a1 Mon Sep 17 00:00:00 2001 From: Zi Ree Date: Sun, 29 Oct 2023 23:57:08 +0100 Subject: [PATCH 04/24] Vintage: add inventory settings menu item to Inventory menu --- .../skins/vintage/xui/en/panel_main_inventory.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/indra/newview/skins/vintage/xui/en/panel_main_inventory.xml b/indra/newview/skins/vintage/xui/en/panel_main_inventory.xml index b5e5698f59..60f4a5d891 100644 --- a/indra/newview/skins/vintage/xui/en/panel_main_inventory.xml +++ b/indra/newview/skins/vintage/xui/en/panel_main_inventory.xml @@ -81,6 +81,16 @@ function="Floater.Toggle" parameter="fs_protectedfolders" /> + + + + Date: Thu, 2 Nov 2023 14:30:48 +1100 Subject: [PATCH 05/24] Linux: Remove conflicting xmlrpc_epi package and revert back to a working one --- autobuild.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 04dc72437c..23b0a7d82f 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -2959,11 +2959,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - ad0c8b41ee4b4de216382bec46ee1c25962a3f12 + 71a9c7c03a2c26cdb21fa476de485d9c hash_algorithm - sha1 + md5 url - https://github.com/secondlife/3p-xmlrpc-epi/releases/download/v0.54.1.8a05acf/xmlrpc_epi-0.54.1.8a05acf-linux64-8a05acf.tar.zst + http://3p.firestormviewer.org/xmlrpc_epi-0.54.2.230940042-linux64-230940042.tar.bz2 name linux64 From a27e5be75de6c51b626405dcd775f35768fa66dd Mon Sep 17 00:00:00 2001 From: PanteraPolnocy Date: Thu, 2 Nov 2023 19:49:02 +0100 Subject: [PATCH 06/24] Updated Polish translation, Vintage skin --- .../vintage/xui/pl/panel_main_inventory.xml | 33 +++++++++++++++---- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/indra/newview/skins/vintage/xui/pl/panel_main_inventory.xml b/indra/newview/skins/vintage/xui/pl/panel_main_inventory.xml index 867c0a8378..3c06ae53c4 100644 --- a/indra/newview/skins/vintage/xui/pl/panel_main_inventory.xml +++ b/indra/newview/skins/vintage/xui/pl/panel_main_inventory.xml @@ -9,6 +9,9 @@ Pobrano [ITEM_COUNT] elementów [FILTER] + + Szafa + @@ -16,6 +19,7 @@ + @@ -62,6 +66,9 @@ + + + @@ -77,7 +84,17 @@ - + + +