From a6a79ee904947e0a7f67c6d2001c5d494019fd33 Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <panterapolnocy@gmail.com>
Date: Sat, 8 Mar 2025 14:57:23 +0100
Subject: [PATCH 1/5] =?UTF-8?q?FIRE-35237,=20FIRE-35235=20Chinese=20(by=20?=
 =?UTF-8?q?=E5=B0=8F=E6=BB=A2=20Zi=20Ying),=20Russian=20(by=20Romka=20Swal?=
 =?UTF-8?q?lowtail)=20and=20Polish=20translation=20updates?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pl/floater_preferences_graphics_advanced.xml   |  4 ++++
 indra/newview/skins/default/xui/pl/menu_login.xml  |  1 -
 indra/newview/skins/default/xui/pl/menu_viewer.xml |  1 -
 .../default/xui/pl/panel_preferences_graphics1.xml |  9 ++++-----
 .../ru/floater_preferences_graphics_advanced.xml   |  4 ++++
 indra/newview/skins/default/xui/ru/menu_login.xml  |  6 +++---
 indra/newview/skins/default/xui/ru/menu_viewer.xml |  1 -
 .../skins/default/xui/ru/panel_progress.xml        |  6 +++---
 .../skins/default/xui/ru/panel_sound_devices.xml   |  4 ++++
 .../zh/floater_preferences_graphics_advanced.xml   |  4 ++++
 .../newview/skins/default/xui/zh/floater_tools.xml | 12 ++++++------
 .../default/xui/zh/panel_preferences_graphics1.xml | 14 ++++++--------
 .../skins/default/xui/zh/panel_progress.xml        |  6 +++---
 13 files changed, 41 insertions(+), 31 deletions(-)

diff --git a/indra/newview/skins/default/xui/pl/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/pl/floater_preferences_graphics_advanced.xml
index 2a5ee34cb8..af5274e143 100644
--- a/indra/newview/skins/default/xui/pl/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/pl/floater_preferences_graphics_advanced.xml
@@ -10,6 +10,10 @@
 		Niska
 	</text>
 	<slider label="Maks. świateł:" name="MaxLights" />
+	<text name="MaxTextureResolutionLabel">
+		Maks. rozdzielcz. LOD:
+	</text>
+	<combo_box name="MaxTextureResolution" tool_tip="Maksymalna rozdzielczość 'poziomu szczegółowości' tekstur" />
 	<check_box label="Włącz VSync" name="vsync" tool_tip="Synchronizuje liczbę klatek na sekundę z częstotliwością odświeżania monitora, może skutkować zmniejszeniem widocznej płynności i opóźnieniami." />
 	<text name="AvatarText">
 		Awatar
diff --git a/indra/newview/skins/default/xui/pl/menu_login.xml b/indra/newview/skins/default/xui/pl/menu_login.xml
index c16d99f4b2..93d5df8961 100644
--- a/indra/newview/skins/default/xui/pl/menu_login.xml
+++ b/indra/newview/skins/default/xui/pl/menu_login.xml
@@ -14,7 +14,6 @@
 		<menu_item_call label="Wiki Second Life" name="Wiki"/>
 		<menu_item_call label="Forum społecznościowe" name="Community Forums"/>
 		<menu_item_call label="Portal wsparcia" name="Support portal"/>
-		<menu_item_call label="Newsy: [SECOND_LIFE]" name="Second Life News"/>
 		<menu_item_call label="Blogi: [SECOND_LIFE]" name="Second Life Blogs"/> -->
 		<menu_item_call label="Zgłoś problem" name="Report Bug"/>
 		<menu_item_call label="Informacje o [APP_NAME]" name="About Second Life"/>
diff --git a/indra/newview/skins/default/xui/pl/menu_viewer.xml b/indra/newview/skins/default/xui/pl/menu_viewer.xml
index e853e86930..0ce2db7c70 100644
--- a/indra/newview/skins/default/xui/pl/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/pl/menu_viewer.xml
@@ -297,7 +297,6 @@
 		<menu_item_call label="Wiki informacyjna" name="Wiki"/>
 		<menu_item_call label="Forum społecznościowe" name="Community Forums"/>
 		<menu_item_call label="Portal wsparcia" name="Support portal"/>
-		<menu_item_call label="Newsy: [SECOND_LIFE]" name="Second Life News"/>
 		<menu_item_call label="Blogi: [SECOND_LIFE]" name="Second Life Blogs"/> -->
 		<menu_item_call name="whitelist_folders" label="Doradca wykluczeń" />
 		<menu_item_check label="Sprawdź stan świata" name="Grid Status"/>
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/pl/panel_preferences_graphics1.xml
index 97e2cb58f8..1fa08b4950 100644
--- a/indra/newview/skins/default/xui/pl/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_graphics1.xml
@@ -169,15 +169,14 @@
 				Rendering tekstur:
 			</text>
 			<!-- Removed in FIRE-24256, leaving it here for non-SL viewer version --> <check_box label="Pobieraj tekstury przez HTTP" tool_tip="Zaznacz tę opcję, aby ściągać tekstury poprzez protokół HTTP - odznacz ją, jeśli masz problemy z wyświetlaniem i chcesz wczytywać tekstury w taki sam sposób, jak przed lipcem 2010: na Viewerze 1." name="TexturesHTTP" />
-			<check_box width="270" label="Ogranicz maksymalną rozdzielczość tekstur do:" tool_tip="Zaznacz tą opcję, aby ograniczyć maksymalną rozdzielczość tekstur w świecie. Pozwala to na wyświetlanie większej ilości tekstur zanim dostępna na nie pamięć zostanie przekroczona i zaczną się one rozmywać." name="FSRestrictMaxTextureSize" />
-			<combo_box name="FSRestrictMaxTexturePixels">
+			<text name="FSRestrictMaxTextureSize">
+				Ogranicz maks. rozdzielczość tekstur do:
+			</text>
+			<combo_box name="FSRestrictMaxTexturePixels" tool_tip="Ustawia maksymalną rozdzielczość wyświetlania tekstur wewnątrz świata. Pozwala to na wyświetlenie większej ich ilości przed przekroczeniem dostępnej pamięci i zauważaniem ich rozmywania.">
 				<combo_box.item label="512 pikseli" name="512" />
 				<combo_box.item label="1024 pikseli" name="1024" />
 				<combo_box.item label="2048 pikseli" name="2048" />
 			</combo_box>
-			<text name="FSRestrictMaxTextureSizeRestartText">
-				(wymagany restart)
-			</text>
 			<text name="TextureDetailLabel">
 				Maks. jakość tekstur:
 			</text>
diff --git a/indra/newview/skins/default/xui/ru/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/ru/floater_preferences_graphics_advanced.xml
index f4292f5662..0a6970d55f 100644
--- a/indra/newview/skins/default/xui/ru/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/ru/floater_preferences_graphics_advanced.xml
@@ -12,6 +12,10 @@
 	<text name="PostProcessText">
 		Низкое
 	</text>
+	<text name="MaxTextureResolutionLabel">
+		Макс. разрешение LOD:
+	</text>
+	<combo_box name="MaxTextureResolution" tool_tip="Максимальное разрешение для текстур с'высоким уровнем детализации'"/>
 	<slider label="Макс. источн.света рядом:" label_width="185" name="MaxLights" width="336" />
 	<check_box label="Включить VSync" name="vsync" tool_tip="Синхронизирует частоту кадров с частотой обновления монитора, что обеспечивает плавную работу."/>
 	<text name="AvatarText">
diff --git a/indra/newview/skins/default/xui/ru/menu_login.xml b/indra/newview/skins/default/xui/ru/menu_login.xml
index 34753ed2bc..98a5021357 100644
--- a/indra/newview/skins/default/xui/ru/menu_login.xml
+++ b/indra/newview/skins/default/xui/ru/menu_login.xml
@@ -10,13 +10,13 @@
 		<menu_item_call label="Firestorm Wiki" name="Firestorm Wiki"/>
 		<menu_item_call label="Решение проблем" name="Troubleshooting"/>
 		<menu_item_call label="Обучение" name="How To"/>
-		<!-- <menu_item_call label="Быстрый старт" name="Quickstart"/>
+		<!--
 		<menu_item_call label="База знаний" name="Knowledge Base"/>
 		<menu_item_call label="Wiki Second Life" name="Wiki"/>
 		<menu_item_call label="Forum сообщества" name="Community Forums"/>
 		<menu_item_call label="Портал поддержки" name="Support portal"/>
-		<menu_item_call label="Новости: [SECOND_LIFE]" name="Second Life News"/>
-		<menu_item_call label="Блоги: [SECOND_LIFE]" name="Second Life Blogs"/> -->
+		<menu_item_call label="Блоги: [SECOND_LIFE]" name="Second Life Blogs"/>
+		 -->
 		<menu_item_call label="Сообщить об ошибке" name="Report Bug"/>
 		<menu_item_call label="Информация о [APP_NAME]" name="About Second Life"/>
 		<menu_item_call label="Помощь для [CURRENT_GRID]" name="current_grid_help_login"/>
diff --git a/indra/newview/skins/default/xui/ru/menu_viewer.xml b/indra/newview/skins/default/xui/ru/menu_viewer.xml
index c89c123943..5bdd1b7665 100644
--- a/indra/newview/skins/default/xui/ru/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ru/menu_viewer.xml
@@ -334,7 +334,6 @@
 		<menu_item_call label="Wiki" name="Wiki"/>
 		<menu_item_call label="Community Forums" name="Community Forums"/>
 		<menu_item_call label="Support portal" name="Support portal"/>
-		<menu_item_call label="[SECOND_LIFE] News" name="Second Life News"/>
 		<menu_item_call label="[SECOND_LIFE] Blogs" name="Second Life Blogs"/> -->
 		<menu_item_call name="whitelist_folders" label="Советник Белого Списка"/>
 		<menu_item_call label="Проверка статуса сети (Grid Status)" name="Grid Status"/>
diff --git a/indra/newview/skins/default/xui/ru/panel_progress.xml b/indra/newview/skins/default/xui/ru/panel_progress.xml
index 314d795307..ed43e1107b 100644
--- a/indra/newview/skins/default/xui/ru/panel_progress.xml
+++ b/indra/newview/skins/default/xui/ru/panel_progress.xml
@@ -2,12 +2,12 @@
 <panel name="login_progress_panel">
   <layout_stack name="horizontal_centering">
     <layout_panel name="center">
-      <layout_stack name="vertical_centering">
+      <layout_stack name="vertical_centering1">
         <layout_panel name="panel4">
-          <layout_stack name="vertical_centering">
+          <layout_stack name="vertical_centering2">
             <layout_panel name="panel_icons">
               <text name="logos_lbl">
-                [APP_NAME] использует
+                Вторая Жизнь использует
               </text>
             </layout_panel>
           </layout_stack>
diff --git a/indra/newview/skins/default/xui/ru/panel_sound_devices.xml b/indra/newview/skins/default/xui/ru/panel_sound_devices.xml
index a62c13bfa9..6c0db81c63 100644
--- a/indra/newview/skins/default/xui/ru/panel_sound_devices.xml
+++ b/indra/newview/skins/default/xui/ru/panel_sound_devices.xml
@@ -22,4 +22,8 @@
 	<text name="wait_text">
 		Подождите
 	</text>
+	<text name="disabled_text">
+		Отключен
+	</text>
+	<button name="unmute_btn" label="Включить"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/zh/floater_preferences_graphics_advanced.xml
index c2d1aa1835..4230a87c86 100644
--- a/indra/newview/skins/default/xui/zh/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/zh/floater_preferences_graphics_advanced.xml
@@ -13,6 +13,10 @@
 		低
 	</text>
 	<slider label="最大鄰近光源數：" name="MaxLights" />
+	<text name="MaxTextureResolutionLabel">
+		最大細節層次解析度：
+	</text>
+	<combo_box name="MaxTextureResolution" tool_tip="“細節層次(LOD)”紋理的最大解析度"/>
 	<check_box label="啟用垂直同步" tool_tip="將影格速率與顯示器的更新率同步，可能會導致更多的卡頓和輸入延遲。" name="vsync" />
 	<text name="AvatarText">
 		化身
diff --git a/indra/newview/skins/default/xui/zh/floater_tools.xml b/indra/newview/skins/default/xui/zh/floater_tools.xml
index b5b08f13d8..1908359541 100644
--- a/indra/newview/skins/default/xui/zh/floater_tools.xml
+++ b/indra/newview/skins/default/xui/zh/floater_tools.xml
@@ -294,15 +294,15 @@
 			<text name="label position">
 				位置（米）
 			</text>
-			<button name="copy_rot_btn" tool_tip="複製旋轉" />
-			<button name="paste_rot_btn" tool_tip="貼上旋轉" />
-			<button name="paste_rot_clip_btn" tool_tip="嘗試從剪貼簿貼上旋轉" />
+			<button name="copy_pos_btn" tool_tip="複製旋轉" />
+			<button name="paste_pos_btn" tool_tip="貼上旋轉" />
+			<button name="paste_pos_clip_btn" tool_tip="嘗試從剪貼簿貼上旋轉" />
 			<text name="label size">
 				尺寸（米）
 			</text>
-			<button name="copy_rot_btn" tool_tip="複製尺寸" />
-			<button name="paste_rot_btn" tool_tip="貼上尺寸" />
-			<button name="paste_rot_clip_btn" tool_tip="嘗試從剪貼簿貼上尺寸" />
+			<button name="copy_size_btn" tool_tip="複製尺寸" />
+			<button name="paste_size_btn" tool_tip="貼上尺寸" />
+			<button name="paste_size_clip_btn" tool_tip="嘗試從剪貼簿貼上尺寸" />
 			<text name="label rotation">
 				旋轉（角度）
 			</text>
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml
index e75f726f0a..2f519bafc0 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml
@@ -168,20 +168,18 @@
 			<check_box label="暫停世界更新 (使所有內容暫停)" tool_tip="勾選此項可暫停來自世界的所有更新- 這將暫停所有視覺操作，但不會影響書面或語音聊天" name="WorldPause" />
 			<check_box label="限制影格率" name="FSLimitFramerate" />
 			<slider label="FPS：" name="MaxFPS" />
-			<check_box label="啟用垂直同步" name="vsync" tool_tip="將影格速率與顯示器更新率同步，可能會導致延遲增加和圖像卡頓。" />
+			<check_box label="將影格率限制為顯示器頻率（垂直同步）" name="vsync" tool_tip="將影格速率與顯示器更新率同步，可能會導致延遲增加和圖像卡頓。" />
 			<text name="Texture Rendering">紋理彩現：</text>
 			<check_box label="載入最小紋理" tool_tip="設定「紋理禁用」參數-紋理載入速度極慢，可能對GPU較慢的電腦有用" name="TexturesLoaded" />
 			<check_box label="使用HTTP載入紋理" tool_tip="啟用通過HTTP協定載入紋理-如果出現紋理載入緩慢或不正確的問題，並且要使用過時的UDP協定，則禁用此選項。" name="TexturesHTTP" />
-			<check_box label="將紋理的最大解析度限制為：（需要重新啟動）" tool_tip="將紋理的最大解析度限制為指定的畫素。這允許在現有紋理記憶體用盡之前顯示多個紋理，並且不會顯示模糊的紋理。" name="FSRestrictMaxTextureSize" />
-			<combo_box name="FSRestrictMaxTexturePixels">
+			<text name="FSRestrictMaxTextureSize">
+				將紋理的最大解析度限制為：
+			</text>
+			<combo_box name="FSRestrictMaxTexturePixels" tool_tip="將紋理的最大解析度限制為指定的畫素。這允許在現有紋理記憶體用盡之前顯示多個紋理，並且不會顯示模糊的紋理。">
 				<combo_box.item label="512畫素" name="512" />
 				<combo_box.item label="1024畫素" name="1024" />
-				<!-- 2048 is the current maximum, so this only becomes important if we get 4096 pixel textures
-				<combo_box.item label="2048畫素" name="2048"/>-->
+				<combo_box.item label="2048畫素" name="2048"/>
 			</combo_box>
-			<text name="FSRestrictMaxTextureSizeRestartText">
-				(需要重新啟動)
-			</text>
 			<slider label="最大同時HTTP請求數" name="HTTPFetchMaxRequests" />
 			<text name="TextureDetailLabel" tool_tip="載入紋理的品質級別。影響紋理丟棄設定">
 				最大紋理品質：
diff --git a/indra/newview/skins/default/xui/zh/panel_progress.xml b/indra/newview/skins/default/xui/zh/panel_progress.xml
index 5799def95b..57686b81ad 100644
--- a/indra/newview/skins/default/xui/zh/panel_progress.xml
+++ b/indra/newview/skins/default/xui/zh/panel_progress.xml
@@ -2,9 +2,9 @@
 <panel name="login_progress_panel">
 	<layout_stack name="horizontal_centering">
 		<layout_panel name="center">
-			<layout_stack name="vertical_centering">
+			<layout_stack name="vertical_centering1">
 				<layout_panel name="panel4">
-					<layout_stack name="vertical_centering">
+					<layout_stack name="vertical_centering2">
 						<layout_panel name="panel_login">
 							<text name="login_text">
 								正在登入...
@@ -12,7 +12,7 @@
 						</layout_panel>
 						<layout_panel name="panel_icons">
 							<text name="logos_lbl">
-								[APP_NAME] 正在使用
+								正在使用Second Life
 							</text>
 						</layout_panel>
 					</layout_stack>

From f1090e2f614044fcb74ad3ecd7824b037c29a617 Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <panterapolnocy@gmail.com>
Date: Sat, 8 Mar 2025 15:09:33 +0100
Subject: [PATCH 2/5] Synch / clean up panel_progress.xml for all applicable
 translations

---
 .../skins/default/xui/az/panel_progress.xml    |  6 +++---
 .../skins/default/xui/de/panel_progress.xml    |  7 +------
 .../skins/default/xui/es/panel_progress.xml    | 16 +++++++++++++---
 .../skins/default/xui/fr/panel_progress.xml    |  2 +-
 .../skins/default/xui/it/panel_progress.xml    | 16 +++++++++++++---
 .../skins/default/xui/ja/panel_progress.xml    | 18 ++++++++++++++----
 .../skins/default/xui/pt/panel_progress.xml    | 16 +++++++++++++---
 .../skins/default/xui/zh/panel_progress.xml    |  5 -----
 8 files changed, 58 insertions(+), 28 deletions(-)

diff --git a/indra/newview/skins/default/xui/az/panel_progress.xml b/indra/newview/skins/default/xui/az/panel_progress.xml
index f356bd391b..4198e7f03b 100644
--- a/indra/newview/skins/default/xui/az/panel_progress.xml
+++ b/indra/newview/skins/default/xui/az/panel_progress.xml
@@ -2,12 +2,12 @@
 <panel name="login_progress_panel">
   <layout_stack name="horizontal_centering">
     <layout_panel name="center">
-      <layout_stack name="vertical_centering">
+      <layout_stack name="vertical_centering1">
         <layout_panel name="panel4">
-          <layout_stack name="vertical_centering">
+          <layout_stack name="vertical_centering2">
             <layout_panel name="panel_icons">
               <text name="logos_lbl">
-                [APP_NAME] istifadə edir:
+                Second Life istifadə edir:
               </text>
             </layout_panel>
           </layout_stack>
diff --git a/indra/newview/skins/default/xui/de/panel_progress.xml b/indra/newview/skins/default/xui/de/panel_progress.xml
index b20aeb33de..c6a709803b 100644
--- a/indra/newview/skins/default/xui/de/panel_progress.xml
+++ b/indra/newview/skins/default/xui/de/panel_progress.xml
@@ -5,14 +5,9 @@
 			<layout_stack name="vertical_centering1">
 				<layout_panel name="panel4">
 					<layout_stack name="vertical_centering2">
-						<layout_panel name="panel_login">
-							<text name="login_text">
-								Anmeldung...
-							</text>
-						</layout_panel>
 						<layout_panel name="panel_icons">
 							<text name="logos_lbl">
-								[APP_NAME] verwendet
+								Second Life verwendet
 							</text>
 						</layout_panel>
 					</layout_stack>
diff --git a/indra/newview/skins/default/xui/es/panel_progress.xml b/indra/newview/skins/default/xui/es/panel_progress.xml
index c9bed9fd9b..597d55cc4b 100644
--- a/indra/newview/skins/default/xui/es/panel_progress.xml
+++ b/indra/newview/skins/default/xui/es/panel_progress.xml
@@ -1,8 +1,18 @@
 <?xml version="1.0" ?>
 <panel name="login_progress_panel">
-	<layout_stack name="vertical_centering"/>
-	<layout_panel name="panel4"/>
-	<layout_panel name="center"/>
 	<layout_stack name="horizontal_centering">
+		<layout_panel name="center">
+			<layout_stack name="vertical_centering1">
+				<layout_panel name="panel4">
+					<layout_stack name="vertical_centering2">
+						<layout_panel name="panel_icons">
+							<!-- <text name="logos_lbl">
+								Second Life uses
+							</text> -->
+						</layout_panel>
+					</layout_stack>
+				</layout_panel>
+			</layout_stack>
+		</layout_panel>
 	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_progress.xml b/indra/newview/skins/default/xui/fr/panel_progress.xml
index 1f125c1007..9b20750f0f 100644
--- a/indra/newview/skins/default/xui/fr/panel_progress.xml
+++ b/indra/newview/skins/default/xui/fr/panel_progress.xml
@@ -7,7 +7,7 @@
 					<layout_stack name="vertical_centering2">
 						<layout_panel name="panel_icons">
 							<text name="logos_lbl">
-								[APP_NAME] utilise
+								Second Life utilise
 							</text>
 						</layout_panel>
 					</layout_stack>
diff --git a/indra/newview/skins/default/xui/it/panel_progress.xml b/indra/newview/skins/default/xui/it/panel_progress.xml
index c9bed9fd9b..597d55cc4b 100644
--- a/indra/newview/skins/default/xui/it/panel_progress.xml
+++ b/indra/newview/skins/default/xui/it/panel_progress.xml
@@ -1,8 +1,18 @@
 <?xml version="1.0" ?>
 <panel name="login_progress_panel">
-	<layout_stack name="vertical_centering"/>
-	<layout_panel name="panel4"/>
-	<layout_panel name="center"/>
 	<layout_stack name="horizontal_centering">
+		<layout_panel name="center">
+			<layout_stack name="vertical_centering1">
+				<layout_panel name="panel4">
+					<layout_stack name="vertical_centering2">
+						<layout_panel name="panel_icons">
+							<!-- <text name="logos_lbl">
+								Second Life uses
+							</text> -->
+						</layout_panel>
+					</layout_stack>
+				</layout_panel>
+			</layout_stack>
+		</layout_panel>
 	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_progress.xml b/indra/newview/skins/default/xui/ja/panel_progress.xml
index 1edada6098..597d55cc4b 100644
--- a/indra/newview/skins/default/xui/ja/panel_progress.xml
+++ b/indra/newview/skins/default/xui/ja/panel_progress.xml
@@ -1,8 +1,18 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" ?>
 <panel name="login_progress_panel">
-	<layout_stack name="vertical_centering"/>
-	<layout_panel name="panel4"/>
-	<layout_panel name="center"/>
 	<layout_stack name="horizontal_centering">
+		<layout_panel name="center">
+			<layout_stack name="vertical_centering1">
+				<layout_panel name="panel4">
+					<layout_stack name="vertical_centering2">
+						<layout_panel name="panel_icons">
+							<!-- <text name="logos_lbl">
+								Second Life uses
+							</text> -->
+						</layout_panel>
+					</layout_stack>
+				</layout_panel>
+			</layout_stack>
+		</layout_panel>
 	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_progress.xml b/indra/newview/skins/default/xui/pt/panel_progress.xml
index c9bed9fd9b..597d55cc4b 100644
--- a/indra/newview/skins/default/xui/pt/panel_progress.xml
+++ b/indra/newview/skins/default/xui/pt/panel_progress.xml
@@ -1,8 +1,18 @@
 <?xml version="1.0" ?>
 <panel name="login_progress_panel">
-	<layout_stack name="vertical_centering"/>
-	<layout_panel name="panel4"/>
-	<layout_panel name="center"/>
 	<layout_stack name="horizontal_centering">
+		<layout_panel name="center">
+			<layout_stack name="vertical_centering1">
+				<layout_panel name="panel4">
+					<layout_stack name="vertical_centering2">
+						<layout_panel name="panel_icons">
+							<!-- <text name="logos_lbl">
+								Second Life uses
+							</text> -->
+						</layout_panel>
+					</layout_stack>
+				</layout_panel>
+			</layout_stack>
+		</layout_panel>
 	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_progress.xml b/indra/newview/skins/default/xui/zh/panel_progress.xml
index 57686b81ad..a925df6e98 100644
--- a/indra/newview/skins/default/xui/zh/panel_progress.xml
+++ b/indra/newview/skins/default/xui/zh/panel_progress.xml
@@ -5,11 +5,6 @@
 			<layout_stack name="vertical_centering1">
 				<layout_panel name="panel4">
 					<layout_stack name="vertical_centering2">
-						<layout_panel name="panel_login">
-							<text name="login_text">
-								正在登入...
-							</text>
-						</layout_panel>
 						<layout_panel name="panel_icons">
 							<text name="logos_lbl">
 								正在使用Second Life

From 19999b5858ab3dee5b62b4b2b7867b49648ac0aa Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Wed, 26 Feb 2025 23:45:54 +0000
Subject: [PATCH 3/5] tentative workaround for gcc c++20 std::lerp clash

We may revert this for a better less dispruptive solution if we can find one.
---
 indra/llcharacter/llmotion.cpp                |  6 +++
 indra/llcommon/llfasttimer.cpp                | 40 ++++++++++++++++---
 indra/llinventory/llsettingsbase.cpp          |  6 +++
 indra/llinventory/llsettingssky.cpp           |  7 +++-
 indra/llinventory/llsettingswater.cpp         |  6 +++
 indra/llmath/llmath.h                         |  4 +-
 indra/llmath/llvolume.cpp                     |  6 +++
 indra/llrender/llrender2dutils.cpp            |  5 +++
 indra/llui/llbutton.cpp                       |  6 +++
 indra/llui/llfloater.cpp                      |  5 +++
 indra/llui/llfocusmgr.h                       |  2 +-
 indra/llui/llfolderviewitem.cpp               |  6 +++
 indra/llui/lllayoutstack.cpp                  |  6 +++
 indra/llui/llmenugl.cpp                       |  7 ++++
 indra/llui/llscrollbar.cpp                    |  6 +++
 indra/llui/llstatbar.cpp                      |  6 +++
 indra/llui/lltabcontainer.cpp                 |  5 +++
 indra/llui/llviewborder.cpp                   |  6 +++
 indra/newview/llagentcamera.cpp               |  6 +++
 indra/newview/llagentpilot.cpp                |  6 +++
 indra/newview/llenvironment.cpp               |  6 +++
 indra/newview/llfasttimerview.cpp             |  7 ++++
 indra/newview/llflexibleobject.cpp            |  6 +++
 indra/newview/llhudtext.cpp                   |  7 ++++
 .../llinventorymodelbackgroundfetch.cpp       |  7 ++++
 indra/newview/llmanipscale.cpp                |  7 ++++
 indra/newview/llmaniptranslate.cpp            |  8 ++++
 indra/newview/llpanelprimmediacontrols.cpp    |  7 ++++
 indra/newview/llsnapshotlivepreview.cpp       |  7 ++++
 indra/newview/llviewerdisplay.cpp             |  7 ++++
 indra/newview/llviewerpartsim.cpp             |  7 ++++
 indra/newview/llvisualeffect.cpp              |  7 ++++
 indra/newview/llworldmapview.cpp              |  6 +++
 33 files changed, 227 insertions(+), 9 deletions(-)

diff --git a/indra/llcharacter/llmotion.cpp b/indra/llcharacter/llmotion.cpp
index bc9f578660..684aca476c 100644
--- a/indra/llcharacter/llmotion.cpp
+++ b/indra/llcharacter/llmotion.cpp
@@ -32,6 +32,12 @@
 #include "llmotion.h"
 #include "llcriticaldamp.h"
 
+// <FS:Beq> use std::lerp for C++20
+#if __cplusplus >= 202002L
+using std::lerp;
+#endif
+// </FS:Beq>
+
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // LLMotion class
diff --git a/indra/llcommon/llfasttimer.cpp b/indra/llcommon/llfasttimer.cpp
index bcaac1e848..3d497a52b2 100644
--- a/indra/llcommon/llfasttimer.cpp
+++ b/indra/llcommon/llfasttimer.cpp
@@ -325,14 +325,37 @@ void BlockTimer::processTimes()
 #endif
 }
 
+// Define a static empty vector that will be used for the root's children.
+static std::vector<BlockTimerStatHandle*> sEmptyChildren;
+
 std::vector<BlockTimerStatHandle*>::iterator BlockTimerStatHandle::beginChildren()
-        {
-    return getTreeNode().mChildren.begin();
-        }
+{
+    // If this is the root node, return an iterator over an empty container.
+    if (this == &BlockTimer::getRootTimeBlock())
+    {
+        return sEmptyChildren.begin();
+    }
+    auto it = getTreeNode().mChildren.begin();
+    while (it != getTreeNode().mChildren.end() && *it == nullptr)
+    {
+        ++it;
+    }
+    return it;
+}
 
 std::vector<BlockTimerStatHandle*>::iterator BlockTimerStatHandle::endChildren()
-        {
-    return getTreeNode().mChildren.end();
+{
+    // For the root node, return the end iterator of the empty container.
+    if (this == &BlockTimer::getRootTimeBlock())
+    {
+        return sEmptyChildren.end();
+    }
+    auto it = getTreeNode().mChildren.end();
+    while (it != getTreeNode().mChildren.begin() && *(it - 1) == nullptr)
+    {
+        --it;
+    }
+    return it;
 }
 
 std::vector<BlockTimerStatHandle*>& BlockTimerStatHandle::getChildren()
@@ -398,6 +421,13 @@ void BlockTimer::dumpCurTimes()
     LLTrace::PeriodicRecording& frame_recording = LLTrace::get_frame_recording();
     LLTrace::Recording& last_frame_recording = frame_recording.getLastRecording();
 
+    // If the root timer's children container is empty,
+    // there's nothing to traverse so we simply return.
+    if ( BlockTimer::getRootTimeBlock().getTreeNode().mChildren.empty() )
+    {
+        return;
+    }    
+
     // walk over timers in depth order and output timings
     for(block_timer_tree_df_iterator_t it = begin_timer_tree(BlockTimer::getRootTimeBlock());
         it != end_timer_tree();
diff --git a/indra/llinventory/llsettingsbase.cpp b/indra/llinventory/llsettingsbase.cpp
index 2143ae54a0..74e393794e 100644
--- a/indra/llinventory/llsettingsbase.cpp
+++ b/indra/llinventory/llsettingsbase.cpp
@@ -33,6 +33,12 @@
 #include "llsdserialize.h"
 #include <boost/bind.hpp>
 
+// <FS:Beq> use std::lerp for C++20
+#if __cplusplus >= 202002L
+using std::lerp;
+#endif
+// </FS:Beq>
+
 //=========================================================================
 namespace
 {
diff --git a/indra/llinventory/llsettingssky.cpp b/indra/llinventory/llsettingssky.cpp
index efcbc06e18..8cebca74d8 100644
--- a/indra/llinventory/llsettingssky.cpp
+++ b/indra/llinventory/llsettingssky.cpp
@@ -32,8 +32,11 @@
 #include "llfasttimer.h"
 #include "v3colorutil.h"
 #include <boost/bind.hpp>
-
-
+// <FS:Beq> use std::lerp for C++20
+#if __cplusplus >= 202002L
+using std::lerp;
+#endif
+// </FS:Beq>
 //=========================================================================
 namespace
 {
diff --git a/indra/llinventory/llsettingswater.cpp b/indra/llinventory/llsettingswater.cpp
index b5d59dc497..5c3219de33 100644
--- a/indra/llinventory/llsettingswater.cpp
+++ b/indra/llinventory/llsettingswater.cpp
@@ -33,6 +33,12 @@
 #include "indra_constants.h"
 #include <boost/bind.hpp>
 
+// <FS:Beq> use std::lerp for C++20
+#if __cplusplus >= 202002L
+using std::lerp;
+#endif
+// </FS:Beq>
+
 const std::string LLSettingsWater::SETTING_BLUR_MULTIPLIER("blur_multiplier");
 const std::string LLSettingsWater::SETTING_FOG_COLOR("water_fog_color");
 const std::string LLSettingsWater::SETTING_FOG_DENSITY("water_fog_density");
diff --git a/indra/llmath/llmath.h b/indra/llmath/llmath.h
index f5e9cdc7e4..19cd1d5de2 100644
--- a/indra/llmath/llmath.h
+++ b/indra/llmath/llmath.h
@@ -358,10 +358,12 @@ inline F32 snap_to_sig_figs(F32 foo, S32 sig_figs)
     return new_foo;
 }
 
+#if __cplusplus < 202002L
 inline F32 lerp(F32 a, F32 b, F32 u)
 {
     return a + ((b - a) * u);
 }
+#endif
 
 inline F32 lerp2d(F32 x00, F32 x01, F32 x10, F32 x11, F32 u, F32 v)
 {
@@ -378,7 +380,7 @@ inline F32 ramp(F32 x, F32 a, F32 b)
 
 inline F32 rescale(F32 x, F32 x1, F32 x2, F32 y1, F32 y2)
 {
-    return lerp(y1, y2, ramp(x, x1, x2));
+    return std::lerp(y1, y2, ramp(x, x1, x2));
 }
 
 inline F32 clamp_rescale(F32 x, F32 x1, F32 x2, F32 y1, F32 y2)
diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp
index 884d90158b..e7bb8cc915 100644
--- a/indra/llmath/llvolume.cpp
+++ b/indra/llmath/llvolume.cpp
@@ -57,6 +57,12 @@
 
 #include "meshoptimizer/meshoptimizer.h"
 
+// <FS:Beq> use std::lerp for C++20
+#if __cplusplus >= 202002L
+using std::lerp;
+#endif
+// </FS:Beq>
+
 #define DEBUG_SILHOUETTE_BINORMALS 0
 #define DEBUG_SILHOUETTE_NORMALS 0 // TomY: Use this to display normals using the silhouette
 #define DEBUG_SILHOUETTE_EDGE_MAP 0 // DaveP: Use this to display edge map using the silhouette
diff --git a/indra/llrender/llrender2dutils.cpp b/indra/llrender/llrender2dutils.cpp
index 8ef5a47a8d..0dd6941867 100644
--- a/indra/llrender/llrender2dutils.cpp
+++ b/indra/llrender/llrender2dutils.cpp
@@ -41,6 +41,11 @@
 #include "llrender2dutils.h"
 #include "lluiimage.h"
 
+// <FS:Beq> use std::lerp for C++20
+#if __cplusplus >= 202002L
+using std::lerp;
+#endif
+// </FS:Beq>
 
 //
 // Globals
diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp
index cbce9a87d5..4d55b3d16f 100644
--- a/indra/llui/llbutton.cpp
+++ b/indra/llui/llbutton.cpp
@@ -56,6 +56,12 @@
 
 #include "llcheckboxctrl.h"     // <FS:Zi> Add checkbox control toggle
 
+// <FS:Beq> use std::lerp for C++20
+#if __cplusplus >= 202002L
+using std::lerp;
+#endif
+// </FS:Beq>
+
 static LLDefaultChildRegistry::Register<LLButton> r("button");
 
 // Compiler optimization, generate extern template
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index 5d29177f53..9c530821db 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -60,6 +60,11 @@
 #include "llsdutil.h"
 #include "lluiusage.h"
 
+// <FS:Beq> use std::lerp for C++20
+#if __cplusplus >= 202002L
+using std::lerp;
+#endif
+// </FS:Beq>
 
 // use this to control "jumping" behavior when Ctrl-Tabbing
 const S32 TABBED_FLOATER_OFFSET = 0;
diff --git a/indra/llui/llfocusmgr.h b/indra/llui/llfocusmgr.h
index 1fa0ac137e..3e0c6ea3d1 100644
--- a/indra/llui/llfocusmgr.h
+++ b/indra/llui/llfocusmgr.h
@@ -101,7 +101,7 @@ public:
     void            setKeystrokesOnly(bool keystrokes_only) { mKeystrokesOnly = keystrokes_only; }
 
     F32             getFocusFlashAmt() const;
-    S32             getFocusFlashWidth() const { return ll_round(lerp(1.f, 3.f, getFocusFlashAmt())); }
+    S32             getFocusFlashWidth() const { return ll_round(std::lerp(1.f, 3.f, getFocusFlashAmt())); }
     LLColor4        getFocusColor() const;
     void            triggerFocusFlash();
     bool            getAppHasFocus() const { return mAppHasFocus; }
diff --git a/indra/llui/llfolderviewitem.cpp b/indra/llui/llfolderviewitem.cpp
index 6097f91f09..aac4a2ca0f 100644
--- a/indra/llui/llfolderviewitem.cpp
+++ b/indra/llui/llfolderviewitem.cpp
@@ -41,6 +41,12 @@
 #include "lltrans.h"
 #include "llwindow.h"
 
+// <FS:Beq> use std::lerp for C++20
+#if __cplusplus >= 202002L
+using std::lerp;
+#endif
+// </FS:Beq>
+
 ///----------------------------------------------------------------------------
 /// Class LLFolderViewItem
 ///----------------------------------------------------------------------------
diff --git a/indra/llui/lllayoutstack.cpp b/indra/llui/lllayoutstack.cpp
index 6ea0d683a3..598ae2f8f5 100644
--- a/indra/llui/lllayoutstack.cpp
+++ b/indra/llui/lllayoutstack.cpp
@@ -36,6 +36,12 @@
 #include "lliconctrl.h"
 #include "boost/foreach.hpp"
 
+// <FS:Beq> use std::lerp for C++20
+#if __cplusplus >= 202002L
+using std::lerp;
+#endif
+// </FS:Beq>
+
 static const F32 MIN_FRACTIONAL_SIZE = 0.00001f;
 static const F32 MAX_FRACTIONAL_SIZE = 1.f;
 
diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp
index 6fffea386f..4fed3d698b 100644
--- a/indra/llui/llmenugl.cpp
+++ b/indra/llui/llmenugl.cpp
@@ -62,6 +62,13 @@
 #include <boost/tokenizer.hpp>
 
 #include "llclipboard.h" // <FS:ND/ To let someone copy a menus text + accelerator to clipboard
+
+// <FS:Beq> use std::lerp for C++20
+#if __cplusplus >= 202002L
+using std::lerp;
+#endif
+// </FS:Beq>
+
 // static
 LLMenuHolderGL *LLMenuGL::sMenuContainer = NULL;
 view_listener_t::listener_map_t view_listener_t::sListeners;
diff --git a/indra/llui/llscrollbar.cpp b/indra/llui/llscrollbar.cpp
index d0eec387bd..cc439231bb 100644
--- a/indra/llui/llscrollbar.cpp
+++ b/indra/llui/llscrollbar.cpp
@@ -42,6 +42,12 @@
 #include "llrender.h"
 #include "lluictrlfactory.h"
 
+// <FS:Beq> use std::lerp for C++20
+#if __cplusplus >= 202002L
+using std::lerp;
+#endif
+// </FS:Beq>
+
 static LLDefaultChildRegistry::Register<LLScrollbar> register_scrollbar("scroll_bar");
 
 LLScrollbar::Params::Params()
diff --git a/indra/llui/llstatbar.cpp b/indra/llui/llstatbar.cpp
index 46b4071675..8e5fea710d 100644
--- a/indra/llui/llstatbar.cpp
+++ b/indra/llui/llstatbar.cpp
@@ -42,6 +42,12 @@
 #include <iostream>
 #include "lltrans.h"
 
+// <FS:Beq> use std::lerp for C++20
+#if __cplusplus >= 202002L
+using std::lerp;
+#endif
+// </FS:Beq>
+
 // rate at which to update display of value that is rapidly changing
 const F32 MEAN_VALUE_UPDATE_TIME = 1.f / 4.f;
 // time between value changes that qualifies as a "rapid change"
diff --git a/indra/llui/lltabcontainer.cpp b/indra/llui/lltabcontainer.cpp
index 51d0694dc8..df03cac253 100644
--- a/indra/llui/lltabcontainer.cpp
+++ b/indra/llui/lltabcontainer.cpp
@@ -40,6 +40,11 @@
 #include "lltrans.h"
 #include "lluiusage.h"
 
+// <FS:Beq> use std::lerp for C++20
+#if __cplusplus >= 202002L
+using std::lerp;
+#endif
+// </FS:Beq>
 //----------------------------------------------------------------------------
 
 // Implementation Notes:
diff --git a/indra/llui/llviewborder.cpp b/indra/llui/llviewborder.cpp
index d53fd6eb91..fd28ea47dd 100644
--- a/indra/llui/llviewborder.cpp
+++ b/indra/llui/llviewborder.cpp
@@ -30,6 +30,12 @@
 #include "lluictrlfactory.h"
 #include "lluiimage.h"
 
+// <FS:Beq> use std::lerp for C++20
+#if __cplusplus >= 202002L
+using std::lerp;
+#endif
+// </FS:Beq>
+
 static LLDefaultChildRegistry::Register<LLViewBorder> r("view_border");
 
 void LLViewBorder::BevelValues::declareValues()
diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp
index cea5800c36..a289875a90 100644
--- a/indra/newview/llagentcamera.cpp
+++ b/indra/newview/llagentcamera.cpp
@@ -58,6 +58,12 @@
 #include "fscommon.h"
 #include "lltrans.h"
 
+// <FS:Beq> use std::lerp for C++20
+#if __cplusplus >= 202002L
+using std::lerp;
+#endif
+// </FS:Beq>
+
 using namespace LLAvatarAppearanceDefines;
 
 extern LLMenuBarGL* gMenuBarView;
diff --git a/indra/newview/llagentpilot.cpp b/indra/newview/llagentpilot.cpp
index 0b5198bbd3..dda10c8242 100644
--- a/indra/newview/llagentpilot.cpp
+++ b/indra/newview/llagentpilot.cpp
@@ -38,6 +38,12 @@
 #include "llsdserialize.h"
 #include "llsdutil_math.h"
 
+// <FS:Beq> use std::lerp for C++20
+#if __cplusplus >= 202002L
+using std::lerp;
+#endif
+// </FS:Beq>
+
 LLAgentPilot gAgentPilot;
 
 LLAgentPilot::LLAgentPilot() :
diff --git a/indra/newview/llenvironment.cpp b/indra/newview/llenvironment.cpp
index bb73db96ef..641f817ef5 100644
--- a/indra/newview/llenvironment.cpp
+++ b/indra/newview/llenvironment.cpp
@@ -70,6 +70,12 @@
 #include "fscommon.h"
 #include "llviewernetwork.h"
 
+// <FS:Beq> use std::lerp for C++20
+#if __cplusplus >= 202002L
+using std::lerp;
+#endif
+// </FS:Beq>
+
 //=========================================================================
 namespace
 {
diff --git a/indra/newview/llfasttimerview.cpp b/indra/newview/llfasttimerview.cpp
index 43b9f6f692..67ae2caa10 100644
--- a/indra/newview/llfasttimerview.cpp
+++ b/indra/newview/llfasttimerview.cpp
@@ -55,6 +55,13 @@
 #include "llmetricperformancetester.h"
 #include "llviewerstats.h"
 
+
+// <FS:Beq> use std::lerp for C++20
+#if __cplusplus >= 202002L
+using std::lerp;
+#endif
+// </FS:Beq>
+
 //////////////////////////////////////////////////////////////////////////////
 
 using namespace LLTrace;
diff --git a/indra/newview/llflexibleobject.cpp b/indra/newview/llflexibleobject.cpp
index 7d098b2676..4c1961d29b 100644
--- a/indra/newview/llflexibleobject.cpp
+++ b/indra/newview/llflexibleobject.cpp
@@ -43,6 +43,12 @@
 #include "llworld.h"
 #include "llvoavatar.h"
 
+// <FS:Beq> use std::lerp for C++20
+#if __cplusplus >= 202002L
+using std::lerp;
+#endif
+// </FS:Beq>
+
 static const F32 SEC_PER_FLEXI_FRAME = 1.f / 60.f; // 60 flexi updates per second
 /*static*/ F32 LLVolumeImplFlexible::sUpdateFactor = 1.0f;
 std::vector<LLVolumeImplFlexible*> LLVolumeImplFlexible::sInstanceList;
diff --git a/indra/newview/llhudtext.cpp b/indra/newview/llhudtext.cpp
index fa1f800952..84a2354080 100644
--- a/indra/newview/llhudtext.cpp
+++ b/indra/newview/llhudtext.cpp
@@ -51,6 +51,13 @@
 #include "rlvcommon.h"
 // [/RLVa:KB]
 #include <boost/tokenizer.hpp>
+
+// <FS:Beq> use std::lerp for C++20
+#if __cplusplus >= 202002L
+using std::lerp;
+#endif
+// </FS:Beq>
+
 const F32 HORIZONTAL_PADDING = 15.f;
 const F32 VERTICAL_PADDING = 12.f;
 const F32 BUFFER_SIZE = 2.f;
diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp
index 10ae85baf9..b35e27f1e4 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.cpp
+++ b/indra/newview/llinventorymodelbackgroundfetch.cpp
@@ -47,6 +47,13 @@
 #include "llviewermenu.h"
 #include "llviewernetwork.h"
 
+
+// <FS:Beq> use std::lerp for C++20
+#if __cplusplus >= 202002L
+using std::lerp;
+#endif
+// </FS:Beq>
+
 // History (may be apocryphal)
 //
 // Around V2, an HTTP inventory download mechanism was added
diff --git a/indra/newview/llmanipscale.cpp b/indra/newview/llmanipscale.cpp
index 3ebae4649b..4aaf25075b 100644
--- a/indra/newview/llmanipscale.cpp
+++ b/indra/newview/llmanipscale.cpp
@@ -62,6 +62,13 @@
 #include "llmeshrepository.h"
 #include "lltrans.h"
 
+
+// <FS:Beq> use std::lerp for C++20
+#if __cplusplus >= 202002L
+using std::lerp;
+#endif
+// </FS:Beq>
+
 const F32 MAX_MANIP_SELECT_DISTANCE_SQUARED = 11.f * 11.f;
 const F32 SNAP_GUIDE_SCREEN_OFFSET = 0.05f;
 const F32 SNAP_GUIDE_SCREEN_LENGTH = 0.7f;
diff --git a/indra/newview/llmaniptranslate.cpp b/indra/newview/llmaniptranslate.cpp
index 4b93d946ec..17e6331881 100644
--- a/indra/newview/llmaniptranslate.cpp
+++ b/indra/newview/llmaniptranslate.cpp
@@ -66,6 +66,14 @@
 #include "rlvhandler.h"
 // [/RLVa:KB]
 
+
+// <FS:Beq> use std::lerp for C++20
+#if __cplusplus >= 202002L
+using std::lerp;
+#endif
+// </FS:Beq>
+
+
 const S32 NUM_AXES = 3;
 const S32 MOUSE_DRAG_SLOP = 2;       // pixels
 const F32 SELECTED_ARROW_SCALE = 1.3f;
diff --git a/indra/newview/llpanelprimmediacontrols.cpp b/indra/newview/llpanelprimmediacontrols.cpp
index 4de1b06cbd..2396f6369a 100644
--- a/indra/newview/llpanelprimmediacontrols.cpp
+++ b/indra/newview/llpanelprimmediacontrols.cpp
@@ -65,6 +65,13 @@
 
 #include <glm/gtx/transform2.hpp>
 
+
+// <FS:Beq> use std::lerp for C++20
+#if __cplusplus >= 202002L
+using std::lerp;
+#endif
+// </FS:Beq>
+
 // Functions pulled from llviewerdisplay.cpp
 bool get_hud_matrices(glm::mat4 &proj, glm::mat4 &model);
 
diff --git a/indra/newview/llsnapshotlivepreview.cpp b/indra/newview/llsnapshotlivepreview.cpp
index c9826a9775..e99d85c0e3 100644
--- a/indra/newview/llsnapshotlivepreview.cpp
+++ b/indra/newview/llsnapshotlivepreview.cpp
@@ -57,6 +57,13 @@
 #include "llworld.h"
 #include <boost/filesystem.hpp>
 
+
+// <FS:Beq> use std::lerp for C++20
+#if __cplusplus >= 202002L
+using std::lerp;
+#endif
+// </FS:Beq>
+
 constexpr F32 AUTO_SNAPSHOT_TIME_DELAY = 1.f;
 
 constexpr F32 SHINE_TIME = 0.5f;
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp
index 3d762c5928..49835c8bd0 100644
--- a/indra/newview/llviewerdisplay.cpp
+++ b/indra/newview/llviewerdisplay.cpp
@@ -104,6 +104,13 @@
 #include <glm/gtc/matrix_transform.hpp>
 #include <glm/gtc/type_ptr.hpp>
 
+
+// <FS:Beq> use std::lerp for C++20
+#if __cplusplus >= 202002L
+using std::lerp;
+#endif
+// </FS:Beq>
+
 extern LLPointer<LLViewerTexture> gStartTexture;
 extern bool gShiftFrame;
 
diff --git a/indra/newview/llviewerpartsim.cpp b/indra/newview/llviewerpartsim.cpp
index dda38667ec..ea0f6cb027 100644
--- a/indra/newview/llviewerpartsim.cpp
+++ b/indra/newview/llviewerpartsim.cpp
@@ -43,6 +43,13 @@
 #include "llvoavatarself.h"
 #include "llvovolume.h"
 
+
+// <FS:Beq> use std::lerp for C++20
+#if __cplusplus >= 202002L
+using std::lerp;
+#endif
+// </FS:Beq>
+
 const F32 PART_SIM_BOX_SIDE = 16.f;
 
 //static
diff --git a/indra/newview/llvisualeffect.cpp b/indra/newview/llvisualeffect.cpp
index ffa8164e49..161218c2a3 100644
--- a/indra/newview/llvisualeffect.cpp
+++ b/indra/newview/llvisualeffect.cpp
@@ -21,6 +21,13 @@
 #include <boost/iterator/filter_iterator.hpp>
 #include <boost/range/iterator_range.hpp>
 
+
+// <FS:Beq> use std::lerp for C++20
+#if __cplusplus >= 202002L
+using std::lerp;
+#endif
+// </FS:Beq>
+
 // ============================================================================
 // LLTweenableValue class
 //
diff --git a/indra/newview/llworldmapview.cpp b/indra/newview/llworldmapview.cpp
index 4e100da0fc..a46d9faa28 100644
--- a/indra/newview/llworldmapview.cpp
+++ b/indra/newview/llworldmapview.cpp
@@ -69,6 +69,12 @@
 
 #include "llglheaders.h"
 
+// <FS:Beq> use std::lerp for C++20
+#if __cplusplus >= 202002L
+using std::lerp;
+#endif
+// </FS:Beq>
+
 // # Constants
 static constexpr F32 MAP_DEFAULT_SCALE = 128.f;
 static constexpr F32 MAP_ITERP_TIME_CONSTANT = 0.75f;

From 98a96cf0330f04beac30aeada6bc70bd325d0e0f Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Sat, 8 Mar 2025 23:46:30 +0100
Subject: [PATCH 4/5] Revert "tentative workaround for gcc c++20 std::lerp
 clash"

This reverts commit 19999b5858ab3dee5b62b4b2b7867b49648ac0aa.
---
 indra/llcharacter/llmotion.cpp                |  6 ---
 indra/llcommon/llfasttimer.cpp                | 40 +++----------------
 indra/llinventory/llsettingsbase.cpp          |  6 ---
 indra/llinventory/llsettingssky.cpp           |  7 +---
 indra/llinventory/llsettingswater.cpp         |  6 ---
 indra/llmath/llmath.h                         |  4 +-
 indra/llmath/llvolume.cpp                     |  6 ---
 indra/llrender/llrender2dutils.cpp            |  5 ---
 indra/llui/llbutton.cpp                       |  6 ---
 indra/llui/llfloater.cpp                      |  5 ---
 indra/llui/llfocusmgr.h                       |  2 +-
 indra/llui/llfolderviewitem.cpp               |  6 ---
 indra/llui/lllayoutstack.cpp                  |  6 ---
 indra/llui/llmenugl.cpp                       |  7 ----
 indra/llui/llscrollbar.cpp                    |  6 ---
 indra/llui/llstatbar.cpp                      |  6 ---
 indra/llui/lltabcontainer.cpp                 |  5 ---
 indra/llui/llviewborder.cpp                   |  6 ---
 indra/newview/llagentcamera.cpp               |  6 ---
 indra/newview/llagentpilot.cpp                |  6 ---
 indra/newview/llenvironment.cpp               |  6 ---
 indra/newview/llfasttimerview.cpp             |  7 ----
 indra/newview/llflexibleobject.cpp            |  6 ---
 indra/newview/llhudtext.cpp                   |  7 ----
 .../llinventorymodelbackgroundfetch.cpp       |  7 ----
 indra/newview/llmanipscale.cpp                |  7 ----
 indra/newview/llmaniptranslate.cpp            |  8 ----
 indra/newview/llpanelprimmediacontrols.cpp    |  7 ----
 indra/newview/llsnapshotlivepreview.cpp       |  7 ----
 indra/newview/llviewerdisplay.cpp             |  7 ----
 indra/newview/llviewerpartsim.cpp             |  7 ----
 indra/newview/llvisualeffect.cpp              |  7 ----
 indra/newview/llworldmapview.cpp              |  6 ---
 33 files changed, 9 insertions(+), 227 deletions(-)

diff --git a/indra/llcharacter/llmotion.cpp b/indra/llcharacter/llmotion.cpp
index 684aca476c..bc9f578660 100644
--- a/indra/llcharacter/llmotion.cpp
+++ b/indra/llcharacter/llmotion.cpp
@@ -32,12 +32,6 @@
 #include "llmotion.h"
 #include "llcriticaldamp.h"
 
-// <FS:Beq> use std::lerp for C++20
-#if __cplusplus >= 202002L
-using std::lerp;
-#endif
-// </FS:Beq>
-
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // LLMotion class
diff --git a/indra/llcommon/llfasttimer.cpp b/indra/llcommon/llfasttimer.cpp
index 3d497a52b2..bcaac1e848 100644
--- a/indra/llcommon/llfasttimer.cpp
+++ b/indra/llcommon/llfasttimer.cpp
@@ -325,37 +325,14 @@ void BlockTimer::processTimes()
 #endif
 }
 
-// Define a static empty vector that will be used for the root's children.
-static std::vector<BlockTimerStatHandle*> sEmptyChildren;
-
 std::vector<BlockTimerStatHandle*>::iterator BlockTimerStatHandle::beginChildren()
-{
-    // If this is the root node, return an iterator over an empty container.
-    if (this == &BlockTimer::getRootTimeBlock())
-    {
-        return sEmptyChildren.begin();
-    }
-    auto it = getTreeNode().mChildren.begin();
-    while (it != getTreeNode().mChildren.end() && *it == nullptr)
-    {
-        ++it;
-    }
-    return it;
-}
+        {
+    return getTreeNode().mChildren.begin();
+        }
 
 std::vector<BlockTimerStatHandle*>::iterator BlockTimerStatHandle::endChildren()
-{
-    // For the root node, return the end iterator of the empty container.
-    if (this == &BlockTimer::getRootTimeBlock())
-    {
-        return sEmptyChildren.end();
-    }
-    auto it = getTreeNode().mChildren.end();
-    while (it != getTreeNode().mChildren.begin() && *(it - 1) == nullptr)
-    {
-        --it;
-    }
-    return it;
+        {
+    return getTreeNode().mChildren.end();
 }
 
 std::vector<BlockTimerStatHandle*>& BlockTimerStatHandle::getChildren()
@@ -421,13 +398,6 @@ void BlockTimer::dumpCurTimes()
     LLTrace::PeriodicRecording& frame_recording = LLTrace::get_frame_recording();
     LLTrace::Recording& last_frame_recording = frame_recording.getLastRecording();
 
-    // If the root timer's children container is empty,
-    // there's nothing to traverse so we simply return.
-    if ( BlockTimer::getRootTimeBlock().getTreeNode().mChildren.empty() )
-    {
-        return;
-    }    
-
     // walk over timers in depth order and output timings
     for(block_timer_tree_df_iterator_t it = begin_timer_tree(BlockTimer::getRootTimeBlock());
         it != end_timer_tree();
diff --git a/indra/llinventory/llsettingsbase.cpp b/indra/llinventory/llsettingsbase.cpp
index 74e393794e..2143ae54a0 100644
--- a/indra/llinventory/llsettingsbase.cpp
+++ b/indra/llinventory/llsettingsbase.cpp
@@ -33,12 +33,6 @@
 #include "llsdserialize.h"
 #include <boost/bind.hpp>
 
-// <FS:Beq> use std::lerp for C++20
-#if __cplusplus >= 202002L
-using std::lerp;
-#endif
-// </FS:Beq>
-
 //=========================================================================
 namespace
 {
diff --git a/indra/llinventory/llsettingssky.cpp b/indra/llinventory/llsettingssky.cpp
index 8cebca74d8..efcbc06e18 100644
--- a/indra/llinventory/llsettingssky.cpp
+++ b/indra/llinventory/llsettingssky.cpp
@@ -32,11 +32,8 @@
 #include "llfasttimer.h"
 #include "v3colorutil.h"
 #include <boost/bind.hpp>
-// <FS:Beq> use std::lerp for C++20
-#if __cplusplus >= 202002L
-using std::lerp;
-#endif
-// </FS:Beq>
+
+
 //=========================================================================
 namespace
 {
diff --git a/indra/llinventory/llsettingswater.cpp b/indra/llinventory/llsettingswater.cpp
index 5c3219de33..b5d59dc497 100644
--- a/indra/llinventory/llsettingswater.cpp
+++ b/indra/llinventory/llsettingswater.cpp
@@ -33,12 +33,6 @@
 #include "indra_constants.h"
 #include <boost/bind.hpp>
 
-// <FS:Beq> use std::lerp for C++20
-#if __cplusplus >= 202002L
-using std::lerp;
-#endif
-// </FS:Beq>
-
 const std::string LLSettingsWater::SETTING_BLUR_MULTIPLIER("blur_multiplier");
 const std::string LLSettingsWater::SETTING_FOG_COLOR("water_fog_color");
 const std::string LLSettingsWater::SETTING_FOG_DENSITY("water_fog_density");
diff --git a/indra/llmath/llmath.h b/indra/llmath/llmath.h
index 19cd1d5de2..f5e9cdc7e4 100644
--- a/indra/llmath/llmath.h
+++ b/indra/llmath/llmath.h
@@ -358,12 +358,10 @@ inline F32 snap_to_sig_figs(F32 foo, S32 sig_figs)
     return new_foo;
 }
 
-#if __cplusplus < 202002L
 inline F32 lerp(F32 a, F32 b, F32 u)
 {
     return a + ((b - a) * u);
 }
-#endif
 
 inline F32 lerp2d(F32 x00, F32 x01, F32 x10, F32 x11, F32 u, F32 v)
 {
@@ -380,7 +378,7 @@ inline F32 ramp(F32 x, F32 a, F32 b)
 
 inline F32 rescale(F32 x, F32 x1, F32 x2, F32 y1, F32 y2)
 {
-    return std::lerp(y1, y2, ramp(x, x1, x2));
+    return lerp(y1, y2, ramp(x, x1, x2));
 }
 
 inline F32 clamp_rescale(F32 x, F32 x1, F32 x2, F32 y1, F32 y2)
diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp
index e7bb8cc915..884d90158b 100644
--- a/indra/llmath/llvolume.cpp
+++ b/indra/llmath/llvolume.cpp
@@ -57,12 +57,6 @@
 
 #include "meshoptimizer/meshoptimizer.h"
 
-// <FS:Beq> use std::lerp for C++20
-#if __cplusplus >= 202002L
-using std::lerp;
-#endif
-// </FS:Beq>
-
 #define DEBUG_SILHOUETTE_BINORMALS 0
 #define DEBUG_SILHOUETTE_NORMALS 0 // TomY: Use this to display normals using the silhouette
 #define DEBUG_SILHOUETTE_EDGE_MAP 0 // DaveP: Use this to display edge map using the silhouette
diff --git a/indra/llrender/llrender2dutils.cpp b/indra/llrender/llrender2dutils.cpp
index 0dd6941867..8ef5a47a8d 100644
--- a/indra/llrender/llrender2dutils.cpp
+++ b/indra/llrender/llrender2dutils.cpp
@@ -41,11 +41,6 @@
 #include "llrender2dutils.h"
 #include "lluiimage.h"
 
-// <FS:Beq> use std::lerp for C++20
-#if __cplusplus >= 202002L
-using std::lerp;
-#endif
-// </FS:Beq>
 
 //
 // Globals
diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp
index 4d55b3d16f..cbce9a87d5 100644
--- a/indra/llui/llbutton.cpp
+++ b/indra/llui/llbutton.cpp
@@ -56,12 +56,6 @@
 
 #include "llcheckboxctrl.h"     // <FS:Zi> Add checkbox control toggle
 
-// <FS:Beq> use std::lerp for C++20
-#if __cplusplus >= 202002L
-using std::lerp;
-#endif
-// </FS:Beq>
-
 static LLDefaultChildRegistry::Register<LLButton> r("button");
 
 // Compiler optimization, generate extern template
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index 9c530821db..5d29177f53 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -60,11 +60,6 @@
 #include "llsdutil.h"
 #include "lluiusage.h"
 
-// <FS:Beq> use std::lerp for C++20
-#if __cplusplus >= 202002L
-using std::lerp;
-#endif
-// </FS:Beq>
 
 // use this to control "jumping" behavior when Ctrl-Tabbing
 const S32 TABBED_FLOATER_OFFSET = 0;
diff --git a/indra/llui/llfocusmgr.h b/indra/llui/llfocusmgr.h
index 3e0c6ea3d1..1fa0ac137e 100644
--- a/indra/llui/llfocusmgr.h
+++ b/indra/llui/llfocusmgr.h
@@ -101,7 +101,7 @@ public:
     void            setKeystrokesOnly(bool keystrokes_only) { mKeystrokesOnly = keystrokes_only; }
 
     F32             getFocusFlashAmt() const;
-    S32             getFocusFlashWidth() const { return ll_round(std::lerp(1.f, 3.f, getFocusFlashAmt())); }
+    S32             getFocusFlashWidth() const { return ll_round(lerp(1.f, 3.f, getFocusFlashAmt())); }
     LLColor4        getFocusColor() const;
     void            triggerFocusFlash();
     bool            getAppHasFocus() const { return mAppHasFocus; }
diff --git a/indra/llui/llfolderviewitem.cpp b/indra/llui/llfolderviewitem.cpp
index aac4a2ca0f..6097f91f09 100644
--- a/indra/llui/llfolderviewitem.cpp
+++ b/indra/llui/llfolderviewitem.cpp
@@ -41,12 +41,6 @@
 #include "lltrans.h"
 #include "llwindow.h"
 
-// <FS:Beq> use std::lerp for C++20
-#if __cplusplus >= 202002L
-using std::lerp;
-#endif
-// </FS:Beq>
-
 ///----------------------------------------------------------------------------
 /// Class LLFolderViewItem
 ///----------------------------------------------------------------------------
diff --git a/indra/llui/lllayoutstack.cpp b/indra/llui/lllayoutstack.cpp
index 598ae2f8f5..6ea0d683a3 100644
--- a/indra/llui/lllayoutstack.cpp
+++ b/indra/llui/lllayoutstack.cpp
@@ -36,12 +36,6 @@
 #include "lliconctrl.h"
 #include "boost/foreach.hpp"
 
-// <FS:Beq> use std::lerp for C++20
-#if __cplusplus >= 202002L
-using std::lerp;
-#endif
-// </FS:Beq>
-
 static const F32 MIN_FRACTIONAL_SIZE = 0.00001f;
 static const F32 MAX_FRACTIONAL_SIZE = 1.f;
 
diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp
index 4fed3d698b..6fffea386f 100644
--- a/indra/llui/llmenugl.cpp
+++ b/indra/llui/llmenugl.cpp
@@ -62,13 +62,6 @@
 #include <boost/tokenizer.hpp>
 
 #include "llclipboard.h" // <FS:ND/ To let someone copy a menus text + accelerator to clipboard
-
-// <FS:Beq> use std::lerp for C++20
-#if __cplusplus >= 202002L
-using std::lerp;
-#endif
-// </FS:Beq>
-
 // static
 LLMenuHolderGL *LLMenuGL::sMenuContainer = NULL;
 view_listener_t::listener_map_t view_listener_t::sListeners;
diff --git a/indra/llui/llscrollbar.cpp b/indra/llui/llscrollbar.cpp
index cc439231bb..d0eec387bd 100644
--- a/indra/llui/llscrollbar.cpp
+++ b/indra/llui/llscrollbar.cpp
@@ -42,12 +42,6 @@
 #include "llrender.h"
 #include "lluictrlfactory.h"
 
-// <FS:Beq> use std::lerp for C++20
-#if __cplusplus >= 202002L
-using std::lerp;
-#endif
-// </FS:Beq>
-
 static LLDefaultChildRegistry::Register<LLScrollbar> register_scrollbar("scroll_bar");
 
 LLScrollbar::Params::Params()
diff --git a/indra/llui/llstatbar.cpp b/indra/llui/llstatbar.cpp
index 8e5fea710d..46b4071675 100644
--- a/indra/llui/llstatbar.cpp
+++ b/indra/llui/llstatbar.cpp
@@ -42,12 +42,6 @@
 #include <iostream>
 #include "lltrans.h"
 
-// <FS:Beq> use std::lerp for C++20
-#if __cplusplus >= 202002L
-using std::lerp;
-#endif
-// </FS:Beq>
-
 // rate at which to update display of value that is rapidly changing
 const F32 MEAN_VALUE_UPDATE_TIME = 1.f / 4.f;
 // time between value changes that qualifies as a "rapid change"
diff --git a/indra/llui/lltabcontainer.cpp b/indra/llui/lltabcontainer.cpp
index df03cac253..51d0694dc8 100644
--- a/indra/llui/lltabcontainer.cpp
+++ b/indra/llui/lltabcontainer.cpp
@@ -40,11 +40,6 @@
 #include "lltrans.h"
 #include "lluiusage.h"
 
-// <FS:Beq> use std::lerp for C++20
-#if __cplusplus >= 202002L
-using std::lerp;
-#endif
-// </FS:Beq>
 //----------------------------------------------------------------------------
 
 // Implementation Notes:
diff --git a/indra/llui/llviewborder.cpp b/indra/llui/llviewborder.cpp
index fd28ea47dd..d53fd6eb91 100644
--- a/indra/llui/llviewborder.cpp
+++ b/indra/llui/llviewborder.cpp
@@ -30,12 +30,6 @@
 #include "lluictrlfactory.h"
 #include "lluiimage.h"
 
-// <FS:Beq> use std::lerp for C++20
-#if __cplusplus >= 202002L
-using std::lerp;
-#endif
-// </FS:Beq>
-
 static LLDefaultChildRegistry::Register<LLViewBorder> r("view_border");
 
 void LLViewBorder::BevelValues::declareValues()
diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp
index a289875a90..cea5800c36 100644
--- a/indra/newview/llagentcamera.cpp
+++ b/indra/newview/llagentcamera.cpp
@@ -58,12 +58,6 @@
 #include "fscommon.h"
 #include "lltrans.h"
 
-// <FS:Beq> use std::lerp for C++20
-#if __cplusplus >= 202002L
-using std::lerp;
-#endif
-// </FS:Beq>
-
 using namespace LLAvatarAppearanceDefines;
 
 extern LLMenuBarGL* gMenuBarView;
diff --git a/indra/newview/llagentpilot.cpp b/indra/newview/llagentpilot.cpp
index dda10c8242..0b5198bbd3 100644
--- a/indra/newview/llagentpilot.cpp
+++ b/indra/newview/llagentpilot.cpp
@@ -38,12 +38,6 @@
 #include "llsdserialize.h"
 #include "llsdutil_math.h"
 
-// <FS:Beq> use std::lerp for C++20
-#if __cplusplus >= 202002L
-using std::lerp;
-#endif
-// </FS:Beq>
-
 LLAgentPilot gAgentPilot;
 
 LLAgentPilot::LLAgentPilot() :
diff --git a/indra/newview/llenvironment.cpp b/indra/newview/llenvironment.cpp
index 641f817ef5..bb73db96ef 100644
--- a/indra/newview/llenvironment.cpp
+++ b/indra/newview/llenvironment.cpp
@@ -70,12 +70,6 @@
 #include "fscommon.h"
 #include "llviewernetwork.h"
 
-// <FS:Beq> use std::lerp for C++20
-#if __cplusplus >= 202002L
-using std::lerp;
-#endif
-// </FS:Beq>
-
 //=========================================================================
 namespace
 {
diff --git a/indra/newview/llfasttimerview.cpp b/indra/newview/llfasttimerview.cpp
index 67ae2caa10..43b9f6f692 100644
--- a/indra/newview/llfasttimerview.cpp
+++ b/indra/newview/llfasttimerview.cpp
@@ -55,13 +55,6 @@
 #include "llmetricperformancetester.h"
 #include "llviewerstats.h"
 
-
-// <FS:Beq> use std::lerp for C++20
-#if __cplusplus >= 202002L
-using std::lerp;
-#endif
-// </FS:Beq>
-
 //////////////////////////////////////////////////////////////////////////////
 
 using namespace LLTrace;
diff --git a/indra/newview/llflexibleobject.cpp b/indra/newview/llflexibleobject.cpp
index 4c1961d29b..7d098b2676 100644
--- a/indra/newview/llflexibleobject.cpp
+++ b/indra/newview/llflexibleobject.cpp
@@ -43,12 +43,6 @@
 #include "llworld.h"
 #include "llvoavatar.h"
 
-// <FS:Beq> use std::lerp for C++20
-#if __cplusplus >= 202002L
-using std::lerp;
-#endif
-// </FS:Beq>
-
 static const F32 SEC_PER_FLEXI_FRAME = 1.f / 60.f; // 60 flexi updates per second
 /*static*/ F32 LLVolumeImplFlexible::sUpdateFactor = 1.0f;
 std::vector<LLVolumeImplFlexible*> LLVolumeImplFlexible::sInstanceList;
diff --git a/indra/newview/llhudtext.cpp b/indra/newview/llhudtext.cpp
index 84a2354080..fa1f800952 100644
--- a/indra/newview/llhudtext.cpp
+++ b/indra/newview/llhudtext.cpp
@@ -51,13 +51,6 @@
 #include "rlvcommon.h"
 // [/RLVa:KB]
 #include <boost/tokenizer.hpp>
-
-// <FS:Beq> use std::lerp for C++20
-#if __cplusplus >= 202002L
-using std::lerp;
-#endif
-// </FS:Beq>
-
 const F32 HORIZONTAL_PADDING = 15.f;
 const F32 VERTICAL_PADDING = 12.f;
 const F32 BUFFER_SIZE = 2.f;
diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp
index b35e27f1e4..10ae85baf9 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.cpp
+++ b/indra/newview/llinventorymodelbackgroundfetch.cpp
@@ -47,13 +47,6 @@
 #include "llviewermenu.h"
 #include "llviewernetwork.h"
 
-
-// <FS:Beq> use std::lerp for C++20
-#if __cplusplus >= 202002L
-using std::lerp;
-#endif
-// </FS:Beq>
-
 // History (may be apocryphal)
 //
 // Around V2, an HTTP inventory download mechanism was added
diff --git a/indra/newview/llmanipscale.cpp b/indra/newview/llmanipscale.cpp
index 4aaf25075b..3ebae4649b 100644
--- a/indra/newview/llmanipscale.cpp
+++ b/indra/newview/llmanipscale.cpp
@@ -62,13 +62,6 @@
 #include "llmeshrepository.h"
 #include "lltrans.h"
 
-
-// <FS:Beq> use std::lerp for C++20
-#if __cplusplus >= 202002L
-using std::lerp;
-#endif
-// </FS:Beq>
-
 const F32 MAX_MANIP_SELECT_DISTANCE_SQUARED = 11.f * 11.f;
 const F32 SNAP_GUIDE_SCREEN_OFFSET = 0.05f;
 const F32 SNAP_GUIDE_SCREEN_LENGTH = 0.7f;
diff --git a/indra/newview/llmaniptranslate.cpp b/indra/newview/llmaniptranslate.cpp
index 17e6331881..4b93d946ec 100644
--- a/indra/newview/llmaniptranslate.cpp
+++ b/indra/newview/llmaniptranslate.cpp
@@ -66,14 +66,6 @@
 #include "rlvhandler.h"
 // [/RLVa:KB]
 
-
-// <FS:Beq> use std::lerp for C++20
-#if __cplusplus >= 202002L
-using std::lerp;
-#endif
-// </FS:Beq>
-
-
 const S32 NUM_AXES = 3;
 const S32 MOUSE_DRAG_SLOP = 2;       // pixels
 const F32 SELECTED_ARROW_SCALE = 1.3f;
diff --git a/indra/newview/llpanelprimmediacontrols.cpp b/indra/newview/llpanelprimmediacontrols.cpp
index 2396f6369a..4de1b06cbd 100644
--- a/indra/newview/llpanelprimmediacontrols.cpp
+++ b/indra/newview/llpanelprimmediacontrols.cpp
@@ -65,13 +65,6 @@
 
 #include <glm/gtx/transform2.hpp>
 
-
-// <FS:Beq> use std::lerp for C++20
-#if __cplusplus >= 202002L
-using std::lerp;
-#endif
-// </FS:Beq>
-
 // Functions pulled from llviewerdisplay.cpp
 bool get_hud_matrices(glm::mat4 &proj, glm::mat4 &model);
 
diff --git a/indra/newview/llsnapshotlivepreview.cpp b/indra/newview/llsnapshotlivepreview.cpp
index e99d85c0e3..c9826a9775 100644
--- a/indra/newview/llsnapshotlivepreview.cpp
+++ b/indra/newview/llsnapshotlivepreview.cpp
@@ -57,13 +57,6 @@
 #include "llworld.h"
 #include <boost/filesystem.hpp>
 
-
-// <FS:Beq> use std::lerp for C++20
-#if __cplusplus >= 202002L
-using std::lerp;
-#endif
-// </FS:Beq>
-
 constexpr F32 AUTO_SNAPSHOT_TIME_DELAY = 1.f;
 
 constexpr F32 SHINE_TIME = 0.5f;
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp
index 49835c8bd0..3d762c5928 100644
--- a/indra/newview/llviewerdisplay.cpp
+++ b/indra/newview/llviewerdisplay.cpp
@@ -104,13 +104,6 @@
 #include <glm/gtc/matrix_transform.hpp>
 #include <glm/gtc/type_ptr.hpp>
 
-
-// <FS:Beq> use std::lerp for C++20
-#if __cplusplus >= 202002L
-using std::lerp;
-#endif
-// </FS:Beq>
-
 extern LLPointer<LLViewerTexture> gStartTexture;
 extern bool gShiftFrame;
 
diff --git a/indra/newview/llviewerpartsim.cpp b/indra/newview/llviewerpartsim.cpp
index ea0f6cb027..dda38667ec 100644
--- a/indra/newview/llviewerpartsim.cpp
+++ b/indra/newview/llviewerpartsim.cpp
@@ -43,13 +43,6 @@
 #include "llvoavatarself.h"
 #include "llvovolume.h"
 
-
-// <FS:Beq> use std::lerp for C++20
-#if __cplusplus >= 202002L
-using std::lerp;
-#endif
-// </FS:Beq>
-
 const F32 PART_SIM_BOX_SIDE = 16.f;
 
 //static
diff --git a/indra/newview/llvisualeffect.cpp b/indra/newview/llvisualeffect.cpp
index 161218c2a3..ffa8164e49 100644
--- a/indra/newview/llvisualeffect.cpp
+++ b/indra/newview/llvisualeffect.cpp
@@ -21,13 +21,6 @@
 #include <boost/iterator/filter_iterator.hpp>
 #include <boost/range/iterator_range.hpp>
 
-
-// <FS:Beq> use std::lerp for C++20
-#if __cplusplus >= 202002L
-using std::lerp;
-#endif
-// </FS:Beq>
-
 // ============================================================================
 // LLTweenableValue class
 //
diff --git a/indra/newview/llworldmapview.cpp b/indra/newview/llworldmapview.cpp
index a46d9faa28..4e100da0fc 100644
--- a/indra/newview/llworldmapview.cpp
+++ b/indra/newview/llworldmapview.cpp
@@ -69,12 +69,6 @@
 
 #include "llglheaders.h"
 
-// <FS:Beq> use std::lerp for C++20
-#if __cplusplus >= 202002L
-using std::lerp;
-#endif
-// </FS:Beq>
-
 // # Constants
 static constexpr F32 MAP_DEFAULT_SCALE = 128.f;
 static constexpr F32 MAP_ITERP_TIME_CONSTANT = 0.75f;

From fb675c42f8d71c6b156f982c23a17adc95049b8b Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Sat, 8 Mar 2025 23:58:03 +0100
Subject: [PATCH 5/5] Apply my actual std::lerp fixes submitted to LL develop
 branch

---
 indra/llmath/llmath.h                      | 11 +++++++----
 indra/llmath/llvolume.cpp                  | 22 +++++++++++-----------
 indra/newview/llpanelprimmediacontrols.cpp |  2 +-
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/indra/llmath/llmath.h b/indra/llmath/llmath.h
index f5e9cdc7e4..640c55c988 100644
--- a/indra/llmath/llmath.h
+++ b/indra/llmath/llmath.h
@@ -358,10 +358,13 @@ inline F32 snap_to_sig_figs(F32 foo, S32 sig_figs)
     return new_foo;
 }
 
-inline F32 lerp(F32 a, F32 b, F32 u)
-{
-    return a + ((b - a) * u);
-}
+// <FS:Ansariel> std::lerp fix from previous develop branch
+//inline F32 lerp(F32 a, F32 b, F32 u)
+//{
+//    return a + ((b - a) * u);
+//}
+using std::lerp;
+// </FS:Ansariel>
 
 inline F32 lerp2d(F32 x00, F32 x01, F32 x10, F32 x11, F32 u, F32 v)
 {
diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp
index 884d90158b..c1249c64bb 100644
--- a/indra/llmath/llvolume.cpp
+++ b/indra/llmath/llvolume.cpp
@@ -1311,9 +1311,9 @@ void LLPath::genNGon(const LLPathParams& params, S32 sides, F32 startOff, F32 en
     c       = cos(ang)*lerp(radius_start, radius_end, t);
 
 
-    pt->mPos.set(0 + lerp(0,params.getShear().mV[0],s)
+    pt->mPos.set(0 + lerp(0.f,params.getShear().mV[0],s)
                       + lerp(-skew ,skew, t) * 0.5f,
-                    c + lerp(0,params.getShear().mV[1],s),
+                    c + lerp(0.f,params.getShear().mV[1],s),
                     s);
     pt->mScale.set(hole_x * lerp(taper_x_begin, taper_x_end, t),
         hole_y * lerp(taper_y_begin, taper_y_end, t),
@@ -1344,9 +1344,9 @@ void LLPath::genNGon(const LLPathParams& params, S32 sides, F32 startOff, F32 en
         c   = cos(ang)*lerp(radius_start, radius_end, t);
         s   = sin(ang)*lerp(radius_start, radius_end, t);
 
-        pt->mPos.set(0 + lerp(0,params.getShear().mV[0],s)
+        pt->mPos.set(0 + lerp(0.f,params.getShear().mV[0],s)
                           + lerp(-skew ,skew, t) * 0.5f,
-                        c + lerp(0,params.getShear().mV[1],s),
+                        c + lerp(0.f,params.getShear().mV[1],s),
                         s);
 
         pt->mScale.set(hole_x * lerp(taper_x_begin, taper_x_end, t),
@@ -1371,9 +1371,9 @@ void LLPath::genNGon(const LLPathParams& params, S32 sides, F32 startOff, F32 en
     c   = cos(ang)*lerp(radius_start, radius_end, t);
     s   = sin(ang)*lerp(radius_start, radius_end, t);
 
-    pt->mPos.set(0 + lerp(0,params.getShear().mV[0],s)
+    pt->mPos.set(0 + lerp(0.f,params.getShear().mV[0],s)
                       + lerp(-skew ,skew, t) * 0.5f,
-                    c + lerp(0,params.getShear().mV[1],s),
+                    c + lerp(0.f,params.getShear().mV[1],s),
                     s);
     pt->mScale.set(hole_x * lerp(taper_x_begin, taper_x_end, t),
                    hole_y * lerp(taper_y_begin, taper_y_end, t),
@@ -1511,8 +1511,8 @@ bool LLPath::generate(const LLPathParams& params, F32 detail, S32 split,
             for (S32 i=0;i<np;i++)
             {
                 F32 t = lerp(params.getBegin(),params.getEnd(),(F32)i * mStep);
-                mPath[i].mPos.set(lerp(0,params.getShear().mV[0],t),
-                                     lerp(0,params.getShear().mV[1],t),
+                mPath[i].mPos.set(lerp(0.f,params.getShear().mV[0],t),
+                                     lerp(0.f,params.getShear().mV[1],t),
                                      t - 0.5f);
                 LLQuaternion quat;
                 quat.setQuat(lerp(F_PI * params.getTwistBegin(),F_PI * params.getTwist(),t),0,0,1);
@@ -1576,10 +1576,10 @@ bool LLPath::generate(const LLPathParams& params, F32 detail, S32 split,
         {
             F32 t = (F32)i * mStep;
             mPath[i].mPos.set(0,
-                                lerp(0,   -sin(F_PI*params.getTwist()*t)*0.5f,t),
+                                lerp(0.f,   -sin(F_PI*params.getTwist()*t)*0.5f,t),
                                 lerp(-0.5f, cos(F_PI*params.getTwist()*t)*0.5f,t));
-            mPath[i].mScale.set(lerp(1,params.getScale().mV[0],t),
-                                lerp(1,params.getScale().mV[1],t), 0,1);
+            mPath[i].mScale.set(lerp(1.f,params.getScale().mV[0],t),
+                                lerp(1.f,params.getScale().mV[1],t), 0.f,1.f);
             mPath[i].mTexT  = t;
             LLQuaternion quat;
             quat.setQuat(F_PI * params.getTwist() * t,1,0,0);
diff --git a/indra/newview/llpanelprimmediacontrols.cpp b/indra/newview/llpanelprimmediacontrols.cpp
index 4de1b06cbd..249a4361fc 100644
--- a/indra/newview/llpanelprimmediacontrols.cpp
+++ b/indra/newview/llpanelprimmediacontrols.cpp
@@ -779,7 +779,7 @@ void LLPanelPrimMediaControls::draw()
     else if(mFadeTimer.getStarted())
     {
         F32 time = mFadeTimer.getElapsedTimeF32();
-        alpha *= llmax(lerp(1.0, 0.0, time / mControlFadeTime), 0.0f);
+        alpha *= llmax(lerp(1.0f, 0.0f, time / mControlFadeTime), 0.0f);
 
         if(time >= mControlFadeTime)
         {