1 files changed, 12 insertions, 2 deletions

diff --git a/linden/indra/newview/llviewertexteditor.cpp b/linden/indra/newview/llviewertexteditor.cpp
index 832fdd6..4caf257 100644
--- a/linden/indra/newview/llviewertexteditor.cpp
+++ b/linden/indra/newview/llviewertexteditor.cpp
@@ -61,6 +61,7 @@
 #include "llmenugl.h"
 
 #include "llappviewer.h" // for gPacificDaylightTime
+#include "viewertime.h"
 
 static LLRegisterWidget<LLViewerTextEditor> r("text_editor");
 
@@ -1251,7 +1252,8 @@ std::string LLViewerTextEditor::getEmbeddedText()
 
 std::string LLViewerTextEditor::appendTime(bool prepend_newline)
 {
-        time_t utc_time;
+        // Format time according to the person's settings -- MC
+        /*time_t utc_time;
         utc_time = time_corrected();
 
         // There's only one internal tm buffer.
@@ -1261,7 +1263,15 @@ std::string LLViewerTextEditor::appendTime(bool prepend_newline)
         // it's daylight savings time there.
         timep = utc_to_pacific_time(utc_time, gPacificDaylightTime);
 
-        std::string text = llformat("[%02d:%02d]  ", timep->tm_hour, timep->tm_min);
+        text = llformat("[%02d:%02d]  ", timep->tm_hour, timep->tm_min);
+        appendColoredText(text, false, prepend_newline, LLColor4::grey);*/
+        std::string text = llformat("[%02d:%02d", gViewerTime->getCurHour(), gViewerTime->getCurMin());
+        if (!gViewerTime->getCurAMPM().empty())
+        {
+                text += " ";
+                text += gViewerTime->getCurAMPM();
+        }
+        text += "]  ";
         appendColoredText(text, false, prepend_newline, LLColor4::grey);
 
         return text;