From 9a13f4270b502036de01be531b17ba3a0e82e548 Mon Sep 17 00:00:00 2001 From: Mnikolenko ProductEngine Date: Mon, 8 Jun 2015 11:56:14 +0300 Subject: MAINT-14 FIXED Treat region message like a system message, but also show sender name. --- indra/newview/llchathistory.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'indra/newview/llchathistory.cpp') diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index b81b95462e..df6fe99fdb 100755 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -376,6 +376,10 @@ public: || mSourceType == CHAT_SOURCE_SYSTEM) { mFrom = LLTrans::getString("SECOND_LIFE"); + if(!chat.mFromName.empty()) + { + mFrom += " (" + chat.mFromName + ")"; + } user_name->setValue(mFrom); updateMinUserNameWidth(); } -- cgit v1.3 From 70a31d5c6b8872e72c5a90098afc9165d8d020b1 Mon Sep 17 00:00:00 2001 From: Mnikolenko ProductEngine Date: Thu, 11 Jun 2015 12:57:18 +0300 Subject: MAINT-14 FIXED Region message logged into nearby chat log has duplicated sender name --- indra/newview/llchathistory.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llchathistory.cpp') diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index df6fe99fdb..dc0835eb1c 100755 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -376,7 +376,7 @@ public: || mSourceType == CHAT_SOURCE_SYSTEM) { mFrom = LLTrans::getString("SECOND_LIFE"); - if(!chat.mFromName.empty()) + if(!chat.mFromName.empty() && (mFrom != chat.mFromName)) { mFrom += " (" + chat.mFromName + ")"; } -- cgit v1.3