From 21d63e760dc2d87abb23c57e9cd6d1b15eed66ae Mon Sep 17 00:00:00 2001
From: Zi Ree <zi.ree@phoenixviewer.com>
Date: Mon, 15 Dec 2025 20:51:29 +0100
Subject: [PATCH] FIRE-36213 - Make 24H clock the default so chat logfiles
 aren't mangled, fix width of time format dropdown, fix positioning of IME
 checkbox on linux

---
 indra/newview/app_settings/settings.xml       |  2 +-
 .../xui/de/panel_preferences_general.xml      |  4 +--
 .../xui/en/panel_preferences_general.xml      | 25 +++++++++----------
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 612c4923e2..402896171c 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -17265,7 +17265,7 @@ Change of this parameter will affect the layout of buttons in notification toast
         <key>Type</key>
         <string>Boolean</string>
         <key>Value</key>
-        <integer>0</integer>
+        <integer>1</integer>
     </map>
     <key>EnvironmentPersistAcrossLogin</key>
     <map>
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_general.xml b/indra/newview/skins/default/xui/de/panel_preferences_general.xml
index f84249e130..0e69de8170 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_general.xml
@@ -24,13 +24,12 @@
 		Uhrzeitformat:
 	</text>
 	<combo_box name="time_format_combobox">
-		<combo_box.item label="1:00 AM" name="12H"/>
+		<combo_box.item label="1:00 PM" name="12H"/>
 		<combo_box.item label="13:00" name="24H"/>
 	</combo_box>
 	<text name="time_format_textbox2">
 		(Erfordert Neustart)
 	</text>
-	<check_box label="IME-Texteingabe aktivieren" name="use_ime" tool_tip="Input Method Editor für Texteingabe aktivieren - nur für spezielle Sprachen wie z.B. Japanisch oder Chinesisch benötigt."/>
 	<text name="maturity_desired_prompt" width="320">
 		Auf Inhalte mit folgender Einstufung zugreifen:
 	</text>
@@ -40,6 +39,7 @@
 		<combo_box.item label="Generell und Moderat" name="Desired_Mature"/>
 		<combo_box.item label="Generell" name="Desired_PG"/>
 	</combo_box>
+	<check_box label="IME-Texteingabe aktivieren" name="use_ime" tool_tip="Input Method Editor für Texteingabe aktivieren - nur für spezielle Sprachen wie z.B. Japanisch oder Chinesisch benötigt."/>
 	<text name="start_location_textbox">
 		Startstandort:
 	</text>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
index 7286ea146b..d6d47c73cb 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@@ -136,10 +136,10 @@
      left="300"
      max_chars="135"
      name="time_format_combobox"
-     width="70">
+     width="90">
         <combo_box.item
          enabled="true"
-         label="1:00 AM"
+         label="1:00 PM"
          name="12H"
          value="0" />
         <combo_box.item
@@ -162,17 +162,6 @@
      width="130">
         (Requires restart)
     </text>
-    <check_box
-     control_name="SDL2IMEEnabled"
-     height="16"
-     label="Show IME Text Input"
-     layout="topleft"
-     left_pad="5"
-     name="use_ime"
-     top_delta="5"
-     width="256"
-     visible="false"
-     tool_tip="Use the international input method editor, only needed for specific languages like Japanese, Chinese, etc." />
 <!--maturity-->
      <text
      type="string"
@@ -245,6 +234,16 @@
      left_pad="5"
      name="rating_icon_adult"
      width="18"/>
+    <check_box
+     control_name="SDL2IMEEnabled"
+     height="16"
+     label="Show IME Text Input"
+     layout="topleft"
+     left_pad="48"
+     name="use_ime"
+     width="256"
+     visible="true"
+     tool_tip="Use the international input method editor, only needed for specific languages like Japanese, Chinese, etc." />
 <!--start location-->
     <text
      type="string"