From f804bcadb18488d36a97dc1f3a9ca2e4b1f7f039 Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Wed, 2 Jul 2014 01:05:52 +0100
Subject: Added 'Loading experiences...' message on experience lists before
populating lists for ACME-1543
---
indra/newview/llpanelexperiences.cpp | 10 +++++++++-
indra/newview/llpanelgroupexperiences.cpp | 10 +++++++++-
indra/newview/skins/default/xui/en/panel_experiences.xml | 3 +++
3 files changed, 21 insertions(+), 2 deletions(-)
(limited to 'indra')
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/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
@@ -9,6 +9,9 @@
label="Experiences"
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."/>
--
cgit v1.2.3