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

1 files changed, 8 insertions, 0 deletions

diff --git a/linden/indra/newview/llprefsadvanced.cpp b/linden/indra/newview/llprefsadvanced.cpp
index 9429d2d..6489f52 100644
--- a/linden/indra/newview/llprefsadvanced.cpp
+++ b/linden/indra/newview/llprefsadvanced.cpp
@@ -30,6 +30,8 @@
 
 #include "llviewerprecompiledheaders.h"
 
+#include "llcombobox.h"
+
 #include "llagent.h"
 #include "llprefsadvanced.h"
 #include "llviewercontrol.h"
@@ -65,6 +67,9 @@ BOOL LLPrefsAdvanced::postBuild()
         childSetValue("legacy_pie_menu_checkbox", gSavedSettings.getBOOL("LegacyPieEnabled"));
         childSetValue("language_is_public", gSavedSettings.getBOOL("LanguageIsPublic"));
 
+        LLComboBox* crash_behavior_combobox = getChild<LLComboBox>("crash_behavior_combobox");
+        crash_behavior_combobox->setCurrentByIndex(gCrashSettings.getS32(CRASH_BEHAVIOR_SETTING));
+
         refresh();
 
         return TRUE;
@@ -139,6 +144,9 @@ void LLPrefsAdvanced::apply()
                 gSavedSettings.setBOOL("LegacyPieEnabled", childGetValue("legacy_pie_menu_checkbox"));
                 build_pie_menus();
         }
+
+        LLComboBox* crash_behavior_combobox = getChild<LLComboBox>("crash_behavior_combobox");
+        gCrashSettings.setS32(CRASH_BEHAVIOR_SETTING, crash_behavior_combobox->getCurrentIndex());
 }
 
 void LLPrefsAdvanced::cancel()