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

Naaaaaaaa

Browse Source
This commit is contained in:
Lirusaito
2019-07-22 10:04:31 -04:00
parent b3fcd87a20
commit 189590edb9
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llfloaterregioninfo.cpp
View File

@@ -4146,6 +4146,7 @@ void LLPanelEstateAccess::onEstateAccessReceived(const LLSD& result)
banned_agent_name_list->clearSortOrder(); banned_agent_name_list->clearSortOrder();
banned_agent_name_list->deleteAllItems(); banned_agent_name_list->deleteAllItems();
static const auto na = LLTrans::getString("na");
for (LLSD::array_const_iterator it = result["BannedAgents"].beginArray(); it != result["BannedAgents"].endArray(); ++it) for (LLSD::array_const_iterator it = result["BannedAgents"].beginArray(); it != result["BannedAgents"].endArray(); ++it)
{ {
LLSD item; LLSD item;
@@ -4159,14 +4160,14 @@ void LLPanelEstateAccess::onEstateAccessReceived(const LLSD& result)
std::string ban_date = (*it)["ban_date"].asString(); std::string ban_date = (*it)["ban_date"].asString();
columns[2]["column"] = "ban_date"; columns[2]["column"] = "ban_date";
columns[2]["value"] = ban_date[0] != '0' ? ban_date.substr(0, 16) : LLTrans::getString("na"); // server returns the "0000-00-00 00:00:00" date in case it doesn't know it columns[2]["value"] = ban_date[0] != '0' ? ban_date.substr(0, 16) : na; // server returns the "0000-00-00 00:00:00" date in case it doesn't know it
columns[3]["column"] = "bannedby"; columns[3]["column"] = "bannedby";
LLUUID banning_id = (*it)["banning_id"].asUUID(); LLUUID banning_id = (*it)["banning_id"].asUUID();
LLAvatarName av_name; LLAvatarName av_name;
if (banning_id.isNull()) if (banning_id.isNull())
{ {
columns[3]["value"] = LLTrans::getString("na"); columns[3]["value"] = na;
} }
else if (LLAvatarNameCache::get(banning_id, &av_name)) else if (LLAvatarNameCache::get(banning_id, &av_name))
{ {

3
indra/newview/skins/default/xui/en-us/strings.xml
View File

@@ -4828,6 +4828,9 @@ Try enclosing path to the editor with double quotes.
<string name="ExperiencePermissionShort12">Permission</string> <string name="ExperiencePermissionShort12">Permission</string>
<string name="ExperiencePermissionShortUnknown">Unknown: [Permission]</string> <string name="ExperiencePermissionShortUnknown">Unknown: [Permission]</string>
<!-- Statistics -->
<string name="na">n/a</string>
<!-- teleport_strings.xml's strings we need --> <!-- teleport_strings.xml's strings we need -->
<string name="completed_from">Teleport completed from</string> <string name="completed_from">Teleport completed from</string>