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

Fix possible unlinked and bad looking names in general tab of build tools

Browse Source
This commit is contained in:
Liru Færs
2020-01-01 13:07:49 -05:00
parent 5df00a481d
commit 37c4a4bbcb
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llpanelpermissions.cpp
View File

@@ -390,7 +390,8 @@ void LLPanelPermissions::refresh()
// Update last owner text field // Update last owner text field
getChildView("Last Owner:")->setEnabled(TRUE); getChildView("Last Owner:")->setEnabled(TRUE);
std::string owner_app_link; static const auto none_str = LLTrans::getString("GroupNameNone");
std::string owner_app_link(none_str);
if (auto view = getChild<LLTextBox>("Creator Name")) if (auto view = getChild<LLTextBox>("Creator Name"))
{ {
if (LLSelectMgr::getInstance()->selectGetCreator(mCreatorID, owner_app_link)) if (LLSelectMgr::getInstance()->selectGetCreator(mCreatorID, owner_app_link))
@@ -405,6 +406,7 @@ void LLPanelPermissions::refresh()
view->setEnabled(true); view->setEnabled(true);
} }
owner_app_link = none_str;
const BOOL owners_identical = LLSelectMgr::getInstance()->selectGetOwner(mOwnerID, owner_app_link); const BOOL owners_identical = LLSelectMgr::getInstance()->selectGetOwner(mOwnerID, owner_app_link);
if (auto view = getChild<LLTextBox>("Owner Name")) if (auto view = getChild<LLTextBox>("Owner Name"))
{ {
@@ -422,6 +424,7 @@ void LLPanelPermissions::refresh()
if (auto view = getChild<LLTextBox>("Last Owner Name")) if (auto view = getChild<LLTextBox>("Last Owner Name"))
{ {
owner_app_link = none_str;
if (LLSelectMgr::getInstance()->selectGetLastOwner(mLastOwnerID, owner_app_link)) if (LLSelectMgr::getInstance()->selectGetLastOwner(mLastOwnerID, owner_app_link))
{ {
view->setValue(mLastOwnerID); view->setValue(mLastOwnerID);