3 files changed, 22 insertions, 0 deletions

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 9c95b1f..aae182c 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -789,6 +789,17 @@
     <key>Value</key>
     <string>f54a0c32-3cd1-d49a-5b4f-7b792bebc204</string>
   </map>
+  <key>TimeFormat</key>
+  <map>
+    <key>Comment</key>
+    <string>0 = 12 hr, 1 = 24 hr, 2 = UTC</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>U32</string>
+    <key>Value</key>
+    <real>0</real>
+  </map>
   <key>Use24HourTime</key>
   <map>
     <key>Comment</key>
diff --git a/linden/indra/newview/llpanelgeneral.cpp b/linden/indra/newview/llpanelgeneral.cpp
index 14b3dc1..538eb22 100644
--- a/linden/indra/newview/llpanelgeneral.cpp
+++ b/linden/indra/newview/llpanelgeneral.cpp
@@ -172,6 +172,12 @@ void LLPanelGeneral::apply()
         gSavedSettings.setBOOL("UIAutoScale", childGetValue("ui_auto_scale"));
         gSavedSettings.setString("Language", childGetValue("language_combobox"));
 
+        /*
+        Time Format: 
+        0 - sim 12 hour time
+        1 - sim 24 hour time
+        2 - UTC time
+        */
         LLComboBox* time_combobox = getChild<LLComboBox>("time_combobox");
         gSavedSettings.setU32("TimeFormat", time_combobox->getCurrentIndex());
         gViewerTime->updateTimeFormat(time_combobox->getCurrentIndex());
diff --git a/linden/indra/newview/viewertime.cpp b/linden/indra/newview/viewertime.cpp
index 57348f0..06dd91a 100644
--- a/linden/indra/newview/viewertime.cpp
+++ b/linden/indra/newview/viewertime.cpp
@@ -32,6 +32,7 @@
 
 #include "llappviewer.h" // for gPacificDaylightTime
 #include "lltrans.h"
+#include "llviewercontrol.h"
 #include "viewertime.h"
 
 // system includes
@@ -43,6 +44,7 @@
 // TODO: support multiple date formats
 
 ViewerTime* gViewerTime = 0;
+// We use statics here for speed reasons
 bool ViewerTime::sUse24HourTime = false;
 bool ViewerTime::sUseUTCTime = false;
 
@@ -257,4 +259,7 @@ void ViewerTime::updateTimeFormat(const U32& index)
                 sUseUTCTime = false;
                 break;
         }
+
+        gSavedSettings.setBOOL("Use24HourTime", sUse24HourTime);
+        gSavedSettings.setBOOL("UseUTCTime", sUseUTCTime);
 }