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

Inventory offers should link offerer avatar/group name

Browse Source
This commit is contained in:
Liru Færs
2020-01-17 23:44:41 -05:00
parent 2ffc99aecf
commit e9d28ee5c1
2 changed files with 8 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
indra/newview/llviewermessage.cpp
View File

@@ -1894,34 +1894,24 @@ void inventory_offer_handler(LLOfferInfo* info, bool is_friend, bool is_owned_by
// Name cache callbacks don't store userdata, so can't save
// off the LLOfferInfo. Argh.
BOOL name_found = FALSE;
payload["from_id"] = info->mFromID;
args["OBJECTFROMNAME"] = info->mFromName;
args["NAME"] = info->mFromName;
if (info->mFromGroup)
{
std::string group_name;
if (gCacheName->getGroupName(info->mFromID, group_name))
{
args["NAME"] = group_name;
name_found = TRUE;
}
args["NAME"] = LLGroupActions::getSLURL(info->mFromID);
}
else
{
std::string full_name;
if (gCacheName->getFullName(info->mFromID, full_name))
{
std::string full_name = LLAvatarActions::getSLURL(info->mFromID);
// [RLVa:KB] - Checked: 2010-11-02 (RLVa-1.2.2a) | Modified: RLVa-1.2.2a
// Only filter if the object owner is a nearby agent
if ( (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) && (RlvUtil::isNearbyAgent(info->mFromID)) )
{
full_name = RlvStrings::getAnonym(full_name);
}
// [/RLVa:KB]
args["NAME"] = full_name;
name_found = TRUE;
if ( (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) && (RlvUtil::isNearbyAgent(info->mFromID)) )
{
full_name = RlvStrings::getAnonym(full_name);
}
// [/RLVa:KB]
args["NAME"] = full_name;
}
@@ -1931,7 +1921,7 @@ void inventory_offer_handler(LLOfferInfo* info, bool is_friend, bool is_owned_by
// Object -> Agent Inventory Offer
if (info->mFromObject)
{
p.name = name_found ? "ObjectGiveItem" : "ObjectGiveItemUnknownUser";
p.name = "ObjectGiveItem";
}
else // Agent -> Agent Inventory Offer
{

21
indra/newview/skins/default/xui/en-us/notifications.xml
View File

@@ -7436,27 +7436,6 @@ An object named [OBJECTFROMNAME] owned by [NAME] has given you a [OBJECTTYPE] na
</form>
</notification>
<notification
icon="notify.tga"
name="ObjectGiveItemUnknownUser"
type="notify">
An object named [OBJECTFROMNAME] owned by (an unknown user) has given you a [OBJECTTYPE] named [OBJECTNAME].
<form name="form">
<button
index="0"
name="Keep"
text="Keep"/>
<button
index="1"
name="Discard"
text="Discard"/>
<button
index="2"
name="Mute"
text="Mute"/>
</form>
</notification>
<notification
icon="notify.tga"
name="UserGiveItem"