From f85e3c5b745a5311870981c85250c9bc21d4b31e Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Wed, 19 Nov 2025 10:09:51 +0100
Subject: [PATCH 1/9] Yoinkin' it right...

---
 indra/newview/llfloatermodelpreview.cpp       |  2 +-
 indra/newview/llfloaterpathfindingconsole.cpp | 13 -------------
 indra/newview/llmodelpreview.cpp              |  2 +-
 indra/newview/llpathfindingpathtool.cpp       |  4 ----
 4 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp
index a501ae14c6..bad15b3333 100644
--- a/indra/newview/llfloatermodelpreview.cpp
+++ b/indra/newview/llfloatermodelpreview.cpp
@@ -328,7 +328,7 @@ bool LLFloaterModelPreview::postBuild()
     // </Ansariel>
 
 // <FS:CR> Show an alert dialog if using the Opensim viewer as functionality will be limited without Havok
-#ifndef HAVOK_TPV
+#if !LL_HAVOK
     LLSD args;
     args["FEATURE"] = getString("no_havok");
     LLNotificationsUtil::add("NoHavok", args);
diff --git a/indra/newview/llfloaterpathfindingconsole.cpp b/indra/newview/llfloaterpathfindingconsole.cpp
index a7a74be26a..994a5c0c02 100644
--- a/indra/newview/llfloaterpathfindingconsole.cpp
+++ b/indra/newview/llfloaterpathfindingconsole.cpp
@@ -52,12 +52,6 @@
 #include "llviewerparcelmgr.h"
 #include "pipeline.h"
 
-// <FS:CR> For NoHavok alert
-#ifndef HAVOK_TPV
-#include "llnotificationsutil.h"
-#endif // OPENSIM
-// </FS:CR>
-
 #define XUI_RENDER_HEATMAP_NONE 0
 #define XUI_RENDER_HEATMAP_A 1
 #define XUI_RENDER_HEATMAP_B 2
@@ -245,13 +239,6 @@ void LLFloaterPathfindingConsole::onOpen(const LLSD& pKey)
     {
         switchIntoTestPathMode();
     }
-// <FS:CR> Show an alert dialog if using the Opensim viewer as functionality will be limited without Havok
-#ifndef HAVOK_TPV
-    LLSD args;
-    args["FEATURE"] = getString("no_havok");
-    LLNotificationsUtil::add("NoHavok", args);
-#endif // OPENSIM
-// </FS:CR>
 }
 
 void LLFloaterPathfindingConsole::onClose(bool pIsAppQuitting)
diff --git a/indra/newview/llmodelpreview.cpp b/indra/newview/llmodelpreview.cpp
index 04c5ca25d5..f73986d4e2 100644
--- a/indra/newview/llmodelpreview.cpp
+++ b/indra/newview/llmodelpreview.cpp
@@ -3387,7 +3387,7 @@ void LLModelPreview::updateStatusMessages()
     //        physStatusIcon->setImage(img);
     //    }
     //}
-#ifndef HAVOK_TPV
+#if !LL_HAVOK
     has_physics_error |= PhysicsError::NOHAVOK;
 #endif
 
diff --git a/indra/newview/llpathfindingpathtool.cpp b/indra/newview/llpathfindingpathtool.cpp
index 41bfd644d0..1d04ebd145 100644
--- a/indra/newview/llpathfindingpathtool.cpp
+++ b/indra/newview/llpathfindingpathtool.cpp
@@ -230,11 +230,7 @@ LLPathfindingPathTool::EPathStatus LLPathfindingPathTool::getPathStatus() const
 
 F32 LLPathfindingPathTool::getCharacterWidth() const
 {
-#ifdef HAVOK_TPV
     return mFinalPathData.mCharacterWidth;
-#else
-    return (F32)mFinalPathData.mCharacterWidth;
-#endif
 }
 
 void LLPathfindingPathTool::setCharacterWidth(F32 pCharacterWidth)

From 8a45c1b739dbf2edf4af3e670973d832e7daec52 Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <panterapolnocy@gmail.com>
Date: Wed, 19 Nov 2025 10:49:54 +0100
Subject: [PATCH 2/9] Replace 'Welcome Island Public' with 'Welcome Hub' in the
 teleport failure message

Signed-off-by: PanteraPolnocy <panterapolnocy@gmail.com>
---
 indra/newview/skins/default/xui/az/teleport_strings.xml | 2 +-
 indra/newview/skins/default/xui/da/teleport_strings.xml | 2 +-
 indra/newview/skins/default/xui/de/teleport_strings.xml | 2 +-
 indra/newview/skins/default/xui/en/teleport_strings.xml | 2 +-
 indra/newview/skins/default/xui/es/teleport_strings.xml | 2 +-
 indra/newview/skins/default/xui/fr/teleport_strings.xml | 2 +-
 indra/newview/skins/default/xui/it/teleport_strings.xml | 2 +-
 indra/newview/skins/default/xui/ja/teleport_strings.xml | 2 +-
 indra/newview/skins/default/xui/pl/teleport_strings.xml | 2 +-
 indra/newview/skins/default/xui/pt/teleport_strings.xml | 2 +-
 indra/newview/skins/default/xui/ru/teleport_strings.xml | 2 +-
 indra/newview/skins/default/xui/tr/teleport_strings.xml | 2 +-
 indra/newview/skins/default/xui/zh/teleport_strings.xml | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/indra/newview/skins/default/xui/az/teleport_strings.xml b/indra/newview/skins/default/xui/az/teleport_strings.xml
index c48555000b..b590a8b9f6 100644
--- a/indra/newview/skins/default/xui/az/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/az/teleport_strings.xml
@@ -21,7 +21,7 @@ Bir az sonra yenidən cəhd edin.
 		</message>
 		<message name="NoHelpIslandTP">
 			Gəlmə adasına yenidən teləport oluna bilməz.
-Təlimi təkrarlamaq üçün 'Gəlmə Adası - Ümumi' nöqtəsinə keçin.
+Təlimi təkrarlamaq üçün [http://maps.secondlife.com/secondlife/WelcomeHub/108/72/25 Welcome Hub] nöqtəsinə keçin.
 		</message>
 		<message name="noaccess_tport">
 			Bu teleporun nöqtəsinə giriş üçün sizin giriş hüququnuz yoxdur.
diff --git a/indra/newview/skins/default/xui/da/teleport_strings.xml b/indra/newview/skins/default/xui/da/teleport_strings.xml
index 79ec69fd9b..1f9e840cd6 100644
--- a/indra/newview/skins/default/xui/da/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/da/teleport_strings.xml
@@ -22,7 +22,7 @@ Prøv igen om lidt.
 		</message>
 		<message name="NoHelpIslandTP">
 			Du kan ikke teleportere tilbage til Welcome Island.
-Gå til 'Welcome Island Puclic' for at prøve tutorial igen.
+Gå til [http://maps.secondlife.com/secondlife/WelcomeHub/108/72/25 Welcome Hub] for at prøve tutorial igen.
 		</message>
 		<message name="noaccess_tport">
 			Beklager, du har ikke adgang til denne teleport destination.
diff --git a/indra/newview/skins/default/xui/de/teleport_strings.xml b/indra/newview/skins/default/xui/de/teleport_strings.xml
index 84494160d3..b6ad579736 100644
--- a/indra/newview/skins/default/xui/de/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/de/teleport_strings.xml
@@ -21,7 +21,7 @@ Versuchen Sie es später noch einmal.
 		</message>
 		<message name="NoHelpIslandTP">
 			Sie können nicht zurück nach Welcome Island teleportieren.
-Gehen Sie zu „Welcome Island Public“, um das Tutorial zu wiederholen.
+Gehen Sie zu [http://maps.secondlife.com/secondlife/WelcomeHub/108/72/25 Welcome Hub], um das Tutorial zu wiederholen.
 		</message>
 		<message name="noaccess_tport">
 			Sie haben leider keinen Zugang zu diesem Teleport-Ziel.
diff --git a/indra/newview/skins/default/xui/en/teleport_strings.xml b/indra/newview/skins/default/xui/en/teleport_strings.xml
index 819acb7dac..f662281407 100644
--- a/indra/newview/skins/default/xui/en/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/en/teleport_strings.xml
@@ -21,7 +21,7 @@ Try again in a moment.
 		</message>
 		<message name="NoHelpIslandTP">
 You cannot teleport back to Welcome Island.
-Go to &apos;Welcome Island Public&apos; to repeat the tutorial.
+Go to [http://maps.secondlife.com/secondlife/WelcomeHub/108/72/25 Welcome Hub] to repeat the tutorial.
 		</message>
 		<message name="noaccess_tport">
 			Sorry, you do not have access to that teleport destination.
diff --git a/indra/newview/skins/default/xui/es/teleport_strings.xml b/indra/newview/skins/default/xui/es/teleport_strings.xml
index 6072625cd2..a7aa94be46 100644
--- a/indra/newview/skins/default/xui/es/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/es/teleport_strings.xml
@@ -21,7 +21,7 @@ Vuelva a intentarlo en un momento.
 		</message>
 		<message name="NoHelpIslandTP">
 			No te puedes volver a teleportar a la isla de bienvenida.
-Para repetir el tutorial, visita la isla de bienvenida pública.
+Para repetir el tutorial, visita la [http://maps.secondlife.com/secondlife/WelcomeHub/108/72/25 isla de bienvenida pública].
 		</message>
 		<message name="noaccess_tport">
 			Lo sentimos, pero no tienes acceso al destino de este teleporte.
diff --git a/indra/newview/skins/default/xui/fr/teleport_strings.xml b/indra/newview/skins/default/xui/fr/teleport_strings.xml
index 6b56f7bbc5..c6017b4a3f 100644
--- a/indra/newview/skins/default/xui/fr/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/fr/teleport_strings.xml
@@ -20,7 +20,7 @@
 		</message>
 		<message name="NoHelpIslandTP">
  Vous ne pouvez pas vous téléporter à nouveau vers Welcome Island.
- Pour recommencer le didacticiel, retournez à Welcome Island Public.
+ Pour recommencer le didacticiel, retournez à [http://maps.secondlife.com/secondlife/WelcomeHub/108/72/25 Welcome Hub].
 		</message>
 		<message name="noaccess_tport">Désolé, vous n'avez pas accès à cette destination.</message>
 		<message name="missing_attach_tport">Vos pièces-jointes ne sont pas encore arrivées. Attendez quelques secondes de plus ou déconnectez-vous puis reconnectez-vous avant d'essayer de vous téléporter.</message>
diff --git a/indra/newview/skins/default/xui/it/teleport_strings.xml b/indra/newview/skins/default/xui/it/teleport_strings.xml
index 0c311ef8b2..bb0d33e170 100644
--- a/indra/newview/skins/default/xui/it/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/it/teleport_strings.xml
@@ -20,7 +20,7 @@ Se si continua a visualizzare questo messaggio, consulta la pagina [SUPPORT_SITE
 		</message>
 		<message name="NoHelpIslandTP">
 			Non puoi teleportarti nuovamente a Welcome Island.
-Per ripetere l&apos;esercitazione, visita &apos;Welcome Island Public&apos;.
+Per ripetere l&apos;esercitazione, visita [http://maps.secondlife.com/secondlife/WelcomeHub/108/72/25 Welcome Hub].
 		</message>
 		<message name="noaccess_tport">
 			Spiacenti, ma non hai accesso nel luogo di destinazione richiesto.
diff --git a/indra/newview/skins/default/xui/ja/teleport_strings.xml b/indra/newview/skins/default/xui/ja/teleport_strings.xml
index 325fb2571f..59e9cc6308 100644
--- a/indra/newview/skins/default/xui/ja/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/ja/teleport_strings.xml
@@ -21,7 +21,7 @@
 		</message>
 		<message name="NoHelpIslandTP">
 			ウェルカムアイランドにテレポートで戻ることはできません。
-「Welcome Island Public」に行き再度チュートリアルを行ってください。
+「[http://maps.secondlife.com/secondlife/WelcomeHub/108/72/25 Welcome Hub]」に行き再度チュートリアルを行ってください。
 		</message>
 		<message name="noaccess_tport">
 			残念ながら、そのテレポート目的地へのアクセスがありません。
diff --git a/indra/newview/skins/default/xui/pl/teleport_strings.xml b/indra/newview/skins/default/xui/pl/teleport_strings.xml
index 307fd3aa76..96047e4c33 100644
--- a/indra/newview/skins/default/xui/pl/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/pl/teleport_strings.xml
@@ -21,7 +21,7 @@ Spróbuj jeszcze raz.
 		</message>
 		<message name="NoHelpIslandTP">
 			Brak możliwości ponownej teleportacji do Welcome Island.
-Odwiedź 'Welcome Island Public' by powtórzyć szkolenie.
+Odwiedź [http://maps.secondlife.com/secondlife/WelcomeHub/108/72/25 Welcome Hub] by powtórzyć szkolenie.
 		</message>
 		<message name="noaccess_tport">
 			Przepraszamy, ale nie masz dostępu do miejsca docelowego.
diff --git a/indra/newview/skins/default/xui/pt/teleport_strings.xml b/indra/newview/skins/default/xui/pt/teleport_strings.xml
index 014e44a175..c2260fccff 100644
--- a/indra/newview/skins/default/xui/pt/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/pt/teleport_strings.xml
@@ -20,7 +20,7 @@ Se você continuar a receber esta mensagem, por favor consulte o [SUPPORT_SITE].
 		</message>
 		<message name="NoHelpIslandTP">
 			Não é possível se teletransportar de volta à Ilha Welcome.
-Vá para a 'Ilha Welcome Pública' para repetir o tutorial.
+Vá para a [http://maps.secondlife.com/secondlife/WelcomeHub/108/72/25 Welcome Hub] para repetir o tutorial.
 		</message>
 		<message name="noaccess_tport">
 			Desculpe, você não tem acesso ao destino deste teletransporte.
diff --git a/indra/newview/skins/default/xui/ru/teleport_strings.xml b/indra/newview/skins/default/xui/ru/teleport_strings.xml
index 25491c40cd..1223e64d39 100644
--- a/indra/newview/skins/default/xui/ru/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/ru/teleport_strings.xml
@@ -21,7 +21,7 @@
 		</message>
 		<message name="NoHelpIslandTP">
 			Телепортироваться назад на Остров прибытия нельзя.
-Для повторения обучения перейдите на 'Остров прибытия - общий'.
+Для повторения обучения перейдите на [http://maps.secondlife.com/secondlife/WelcomeHub/108/72/25 Остров прибытия - общий].
 		</message>
 		<message name="noaccess_tport">
 			У вас нет доступа к точке назначения этого телепорта.
diff --git a/indra/newview/skins/default/xui/tr/teleport_strings.xml b/indra/newview/skins/default/xui/tr/teleport_strings.xml
index b403786bd2..c32a4c9778 100644
--- a/indra/newview/skins/default/xui/tr/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/tr/teleport_strings.xml
@@ -22,7 +22,7 @@ Bir dakika sonra tekrar deneyin.
 		</message>
 		<message name="NoHelpIslandTP">
 			Karşılama Ada'sına geri ışınlanamazsınız.
-Öğreticiyi tekrarlamak için 'Karşılama Ada'sı Kamusal Alanı'na gidin.
+Öğreticiyi tekrarlamak için [http://maps.secondlife.com/secondlife/WelcomeHub/108/72/25 'Karşılama Ada'sı Kamusal Alanı'na gidin].
 		</message>
 		<message name="noaccess_tport">
 			Üzgünüz, bu ışınlanma hedef konumuna erişim hakkına sahip değilsiniz.
diff --git a/indra/newview/skins/default/xui/zh/teleport_strings.xml b/indra/newview/skins/default/xui/zh/teleport_strings.xml
index 02c92c4892..20c9804078 100644
--- a/indra/newview/skins/default/xui/zh/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/zh/teleport_strings.xml
@@ -22,7 +22,7 @@
 		</message>
 		<message name="NoHelpIslandTP">
 			你無法瞬間傳送回「新手導引島」。
-請到「大眾新手導引島」重新參加導引教學。
+請到「[http://maps.secondlife.com/secondlife/WelcomeHub/108/72/25 大眾新手導引島]」重新參加導引教學。
 		</message>
 		<message name="noaccess_tport">
 			抱歉，你並沒有權限進入要瞬間傳送的目的地。

From ff8d39ce07ab0c6e1e88cd9876a35a9fbe8e213f Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <panterapolnocy@gmail.com>
Date: Wed, 19 Nov 2025 11:28:47 +0100
Subject: [PATCH 3/9] Change mesh uploader's panel name in all translations

Signed-off-by: PanteraPolnocy <panterapolnocy@gmail.com>
---
 indra/newview/skins/default/xui/az/floater_model_preview.xml | 2 +-
 indra/newview/skins/default/xui/da/floater_model_preview.xml | 2 +-
 indra/newview/skins/default/xui/de/floater_model_preview.xml | 2 +-
 indra/newview/skins/default/xui/es/floater_model_preview.xml | 2 +-
 indra/newview/skins/default/xui/fr/floater_model_preview.xml | 2 +-
 indra/newview/skins/default/xui/it/floater_model_preview.xml | 2 +-
 indra/newview/skins/default/xui/ja/floater_model_preview.xml | 2 +-
 indra/newview/skins/default/xui/pl/floater_model_preview.xml | 2 +-
 indra/newview/skins/default/xui/pt/floater_model_preview.xml | 2 +-
 indra/newview/skins/default/xui/ru/floater_model_preview.xml | 2 +-
 indra/newview/skins/default/xui/tr/floater_model_preview.xml | 2 +-
 indra/newview/skins/default/xui/zh/floater_model_preview.xml | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/indra/newview/skins/default/xui/az/floater_model_preview.xml b/indra/newview/skins/default/xui/az/floater_model_preview.xml
index ade7698b3c..786b5aa416 100644
--- a/indra/newview/skins/default/xui/az/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/az/floater_model_preview.xml
@@ -136,7 +136,7 @@
 			</combo_box>
           <button label="İcmal..." name="physics_browse"/>
         </panel>
-        <panel name="physics analysis">
+        <panel name="physics analysis havok">
           <text name="method_label">Addım 2. Analiz</text>
           <text name="analysis_method_label">Üsul:</text>
           <text name="quality_label">Keyfiyyət:</text>
diff --git a/indra/newview/skins/default/xui/da/floater_model_preview.xml b/indra/newview/skins/default/xui/da/floater_model_preview.xml
index 5c89ef2919..4a1fa9ac6d 100644
--- a/indra/newview/skins/default/xui/da/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/da/floater_model_preview.xml
@@ -191,7 +191,7 @@
 				</combo_box>
 				<button label="Browse..." name="physics_browse"/>
 			</panel>
-			<panel name="physics analysis">
+			<panel name="physics analysis havok">
 				<slider label="Smooth:" name="Smooth"/>
 				<check_box label="Close Holes (slow)" name="Close Holes (Slow)"/>
 				<button label="Analyze" name="Decompose"/>
diff --git a/indra/newview/skins/default/xui/de/floater_model_preview.xml b/indra/newview/skins/default/xui/de/floater_model_preview.xml
index f34a5f2f80..f9a07c29fc 100644
--- a/indra/newview/skins/default/xui/de/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/de/floater_model_preview.xml
@@ -282,7 +282,7 @@
 					</combo_box>
 					<button label="Auswählen" name="physics_browse"/>
 				</panel>
-				<panel name="physics analysis">
+				<panel name="physics analysis havok">
 					<text name="method_label">
 						Schritt 2: Zu Hüllen konvertieren (optional)
 					</text>
diff --git a/indra/newview/skins/default/xui/es/floater_model_preview.xml b/indra/newview/skins/default/xui/es/floater_model_preview.xml
index 475590b321..2ccc36b734 100644
--- a/indra/newview/skins/default/xui/es/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/es/floater_model_preview.xml
@@ -178,7 +178,7 @@
 					</combo_box>
 					<button label="Buscar..." name="physics_browse"/>
 				</panel>
-				<panel name="physics analysis">
+				<panel name="physics analysis havok">
 					<text name="method_label">
 						Paso 2: Analizar
 					</text>
diff --git a/indra/newview/skins/default/xui/fr/floater_model_preview.xml b/indra/newview/skins/default/xui/fr/floater_model_preview.xml
index 578e1eca05..ca2c93baec 100644
--- a/indra/newview/skins/default/xui/fr/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/fr/floater_model_preview.xml
@@ -200,7 +200,7 @@
 				</combo_box>
 				<button label="Parcourir..." name="physics_browse"/>
 			</panel>
-			<panel name="physics analysis">
+			<panel name="physics analysis havok">
 				<text name="method_label">
 					Étape 2 : Analyser
 				</text>
diff --git a/indra/newview/skins/default/xui/it/floater_model_preview.xml b/indra/newview/skins/default/xui/it/floater_model_preview.xml
index cc6d15ae23..ed1d41910c 100644
--- a/indra/newview/skins/default/xui/it/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/it/floater_model_preview.xml
@@ -256,7 +256,7 @@
 					</combo_box>
 					<button label="Scegli..." name="physics_browse"/>
 				</panel>
-				<panel name="physics analysis">
+				<panel name="physics analysis havok">
 					<text name="method_label">
 						Passaggio 2: Analizza
 					</text>
diff --git a/indra/newview/skins/default/xui/ja/floater_model_preview.xml b/indra/newview/skins/default/xui/ja/floater_model_preview.xml
index ca70b6546f..471cc3d01d 100644
--- a/indra/newview/skins/default/xui/ja/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/ja/floater_model_preview.xml
@@ -335,7 +335,7 @@
 					-->
 				</panel>
 				<!-- ==== STEP 2: Analyze ==== -->
-				<panel name="physics analysis">
+				<panel name="physics analysis havok">
 					<text name="method_label">
 						ステップ２：分析
 					</text>
diff --git a/indra/newview/skins/default/xui/pl/floater_model_preview.xml b/indra/newview/skins/default/xui/pl/floater_model_preview.xml
index 5814763e75..3c1a998e14 100644
--- a/indra/newview/skins/default/xui/pl/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/pl/floater_model_preview.xml
@@ -158,7 +158,7 @@
                     </combo_box>
                     <button name="physics_browse" label="Przeglądaj"/>
                 </panel>
-                <panel name="physics analysis">
+                <panel name="physics analysis havok">
                     <text name="method_label">
                       Krok 2: Konwersja na powłoki (opcjonalne)
                     </text>
diff --git a/indra/newview/skins/default/xui/pt/floater_model_preview.xml b/indra/newview/skins/default/xui/pt/floater_model_preview.xml
index 94c7d38bfa..995766bc33 100644
--- a/indra/newview/skins/default/xui/pt/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/pt/floater_model_preview.xml
@@ -179,7 +179,7 @@
 					</combo_box>
 					<button label="Procurar..." name="physics_browse"/>
 				</panel>
-				<panel name="physics analysis">
+				<panel name="physics analysis havok">
 					<text name="method_label">
 						Etapa 2: Analisar
 					</text>
diff --git a/indra/newview/skins/default/xui/ru/floater_model_preview.xml b/indra/newview/skins/default/xui/ru/floater_model_preview.xml
index bb54e2582b..c22503d314 100644
--- a/indra/newview/skins/default/xui/ru/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/ru/floater_model_preview.xml
@@ -139,7 +139,7 @@
           </combo_box>
           <button label="Обзор..." name="physics_browse"/>
         </panel>
-        <panel name="physics analysis">
+        <panel name="physics analysis havok">
           <text name="method_label">2 этап. Анализ</text>
           <text name="analysis_method_label">Метод:</text>
           <text name="quality_label">Качество:</text>
diff --git a/indra/newview/skins/default/xui/tr/floater_model_preview.xml b/indra/newview/skins/default/xui/tr/floater_model_preview.xml
index 0429ba05ad..49ed89ece2 100644
--- a/indra/newview/skins/default/xui/tr/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/tr/floater_model_preview.xml
@@ -179,7 +179,7 @@
 					</combo_box>
 					<button label="Gözat..." name="physics_browse"/>
 				</panel>
-				<panel name="physics analysis">
+				<panel name="physics analysis havok">
 					<text name="method_label">
 						2. Adım: Çözümle
 					</text>
diff --git a/indra/newview/skins/default/xui/zh/floater_model_preview.xml b/indra/newview/skins/default/xui/zh/floater_model_preview.xml
index 3cbb26fb9b..7d012dfd12 100644
--- a/indra/newview/skins/default/xui/zh/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/zh/floater_model_preview.xml
@@ -341,7 +341,7 @@
 					</combo_box>
 					<button label="瀏覽…" name="physics_browse" />
 				</panel>
-				<panel name="physics analysis">
+				<panel name="physics analysis havok">
 					<text name="method_label">
 						步驟 2：分析
 					</text>

From 4fb9f7d2941e4907eb55155c05b27d40b153397b Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <panterapolnocy@gmail.com>
Date: Wed, 19 Nov 2025 11:41:52 +0100
Subject: [PATCH 4/9] Updated Polish translation

Signed-off-by: PanteraPolnocy <panterapolnocy@gmail.com>
---
 .../default/xui/pl/floater_model_preview.xml  | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/indra/newview/skins/default/xui/pl/floater_model_preview.xml b/indra/newview/skins/default/xui/pl/floater_model_preview.xml
index 3c1a998e14..40313d1859 100644
--- a/indra/newview/skins/default/xui/pl/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/pl/floater_model_preview.xml
@@ -175,6 +175,28 @@
                     <button label="Analizuj" name="Decompose"/>
                     <button label="Anuluj" name="decompose_cancel"/>
                 </panel>
+                <panel name="physics analysis vhacd">
+                    <text name="method_label">
+                      Krok 2: Konwersja na powłoki (opcjonalne)
+                    </text>
+                    <text name="fill_mode_label">
+                      Wypełnianie:
+                    </text>
+                    <text name="resolution_label">
+                      Rozdzielczość:
+                    </text>
+                    <text name="hulls_per_mesh_label">
+                      Powłok / mesz:
+                    </text>
+                    <text name="vertices_per_hull_label">
+                      Wierzch. / powł.:
+                    </text>
+                    <text name="tolerance_label">
+                      Tolerancja błędów:
+                    </text>
+                    <button label="Analizuj" name="Analyze" />
+                    <button label="Anuluj" name="analyze_cancel" />
+                </panel>
                 <panel name="physics simplification">
                     <text name="second_step_label">
                       Krok 3: Upraszczanie

From d40ffe8b544d3e45b147b6c8125205704dd467d3 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Wed, 19 Nov 2025 13:00:27 +0100
Subject: [PATCH 5/9] More yoinking

---
 .../default/xui/de/floater_model_preview.xml  | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/indra/newview/skins/default/xui/de/floater_model_preview.xml b/indra/newview/skins/default/xui/de/floater_model_preview.xml
index f9a07c29fc..8221d391f0 100644
--- a/indra/newview/skins/default/xui/de/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/de/floater_model_preview.xml
@@ -299,6 +299,28 @@
 					<button label="Analysieren" name="Decompose"/>
 					<button label="Abbrechen" name="decompose_cancel"/>
 				</panel>
+				<panel name="physics analysis vhacd">
+					<text name="method_label">
+						Schritt 2: Zu Hüllen konvertieren (optional)
+					</text>
+					<text name="fill_mode_label">
+						Füllmodus:
+					</text>
+					<text name="resolution_label">
+						Aufösung:
+					</text>
+					<text name="hulls_per_mesh_label">
+						Hüllen pro Mesh:
+					</text>
+					<text name="vertices_per_hull_label">
+						Kanten pro Mesh:
+					</text>
+					<text name="tolerance_label">
+						Fehlertoleranz:
+					</text>
+					<button label="Analysieren" name="Decompose"/>
+					<button label="Abbrechen" name="decompose_cancel"/>
+				</panel>
 				<panel name="physics simplification">
 					<text name="second_step_label">
 						Schritt 3: Vereinfachen

From 5d6199ef2c91960948ba92a9e352859994b7e85b Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <panterapolnocy@gmail.com>
Date: Wed, 19 Nov 2025 13:22:41 +0100
Subject: [PATCH 6/9] Replace Welcome Hub with the FS Tutorial, since WH is
 closed for return traffic

Signed-off-by: PanteraPolnocy <panterapolnocy@gmail.com>
---
 indra/newview/skins/default/xui/az/teleport_strings.xml | 2 +-
 indra/newview/skins/default/xui/da/teleport_strings.xml | 2 +-
 indra/newview/skins/default/xui/de/teleport_strings.xml | 2 +-
 indra/newview/skins/default/xui/en/teleport_strings.xml | 2 +-
 indra/newview/skins/default/xui/es/teleport_strings.xml | 2 +-
 indra/newview/skins/default/xui/fr/teleport_strings.xml | 2 +-
 indra/newview/skins/default/xui/it/teleport_strings.xml | 2 +-
 indra/newview/skins/default/xui/ja/teleport_strings.xml | 2 +-
 indra/newview/skins/default/xui/pl/teleport_strings.xml | 2 +-
 indra/newview/skins/default/xui/pt/teleport_strings.xml | 2 +-
 indra/newview/skins/default/xui/ru/teleport_strings.xml | 2 +-
 indra/newview/skins/default/xui/tr/teleport_strings.xml | 2 +-
 indra/newview/skins/default/xui/zh/teleport_strings.xml | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/indra/newview/skins/default/xui/az/teleport_strings.xml b/indra/newview/skins/default/xui/az/teleport_strings.xml
index b590a8b9f6..442605a152 100644
--- a/indra/newview/skins/default/xui/az/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/az/teleport_strings.xml
@@ -21,7 +21,7 @@ Bir az sonra yenidən cəhd edin.
 		</message>
 		<message name="NoHelpIslandTP">
 			Gəlmə adasına yenidən teləport oluna bilməz.
-Təlimi təkrarlamaq üçün [http://maps.secondlife.com/secondlife/WelcomeHub/108/72/25 Welcome Hub] nöqtəsinə keçin.
+Təlimi təkrarlamaq üçün [http://maps.secondlife.com/secondlife/Firestorm%20Social%20Island/8/6/2701 Firestorm Tutorial] nöqtəsinə keçin.
 		</message>
 		<message name="noaccess_tport">
 			Bu teleporun nöqtəsinə giriş üçün sizin giriş hüququnuz yoxdur.
diff --git a/indra/newview/skins/default/xui/da/teleport_strings.xml b/indra/newview/skins/default/xui/da/teleport_strings.xml
index 1f9e840cd6..7048cee62e 100644
--- a/indra/newview/skins/default/xui/da/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/da/teleport_strings.xml
@@ -22,7 +22,7 @@ Prøv igen om lidt.
 		</message>
 		<message name="NoHelpIslandTP">
 			Du kan ikke teleportere tilbage til Welcome Island.
-Gå til [http://maps.secondlife.com/secondlife/WelcomeHub/108/72/25 Welcome Hub] for at prøve tutorial igen.
+Gå til [http://maps.secondlife.com/secondlife/Firestorm%20Social%20Island/8/6/2701 Firestorm Tutorial] for at prøve tutorial igen.
 		</message>
 		<message name="noaccess_tport">
 			Beklager, du har ikke adgang til denne teleport destination.
diff --git a/indra/newview/skins/default/xui/de/teleport_strings.xml b/indra/newview/skins/default/xui/de/teleport_strings.xml
index b6ad579736..80845ab7ce 100644
--- a/indra/newview/skins/default/xui/de/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/de/teleport_strings.xml
@@ -21,7 +21,7 @@ Versuchen Sie es später noch einmal.
 		</message>
 		<message name="NoHelpIslandTP">
 			Sie können nicht zurück nach Welcome Island teleportieren.
-Gehen Sie zu [http://maps.secondlife.com/secondlife/WelcomeHub/108/72/25 Welcome Hub], um das Tutorial zu wiederholen.
+Gehen Sie zu [http://maps.secondlife.com/secondlife/Firestorm%20Social%20Island/8/6/2701 Firestorm Tutorial], um das Tutorial zu wiederholen.
 		</message>
 		<message name="noaccess_tport">
 			Sie haben leider keinen Zugang zu diesem Teleport-Ziel.
diff --git a/indra/newview/skins/default/xui/en/teleport_strings.xml b/indra/newview/skins/default/xui/en/teleport_strings.xml
index f662281407..14a7cdeff1 100644
--- a/indra/newview/skins/default/xui/en/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/en/teleport_strings.xml
@@ -21,7 +21,7 @@ Try again in a moment.
 		</message>
 		<message name="NoHelpIslandTP">
 You cannot teleport back to Welcome Island.
-Go to [http://maps.secondlife.com/secondlife/WelcomeHub/108/72/25 Welcome Hub] to repeat the tutorial.
+Go to [http://maps.secondlife.com/secondlife/Firestorm%20Social%20Island/8/6/2701 Firestorm Tutorial] to repeat the tutorial.
 		</message>
 		<message name="noaccess_tport">
 			Sorry, you do not have access to that teleport destination.
diff --git a/indra/newview/skins/default/xui/es/teleport_strings.xml b/indra/newview/skins/default/xui/es/teleport_strings.xml
index a7aa94be46..c0d943f069 100644
--- a/indra/newview/skins/default/xui/es/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/es/teleport_strings.xml
@@ -21,7 +21,7 @@ Vuelva a intentarlo en un momento.
 		</message>
 		<message name="NoHelpIslandTP">
 			No te puedes volver a teleportar a la isla de bienvenida.
-Para repetir el tutorial, visita la [http://maps.secondlife.com/secondlife/WelcomeHub/108/72/25 isla de bienvenida pública].
+Para repetir el tutorial, visita la [http://maps.secondlife.com/secondlife/Firestorm%20Social%20Island/8/6/2701 Firestorm Tutorial].
 		</message>
 		<message name="noaccess_tport">
 			Lo sentimos, pero no tienes acceso al destino de este teleporte.
diff --git a/indra/newview/skins/default/xui/fr/teleport_strings.xml b/indra/newview/skins/default/xui/fr/teleport_strings.xml
index c6017b4a3f..ee592e056b 100644
--- a/indra/newview/skins/default/xui/fr/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/fr/teleport_strings.xml
@@ -20,7 +20,7 @@
 		</message>
 		<message name="NoHelpIslandTP">
  Vous ne pouvez pas vous téléporter à nouveau vers Welcome Island.
- Pour recommencer le didacticiel, retournez à [http://maps.secondlife.com/secondlife/WelcomeHub/108/72/25 Welcome Hub].
+ Pour recommencer le didacticiel, retournez à [http://maps.secondlife.com/secondlife/Firestorm%20Social%20Island/8/6/2701 Firestorm Tutorial].
 		</message>
 		<message name="noaccess_tport">Désolé, vous n'avez pas accès à cette destination.</message>
 		<message name="missing_attach_tport">Vos pièces-jointes ne sont pas encore arrivées. Attendez quelques secondes de plus ou déconnectez-vous puis reconnectez-vous avant d'essayer de vous téléporter.</message>
diff --git a/indra/newview/skins/default/xui/it/teleport_strings.xml b/indra/newview/skins/default/xui/it/teleport_strings.xml
index bb0d33e170..f41dfc3ccb 100644
--- a/indra/newview/skins/default/xui/it/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/it/teleport_strings.xml
@@ -20,7 +20,7 @@ Se si continua a visualizzare questo messaggio, consulta la pagina [SUPPORT_SITE
 		</message>
 		<message name="NoHelpIslandTP">
 			Non puoi teleportarti nuovamente a Welcome Island.
-Per ripetere l&apos;esercitazione, visita [http://maps.secondlife.com/secondlife/WelcomeHub/108/72/25 Welcome Hub].
+Per ripetere l&apos;esercitazione, visita [http://maps.secondlife.com/secondlife/Firestorm%20Social%20Island/8/6/2701 Firestorm Tutorial].
 		</message>
 		<message name="noaccess_tport">
 			Spiacenti, ma non hai accesso nel luogo di destinazione richiesto.
diff --git a/indra/newview/skins/default/xui/ja/teleport_strings.xml b/indra/newview/skins/default/xui/ja/teleport_strings.xml
index 59e9cc6308..e9b064e2c6 100644
--- a/indra/newview/skins/default/xui/ja/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/ja/teleport_strings.xml
@@ -21,7 +21,7 @@
 		</message>
 		<message name="NoHelpIslandTP">
 			ウェルカムアイランドにテレポートで戻ることはできません。
-「[http://maps.secondlife.com/secondlife/WelcomeHub/108/72/25 Welcome Hub]」に行き再度チュートリアルを行ってください。
+「[http://maps.secondlife.com/secondlife/Firestorm%20Social%20Island/8/6/2701 Firestorm Tutorial]」に行き再度チュートリアルを行ってください。
 		</message>
 		<message name="noaccess_tport">
 			残念ながら、そのテレポート目的地へのアクセスがありません。
diff --git a/indra/newview/skins/default/xui/pl/teleport_strings.xml b/indra/newview/skins/default/xui/pl/teleport_strings.xml
index 96047e4c33..09382d90af 100644
--- a/indra/newview/skins/default/xui/pl/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/pl/teleport_strings.xml
@@ -21,7 +21,7 @@ Spróbuj jeszcze raz.
 		</message>
 		<message name="NoHelpIslandTP">
 			Brak możliwości ponownej teleportacji do Welcome Island.
-Odwiedź [http://maps.secondlife.com/secondlife/WelcomeHub/108/72/25 Welcome Hub] by powtórzyć szkolenie.
+Odwiedź [http://maps.secondlife.com/secondlife/Firestorm%20Social%20Island/8/6/2701 Firestorm Tutorial] by powtórzyć szkolenie.
 		</message>
 		<message name="noaccess_tport">
 			Przepraszamy, ale nie masz dostępu do miejsca docelowego.
diff --git a/indra/newview/skins/default/xui/pt/teleport_strings.xml b/indra/newview/skins/default/xui/pt/teleport_strings.xml
index c2260fccff..29f4c7405d 100644
--- a/indra/newview/skins/default/xui/pt/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/pt/teleport_strings.xml
@@ -20,7 +20,7 @@ Se você continuar a receber esta mensagem, por favor consulte o [SUPPORT_SITE].
 		</message>
 		<message name="NoHelpIslandTP">
 			Não é possível se teletransportar de volta à Ilha Welcome.
-Vá para a [http://maps.secondlife.com/secondlife/WelcomeHub/108/72/25 Welcome Hub] para repetir o tutorial.
+Vá para a [http://maps.secondlife.com/secondlife/Firestorm%20Social%20Island/8/6/2701 Firestorm Tutorial] para repetir o tutorial.
 		</message>
 		<message name="noaccess_tport">
 			Desculpe, você não tem acesso ao destino deste teletransporte.
diff --git a/indra/newview/skins/default/xui/ru/teleport_strings.xml b/indra/newview/skins/default/xui/ru/teleport_strings.xml
index 1223e64d39..fe213cc925 100644
--- a/indra/newview/skins/default/xui/ru/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/ru/teleport_strings.xml
@@ -21,7 +21,7 @@
 		</message>
 		<message name="NoHelpIslandTP">
 			Телепортироваться назад на Остров прибытия нельзя.
-Для повторения обучения перейдите на [http://maps.secondlife.com/secondlife/WelcomeHub/108/72/25 Остров прибытия - общий].
+Для повторения обучения перейдите на [http://maps.secondlife.com/secondlife/Firestorm%20Social%20Island/8/6/2701 Firestorm Tutorial].
 		</message>
 		<message name="noaccess_tport">
 			У вас нет доступа к точке назначения этого телепорта.
diff --git a/indra/newview/skins/default/xui/tr/teleport_strings.xml b/indra/newview/skins/default/xui/tr/teleport_strings.xml
index c32a4c9778..eb9e3b865e 100644
--- a/indra/newview/skins/default/xui/tr/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/tr/teleport_strings.xml
@@ -22,7 +22,7 @@ Bir dakika sonra tekrar deneyin.
 		</message>
 		<message name="NoHelpIslandTP">
 			Karşılama Ada'sına geri ışınlanamazsınız.
-Öğreticiyi tekrarlamak için [http://maps.secondlife.com/secondlife/WelcomeHub/108/72/25 'Karşılama Ada'sı Kamusal Alanı'na gidin].
+Öğreticiyi tekrarlamak için [http://maps.secondlife.com/secondlife/Firestorm%20Social%20Island/8/6/2701 Firestorm Tutorial] na gidin.
 		</message>
 		<message name="noaccess_tport">
 			Üzgünüz, bu ışınlanma hedef konumuna erişim hakkına sahip değilsiniz.
diff --git a/indra/newview/skins/default/xui/zh/teleport_strings.xml b/indra/newview/skins/default/xui/zh/teleport_strings.xml
index 20c9804078..d894ded12d 100644
--- a/indra/newview/skins/default/xui/zh/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/zh/teleport_strings.xml
@@ -22,7 +22,7 @@
 		</message>
 		<message name="NoHelpIslandTP">
 			你無法瞬間傳送回「新手導引島」。
-請到「[http://maps.secondlife.com/secondlife/WelcomeHub/108/72/25 大眾新手導引島]」重新參加導引教學。
+請到「[http://maps.secondlife.com/secondlife/Firestorm%20Social%20Island/8/6/2701 Firestorm Tutorial]」重新參加導引教學。
 		</message>
 		<message name="noaccess_tport">
 			抱歉，你並沒有權限進入要瞬間傳送的目的地。

From 9735346be24907af2e1bf0e0a349946e8dd815be Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <panterapolnocy@gmail.com>
Date: Wed, 19 Nov 2025 18:24:29 +0100
Subject: [PATCH 7/9] =?UTF-8?q?FIRE-36126=20Chinese=20Translation=20Update?=
 =?UTF-8?q?,=20by=20=E5=B0=8F=E6=BB=A2=20Zi=20Ying?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: PanteraPolnocy <panterapolnocy@gmail.com>
---
 .../xui/zh/floater_inventory_settings.xml     |  2 +-
 .../default/xui/zh/floater_marketplace.xml    | 14 ++++++
 .../default/xui/zh/floater_model_preview.xml  | 44 ++++++++++++-------
 .../skins/default/xui/zh/floater_search.xml   | 14 ++++++
 .../skins/default/xui/zh/menu_media_ctrl.xml  |  1 +
 .../skins/default/xui/zh/menu_object_icon.xml |  1 +
 .../default/xui/zh/menu_url_objectim.xml      |  1 +
 .../skins/default/xui/zh/notifications.xml    | 13 ++++++
 .../skins/default/xui/zh/panel_people.xml     |  5 ++-
 .../xui/zh/panel_preferences_firestorm.xml    |  6 +--
 .../skins/default/xui/zh/teleport_strings.xml |  2 +-
 11 files changed, 80 insertions(+), 23 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/zh/floater_marketplace.xml
 create mode 100644 indra/newview/skins/default/xui/zh/floater_search.xml

diff --git a/indra/newview/skins/default/xui/zh/floater_inventory_settings.xml b/indra/newview/skins/default/xui/zh/floater_inventory_settings.xml
index 12d4f5671f..c5d7bae744 100644
--- a/indra/newview/skins/default/xui/zh/floater_inventory_settings.xml
+++ b/indra/newview/skins/default/xui/zh/floater_inventory_settings.xml
@@ -29,7 +29,7 @@
 	<check_box label="在收藏資料夾旁顯示空心星標" name="favorite_hollow_star" />
 	<check_box label="文字顏色" name="favorites_color" />
 	<text name="attachment_return_txt">
-		在化身附件上按下“Enter”鍵
+		按下Enter鍵或雙擊化身附件
 	</text>
 	<combo_box name="attach_combo">
 		<combo_box.item label="添加附件（推薦）" name="1" />
diff --git a/indra/newview/skins/default/xui/zh/floater_marketplace.xml b/indra/newview/skins/default/xui/zh/floater_marketplace.xml
new file mode 100644
index 0000000000..d13a46e9ed
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_marketplace.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Marketplace">
+	<layout_stack name="stack1">
+		<layout_panel name="nav_controls">
+			<button tool_tip="後退" name="back" />
+			<button tool_tip="前進" name="forward" />
+			<button tool_tip="停止" name="stop" />
+			<button tool_tip="刷新頁面" name="reload" />
+			<combo_box name="address" tool_tip="在此輸入網址" />
+			<icon name="media_secure_lock_flag" tool_tip="安全瀏覽" />
+			<button tool_tip="在外部瀏覽器中打開當前網址" name="popexternal" />
+		</layout_panel>
+	</layout_stack>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/zh/floater_model_preview.xml b/indra/newview/skins/default/xui/zh/floater_model_preview.xml
index 7d012dfd12..00a3cb5216 100644
--- a/indra/newview/skins/default/xui/zh/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/zh/floater_model_preview.xml
@@ -64,10 +64,10 @@
 		細節層次材料並非參考模型的子集合。
 	</string>
 	<string name="phys_status_vertex_limit_exceeded">
-		有些具體殼面超出頂點限制。
+		有些具體凸包超出頂點限制。
 	</string>
 	<string name="phys_status_hull_limit_exceeded">
-		一些模型超過了外殼限制（256）。嘗試使用「簡化」功能。
+		一些模型超過了凸包限制（256）。嘗試使用「簡化」功能。
 	</string>
 	<string name="phys_status_degenerate_triangles">
 		物理網格包含退化三角形。嘗試「分析/簡化」。
@@ -76,7 +76,7 @@
 		此版本不包含Havok支援，不推薦用於上傳Second Life的物理內容。可能會出現不可預測的結果！
 	</string>
 	<string name="phys_status_too_thin">
-		一個或多個次元小於0.5公尺 - 只有基於外殼的（分析過的）物理形狀才會正確工作。
+		一個或多個次元小於0.5公尺 - 只有基於凸包的（分析過的）物理形狀才會正確工作。
 	</string>
 	<string name="phys_status_unknown_error">
 		發生未知錯誤。
@@ -264,8 +264,6 @@
 					<item label="三角形上限" name="Triangle Limit" />
 					<item label="錯誤門檻" name="Error Threshold" />
 				</combo_box>
-				<text initial_value="0" name="medium_triangles" value="0" />
-				<text initial_value="0" name="medium_vertices" value="0" />
 				<text initial_value="低" name="low_label" value="低" />
 				<combo_box name="lod_source_low">
 					<item label="從檔案載入" name="Load from file" />
@@ -280,8 +278,6 @@
 					<item label="三角形上限" name="Triangle Limit" />
 					<item label="錯誤門檻" name="Error Threshold" />
 				</combo_box>
-				<text initial_value="0" name="low_triangles" value="0" />
-				<text initial_value="0" name="low_vertices" value="0" />
 				<text initial_value="最低" name="lowest_label" value="最低" />
 				<combo_box name="lod_source_lowest">
 					<item label="從檔案載入" name="Load from file" />
@@ -296,8 +292,6 @@
 					<item label="三角形上限" name="Triangle Limit" />
 					<item label="錯誤門檻" name="Error Threshold" />
 				</combo_box>
-				<text initial_value="0" name="lowest_triangles" value="0" />
-				<text initial_value="0" name="lowest_vertices" value="0" />
 				<check_box label="產生法線" name="gen_normals" />
 				<text initial_value="皺褶角度：" name="crease_label" value="皺褶角度：" />
 				<spinner name="crease_angle" value="75" />
@@ -343,7 +337,7 @@
 				</panel>
 				<panel name="physics analysis havok">
 					<text name="method_label">
-						步驟 2：分析
+						步驟 2：轉換為凸包（可選）
 					</text>
 					<text name="analysis_method_label">
 						方法：
@@ -358,6 +352,28 @@
 					<button label="分析" name="Decompose" />
 					<button label="取消" name="decompose_cancel" />
 				</panel>
+				<panel name="physics analysis vhacd">
+					<text name="method_label">
+						步驟 2：轉換為凸包（可選）
+					</text>
+					<text name="fill_mode_label">
+						填充方式：
+					</text>
+					<text name="resolution_label">
+						解析度：
+					</text>
+					<text name="hulls_per_mesh_label">
+						凸包數/網格：
+					</text>
+					<text name="vertices_per_hull_label">
+						頂點數/凸包：
+					</text>
+					<text name="tolerance_label">
+						容錯閾值：
+					</text>
+					<button label="分析" name="Analyze" />
+					<button label="取消" name="analyze_cancel" />
+				</panel>
 				<panel name="physics simplification">
 					<text name="second_step_label">
 						步驟 3：簡化
@@ -374,7 +390,6 @@
 					<text name="Retain%_label">
 						保留：
 					</text>
-					<combo_box name="Combine Quality" value="1" />
 					<button label="簡化" name="Simplify" />
 					<button label="取消" name="simplify_cancel" />
 				</panel>
@@ -389,7 +404,7 @@
 						頂點：[POINTS]，
 					</text>
 					<text name="physics_hulls">
-						殼面：[HULLS]
+						凸包：[HULLS]
 					</text>
 				</panel>
 			</panel>
@@ -410,7 +425,6 @@
 				<text name="scale_label">
 					縮放比例 (1=無):
 				</text>
-				<spinner name="import_scale" value="1.0" />
 				<text name="dimensions_label">
 					尺寸:
 				</text>
@@ -433,7 +447,6 @@
 				<text name="pelvis_offset_label">
 					Z 偏距（升高或降低化身）：
 				</text>
-				<spinner name="pelvis_offset" value="0.0" />
 				<text name="skin_too_many_joints" text_color="Orange">
 					皮膚權重關節過多
 				</text>
@@ -564,7 +577,7 @@
 					物理成本
 				</text>
 				<text name="physics_breakdown_labels">
-基礎外殼:
+基礎凸包:
 網格:
 分析:
 				</text>
@@ -588,7 +601,6 @@
 				<text name="exploder_label" width="105">
 					展開預覽:
 				</text>
-				<slider name="physics_explode" width="75" />
 				<check_box label="關節位置" name="show_joint_positions" />
 				<check_box label="關節位置覆蓋" name="show_joint_overrides" />
 				<check_box label="皮膚權重" name="show_skin_weight" />
diff --git a/indra/newview/skins/default/xui/zh/floater_search.xml b/indra/newview/skins/default/xui/zh/floater_search.xml
new file mode 100644
index 0000000000..c1dc575ec0
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_search.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Search" title="搜尋">
+	<layout_stack name="stack1">
+		<layout_panel name="nav_controls">
+			<button tool_tip="後退" name="back" />
+			<button tool_tip="前進" name="forward" />
+			<button tool_tip="停止" name="stop" />
+			<button tool_tip="刷新頁面" name="reload" />
+			<combo_box name="address" tool_tip="在此輸入網址" />
+			<icon name="media_secure_lock_flag" tool_tip="安全瀏覽" />
+			<button tool_tip="在外部瀏覽器中打開當前網址" name="popexternal" />
+		</layout_panel>
+	</layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/menu_media_ctrl.xml b/indra/newview/skins/default/xui/zh/menu_media_ctrl.xml
index f3a8bf0290..96046ac8cb 100644
--- a/indra/newview/skins/default/xui/zh/menu_media_ctrl.xml
+++ b/indra/newview/skins/default/xui/zh/menu_media_ctrl.xml
@@ -4,4 +4,5 @@
 	<menu_item_call label="複製" name="Copy" />
 	<menu_item_call label="黏貼" name="Paste" />
 	<menu_item_call label="打開網頁檢查" name="open_webinspector" />
+	<menu_item_call label="顯示原始碼" name="show_page_source" />
 </context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/zh/menu_object_icon.xml b/indra/newview/skins/default/xui/zh/menu_object_icon.xml
index d0add57acb..df19d0b8bc 100644
--- a/indra/newview/skins/default/xui/zh/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/zh/menu_object_icon.xml
@@ -3,6 +3,7 @@
 	<menu_item_call label="物件檔案" name="Object Profile" />
 	<menu_item_call label="封鎖" name="Block" />
 	<menu_item_call label="解除封鎖" name="Unblock" />
+	<menu_item_call label="放大" name="zoom_in" />
 	<menu_item_call label="顯示在地圖上" name="show_on_map" />
 	<menu_item_call label="瞬間傳送到物件" name="teleport_to_object" />
 </menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/zh/menu_url_objectim.xml b/indra/newview/skins/default/xui/zh/menu_url_objectim.xml
index a84d5845f1..d944a62d8a 100644
--- a/indra/newview/skins/default/xui/zh/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/zh/menu_url_objectim.xml
@@ -3,6 +3,7 @@
 	<menu_item_call label="物件檔案" name="show_object" />
 	<menu_item_call label="封鎖" name="block_object" />
 	<menu_item_call label="解除封鎖" name="unblock_object" />
+	<menu_item_call label="放大" name="zoom_in" />
 	<menu_item_call label="顯示在地圖上" name="show_on_map" />
 	<menu_item_call label="瞬間傳送到物件位置" name="teleport_to_object" />
 	<menu_item_call label="複製物件名稱到剪貼簿" name="url_copy_label" />
diff --git a/indra/newview/skins/default/xui/zh/notifications.xml b/indra/newview/skins/default/xui/zh/notifications.xml
index 1ca7e3a135..16592802af 100644
--- a/indra/newview/skins/default/xui/zh/notifications.xml
+++ b/indra/newview/skins/default/xui/zh/notifications.xml
@@ -895,6 +895,15 @@
 		無法開啟並讀取上傳的聲音檔案：
 [FILE]
 	</notification>
+	<notification name="ModelUploaderMissingPhysicsApple">
+		Apple Silicon 暫不支援模型上傳，但在未來的版本中將提供支援。
+
+解決方法：在 Finder 中按右鍵點擊 [APP_NAME] 應用程式，選擇
+"取得資訊"，然後勾選 "使用 Rosetta 打開"。
+	</notification>
+	<notification name="ModelUploaderMissingPhysics">
+		缺少物理庫，模型上傳器的部分功能可能無法使用或無法正常運作。
+	</notification>
 	<notification name="SoundFileNotRIFF">
 		檔案似乎不是 RIFF WAVE 檔案：
 [FILE]
@@ -5278,6 +5287,10 @@ switch語句在沒有預設標籤情況下的行為不正確已被修正。
 		無法移動檔案。 已恢復前一個路徑。
 		<usetemplate ignoretext="無法移動檔案。 已恢復前一個路徑。" name="okignore" yestext="確定"/>
 	</notification>
+	<notification name="PreferenceQualityWithLowMemory">
+		您的系統記憶體為[TOTAL_MEM]MB，可能不足以在高設定下運行檢視器，可能會導致問題。
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="繼續"/>
+	</notification>
 	<notification name="DefaultObjectPermissions">
 		儲存預設物件許可權時出問題，原因：[REASON]。  請稍後再嘗試儲存預設許可權。
 		<usetemplate name="okbutton" yestext="確定"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_people.xml b/indra/newview/skins/default/xui/zh/panel_people.xml
index a3c566b971..dff2bb082c 100644
--- a/indra/newview/skins/default/xui/zh/panel_people.xml
+++ b/indra/newview/skins/default/xui/zh/panel_people.xml
@@ -47,13 +47,14 @@
 	</string>
 	<tab_container name="tabs">
 		<panel label="附近" name="nearby_panel">
-			<!--<panel label="bottom_panel" name="nearby_buttons_panel">
+			<panel label="bottom_panel" name="nearby_buttons_panel">
 				<filter_editor label="人員過濾器" name="nearby_filter_input"/>
 				<button name="gear_btn" tool_tip="對選擇的人採取操作"/>
 				<menu_button name="nearby_view_btn" tool_tip="檢查/排序的選項"/>
 				<button name="add_friend_btn" tool_tip="向某位居民發出交友邀請"/>
 				<dnd_button name="nearby_del_btn" tool_tip="將選擇的人從朋友名單移除"/>
-			</panel>-->
+			</panel>
+			<slider label="範圍:" name="near_me_range" tool_tip="顯示附近人員的範圍" />
 		</panel>
 		<panel label="朋友" name="friends_panel">
 			<panel label="bottom_panel" name="friends_buttons_panel">
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_firestorm.xml b/indra/newview/skins/default/xui/zh/panel_preferences_firestorm.xml
index ecc12a340f..fda2c2febd 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_firestorm.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_firestorm.xml
@@ -110,8 +110,8 @@
 			<check_box name="FSBuildPrefs_EmbedItem" label="將物件嵌入新的元素" />
 			<fs_embedded_item_drop_target name="embed_item" tool_tip="將物件拖到此處">將物件拖到此處</fs_embedded_item_drop_target>
 			<text name="build_item_add_disp_rect_txt">當前: [ITEM]</text>
-			<check_box name="FSBuildPrefs_UseCustomScript" label="Use custom script for New Script button"/>
-			<fs_embedded_item_drop_target name="custom_script" tool_tip="Drop a script from your inventory here.">Drop a script here.</fs_embedded_item_drop_target>
+			<check_box name="FSBuildPrefs_UseCustomScript" label="使用自訂指令碼作為新增指令碼按鈕"/>
+			<fs_embedded_item_drop_target name="custom_script" tool_tip="拖放您庫存中的指令碼到此處。">拖放指令碼到此。</fs_embedded_item_drop_target>
 			<text name="custom_script_disp_rect_txt">當前: [SCRIPT]</text>
 			<button label="預設建立權限" name="fs_default_creation_permissions" />
 			<check_box label="高亮選定元素邊框" tool_tip="取消選擇將不顯示黃色/藍色邊框，當選擇大量元素時，可提高效能。" name="FSBuildPrefsRenderHighlight_toggle" />
@@ -144,7 +144,7 @@
 			<check_box label="按字母順序排序「附著到」選單中的附著點（需要重新啟動）" tool_tip="如果啟用此選項，「附著到」選單中的附件點列表將按字母順序排序。" name="FSSortAttachmentSpotsAlphabetically" />
 			<check_box label="在工具視窗中使用新的[APP_NAME]紋理面板(需要重新啟動)" tool_tip="如果啟用,紋理編輯工具將使用改進的[APP_NAME]工作流,並允許編輯BlinnPhong和PBR材質" name="FSUseNewTexturePanel" />
 		</panel>
-		<panel label="Script Editor" name="BuildTabScriptEditor">
+		<panel label="指令碼編輯器" name="BuildTabScriptEditor">
 			<text name="text_box_scripting_font" width="155">指令碼編輯器字型：</text>
 			<combo_box name="FSScriptingFontName" tool_tip="LSL 指令碼編輯器中使用的字型名稱">
 				<combo_item name="Monospace" label="等寬" />
diff --git a/indra/newview/skins/default/xui/zh/teleport_strings.xml b/indra/newview/skins/default/xui/zh/teleport_strings.xml
index d894ded12d..423746939a 100644
--- a/indra/newview/skins/default/xui/zh/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/zh/teleport_strings.xml
@@ -22,7 +22,7 @@
 		</message>
 		<message name="NoHelpIslandTP">
 			你無法瞬間傳送回「新手導引島」。
-請到「[http://maps.secondlife.com/secondlife/Firestorm%20Social%20Island/8/6/2701 Firestorm Tutorial]」重新參加導引教學。
+前往[http://maps.secondlife.com/secondlife/Firestorm%20Social%20Island/8/6/2701 Firestorm教學]重新學習教程。
 		</message>
 		<message name="noaccess_tport">
 			抱歉，你並沒有權限進入要瞬間傳送的目的地。

From 455364e3e9d71ca4107c0d1dbb52e9d754dbf317 Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <panterapolnocy@gmail.com>
Date: Wed, 19 Nov 2025 18:31:32 +0100
Subject: [PATCH 8/9] Sync button names with English translation

Signed-off-by: PanteraPolnocy <panterapolnocy@gmail.com>
---
 indra/newview/skins/default/xui/de/floater_model_preview.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indra/newview/skins/default/xui/de/floater_model_preview.xml b/indra/newview/skins/default/xui/de/floater_model_preview.xml
index 8221d391f0..f6f5ed6917 100644
--- a/indra/newview/skins/default/xui/de/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/de/floater_model_preview.xml
@@ -318,8 +318,8 @@
 					<text name="tolerance_label">
 						Fehlertoleranz:
 					</text>
-					<button label="Analysieren" name="Decompose"/>
-					<button label="Abbrechen" name="decompose_cancel"/>
+					<button label="Analysieren" name="Analyze"/>
+					<button label="Abbrechen" name="analyze_cancel"/>
 				</panel>
 				<panel name="physics simplification">
 					<text name="second_step_label">

From b5e920d0e1677b2743cf8a78ab5affcc7ff5df86 Mon Sep 17 00:00:00 2001
From: Angeldark Raymaker <dark.angel_raven@yahoo.com.au>
Date: Wed, 19 Nov 2025 19:03:31 +0000
Subject: [PATCH 9/9] build docs: Update Win CMake ver

---
 doc/building_windows.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/building_windows.md b/doc/building_windows.md
index 09eb52d162..e8113cd3f7 100644
--- a/doc/building_windows.md
+++ b/doc/building_windows.md
@@ -55,7 +55,7 @@ All installations are done with default settings (unless told explicitly) - if y
 
 ### CMake
 
-- Download and install at least [CMake 3.16.0](http://www.cmake.org/download)
+- Download and install at least [CMake 4.1.2](http://www.cmake.org/download)
   - Note: No option available to install as Administrator
   - At the "Install options" screen, select "Add CMake to the system PATH for all users"
   - For everything else, use the default options (path, etc.)