diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-10-16 08:32:26 -0400 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-10-16 08:32:26 -0400 |
| commit | 4ac1b64665a49c7121411f3db27718f0c37eaf33 (patch) | |
| tree | 85d7f3ccdacd6f322fb1fa213aa91c12b2d4abf4 /indra/newview/llchathistory.cpp | |
| parent | 972df2587863737eafde9caf6fce89f330358b5e (diff) | |
| parent | 2f9edd050669210d651e66a86efb9746c3fa8a34 (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; } |