diff options
| author | Eugene Kondrashev <ekondrashev@productengine.com> | 2009-11-13 12:26:57 +0200 |
|---|---|---|
| committer | Eugene Kondrashev <ekondrashev@productengine.com> | 2009-11-13 12:26:57 +0200 |
| commit | d116185bfd1d64c7108e75ea1a7745f08cb2a3d0 (patch) | |
| tree | e7ddd133542e95a127ad0a9758ef2c325c49c7df | |
| parent | 74d5a6605bac7ae76889ce3697fc8f59d982d675 (diff) | |
Fixed Low bug EXT-2404-Nearby Chat: There is redundant semicolon in the log for system messages
--HG--
branch : product-engine
| -rw-r--r-- | indra/newview/llchathistory.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index 046e1d92dc..5efecfa78f 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -53,7 +53,7 @@ std::string formatCurrentTime() time_t utc_time; utc_time = time_corrected(); std::string timeStr ="["+ LLTrans::getString("TimeHour")+"]:[" - +LLTrans::getString("TimeMin")+"] "; + +LLTrans::getString("TimeMin")+"]"; LLSD substitution; @@ -344,7 +344,9 @@ LLView* LLChatHistory::getHeader(const LLChat& chat,const LLStyle::Params& style void LLChatHistory::appendWidgetMessage(const LLChat& chat, LLStyle::Params& style_params) { LLView* view = NULL; - std::string view_text = "\n[" + formatCurrentTime() + "] " + chat.mFromName + ": "; + std::string view_text = "\n[" + formatCurrentTime() + "] "; + if (utf8str_trim(chat.mFromName).size() != 0 && chat.mFromName != SYSTEM_FROM) + view_text += chat.mFromName + ": "; LLInlineViewSegment::Params p; p.force_newline = true; |