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

Link owner name in inventory offers from objects

Browse Source
This commit is contained in:
Liru Færs
2020-03-22 10:03:51 -04:00
parent 0511d5903a
commit 4602602a5f
1 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
indra/newview/llviewermessage.cpp
View File

@@ -1512,8 +1512,8 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
{ {
if (mFromGroup) if (mFromGroup)
{ {
std::string group_name; std::string group_name = LLGroupActions::getSLURL(mFromID);
if (gCacheName->getGroupName(mFromID, group_name)) //if (gCacheName->getGroupName(mFromID, group_name))
{ {
from_string = LLTrans::getString("InvOfferAnObjectNamed") + " " + LLTrans::getString("'") from_string = LLTrans::getString("InvOfferAnObjectNamed") + " " + LLTrans::getString("'")
+ mFromName + LLTrans::getString("'") + " " + LLTrans::getString("InvOfferOwnedByGroup") + mFromName + LLTrans::getString("'") + " " + LLTrans::getString("InvOfferOwnedByGroup")
@@ -1522,35 +1522,38 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
chatHistory_string = mFromName + " " + LLTrans::getString("InvOfferOwnedByGroup") chatHistory_string = mFromName + " " + LLTrans::getString("InvOfferOwnedByGroup")
+ " " + group_name + LLTrans::getString("'") + LLTrans::getString("."); + " " + group_name + LLTrans::getString("'") + LLTrans::getString(".");
} }
else /*else
{ {
from_string = LLTrans::getString("InvOfferAnObjectNamed") + " " + LLTrans::getString("'") from_string = LLTrans::getString("InvOfferAnObjectNamed") + " " + LLTrans::getString("'")
+ mFromName + LLTrans::getString("'") + " " + LLTrans::getString("InvOfferOwnedByUnknownGroup"); + mFromName + LLTrans::getString("'") + " " + LLTrans::getString("InvOfferOwnedByUnknownGroup");
chatHistory_string = mFromName + " " + LLTrans::getString("InvOfferOwnedByUnknownGroup") + LLTrans::getString("."); chatHistory_string = mFromName + " " + LLTrans::getString("InvOfferOwnedByUnknownGroup") + LLTrans::getString(".");
} }*/
} }
else else
{ {
std::string full_name; std::string full_name = LLAvatarActions::getSLURL(mFromID);
if (gCacheName->getFullName(mFromID, full_name))
{
// [RLVa:KB] - Version: 1.23.4 | Checked: 2009-07-08 (RLVa-1.0.0e) // [RLVa:KB] - Version: 1.23.4 | Checked: 2009-07-08 (RLVa-1.0.0e)
if ( (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) && (RlvUtil::isNearbyAgent(mFromID)) ) if ( (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) && (RlvUtil::isNearbyAgent(mFromID)) )
{
if (gCacheName->getFullName(mFromID, full_name))
{ {
full_name = RlvStrings::getAnonym(full_name); full_name = RlvStrings::getAnonym(full_name);
} }
from_string = LLTrans::getString("InvOfferAnObjectNamed") + " " + LLTrans::getString("'") + mFromName }
+ LLTrans::getString("'") +" " + LLTrans::getString("InvOfferOwnedBy") + full_name;
chatHistory_string = mFromName + " " + LLTrans::getString("InvOfferOwnedBy") + " " + full_name + LLTrans::getString("."); from_string = LLTrans::getString("InvOfferAnObjectNamed") + " " + LLTrans::getString("'") + mFromName + LLTrans::getString("'") + ' ';
// [/RLVa:KB] chatHistory_string = mFromName + ' ';
//from_string = std::string("An object named '") + mFromName + "' owned by " + first_name + " " + last_name; if (full_name.empty())
//chatHistory_string = mFromName + " owned by " + first_name + " " + last_name; {
from_string += LLTrans::getString("InvOfferOwnedByUnknownUser");
chatHistory_string += LLTrans::getString("InvOfferOwnedByUnknownUser") + LLTrans::getString(".");
} }
else else
// [/RLVa:KB]
{ {
from_string = LLTrans::getString("InvOfferAnObjectNamed") + " " + LLTrans::getString("'") from_string += LLTrans::getString("InvOfferOwnedBy") + full_name;
+ mFromName + LLTrans::getString("'") + " " + LLTrans::getString("InvOfferOwnedByUnknownUser"); chatHistory_string += LLTrans::getString("InvOfferOwnedBy") + " " + full_name + LLTrans::getString(".");
chatHistory_string = mFromName + " " + LLTrans::getString("InvOfferOwnedByUnknownUser") + LLTrans::getString(".");
} }
} }
} }