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, 2 insertions, 7 deletions

diff --git a/linden/indra/newview/llstatusbar.h b/linden/indra/newview/llstatusbar.h
index 8e71f75..92be319 100644
--- a/linden/indra/newview/llstatusbar.h
+++ b/linden/indra/newview/llstatusbar.h
@@ -47,6 +47,7 @@ class LLUICtrl;
 class LLUUID;
 class LLFrameTimer;
 class LLStatGraph;
+class ViewerTime;
 
 // used by LCD screen
 class LLRegionDetails
@@ -122,9 +123,6 @@ public:
         LLRegionDetails mRegionDetails;
 
 private:
-        // simple method to setup the part that holds the date
-        void setupDate();
-
         static void onCommitSearch(LLUICtrl*, void* data);
         static void onClickSearch(void* data);
         static void onClickStatGraph(void* data);
@@ -147,10 +145,7 @@ private:
         S32                             mSquareMetersCommitted;
         LLFrameTimer*   mBalanceTimer;
         LLFrameTimer*   mHealthTimer;
-        
-        static std::vector<std::string> sDays;
-        static std::vector<std::string> sMonths;
-        static const U32 MAX_DATE_STRING_LENGTH;
+        ViewerTime*             mViewerTime;
 };
 
 // *HACK: Status bar owns your cached money balance. JC