summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorMnikolenko ProductEngine <mnikolenko@productengine.com>2015-06-11 12:57:18 +0300
committerMnikolenko ProductEngine <mnikolenko@productengine.com>2015-06-11 12:57:18 +0300
commit70a31d5c6b8872e72c5a90098afc9165d8d020b1 (patch)
tree62174317eca24e10e820b7c01aa4cb561076756c /indra
parent251cccd76c8eb1c1ab2422c5cfcd3d7ef9bd9454 (diff)
MAINT-14 FIXED Region message logged into nearby chat log has duplicated sender name
Diffstat (limited to 'indra')
-rwxr-xr-xindra/newview/llchathistory.cpp2
1 files changed, 1 insertions, 1 deletions
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 + ")";
}