Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't confuse the user by showing loading when refreshing item's experience

Browse Source 
Also reorganize some code in that area to be cleaner
This commit is contained in:
Liru Færs
2020-02-11 20:19:04 -05:00
parent e34999b6a9
commit 6a56d048c0
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
indra/newview/llfloaterproperties.cpp
View File

@@ -300,8 +300,11 @@ void LLFloaterProperties::refreshFromItem(LLInventoryItem* item)
{ {
getChildView("LabelItemExperienceTitle")->setVisible(TRUE); getChildView("LabelItemExperienceTitle")->setVisible(TRUE);
LLTextBox* tb = getChild<LLTextBox>("LabelItemExperience"); LLTextBox* tb = getChild<LLTextBox>("LabelItemExperience");
tb->setText(getString("loading_experience")); if (tb->getValue().asUUID().isNull())
tb->setVisible(TRUE); {
tb->setText(getString("loading_experience"));
tb->setVisible(TRUE);
}
std::string url = std::string(); std::string url = std::string();
if(object && object->getRegion()) if(object && object->getRegion())
{ {
@@ -592,14 +595,10 @@ void LLFloaterProperties::refreshFromItem(LLInventoryItem* item)
void LLFloaterProperties::setAssociatedExperience(LLHandle<LLFloaterProperties> hInfo, const LLSD& experience) void LLFloaterProperties::setAssociatedExperience(LLHandle<LLFloaterProperties> hInfo, const LLSD& experience)
{ {
LLFloaterProperties* info = hInfo.get(); LLFloaterProperties* info = hInfo.get();
if(info) if (info && experience.has(LLExperienceCache::EXPERIENCE_ID))
{ {
LLUUID id; auto id = experience[LLExperienceCache::EXPERIENCE_ID].asUUID();
if (experience.has(LLExperienceCache::EXPERIENCE_ID))
{
id = experience[LLExperienceCache::EXPERIENCE_ID].asUUID();
}
if (id.notNull()) if (id.notNull())
{ {
//info->getChild<LLTextBox>("LabelItemExperience")->setText(LLSLURL("experience", id, "profile").getSLURLString(); //info->getChild<LLTextBox>("LabelItemExperience")->setText(LLSLURL("experience", id, "profile").getSLURLString();