diff options
| author | Igor Borovkov <iborovkov@productengine.com> | 2010-06-11 19:21:26 +0300 |
|---|---|---|
| committer | Igor Borovkov <iborovkov@productengine.com> | 2010-06-11 19:21:26 +0300 |
| commit | 33d91c0a396632d55f0b322f10d1594ee2990e1d (patch) | |
| tree | 660a161f36d25cb361e273abef856a6caa27e8ea | |
| parent | 47211f0ed5c9dab26c512e59b0d8f54e9018f548 (diff) | |
EXT-7137 FIXED nearby chat messages coming from non-null id with from name "Second Life" are no longer considered "system messages"
Messages coming from objects named "Second Life" were mistaken for messages coming from system
under the name "Second Life".
It is impossible to distinguish using the from_id and from_name two cases:
- messages coming from system under the name "Second Life" but under the id of an object
- messages comding from object named "Second Life"
Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/556/
--HG--
branch : product-engine
| -rw-r--r-- | indra/newview/llchathistory.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index 961969a5c5..18c69b5130 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -243,7 +243,7 @@ public: gCacheName->get(mAvatarID, FALSE, boost::bind(&LLChatHistoryHeader::nameUpdatedCallback, this, _1, _2, _3, _4)); //*TODO overly defensive thing, source type should be maintained out there - if((chat.mFromID.isNull() && chat.mFromName.empty()) || chat.mFromName == SYSTEM_FROM) + if((chat.mFromID.isNull() && chat.mFromName.empty()) || chat.mFromName == SYSTEM_FROM && chat.mFromID.isNull()) { mSourceType = CHAT_SOURCE_SYSTEM; } |