merge up to 3.8.0-release (and fix for unit tests with a proxy enabled)'

1 files changed, 10 insertions, 0 deletions

diff --git a/indra/newview/llpanelgroup.cpp b/indra/newview/llpanelgroup.cpp
index f4aab6bd4e..f67a90fd01 100755
--- a/indra/newview/llpanelgroup.cpp
+++ b/indra/newview/llpanelgroup.cpp
@@ -177,11 +177,13 @@ BOOL LLPanelGroup::postBuild()
 	LLPanelGroupTab* panel_roles = findChild<LLPanelGroupTab>("group_roles_tab_panel");
 	LLPanelGroupTab* panel_notices = findChild<LLPanelGroupTab>("group_notices_tab_panel");
 	LLPanelGroupTab* panel_land = findChild<LLPanelGroupTab>("group_land_tab_panel");
+	LLPanelGroupTab* panel_experiences = findChild<LLPanelGroupTab>("group_experiences_tab_panel");
 
 	if(panel_general)	mTabs.push_back(panel_general);
 	if(panel_roles)		mTabs.push_back(panel_roles);
 	if(panel_notices)	mTabs.push_back(panel_notices);
 	if(panel_land)		mTabs.push_back(panel_land);
+	if(panel_experiences)		mTabs.push_back(panel_experiences);
 
 	if(panel_general)
 	{
@@ -418,6 +420,7 @@ void LLPanelGroup::setGroupID(const LLUUID& group_id)
 	LLAccordionCtrlTab* tab_roles = getChild<LLAccordionCtrlTab>("group_roles_tab");
 	LLAccordionCtrlTab* tab_notices = getChild<LLAccordionCtrlTab>("group_notices_tab");
 	LLAccordionCtrlTab* tab_land = getChild<LLAccordionCtrlTab>("group_land_tab");
+	LLAccordionCtrlTab* tab_experiences = getChild<LLAccordionCtrlTab>("group_experiences_tab");
 
 	if(mButtonJoin)
 		mButtonJoin->setVisible(false);
@@ -434,10 +437,13 @@ void LLPanelGroup::setGroupID(const LLUUID& group_id)
 			tab_notices->changeOpenClose(tab_notices->getDisplayChildren());
 		if(tab_land->getDisplayChildren())
 			tab_land->changeOpenClose(tab_land->getDisplayChildren());
+		if(tab_experiences->getDisplayChildren())
+			tab_experiences->changeOpenClose(tab_land->getDisplayChildren());
 
 		tab_roles->setVisible(false);
 		tab_notices->setVisible(false);
 		tab_land->setVisible(false);
+		tab_experiences->setVisible(false);
 
 		getChild<LLUICtrl>("group_name")->setVisible(false);
 		getChild<LLUICtrl>("group_name_editor")->setVisible(true);
@@ -459,6 +465,8 @@ void LLPanelGroup::setGroupID(const LLUUID& group_id)
 				tab_notices->changeOpenClose(tab_notices->getDisplayChildren());
 			if(tab_land->getDisplayChildren())
 				tab_land->changeOpenClose(tab_land->getDisplayChildren());
+			if(tab_experiences->getDisplayChildren())
+				tab_experiences->changeOpenClose(tab_land->getDisplayChildren());
 		}
 
 		LLGroupData agent_gdatap;
@@ -467,6 +475,7 @@ void LLPanelGroup::setGroupID(const LLUUID& group_id)
 		tab_roles->setVisible(is_member);
 		tab_notices->setVisible(is_member);
 		tab_land->setVisible(is_member);
+		tab_experiences->setVisible(is_member);
 
 		getChild<LLUICtrl>("group_name")->setVisible(true);
 		getChild<LLUICtrl>("group_name_editor")->setVisible(false);
@@ -534,6 +543,7 @@ bool LLPanelGroup::apply()
 		&& apply(findChild<LLPanelGroupTab>("group_roles_tab_panel"))
 		&& apply(findChild<LLPanelGroupTab>("group_notices_tab_panel"))
 		&& apply(findChild<LLPanelGroupTab>("group_land_tab_panel"))
+		&& apply(findChild<LLPanelGroupTab>("group_experiences_tab_panel"))
 		;
 }