Added option in Preferences > General for setting the default time to 12 hour/24 hour/UTC. Side effects: moved crash logger settings to advanced prefs, fixed french date translations, past/future dates and times still need to be correctly formatted

4 files changed, 34 insertions, 15 deletions

diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
index 5bfe769..9814029 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
@@ -63,6 +63,25 @@
        mouse_opaque="true" name="language_is_public"
        radio_style="false" tool_tip="This lets in-world objects know your preferred language."
        width="256" />
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+       bottom_delta="-30" drop_shadow_visible="true" enabled="true" follows="left|top"
+       font="SansSerifSmall" h_pad="0" halign="left" height="18" left="12"
+       mouse_opaque="true" name="crash_report_textbox" v_pad="0" width="394">
+    Crash reports:
+  </text>
+  <combo_box allow_text_entry="false" bottom_delta="0" enabled="true" follows="left|top"
+             height="18" left="153" max_chars="20" mouse_opaque="true"
+             name="crash_behavior_combobox" width="146">
+    <combo_item type="string" length="1" enabled="true" name="Askbeforesending" value="Ask before sending">
+      Ask before sending
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="Alwayssend" value="Always send">
+      Always send
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="Neversend" value="Never send">
+      Never send
+    </combo_item>
+  </combo_box>
 
   <button bottom="5" follows="left|top" font="SansSerifSmall" height="20" width="250" 
        label="Reset All Preferences To Default" name="reset_btn" left="12" 
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
index 6b8f7aa..49ab842 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
@@ -161,8 +161,8 @@
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-352" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="18" left="10"
-             mouse_opaque="true" name="crash_report_textbox" v_pad="0" width="394">
-                Crash reports:
+             mouse_opaque="true" name="time_textbox" v_pad="0" width="394">
+                Clock:
         </text>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-384" drop_shadow_visible="true" enabled="true" follows="left|top"
@@ -182,15 +182,15 @@
         </string>
         <combo_box allow_text_entry="false" bottom="-352" enabled="true" follows="left|top"
              height="18" left="153" max_chars="20" mouse_opaque="true"
-             name="crash_behavior_combobox" width="146">
-                <combo_item type="string" length="1" enabled="true" name="Askbeforesending" value="Ask before sending">
-                        Ask before sending
+             name="time_combobox" width="146">
+                <combo_item type="string" length="1" enabled="true" name="12HourTime" value="Use 12 Hour Sim Time">
+                        Use 12 Hour Sim Time
                 </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="Alwayssend" value="Always send">
-                        Always send
+                <combo_item type="string" length="1" enabled="true" name="24HourTime" value="Use 24 Hour Sim Time">
+                        Use 24 Hour Sim Time
                 </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="Neversend" value="Never send">
-                        Never send
+                <combo_item type="string" length="1" enabled="true" name="UTCTime" value="Use UTC Time">
+                        Use UTC Time
                 </combo_item>
         </combo_box>
         <combo_box allow_text_entry="true" bottom="-382" enabled="true"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_status_bar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_status_bar.xml
index 5a40a3d..1ef815e 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_status_bar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_status_bar.xml
@@ -33,12 +33,6 @@
              text_color="TimeTextColor" tool_tip="Current Time (Pacific)" v_pad="2" width="80">
                 12:00 AM
         </text>
-        <string name="StatBarDaysOfWeek">
-                Sunday:Monday:Tuesday:Wednesday:Thursday:Friday:Saturday
-        </string>
-        <string name="StatBarMonthsOfYear">
-                January:February:March:April:May:June:July:August:September:October:November:December
-        </string>
         <button bottom="-18" enabled="true" follows="right|bottom" font="SansSerif"
              halign="center" height="16" image_selected="status_script_debug.tga"
              image_unselected="status_script_debug.tga" label="" label_selected=""
diff --git a/linden/indra/newview/skins/default/xui/en-us/strings.xml b/linden/indra/newview/skins/default/xui/en-us/strings.xml
index 6a58ff4..5bd0924 100644
--- a/linden/indra/newview/skins/default/xui/en-us/strings.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/strings.xml
@@ -11,6 +11,12 @@
   <string name="server_version_changed_chat">The region you have entered is running a different simulator version: [SERVER_VERSION_INFO]</string>
   <string name="hippo_label_free">free</string>
   <string name="hippo_label_week">week</string>
+  <string name="StatBarDaysOfWeek">
+    Sunday:Monday:Tuesday:Wednesday:Thursday:Friday:Saturday
+  </string>
+  <string name="StatBarMonthsOfYear">
+    January:February:March:April:May:June:July:August:September:October:November:December
+  </string>
 
   <!-- Login -->
   <string name="LoginInProgress">Logging in. [APP_NAME] may appear frozen.  Please wait.</string>