diff options
| author | Logan Dethrow <log@lindenlab.com> | 2011-09-26 13:08:13 -0400 |
|---|---|---|
| committer | Logan Dethrow <log@lindenlab.com> | 2011-09-26 13:08:13 -0400 |
| commit | 1ead58914837f12e943ff1db4b71cd3ed379d01c (patch) | |
| tree | dbb6678b4b519e543deb3c344174888b99b4ccd7 /indra/newview/llchathistory.cpp | |
| parent | 5b7b3cbbbbec439880a33af8944d10c7bb527c3a (diff) | |
| parent | d475a96e94be90e68cf34bf6c25d8ab259aa47b5 (diff) | |
Merge
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 c0c9ea1451..913d2f34b0 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -255,7 +255,7 @@ public: mSourceType = chat.mSourceType; //*TODO overly defensive thing, source type should be maintained out there - if((chat.mFromID.isNull() && chat.mFromName.empty()) || chat.mFromName == SYSTEM_FROM && chat.mFromID.isNull()) + if((chat.mFromID.isNull() && chat.mFromName.empty()) || (chat.mFromName == SYSTEM_FROM && chat.mFromID.isNull())) { mSourceType = CHAT_SOURCE_SYSTEM; } |