merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/indra@1170 https://svn.aws.productengine.com/secondlife/pe/stable-1/indra@1187 -> viewer-2.0.0-3

1 files changed, 10 insertions, 5 deletions

diff --git a/indra/newview/llpanelavatar.cpp b/indra/newview/llpanelavatar.cpp
index bf6ecd6bf4..f57489934a 100644
--- a/indra/newview/llpanelavatar.cpp
+++ b/indra/newview/llpanelavatar.cpp
@@ -340,12 +340,17 @@ void LLPanelAvatarProfile::processProperties(void* data, EAvatarProcessorType ty
 		if(avatar_groups)
 		{
 			std::string groups;
-			LLAvatarGroups::group_list_t::const_iterator it = avatar_groups->group_list.begin();
-			for(; avatar_groups->group_list.end() != it; ++it)
-			{
+			if (!avatar_groups->group_list.empty()) {
+				LLAvatarGroups::group_list_t::const_iterator it = avatar_groups->group_list.begin();
 				LLAvatarGroups::LLGroupData group_data = *it;
-				groups += group_data.group_name;
-				groups += ", ";
+				groups+= group_data.group_name;
+				while (++it != avatar_groups->group_list.end())
+				{
+					group_data = *it;				
+					groups += ", ";
+					groups += group_data.group_name;
+					
+				}
 			}
 			childSetValue("sl_groups",groups);
 		}