diff options
| author | Igor Borovkov <iborovkov@productengine.com> | 2010-02-17 16:09:50 +0200 |
|---|---|---|
| committer | Igor Borovkov <iborovkov@productengine.com> | 2010-02-17 16:09:50 +0200 |
| commit | 4c5a998f79e835d1f3436a8f8d1cc920d158fcff (patch) | |
| tree | 1a4d32f6e7f41895134d84f3e03673095f790510 /indra/newview/llchathistory.cpp | |
| parent | 2ab4bf8b35bed067a1e7871e921e489fdc8322aa (diff) | |
fixed EXT-5456 Messages from objects are shownas messages from Second Life in nearby chat history from the prev session
Completed things which were agreed on:
- system messages in the log file are prepended with "Second Life:" after the timestamp
- object names set which are parsed extended to object names consisting with any number of words
Side effect:
"Second Life:" is shown as From Name in Nearby Chat when in plain text chat
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llchathistory.cpp')
| -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 81cc52528c..3fb043c669 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -264,7 +264,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 == SYSTEM_FROM) + if((chat.mFromID.isNull() && chat.mFromName.empty()) || chat.mFromName == SYSTEM_FROM) { mSourceType = CHAT_SOURCE_SYSTEM; } |