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

Fix handle_secondlifeprotocol.sh, and sync with v-d.

Browse Source 
More translation strings~
Log inventory offers to those we're not chatting with.
"SDL deiconification state switched to " now lldebugs instead of llinfos, far too spammy..

(Pre-outbox commit, may contain pieces of outbox work.. and unmentioned harmless sync)
This commit is contained in:
Lirusaito
2012-11-06 18:50:45 -05:00
parent ad97c72821
commit d0a0aa7a65
12 changed files with 329 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llinventorybridge.cpp
View File

@@ -5106,6 +5106,7 @@ std::string LLObjectBridge::getLabelSuffix() const
{
return LLItemBridge::getLabelSuffix() + LLTrans::getString("worn");
}
bool unsupportedPoint = false; //Unsupported points are given special names, translate them as they're named, not later.
std::string attachment_point_name = gAgentAvatarp->getAttachedPointName(mUUID);
if (attachment_point_name == LLStringUtil::null) // Error condition, invalid attach point
{
@@ -5116,13 +5117,14 @@ std::string LLObjectBridge::getLabelSuffix() const
{
if((*iter).second.first == mUUID)
{
attachment_point_name = llformat("unsupported point %d)", (*iter).first);
attachment_point_name = llformat((LLTrans::getString("unsupported point")+" %d)").c_str(), (*iter).first);
}
}
unsupportedPoint = attachment_point_name != "Invalid Attachment";
}
// e.g. "(worn on ...)" / "(attached to ...)"
LLStringUtil::format_map_t args;
args["[ATTACHMENT_POINT]"] = attachment_point_name;
args["[ATTACHMENT_POINT]"] = unsupportedPoint ? attachment_point_name : LLTrans::getString(attachment_point_name);
if(gRlvAttachmentLocks.canDetach(getItem()))
return LLItemBridge::getLabelSuffix() + LLTrans::getString("WornOnAttachmentPoint", args);