From 61c49f58ef05aba1ea59110eeb1b014ca56b877a Mon Sep 17 00:00:00 2001 From: PanteraPolnocy Date: Wed, 10 Sep 2025 08:50:23 +0200 Subject: [PATCH 1/5] FIRE-35932 Favorites tab in inventory added to Starlight and Vintage skins --- .../starlight/xui/en/panel_main_inventory.xml | 13 ++++++ .../starlight/xui/ja/panel_main_inventory.xml | 1 + .../starlight/xui/zh/panel_main_inventory.xml | 1 + .../xui/en/panel_main_inventory.xml | 40 +++++++++++++------ .../xui/ja/panel_main_inventory.xml | 1 + .../xui/zh/panel_main_inventory.xml | 1 + .../vintage/xui/de/panel_main_inventory.xml | 1 + .../vintage/xui/en/panel_main_inventory.xml | 11 +++++ .../vintage/xui/ja/panel_main_inventory.xml | 1 + .../vintage/xui/pl/panel_main_inventory.xml | 1 + .../vintage/xui/zh/panel_main_inventory.xml | 1 + 11 files changed, 59 insertions(+), 13 deletions(-) diff --git a/indra/newview/skins/starlight/xui/en/panel_main_inventory.xml b/indra/newview/skins/starlight/xui/en/panel_main_inventory.xml index bc87834057..77b7206680 100644 --- a/indra/newview/skins/starlight/xui/en/panel_main_inventory.xml +++ b/indra/newview/skins/starlight/xui/en/panel_main_inventory.xml @@ -269,6 +269,19 @@ preinitialize_views="false"> + + + + diff --git a/indra/newview/skins/starlight/xui/zh/panel_main_inventory.xml b/indra/newview/skins/starlight/xui/zh/panel_main_inventory.xml index 3429549796..4d6c4fc183 100644 --- a/indra/newview/skins/starlight/xui/zh/panel_main_inventory.xml +++ b/indra/newview/skins/starlight/xui/zh/panel_main_inventory.xml @@ -56,6 +56,7 @@ + diff --git a/indra/newview/skins/starlightcui/xui/en/panel_main_inventory.xml b/indra/newview/skins/starlightcui/xui/en/panel_main_inventory.xml index db3d64df5c..e79530721a 100644 --- a/indra/newview/skins/starlightcui/xui/en/panel_main_inventory.xml +++ b/indra/newview/skins/starlightcui/xui/en/panel_main_inventory.xml @@ -259,19 +259,33 @@ scroll.reserve_scroll_corner="false"> - - - + + + + + + + diff --git a/indra/newview/skins/starlightcui/xui/zh/panel_main_inventory.xml b/indra/newview/skins/starlightcui/xui/zh/panel_main_inventory.xml index 3429549796..4d6c4fc183 100644 --- a/indra/newview/skins/starlightcui/xui/zh/panel_main_inventory.xml +++ b/indra/newview/skins/starlightcui/xui/zh/panel_main_inventory.xml @@ -56,6 +56,7 @@ + diff --git a/indra/newview/skins/vintage/xui/de/panel_main_inventory.xml b/indra/newview/skins/vintage/xui/de/panel_main_inventory.xml index 6e4c733698..1e1d55597b 100644 --- a/indra/newview/skins/vintage/xui/de/panel_main_inventory.xml +++ b/indra/newview/skins/vintage/xui/de/panel_main_inventory.xml @@ -114,6 +114,7 @@ + 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 7d99876922..44afa1a770 100644 --- a/indra/newview/skins/vintage/xui/en/panel_main_inventory.xml +++ b/indra/newview/skins/vintage/xui/en/panel_main_inventory.xml @@ -866,6 +866,17 @@ show_item_link_overlays="true" > + + + diff --git a/indra/newview/skins/vintage/xui/ja/panel_main_inventory.xml b/indra/newview/skins/vintage/xui/ja/panel_main_inventory.xml index 5d8e8fd52a..ed09ff1174 100644 --- a/indra/newview/skins/vintage/xui/ja/panel_main_inventory.xml +++ b/indra/newview/skins/vintage/xui/ja/panel_main_inventory.xml @@ -112,6 +112,7 @@ + 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 67f71134d1..e50c8bc6b5 100644 --- a/indra/newview/skins/vintage/xui/pl/panel_main_inventory.xml +++ b/indra/newview/skins/vintage/xui/pl/panel_main_inventory.xml @@ -127,6 +127,7 @@ + diff --git a/indra/newview/skins/vintage/xui/zh/panel_main_inventory.xml b/indra/newview/skins/vintage/xui/zh/panel_main_inventory.xml index 5939b6811c..29a48d0861 100644 --- a/indra/newview/skins/vintage/xui/zh/panel_main_inventory.xml +++ b/indra/newview/skins/vintage/xui/zh/panel_main_inventory.xml @@ -128,6 +128,7 @@ + From 71ece236eaaeb2f38d1974e2c1b86cf30de0d4b0 Mon Sep 17 00:00:00 2001 From: PanteraPolnocy Date: Wed, 10 Sep 2025 08:58:48 +0200 Subject: [PATCH 2/5] Minor correction; Add width param, for consistency --- indra/newview/skins/vintage/xui/de/panel_main_inventory.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/skins/vintage/xui/de/panel_main_inventory.xml b/indra/newview/skins/vintage/xui/de/panel_main_inventory.xml index 1e1d55597b..373b6bf1bb 100644 --- a/indra/newview/skins/vintage/xui/de/panel_main_inventory.xml +++ b/indra/newview/skins/vintage/xui/de/panel_main_inventory.xml @@ -114,7 +114,7 @@ - + From 5512a49a4d00da7a1bd75faee4fec738c1b02115 Mon Sep 17 00:00:00 2001 From: PanteraPolnocy Date: Wed, 10 Sep 2025 12:57:09 +0200 Subject: [PATCH 3/5] Temporarily allow neighbouring regions to load during crossings when neighbour connections are disabled When debug setting to disable neighbouring regions is enabled, the viewer now makes an exception and function pauses itself while the avatar is physically out of bounds of the current region (negative pos, or pos bigger than max region size) indicating a possible region crossing (or grid error). This allows neighbouring regions to load during manual region crossings instead of leaving the user flying into the void. The option still prevents neighbour connections under normal circumstances as intended. However, with this adjustment, region crossings are at least partially possible in most cases, though still not as seamless as with full neighbour connections enabled. --- indra/newview/llworld.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp index 2d73045f72..fc6ca69c5f 100644 --- a/indra/newview/llworld.cpp +++ b/indra/newview/llworld.cpp @@ -1599,9 +1599,17 @@ void process_enable_simulator(LLMessageSystem *msg, void **user_data) if (fsDisableNeighbourRegionConnections) { LLViewerRegion* current_region = gAgent.getRegion(); - if (current_region && current_region->getHandle() != handle) + if (current_region) { - return; + F32 regionSize = current_region->getWidth(); + LLVector3 avPos = gAgent.getPositionAgent(); + if (avPos.mV[VX] >= 0 && avPos.mV[VX] <= regionSize && avPos.mV[VY] >= 0 && avPos.mV[VY] <= regionSize) + { + if (current_region->getHandle() != handle) + { + return; + } + } } } // From 92e8ef3ba2871f25e6a0e406f3a9fc89d77be47a Mon Sep 17 00:00:00 2001 From: PanteraPolnocy Date: Thu, 11 Sep 2025 12:34:28 +0200 Subject: [PATCH 4/5] FIRE-35747 Do not ignore @showworldmap=n for llMapDestination() Kitty Approved. ~ --- indra/newview/llviewermessage.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 5e7a36fd3c..95e64ca158 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -8507,7 +8507,10 @@ void process_script_teleport_request(LLMessageSystem* msg, void**) << LL_ENDL; instance->trackURL(sim_name, (S32)pos.mV[VX], (S32)pos.mV[VY], (S32)pos.mV[VZ]); - if (flags & BEACON_SHOW_MAP) + // FIRE-35747 Do not ignore @showworldmap=n for llMapDestination() [RLVa v2.4.2, 2025-09-11] + // if (flags & BEACON_SHOW_MAP) + if (flags & BEACON_SHOW_MAP && !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWWORLDMAP)) + // { bool old_auto_focus = instance->getAutoFocus(); instance->setAutoFocus(flags & BEACON_FOCUS_MAP); From fee26c83f49e46379637a6118e6bc5305988fec3 Mon Sep 17 00:00:00 2001 From: PanteraPolnocy Date: Thu, 11 Sep 2025 13:15:00 +0200 Subject: [PATCH 5/5] Expose FSDisableNeighbourRegionConnections in preferences Seems to work well enough after few hours of testing, for its intended purpose --- .../skins/default/xui/en/panel_preferences_move.xml | 13 +++++++++++-- .../skins/default/xui/pl/panel_preferences_move.xml | 1 + 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/indra/newview/skins/default/xui/en/panel_preferences_move.xml b/indra/newview/skins/default/xui/en/panel_preferences_move.xml index 193b44f5d0..2e64587d34 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_move.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_move.xml @@ -590,13 +590,22 @@ layout="topleft" label_width="170" label="Avatar Rotation Turn Speed:" - top_pad="2" + top_pad="5" max_val="100.0" min_val="0.0" name="av_turn_spd" tool_tip="Alters the rate at which your avatar responds to turning. 0-100 as estimated percentage of max turn rate. 0 is default. High values will be snappy/jerky" show_text="true" width="320" /> + + top_pad="5"> Region crossing movement prediction: + Przewiduj ruch przy zmianie regionu: