Merge

4 files changed, 29 insertions, 2 deletions

diff --git a/indra/newview/llpanelexperiences.cpp b/indra/newview/llpanelexperiences.cpp
index 2885ef9305..3ee4b5e968 100644
--- a/indra/newview/llpanelexperiences.cpp
+++ b/indra/newview/llpanelexperiences.cpp
@@ -54,7 +54,11 @@ LLPanelExperiences::LLPanelExperiences(  )
 BOOL LLPanelExperiences::postBuild( void )
 {
 	mExperiencesList = getChild<LLFlatListView>("experiences_list");
-	if(hasString("no_experiences"))
+	if (hasString("loading_experiences"))
+	{
+		mExperiencesList->setNoItemsCommentText(getString("loading_experiences"));
+	}
+	else if (hasString("no_experiences"))
 	{
 		mExperiencesList->setNoItemsCommentText(getString("no_experiences"));
 	}
@@ -75,6 +79,10 @@ LLExperienceItem* LLPanelExperiences::getSelectedExperienceItem()
 
 void LLPanelExperiences::setExperienceList( const LLSD& experiences )
 {
+	if (hasString("no_experiences"))
+	{
+		mExperiencesList->setNoItemsCommentText(getString("no_experiences"));
+	}
     mExperiencesList->clear();
 
     LLSD::array_const_iterator it = experiences.beginArray();
diff --git a/indra/newview/llpanelgroup.cpp b/indra/newview/llpanelgroup.cpp
index 8936084d97..f67a90fd01 100755
--- a/indra/newview/llpanelgroup.cpp
+++ b/indra/newview/llpanelgroup.cpp
@@ -420,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);
@@ -436,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);
@@ -461,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;
@@ -469,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);
@@ -536,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"))
 		;
 }
 
diff --git a/indra/newview/llpanelgroupexperiences.cpp b/indra/newview/llpanelgroupexperiences.cpp
index 140a71a528..76b68122fb 100644
--- a/indra/newview/llpanelgroupexperiences.cpp
+++ b/indra/newview/llpanelgroupexperiences.cpp
@@ -82,7 +82,11 @@ LLPanelGroupExperiences::~LLPanelGroupExperiences()
 BOOL LLPanelGroupExperiences::postBuild()
 {
 	mExperiencesList = getChild<LLFlatListView>("experiences_list");
-	if(hasString("no_experiences"))
+	if (hasString("loading_experiences"))
+	{
+		mExperiencesList->setNoItemsCommentText(getString("loading_experiences"));
+	}
+	else if (hasString("no_experiences"))
 	{
 		mExperiencesList->setNoItemsCommentText(getString("no_experiences"));
 	}
@@ -121,6 +125,10 @@ void LLPanelGroupExperiences::setGroupID(const LLUUID& id)
 
 void LLPanelGroupExperiences::setExperienceList(const LLSD& experiences)
 {
+	if (hasString("no_experiences"))
+	{
+		mExperiencesList->setNoItemsCommentText(getString("no_experiences"));
+	}
     mExperiencesList->clear();
 
     LLSD::array_const_iterator it = experiences.beginArray();
diff --git a/indra/newview/skins/default/xui/en/panel_experiences.xml b/indra/newview/skins/default/xui/en/panel_experiences.xml
index 82b69fc344..7691e684c0 100644
--- a/indra/newview/skins/default/xui/en/panel_experiences.xml
+++ b/indra/newview/skins/default/xui/en/panel_experiences.xml
@@ -10,6 +10,9 @@
   bg_opaque_color="0 0.5 0 0.3"
   follows="all">
   <string
+    name="loading_experiences"
+    value="Loading experiences..."/>
+  <string
     name="no_experiences"
     value="No experiences."/>
   <string