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

Hide the drop target reset button when its in the default state

Browse Source
This commit is contained in:
Inusaito Sayori
2014-10-01 23:23:54 -04:00
parent b060ba3c38
commit 8b84d5597f
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/lldroptarget.cpp
View File

@@ -156,6 +156,7 @@ void LLDropTarget::setControlName(const std::string& control_name, LLView* conte
return; // This DropTarget never changes text, it isn't tied to a control
}
bool none(false);
std::string text;
if (LLStartUp::getStartupState() != STATE_STARTED) // Too early for PerAccount
{
@@ -170,7 +171,8 @@ void LLDropTarget::setControlName(const std::string& control_name, LLView* conte
return; // Though this should never happen.
}
const LLUUID id(mControl->getValue().asString());
if (id.isNull())
none = id.isNull();
if (none)
text = LLTrans::getString("CurrentlyNotSet");
else if (LLViewerInventoryItem* item = gInventory.getItem(id))
text = currently_set_to(item);
@@ -183,6 +185,7 @@ void LLDropTarget::setControlName(const std::string& control_name, LLView* conte
mConnection.disconnect();
mText->setText(text);
if (mReset) mReset->setVisible(none);
}
void LLDropTarget::setChildRects(LLRect rect)
@@ -232,6 +235,7 @@ void LLDropTarget::setControlValue(const std::string& val)
void LLDropTarget::setItem(const LLInventoryItem* item)
{
if (mReset) mReset->setVisible(!!item);
mText->setText(currently_set_to(item));
setControlValue(item ? item->getUUID().asString() : "");
}