diff options
| author | maksymsproductengine <maksymsproductengine@lindenlab.com> | 2013-09-19 01:17:12 +0300 |
|---|---|---|
| committer | maksymsproductengine <maksymsproductengine@lindenlab.com> | 2013-09-19 01:17:12 +0300 |
| commit | 932882da22c864dd996d63f35fe168516d3bd654 (patch) | |
| tree | 6629970ba230ee9545e8499776a9073ebcb1d72a /indra/newview/llfloaterimcontainer.cpp | |
| parent | 1c2bbf6ccbadfdbfaadb0b750a950e0d6add6fb8 (diff) | |
| parent | 9b99ece5ab43b6cb28944d1e412f06c6b22dbc2c (diff) | |
Merge with bitbucket.org/msavchenko/viewer-release-maint-3132
Diffstat (limited to 'indra/newview/llfloaterimcontainer.cpp')
| -rwxr-xr-x | indra/newview/llfloaterimcontainer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp index 836a455a67..2c3b34e128 100755 --- a/indra/newview/llfloaterimcontainer.cpp +++ b/indra/newview/llfloaterimcontainer.cpp @@ -1609,7 +1609,7 @@ LLConversationItem* LLFloaterIMContainer::addConversationListItem(const LLUUID& // Create the participants widgets now // Note: usually, we do not get an updated avatar list at that point - if (uuid.isNull() || im_sessionp && !im_sessionp->isP2PSessionType()) + if (uuid.isNull() || (im_sessionp && !im_sessionp->isP2PSessionType())) { LLFolderViewModelItemCommon::child_list_t::const_iterator current_participant_model = item->getChildrenBegin(); LLFolderViewModelItemCommon::child_list_t::const_iterator end_participant_model = item->getChildrenEnd(); |