From 6abe0f3a734f4a567db157c7627aa82f1c84c1f0 Mon Sep 17 00:00:00 2001
From: Cosmic Linden <cosmic@lindenlab.com>
Date: Wed, 6 Mar 2024 15:59:08 -0800
Subject: secondlife/viewer-issues#75: Remove "HTTP Textures" setting in
 Developer menu

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 38763cd9a8..58397afeb5 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -3969,16 +3969,6 @@ function="World.EnvPreset"
 
         <menu_item_separator/>
 
-        <menu_item_check
-         label="HTTP Textures"
-         name="HTTP Textures">
-            <menu_item_check.on_check
-             function="CheckControl"
-             parameter="ImagePipelineUseHTTP" />
-            <menu_item_check.on_click
-             function="ToggleControl"
-             parameter="ImagePipelineUseHTTP" />
-        </menu_item_check>
         <menu_item_call
          label="Compress Images"
          name="Compress Images">
-- 
cgit v1.2.3


From 1ebd23ffed912a5c8c94d109f37a2c25cf169523 Mon Sep 17 00:00:00 2001
From: JamesFoxpaws <162667174+JamesFoxpaws@users.noreply.github.com>
Date: Fri, 8 Mar 2024 16:10:55 +1000
Subject: Remove gender-based restrictions on shape and physics sliders

---
 indra/newview/skins/default/xui/da/strings.xml     |  3 ++
 indra/newview/skins/default/xui/de/strings.xml     |  1 +
 .../skins/default/xui/en/panel_edit_wearable.xml   | 51 ----------------------
 indra/newview/skins/default/xui/en/strings.xml     |  1 +
 indra/newview/skins/default/xui/es/strings.xml     |  1 +
 indra/newview/skins/default/xui/fr/strings.xml     |  1 +
 indra/newview/skins/default/xui/it/strings.xml     |  1 +
 indra/newview/skins/default/xui/ja/strings.xml     |  3 ++
 indra/newview/skins/default/xui/pl/strings.xml     |  3 ++
 indra/newview/skins/default/xui/pt/strings.xml     |  1 +
 indra/newview/skins/default/xui/ru/strings.xml     |  3 ++
 indra/newview/skins/default/xui/tr/strings.xml     |  3 ++
 indra/newview/skins/default/xui/zh/strings.xml     |  3 ++
 13 files changed, 24 insertions(+), 51 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/da/strings.xml b/indra/newview/skins/default/xui/da/strings.xml
index e4f99d14e9..2e351cbc65 100644
--- a/indra/newview/skins/default/xui/da/strings.xml
+++ b/indra/newview/skins/default/xui/da/strings.xml
@@ -2688,6 +2688,9 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE].
 	<string name="Full Sides">
 		Meget hår
 	</string>
+	<string name="Gender">
+		Køn
+	</string>
 	<string name="Glossy">
 		Skinnende
 	</string>
diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml
index a9e7626dc5..4a4a34911d 100644
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@@ -1248,6 +1248,7 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 	<string name="Full Front">Vorne volles Haar</string>
 	<string name="Full Hair Sides">Seitlich volles Haar</string>
 	<string name="Full Sides">Volle Seiten</string>
+	<string name="Gender">Geschlecht</string>
 	<string name="Glossy">Glänzend</string>
 	<string name="Glove Fingers">Handschuhfinger</string>
 	<string name="Glove Length">Handschuhlänge</string>
diff --git a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
index 85d73ece48..b3aadb8ea1 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
@@ -202,57 +202,6 @@
          top="10"
          value="Shape:"
          width="150" />
-        <radio_group
-         control_name="AvatarSex"
-         follows="top|right"
-         height="20"
-         layout="topleft"
-         left="210"
-         name="sex_radio"
-         top="5"
-         width="110">
-            <radio_item
-             follows="all"
-             height="16"
-             label=""
-             layout="topleft"
-             left="0"
-             name="sex_male"
-             tool_tip="Male"
-             value="1"
-             width="40" />
-            <radio_item
-             follows="all"
-             height="16"
-             label=""
-             layout="topleft"
-             left_pad="10"
-             name="sex_female"
-             tool_tip="Female"
-             value="0"
-             width="40"/>
-        </radio_group>
-        <!--  graphical labels for the radio buttons above -->
-        <icon
-         follows="top|right"
-         height="16"
-         image_name="icons/Male.png"
-         layout="topleft"
-         left="230"
-         name="male_icon"
-         tool_tip="Male"
-         top="7"
-         width="16" />
-        <icon
-         follows="top|right"
-         height="16"
-         image_name="icons/Female.png"
-         layout="topleft"
-         left="280"
-         name="female_icon"
-         tool_tip="Female"
-         top="7"
-         width="16" />
         <line_editor
          follows="all"
          height="23"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 3fbb5bc7e8..e7d1233890 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3232,6 +3232,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 <string name="Full Front">Full Front</string>
 <string name="Full Hair Sides">Full Hair Sides</string>
 <string name="Full Sides">Full Sides</string>
+<string name="Gender">Gender</string>
 <string name="Glossy">Glossy</string>
 <string name="Glove Fingers">Glove Fingers</string>
 
diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml
index cd8e7687ae..fd85cdc252 100644
--- a/indra/newview/skins/default/xui/es/strings.xml
+++ b/indra/newview/skins/default/xui/es/strings.xml
@@ -1227,6 +1227,7 @@ Si sigues recibiendo este mensaje, contacta con [SUPPORT_SITE].</string>
 	<string name="Full Front">Sin cortar</string>
 	<string name="Full Hair Sides">Pelo: volumen a los lados</string>
 	<string name="Full Sides">Volumen total</string>
+	<string name="Gender">Sexo</string>
 	<string name="Glossy">Con brillo</string>
 	<string name="Glove Fingers">Guantes: dedos</string>
 	<string name="Glove Length">Guantes: largo</string>
diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml
index 0a3fbeb603..5969856086 100644
--- a/indra/newview/skins/default/xui/fr/strings.xml
+++ b/indra/newview/skins/default/xui/fr/strings.xml
@@ -1249,6 +1249,7 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].</string>
 	<string name="Full Front">Devant touffu</string>
 	<string name="Full Hair Sides">Côtés touffus</string>
 	<string name="Full Sides">Côtés touffus</string>
+	<string name="Gender">Sexe</string>
 	<string name="Glossy">Brillant</string>
 	<string name="Glove Fingers">Gants avec doigts</string>
 	<string name="Glove Length">Longueur</string>
diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml
index 178bb90ca6..e12203c6b7 100644
--- a/indra/newview/skins/default/xui/it/strings.xml
+++ b/indra/newview/skins/default/xui/it/strings.xml
@@ -1229,6 +1229,7 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].</string>
 	<string name="Full Front">Anteriore gonfio</string>
 	<string name="Full Hair Sides">Lati capelli gonfi</string>
 	<string name="Full Sides">Lati gonfi</string>
+	<string name="Gender">Sesso</string>
 	<string name="Glossy">Lucido</string>
 	<string name="Glove Fingers">Dita con guanti</string>
 	<string name="Glove Length">Lunghezza guanti</string>
diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml
index fa6c329fe7..8fe69162c5 100644
--- a/indra/newview/skins/default/xui/ja/strings.xml
+++ b/indra/newview/skins/default/xui/ja/strings.xml
@@ -5052,6 +5052,9 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
 	<string name="Full Sides">
 		生え揃ったサイド
 	</string>
+	<string name="Gender">
+		性別
+	</string>
 	<string name="Glossy">
 		あり
 	</string>
diff --git a/indra/newview/skins/default/xui/pl/strings.xml b/indra/newview/skins/default/xui/pl/strings.xml
index 26ec6cc9dc..a2d386e8ac 100644
--- a/indra/newview/skins/default/xui/pl/strings.xml
+++ b/indra/newview/skins/default/xui/pl/strings.xml
@@ -3318,6 +3318,9 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
 	<string name="Full Sides">
 		Gęste boki
 	</string>
+	<string name="Gender">
+		Płeć
+	</string>
 	<string name="Glossy">
 		Błyszcząca
 	</string>
diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml
index 6db5da2e89..5076e21198 100644
--- a/indra/newview/skins/default/xui/pt/strings.xml
+++ b/indra/newview/skins/default/xui/pt/strings.xml
@@ -1192,6 +1192,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].</string>
 	<string name="Full Front">Frente cheia</string>
 	<string name="Full Hair Sides">Cabelos laterais cheios</string>
 	<string name="Full Sides">Lados cheios</string>
+	<string name="Gender">Sexo</string>
 	<string name="Glossy">Brilhante</string>
 	<string name="Glove Fingers">Dedos da luva</string>
 	<string name="Glove Length">Comprimento das luvas</string>
diff --git a/indra/newview/skins/default/xui/ru/strings.xml b/indra/newview/skins/default/xui/ru/strings.xml
index 61d836a2d1..8fc9641624 100644
--- a/indra/newview/skins/default/xui/ru/strings.xml
+++ b/indra/newview/skins/default/xui/ru/strings.xml
@@ -3479,6 +3479,9 @@ support@secondlife.com.
 	<string name="Full Sides">
 		По бокам
 	</string>
+	<string name="Gender">
+		Пол
+	</string>
 	<string name="Glossy">
 		Блестящие
 	</string>
diff --git a/indra/newview/skins/default/xui/tr/strings.xml b/indra/newview/skins/default/xui/tr/strings.xml
index e709a4c5d6..687de84401 100644
--- a/indra/newview/skins/default/xui/tr/strings.xml
+++ b/indra/newview/skins/default/xui/tr/strings.xml
@@ -3482,6 +3482,9 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun.
 	<string name="Full Sides">
 		Saçlar Yanda
 	</string>
+	<string name="Gender">
+		Cinsiyet
+	</string>
 	<string name="Glossy">
 		Parlak
 	</string>
diff --git a/indra/newview/skins/default/xui/zh/strings.xml b/indra/newview/skins/default/xui/zh/strings.xml
index bdb16c9bf1..cf94391aa4 100644
--- a/indra/newview/skins/default/xui/zh/strings.xml
+++ b/indra/newview/skins/default/xui/zh/strings.xml
@@ -3475,6 +3475,9 @@ http://secondlife.com/support 求助解決問題。
 	<string name="Full Sides">
 		兩側飽滿
 	</string>
+	<string name="Gender">
+		性别
+	</string>
 	<string name="Glossy">
 		光亮
 	</string>
-- 
cgit v1.2.3


From 4a07fd3762b6707b737942c87d1c4d5aeb229678 Mon Sep 17 00:00:00 2001
From: nerodevo <100370411+nerodevo@users.noreply.github.com>
Date: Tue, 12 Mar 2024 14:03:19 -0500
Subject: Remove invalid text color parameter from login screen #960 (#972)

Removed parameter since 'Remember me' isn't using color emphasis.
If emphasis color is desired, then let me know if 'Remember me'
should use same color emphasis for consistency.
---
 indra/newview/skins/default/xui/en/panel_login.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index 3aba80909a..86b08bb24a 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -144,7 +144,6 @@
     control_name="RememberPassword"
     follows="left|top"
     font="SansSerifMedium"
-    text_color="EmphasisColor"
     height="24"
     left="408"
     bottom_delta="0"
-- 
cgit v1.2.3


From 7975a45eb0e72c78a90f2fde449e14c1f607561b Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 14 Mar 2024 23:04:54 +0200
Subject: viewer#970 Fixed param validation warnings

---
 indra/newview/skins/default/xui/en/floater_fast_timers.xml | 2 ++
 indra/newview/skins/default/xui/en/floater_world_map.xml   | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_fast_timers.xml b/indra/newview/skins/default/xui/en/floater_fast_timers.xml
index 645003cc14..f4e61a828e 100644
--- a/indra/newview/skins/default/xui/en/floater_fast_timers.xml
+++ b/indra/newview/skins/default/xui/en/floater_fast_timers.xml
@@ -74,6 +74,8 @@
         orientation="vertical"
         step_size="16"
         doc_size="3000"
+        page_size="50"
+        doc_pos="0"
           />
     </layout_panel>
     <layout_panel name="timers_panel"
diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml
index c965a4427c..fbba1290c0 100644
--- a/indra/newview/skins/default/xui/en/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/en/floater_world_map.xml
@@ -34,7 +34,8 @@
    top="16"
    left="0"
    right="-1"
-   bottom="-1">
+   bottom="-1"
+   orientation="horizontal">
     <layout_panel
      name="map_lp"
      width="385"
-- 
cgit v1.2.3


From cc68803f24d231b89061d855f7bbfe99b99740b9 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 27 Mar 2024 20:13:04 +0200
Subject: viewer#1061 Altitudes are invisible in region's environment

---
 indra/newview/skins/default/xui/en/panel_region_environment.xml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_region_environment.xml b/indra/newview/skins/default/xui/en/panel_region_environment.xml
index 0b3639f779..67eb8f2ca9 100644
--- a/indra/newview/skins/default/xui/en/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml
@@ -264,8 +264,7 @@
                                 top_pad="1"
                                 halign="right"
                                 name="txt_alt1">
-                            Sky [INDEX]
-                            [ALTITUDE]m
+                            Sky [INDEX]&#xA;[ALTITUDE]m
                         </text>
                         <line_editor
                                 follows="left|top"
@@ -310,8 +309,7 @@
                                 top_pad="1"
                                 halign="right"
                                 name="txt_alt2">
-                            Sky [INDEX]
-                            [ALTITUDE]m
+                            Sky [INDEX]&#xA;[ALTITUDE]m
                         </text>
                         <line_editor
                                 follows="left|top"
@@ -356,8 +354,7 @@
                                 top_pad="1"
                                 halign="right"
                                 name="txt_alt3">
-                            Sky [INDEX]
-                            [ALTITUDE]m
+                            Sky [INDEX]&#xA;[ALTITUDE]m
                         </text>
                         <line_editor
                                 follows="left|top"
-- 
cgit v1.2.3


From a6b99dbcb4ea69db73401a3101266ee49b88c9bc Mon Sep 17 00:00:00 2001
From: Andrey Lihatskiy <alihatskiy@productengine.com>
Date: Sat, 9 Mar 2024 19:19:49 +0200
Subject: Revert "Remove gender-based restrictions on shape and physics
 sliders"

This reverts commit 1ebd23ffed912a5c8c94d109f37a2c25cf169523.
---
 indra/newview/skins/default/xui/da/strings.xml     |  3 --
 indra/newview/skins/default/xui/de/strings.xml     |  1 -
 .../skins/default/xui/en/panel_edit_wearable.xml   | 51 ++++++++++++++++++++++
 indra/newview/skins/default/xui/en/strings.xml     |  1 -
 indra/newview/skins/default/xui/es/strings.xml     |  1 -
 indra/newview/skins/default/xui/fr/strings.xml     |  1 -
 indra/newview/skins/default/xui/it/strings.xml     |  1 -
 indra/newview/skins/default/xui/ja/strings.xml     |  3 --
 indra/newview/skins/default/xui/pl/strings.xml     |  3 --
 indra/newview/skins/default/xui/pt/strings.xml     |  1 -
 indra/newview/skins/default/xui/ru/strings.xml     |  3 --
 indra/newview/skins/default/xui/tr/strings.xml     |  3 --
 indra/newview/skins/default/xui/zh/strings.xml     |  3 --
 13 files changed, 51 insertions(+), 24 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/da/strings.xml b/indra/newview/skins/default/xui/da/strings.xml
index 2e351cbc65..e4f99d14e9 100644
--- a/indra/newview/skins/default/xui/da/strings.xml
+++ b/indra/newview/skins/default/xui/da/strings.xml
@@ -2688,9 +2688,6 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE].
 	<string name="Full Sides">
 		Meget hår
 	</string>
-	<string name="Gender">
-		Køn
-	</string>
 	<string name="Glossy">
 		Skinnende
 	</string>
diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml
index 4a4a34911d..a9e7626dc5 100644
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@@ -1248,7 +1248,6 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 	<string name="Full Front">Vorne volles Haar</string>
 	<string name="Full Hair Sides">Seitlich volles Haar</string>
 	<string name="Full Sides">Volle Seiten</string>
-	<string name="Gender">Geschlecht</string>
 	<string name="Glossy">Glänzend</string>
 	<string name="Glove Fingers">Handschuhfinger</string>
 	<string name="Glove Length">Handschuhlänge</string>
diff --git a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
index b3aadb8ea1..85d73ece48 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
@@ -202,6 +202,57 @@
          top="10"
          value="Shape:"
          width="150" />
+        <radio_group
+         control_name="AvatarSex"
+         follows="top|right"
+         height="20"
+         layout="topleft"
+         left="210"
+         name="sex_radio"
+         top="5"
+         width="110">
+            <radio_item
+             follows="all"
+             height="16"
+             label=""
+             layout="topleft"
+             left="0"
+             name="sex_male"
+             tool_tip="Male"
+             value="1"
+             width="40" />
+            <radio_item
+             follows="all"
+             height="16"
+             label=""
+             layout="topleft"
+             left_pad="10"
+             name="sex_female"
+             tool_tip="Female"
+             value="0"
+             width="40"/>
+        </radio_group>
+        <!--  graphical labels for the radio buttons above -->
+        <icon
+         follows="top|right"
+         height="16"
+         image_name="icons/Male.png"
+         layout="topleft"
+         left="230"
+         name="male_icon"
+         tool_tip="Male"
+         top="7"
+         width="16" />
+        <icon
+         follows="top|right"
+         height="16"
+         image_name="icons/Female.png"
+         layout="topleft"
+         left="280"
+         name="female_icon"
+         tool_tip="Female"
+         top="7"
+         width="16" />
         <line_editor
          follows="all"
          height="23"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 87f866881d..7360c06f86 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3242,7 +3242,6 @@ Please reinstall viewer from  https://secondlife.com/support/downloads/ and cont
 <string name="Full Front">Full Front</string>
 <string name="Full Hair Sides">Full Hair Sides</string>
 <string name="Full Sides">Full Sides</string>
-<string name="Gender">Gender</string>
 <string name="Glossy">Glossy</string>
 <string name="Glove Fingers">Glove Fingers</string>
 
diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml
index fd85cdc252..cd8e7687ae 100644
--- a/indra/newview/skins/default/xui/es/strings.xml
+++ b/indra/newview/skins/default/xui/es/strings.xml
@@ -1227,7 +1227,6 @@ Si sigues recibiendo este mensaje, contacta con [SUPPORT_SITE].</string>
 	<string name="Full Front">Sin cortar</string>
 	<string name="Full Hair Sides">Pelo: volumen a los lados</string>
 	<string name="Full Sides">Volumen total</string>
-	<string name="Gender">Sexo</string>
 	<string name="Glossy">Con brillo</string>
 	<string name="Glove Fingers">Guantes: dedos</string>
 	<string name="Glove Length">Guantes: largo</string>
diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml
index 5969856086..0a3fbeb603 100644
--- a/indra/newview/skins/default/xui/fr/strings.xml
+++ b/indra/newview/skins/default/xui/fr/strings.xml
@@ -1249,7 +1249,6 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].</string>
 	<string name="Full Front">Devant touffu</string>
 	<string name="Full Hair Sides">Côtés touffus</string>
 	<string name="Full Sides">Côtés touffus</string>
-	<string name="Gender">Sexe</string>
 	<string name="Glossy">Brillant</string>
 	<string name="Glove Fingers">Gants avec doigts</string>
 	<string name="Glove Length">Longueur</string>
diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml
index e12203c6b7..178bb90ca6 100644
--- a/indra/newview/skins/default/xui/it/strings.xml
+++ b/indra/newview/skins/default/xui/it/strings.xml
@@ -1229,7 +1229,6 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].</string>
 	<string name="Full Front">Anteriore gonfio</string>
 	<string name="Full Hair Sides">Lati capelli gonfi</string>
 	<string name="Full Sides">Lati gonfi</string>
-	<string name="Gender">Sesso</string>
 	<string name="Glossy">Lucido</string>
 	<string name="Glove Fingers">Dita con guanti</string>
 	<string name="Glove Length">Lunghezza guanti</string>
diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml
index 8fe69162c5..fa6c329fe7 100644
--- a/indra/newview/skins/default/xui/ja/strings.xml
+++ b/indra/newview/skins/default/xui/ja/strings.xml
@@ -5052,9 +5052,6 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
 	<string name="Full Sides">
 		生え揃ったサイド
 	</string>
-	<string name="Gender">
-		性別
-	</string>
 	<string name="Glossy">
 		あり
 	</string>
diff --git a/indra/newview/skins/default/xui/pl/strings.xml b/indra/newview/skins/default/xui/pl/strings.xml
index a2d386e8ac..26ec6cc9dc 100644
--- a/indra/newview/skins/default/xui/pl/strings.xml
+++ b/indra/newview/skins/default/xui/pl/strings.xml
@@ -3318,9 +3318,6 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
 	<string name="Full Sides">
 		Gęste boki
 	</string>
-	<string name="Gender">
-		Płeć
-	</string>
 	<string name="Glossy">
 		Błyszcząca
 	</string>
diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml
index 5076e21198..6db5da2e89 100644
--- a/indra/newview/skins/default/xui/pt/strings.xml
+++ b/indra/newview/skins/default/xui/pt/strings.xml
@@ -1192,7 +1192,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE].</string>
 	<string name="Full Front">Frente cheia</string>
 	<string name="Full Hair Sides">Cabelos laterais cheios</string>
 	<string name="Full Sides">Lados cheios</string>
-	<string name="Gender">Sexo</string>
 	<string name="Glossy">Brilhante</string>
 	<string name="Glove Fingers">Dedos da luva</string>
 	<string name="Glove Length">Comprimento das luvas</string>
diff --git a/indra/newview/skins/default/xui/ru/strings.xml b/indra/newview/skins/default/xui/ru/strings.xml
index 8fc9641624..61d836a2d1 100644
--- a/indra/newview/skins/default/xui/ru/strings.xml
+++ b/indra/newview/skins/default/xui/ru/strings.xml
@@ -3479,9 +3479,6 @@ support@secondlife.com.
 	<string name="Full Sides">
 		По бокам
 	</string>
-	<string name="Gender">
-		Пол
-	</string>
 	<string name="Glossy">
 		Блестящие
 	</string>
diff --git a/indra/newview/skins/default/xui/tr/strings.xml b/indra/newview/skins/default/xui/tr/strings.xml
index 687de84401..e709a4c5d6 100644
--- a/indra/newview/skins/default/xui/tr/strings.xml
+++ b/indra/newview/skins/default/xui/tr/strings.xml
@@ -3482,9 +3482,6 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun.
 	<string name="Full Sides">
 		Saçlar Yanda
 	</string>
-	<string name="Gender">
-		Cinsiyet
-	</string>
 	<string name="Glossy">
 		Parlak
 	</string>
diff --git a/indra/newview/skins/default/xui/zh/strings.xml b/indra/newview/skins/default/xui/zh/strings.xml
index cf94391aa4..bdb16c9bf1 100644
--- a/indra/newview/skins/default/xui/zh/strings.xml
+++ b/indra/newview/skins/default/xui/zh/strings.xml
@@ -3475,9 +3475,6 @@ http://secondlife.com/support 求助解決問題。
 	<string name="Full Sides">
 		兩側飽滿
 	</string>
-	<string name="Gender">
-		性别
-	</string>
 	<string name="Glossy">
 		光亮
 	</string>
-- 
cgit v1.2.3


From cc8d71c18c124138e76e85e663498d2ee9776b3c Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 2 Apr 2024 23:11:29 +0300
Subject: viewer#1114 Expose max impostors setting in basic graphics
 preferences

---
 .../en/floater_preferences_graphics_advanced.xml   |  2 +-
 .../default/xui/en/panel_preferences_graphics1.xml | 40 ++++++++++++++++++++--
 2 files changed, 38 insertions(+), 4 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
index bc237322af..d993b1f990 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
@@ -170,7 +170,7 @@
     height="16"
     increment="1"
     initial_value="12"
-    label="Max. # of non-impostors:"
+    label="Max. # animated avatars:"
     label_width="185"
     layout="topleft"
     left="30"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index 8a9d3b755e..5d1ddc2e69 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -210,26 +210,60 @@
     increment="8"
     initial_value="160"
     label="Draw distance:"
-    label_width="90"
+    label_width="187"
     layout="topleft"
     left="30"
     min_val="64"
     max_val="512"
     name="DrawDistance"
     top_delta="40"
-    width="330" />
+    width="427" />
   <text
     type="string"
     length="1"
     follows="left|top"
     height="12"
     layout="topleft"
-    left_delta="330"
+    left_delta="427"
     name="DrawDistanceMeterText2"
     top_delta="0"
     width="128">
      m
   </text>
+  <slider
+    control_name="IndirectMaxNonImpostors"
+    name="IndirectMaxNonImpostors"
+    decimal_digits="0"
+    increment="1"
+    initial_value="12"
+    show_text="false"
+    min_val="1"
+    max_val="66"
+    label="Maximum number of animated avatars:"
+    follows="left|top"
+    layout="topleft"
+    height="16"
+    label_width="240"
+    left="30"
+    top_delta="40"
+    width="393">
+      <slider.commit_callback
+        function="Pref.UpdateIndirectMaxNonImpostors"
+        parameter="IndirectNonImpostorsText" />
+  </slider>
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="16"
+    layout="topleft"
+    top_delta="0"
+    left_delta="397"
+    text_readonly_color="LabelDisabledColor"
+    name="IndirectMaxNonImpostorsText"
+    width="65">
+      0
+  </text>
 
   <button
   height="23"
-- 
cgit v1.2.3


From 37392be4171303db08a4842b7882b4cb758a8f8d Mon Sep 17 00:00:00 2001
From: Nicky Dasmijn <nicky.dasmijn@posteo.nl>
Date: Tue, 9 Apr 2024 20:26:06 +0200
Subject: Update Linux media handling (#1146)

* Enable CEF browser for Linux

* Disable the update for Linux, we don't have that one right now

* Update build_linux.yaml

We need  libpulse-dev for volume_catcher Linux

* Add linux_volum_catcher* files

* Enable OpenAL for Linux-ReleaseOS

* Linux: Update OpenAL

* Update SDL2

* Add libsndio-dev to the dependencies.

* Update CEF to an official LL version

* Remove dupe of emoji_shortcodes

* Reording autobuild does because it can and wants to

* Linux: Disable NDOF for the time being. After updating the ndof 3P needs to be rebuilt and we do not have a fresh one from LL yet.
Forcefully undefine LIB_NDOF, it gets defined in the build variables no matter if it is safe to define.

* Remove wrestling with mutliarch and LIBGL_DRIVERS_PATH

* Remove tcmalloc snippet, tcmalloc is a very faint bad dream of the past

* Putting out a warning this viewer ran on a x64 arch and then suggesting to install 32 bit compat packages makes no sense at all

* CEF resources need to be in lib

* It;'s okay to warn about missing plugins

* Linux: CEF keyboard handling

* Remove old gstreamer 0.10 implementation

* Linux DSO loading always had been very peculiar due to macro magic.
At least now it is peculiar shared magic with only one implementation.

* Remove -fPIC. We get that one from LL_BUILD

* /proc/cpuinfo is not reliable to detrmine the max CPU clock. Try to determine this by reading "/sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq".

Only if this fails go back to /proc/cpuinfo

* Cleanup

* Cleanup common linker and compiler flags, make it more obvious which flags are for which OS/compiler

* Switch to correct plugin file

* Install libpulse-dev for volume catcher.

* And the runner needs libsndio-dev as well.

* check for runner.os=='linux'. matrix.os is the full name of the image (limux-large).
---
 .../skins/default/xui/en/mime_types_linux.xml      | 70 +++++++++++-----------
 1 file changed, 35 insertions(+), 35 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/mime_types_linux.xml b/indra/newview/skins/default/xui/en/mime_types_linux.xml
index 7188b1e699..22a0024874 100644
--- a/indra/newview/skins/default/xui/en/mime_types_linux.xml
+++ b/indra/newview/skins/default/xui/en/mime_types_linux.xml
@@ -7,7 +7,7 @@
 		none
 	</defaultwidget>
 	<defaultimpl>
-		media_plugin_webkit
+		media_plugin_cef
 	</defaultimpl>
 	<widgetset name="web">
 		<label name="web_label">
@@ -130,7 +130,7 @@
 			movie
 		</widgettype>
 		<impl>
-			media_plugin_libvlc
+			media_plugin_gstreamer
 		</impl>
 	</scheme>
 	<mimetype name="blank">
@@ -141,7 +141,7 @@
 			none
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype name="none/none">
@@ -152,7 +152,7 @@
 			none
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype name="audio/*">
@@ -163,7 +163,7 @@
 			audio
 		</widgettype>
 		<impl>
-			media_plugin_libvlc
+			media_plugin_gstreamer
 		</impl>
 	</mimetype>
 	<mimetype name="video/*">
@@ -174,7 +174,7 @@
 			movie
 		</widgettype>
 		<impl>
-			media_plugin_libvlc
+			media_plugin_gstreamer
 		</impl>
 	</mimetype>
 	<mimetype name="image/*">
@@ -185,7 +185,7 @@
 			image
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="video/vnd.secondlife.qt.legacy">
@@ -196,7 +196,7 @@
 			movie
 		</widgettype>
 		<impl>
-			media_plugin_libvlc
+			media_plugin_gstreamer
 		</impl>
 	</mimetype>
 	<mimetype name="application/javascript">
@@ -207,7 +207,7 @@
 			web
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype name="application/ogg">
@@ -218,7 +218,7 @@
 			audio
 		</widgettype>
 		<impl>
-			media_plugin_libvlc
+			media_plugin_gstreamer
 		</impl>
 	</mimetype>
 	<mimetype name="application/pdf">
@@ -229,7 +229,7 @@
 			image
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype name="application/postscript">
@@ -240,7 +240,7 @@
 			image
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype name="application/rtf">
@@ -251,7 +251,7 @@
 			image
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype name="application/smil">
@@ -262,7 +262,7 @@
 			movie
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype name="application/xhtml+xml">
@@ -273,7 +273,7 @@
 			web
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype name="application/x-director">
@@ -284,7 +284,7 @@
 			image
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype name="audio/mid">
@@ -295,7 +295,7 @@
 			audio
 		</widgettype>
 		<impl>
-			media_plugin_libvlc
+			media_plugin_gstreamer
 		</impl>
 	</mimetype>
 	<mimetype name="audio/mpeg">
@@ -306,7 +306,7 @@
 			audio
 		</widgettype>
 		<impl>
-			media_plugin_libvlc
+			media_plugin_gstreamer
 		</impl>
 	</mimetype>
 	<mimetype name="audio/x-aiff">
@@ -317,7 +317,7 @@
 			audio
 		</widgettype>
 		<impl>
-			media_plugin_libvlc
+			media_plugin_gstreamer
 		</impl>
 	</mimetype>
 	<mimetype name="audio/x-wav">
@@ -328,7 +328,7 @@
 			audio
 		</widgettype>
 		<impl>
-			media_plugin_libvlc
+			media_plugin_gstreamer
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="image/bmp">
@@ -339,7 +339,7 @@
 			image
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="image/gif">
@@ -350,7 +350,7 @@
 			image
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="image/jpeg">
@@ -361,7 +361,7 @@
 			image
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="image/png">
@@ -372,7 +372,7 @@
 			image
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype name="image/svg+xml">
@@ -383,7 +383,7 @@
 			image
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="image/tiff">
@@ -394,7 +394,7 @@
 			image
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="text/html">
@@ -405,7 +405,7 @@
 			web
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="text/plain">
@@ -416,7 +416,7 @@
 			text
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype name="text/xml">
@@ -427,7 +427,7 @@
 			text
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="video/mpeg">
@@ -438,7 +438,7 @@
 			movie
 		</widgettype>
 		<impl>
-			media_plugin_libvlc
+			media_plugin_gstreamer
 		</impl>
 	</mimetype>
 	<mimetype name="video/mp4">
@@ -449,7 +449,7 @@
 			movie
 		</widgettype>
 		<impl>
-			media_plugin_libvlc
+			media_plugin_gstreamer
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="video/quicktime">
@@ -460,7 +460,7 @@
 			movie
 		</widgettype>
 		<impl>
-			media_plugin_libvlc
+			media_plugin_gstreamer
 		</impl>
 	</mimetype>
 	<mimetype name="video/x-ms-asf">
@@ -471,7 +471,7 @@
 			movie
 		</widgettype>
 		<impl>
-			media_plugin_libvlc
+			media_plugin_gstreamer
 		</impl>
 	</mimetype>
 	<mimetype name="video/x-ms-wmv">
@@ -482,7 +482,7 @@
 			movie
 		</widgettype>
 		<impl>
-			media_plugin_libvlc
+			media_plugin_gstreamer
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="video/x-msvideo">
@@ -493,7 +493,7 @@
 			movie
 		</widgettype>
 		<impl>
-			media_plugin_libvlc
+			media_plugin_gstreamer
 		</impl>
 	</mimetype>
 </mimetypes>
-- 
cgit v1.2.3


From cc7b416fb8e776c406db6a4f95e505398f5f7fd5 Mon Sep 17 00:00:00 2001
From: nerodevo <100370411+nerodevo@users.noreply.github.com>
Date: Mon, 22 Apr 2024 15:21:38 -0500
Subject: Remove invalid text color parameter from panel_login_first.xml
 Follow-up to previous commit 4a07fd3. This will resolve the warning showing
 up when loading the viewer for the first time.

---
 indra/newview/skins/default/xui/en/panel_login_first.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_login_first.xml b/indra/newview/skins/default/xui/en/panel_login_first.xml
index d002e24782..09eb24c019 100644
--- a/indra/newview/skins/default/xui/en/panel_login_first.xml
+++ b/indra/newview/skins/default/xui/en/panel_login_first.xml
@@ -179,7 +179,6 @@
             control_name="RememberPassword"
             follows="left|top"
             font="SansSerifLarge"
-            text_color="EmphasisColor"
             height="24"
             left="262"
             bottom_delta="0"
-- 
cgit v1.2.3


From 2f25f87ee719a79efc8316079f3c881eddb4d266 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Wed, 15 May 2024 19:10:17 +0200
Subject: secondlife/jira-archive-internal#70713 Combine recently and
 frequently used

---
 indra/newview/skins/default/xui/en/floater_emoji_picker.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_emoji_picker.xml b/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
index e4b8f13df7..f642ca93b7 100644
--- a/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
@@ -13,7 +13,6 @@
     chrome="true"
     height="350"
     width="304">
-  <floater.string name="title_for_recently_used" value="Recently used"/>
   <floater.string name="title_for_frequently_used" value="Frequently used"/>
   <floater.string name="text_no_emoji_for_filter" value="No emoji found for '[FILTER]'"/>
   <scroll_container
-- 
cgit v1.2.3


From a52993fbd72883a0064f74bd6f9197e40ed9ed7a Mon Sep 17 00:00:00 2001
From: Erik Kundiman <erik@megapahit.org>
Date: Sat, 22 Jun 2024 17:45:50 +0800
Subject: Revert streaming to use LibVLC on FBSD & GNU/Linux

I couldn't make it to work with gstreamer even though everything was in
place. It was already working anyway with LibVLC, and, Windows & macOS
use it too, so it's actually the more cross-platform solution.
---
 .../skins/default/xui/en/mime_types_linux.xml      | 30 +++++++++++-----------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/mime_types_linux.xml b/indra/newview/skins/default/xui/en/mime_types_linux.xml
index 87284f564b..e5c33809c8 100644
--- a/indra/newview/skins/default/xui/en/mime_types_linux.xml
+++ b/indra/newview/skins/default/xui/en/mime_types_linux.xml
@@ -130,7 +130,7 @@
 			movie
 		</widgettype>
 		<impl>
-			media_plugin_gstreamer
+			media_plugin_libvlc
 		</impl>
 	</scheme>
 	<mimetype name="blank">
@@ -163,7 +163,7 @@
 			audio
 		</widgettype>
 		<impl>
-			media_plugin_gstreamer
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
 	<mimetype name="video/*">
@@ -174,7 +174,7 @@
 			movie
 		</widgettype>
 		<impl>
-			media_plugin_gstreamer
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
 	<mimetype name="image/*">
@@ -196,7 +196,7 @@
 			movie
 		</widgettype>
 		<impl>
-			media_plugin_gstreamer
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
 	<mimetype name="application/javascript">
@@ -218,7 +218,7 @@
 			audio
 		</widgettype>
 		<impl>
-			media_plugin_gstreamer
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
 	<mimetype name="application/pdf">
@@ -295,7 +295,7 @@
 			audio
 		</widgettype>
 		<impl>
-			media_plugin_gstreamer
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
 	<mimetype name="audio/mpeg">
@@ -306,7 +306,7 @@
 			audio
 		</widgettype>
 		<impl>
-			media_plugin_gstreamer
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
 	<mimetype name="audio/x-aiff">
@@ -317,7 +317,7 @@
 			audio
 		</widgettype>
 		<impl>
-			media_plugin_gstreamer
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
 	<mimetype name="audio/x-wav">
@@ -328,7 +328,7 @@
 			audio
 		</widgettype>
 		<impl>
-			media_plugin_gstreamer
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="image/bmp">
@@ -438,7 +438,7 @@
 			movie
 		</widgettype>
 		<impl>
-			media_plugin_gstreamer
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
 	<mimetype name="video/mp4">
@@ -449,7 +449,7 @@
 			movie
 		</widgettype>
 		<impl>
-			media_plugin_gstreamer
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="video/quicktime">
@@ -460,7 +460,7 @@
 			movie
 		</widgettype>
 		<impl>
-			media_plugin_gstreamer
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
 	<mimetype name="video/x-ms-asf">
@@ -471,7 +471,7 @@
 			movie
 		</widgettype>
 		<impl>
-			media_plugin_gstreamer
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
 	<mimetype name="video/x-ms-wmv">
@@ -482,7 +482,7 @@
 			movie
 		</widgettype>
 		<impl>
-			media_plugin_gstreamer
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="video/x-msvideo">
@@ -493,7 +493,7 @@
 			movie
 		</widgettype>
 		<impl>
-			media_plugin_gstreamer
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
 </mimetypes>
-- 
cgit v1.2.3


From a38b53cc5f456593e8ca21c5d5e20542c1723525 Mon Sep 17 00:00:00 2001
From: Erik Kundiman <erik@megapahit.org>
Date: Tue, 25 Jun 2024 13:16:13 +0800
Subject: Start using SLv Dullahan on Linux too (v1.14.0-r2)

---
 indra/newview/skins/default/xui/en/floater_about.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml
index 5d51cbd682..bf653a547a 100644
--- a/indra/newview/skins/default/xui/en/floater_about.xml
+++ b/indra/newview/skins/default/xui/en/floater_about.xml
@@ -124,7 +124,6 @@ with special thanks to (in order of appearance):
 LinneNoir for the moral support and initial testing;
 Vir Linden for making it possible for the project to have a place (in every sense of the word) in SL;
 nutsobvious for the early testing and video proof;
-Kokua for the Dullahan fork;
 Soft Linden for the security testing;
 Kyle Linden for selling TPV parcel 2 to Erik Kundiman at L$0 price; and
 Fritigern Gothly for the administrative support.
-- 
cgit v1.2.3


From 5deb0352955c9d8c3caf2ffb3a3aaf53f617c8ef Mon Sep 17 00:00:00 2001
From: Erik Kundiman <erik@megapahit.org>
Date: Fri, 19 Jul 2024 17:21:26 +0800
Subject: CTRL-SHIFT-X to get the "Shared Enviroment"

https://megapahit.com/show_bug.cgi?id=46
---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index f3d44cf647..f09fc39596 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1023,6 +1023,7 @@
             </menu_item_check>
             <menu_item_check
              label="Use Shared Environment"
+             shortcut="control|shift|X"
              name="Use Shared Environment">
                 <menu_item_check.on_click
                  function="World.EnvSettings"
-- 
cgit v1.2.3


From cc1421d80d64d3802ebf0842355613251121f0be Mon Sep 17 00:00:00 2001
From: Erik Kundiman <erik@megapahit.org>
Date: Fri, 19 Jul 2024 18:54:48 +0800
Subject: Copy profile link to clipboard in profile actions

https://megapahit.com/show_bug.cgi?id=47
---
 indra/newview/skins/default/xui/en/menu_profile_other.xml | 8 ++++++++
 indra/newview/skins/default/xui/en/menu_profile_self.xml  | 8 ++++++++
 2 files changed, 16 insertions(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/menu_profile_other.xml b/indra/newview/skins/default/xui/en/menu_profile_other.xml
index 101ae33778..a505b38087 100644
--- a/indra/newview/skins/default/xui/en/menu_profile_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_profile_other.xml
@@ -168,4 +168,12 @@
      function="Profile.Commit"
      parameter="copy_user_id"/>
   </menu_item_call>
+  <menu_item_call
+   label="Copy Profile Link"
+   layout="topleft"
+   name="copy_link">
+    <menu_item_call.on_click
+     function="Profile.Commit"
+     parameter="copy_profile_link"/>
+  </menu_item_call>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_profile_self.xml b/indra/newview/skins/default/xui/en/menu_profile_self.xml
index 1b21c7ae61..0a03d7ac2b 100644
--- a/indra/newview/skins/default/xui/en/menu_profile_self.xml
+++ b/indra/newview/skins/default/xui/en/menu_profile_self.xml
@@ -82,4 +82,12 @@
      function="Profile.Commit"
      parameter="copy_user_id"/>
   </menu_item_call>
+  <menu_item_call
+   label="Copy Profile Link"
+   layout="topleft"
+   name="copy_link">
+    <menu_item_call.on_click
+     function="Profile.Commit"
+     parameter="copy_profile_link"/>
+  </menu_item_call>
 </toggleable_menu>
-- 
cgit v1.2.3


From 569d97707459d5f87cb04a0811c0b7eb1b5c2251 Mon Sep 17 00:00:00 2001
From: Erik Kundiman <erik@megapahit.org>
Date: Sat, 20 Jul 2024 21:33:39 +0800
Subject: Revert "NDOF licence not included"

This reverts commit ce44f23aad76a3cd5172837de36498883c2ccbdd.
---
 indra/newview/skins/default/xui/en/floater_about.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml
index 71d15ebcbb..5de09a736e 100644
--- a/indra/newview/skins/default/xui/en/floater_about.xml
+++ b/indra/newview/skins/default/xui/en/floater_about.xml
@@ -194,6 +194,7 @@ Dummy Name replaced at run time
        top="5"
        width="465"
        word_wrap="true">
+        3Dconnexion SDK Copyright (C) 1992-2009 3Dconnexion
         APR Copyright (C) 2011 The Apache Software Foundation
         Collada DOM Copyright 2006 Sony Computer Entertainment Inc.
         cURL Copyright (C) 1996-2010, Daniel Stenberg, (daniel@haxx.se)
-- 
cgit v1.2.3