Merge

1 files changed, 9 insertions, 1 deletions

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();