diff options
Diffstat (limited to 'linden')
-rw-r--r-- | linden/indra/newview/lllogchat.cpp | 4 | ||||
-rw-r--r-- | linden/indra/newview/llviewertexteditor.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/newview/lllogchat.cpp b/linden/indra/newview/lllogchat.cpp index 62504d6..fb8a450 100644 --- a/linden/indra/newview/lllogchat.cpp +++ b/linden/indra/newview/lllogchat.cpp | |||
@@ -73,9 +73,9 @@ std::string LLLogChat::timestamp(bool withdate) | |||
73 | 73 | ||
74 | std::string text; | 74 | std::string text; |
75 | if (withdate) | 75 | if (withdate) |
76 | text = llformat("[%d/%02d/%02d %d:%02d] ", (timep->tm_year-100)+2000, timep->tm_mon+1, timep->tm_mday, timep->tm_hour, timep->tm_min); | 76 | text = llformat("[%d/%02d/%02d %02d:%02d] ", (timep->tm_year-100)+2000, timep->tm_mon+1, timep->tm_mday, timep->tm_hour, timep->tm_min); |
77 | else | 77 | else |
78 | text = llformat("[%d:%02d] ", timep->tm_hour, timep->tm_min); | 78 | text = llformat("[%02d:%02d] ", timep->tm_hour, timep->tm_min); |
79 | 79 | ||
80 | return text; | 80 | return text; |
81 | } | 81 | } |
diff --git a/linden/indra/newview/llviewertexteditor.cpp b/linden/indra/newview/llviewertexteditor.cpp index e5e2cd6..832fdd6 100644 --- a/linden/indra/newview/llviewertexteditor.cpp +++ b/linden/indra/newview/llviewertexteditor.cpp | |||
@@ -1261,7 +1261,7 @@ std::string LLViewerTextEditor::appendTime(bool prepend_newline) | |||
1261 | // it's daylight savings time there. | 1261 | // it's daylight savings time there. |
1262 | timep = utc_to_pacific_time(utc_time, gPacificDaylightTime); | 1262 | timep = utc_to_pacific_time(utc_time, gPacificDaylightTime); |
1263 | 1263 | ||
1264 | std::string text = llformat("[%d:%02d] ", timep->tm_hour, timep->tm_min); | 1264 | std::string text = llformat("[%02d:%02d] ", timep->tm_hour, timep->tm_min); |
1265 | appendColoredText(text, false, prepend_newline, LLColor4::grey); | 1265 | appendColoredText(text, false, prepend_newline, LLColor4::grey); |
1266 | 1266 | ||
1267 | return text; | 1267 | return text; |