summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeth ProductEngine <slitovchuk@productengine.com>2012-06-27 19:33:22 +0300
committerSeth ProductEngine <slitovchuk@productengine.com>2012-06-27 19:33:22 +0300
commit9091986c698af6d008a12f1944724609d649b63e (patch)
treeada974fe21ef873ae2a0f4a993ceeecc296b0d3e
parent0cfea7b406c87bf593d2f7cf6040d92ef99b64cf (diff)
CHUI-147 FIX Added check against empty participants names array to pass the assertion in LLAvatarActions::buildResidentsString.
-rw-r--r--indra/newview/llimfloater.cpp12
1 files changed, 8 insertions, 4 deletions
diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp
index 6a5bf153d4..1bbf6cc320 100644
--- a/indra/newview/llimfloater.cpp
+++ b/indra/newview/llimfloater.cpp
@@ -516,10 +516,14 @@ void LLIMFloater::onParticipantsListChanged(LLUICtrl* ctrl)
}
}
- std::string ui_title;
- LLAvatarActions::buildResidentsString(avatar_names, ui_title);
-
- updateSessionName(ui_title, ui_title);
+ // We should check whether the vector is not empty to pass the assertion
+ // that avatar_names.size() > 0 in LLAvatarActions::buildResidentsString.
+ if (!avatar_names.empty())
+ {
+ std::string ui_title;
+ LLAvatarActions::buildResidentsString(avatar_names, ui_title);
+ updateSessionName(ui_title, ui_title);
+ }
}
}