diff options
| author | Cho <cho@lindenlab.com> | 2014-07-02 01:05:52 +0100 |
|---|---|---|
| committer | Cho <cho@lindenlab.com> | 2014-07-02 01:05:52 +0100 |
| commit | f804bcadb18488d36a97dc1f3a9ca2e4b1f7f039 (patch) | |
| tree | 048403fe7eaef665f83f3fd4e7dcba5e5e25c711 /indra | |
| parent | e20276aadade4f88b9b4ddc149ce4ef97f938d88 (diff) | |
Added 'Loading experiences...' message on experience lists before populating lists for ACME-1543
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llpanelexperiences.cpp | 10 | ||||
| -rw-r--r-- | indra/newview/llpanelgroupexperiences.cpp | 10 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_experiences.xml | 3 |
3 files changed, 21 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/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 |