Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/

--HG--
branch : product-engine

1 files changed, 5 insertions, 6 deletions

diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp
index 4ece380bfb..47d0381bd7 100644
--- a/indra/newview/llpanelpeople.cpp
+++ b/indra/newview/llpanelpeople.cpp
@@ -479,15 +479,10 @@ void LLPanelPeople::onFriendsAccordionExpandedCollapsed(LLUICtrl* ctrl, const LL
 
 	bool expanded = param.asBoolean();
 
+	setAccordionCollapsedByUser(ctrl, !expanded);
 	if(!expanded)
 	{
 		avatar_list->resetSelection();
-
-		setAccordionCollapsedByUser(ctrl, true);
-	}
-	else
-	{
-		setAccordionCollapsedByUser(ctrl, false);
 	}
 }
 
@@ -1385,6 +1380,10 @@ bool LLPanelPeople::isAccordionCollapsedByUser(LLUICtrl* acc_tab)
 	}
 
 	LLSD param = acc_tab->getValue();
+	if(!param.has(COLLAPSED_BY_USER))
+	{
+		return false;
+	}
 	return param[COLLAPSED_BY_USER].asBoolean();
 }