livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge changes for storm-2010

meow-7.2.2
Oz Linden 2014-03-06 14:55:11 -05:00
parent 43eae43798 3e5fb8a274
commit 208d9a2d21
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/contributions.txt
View File

@ -965,6 +965,7 @@ Nicky Dasmijn
OPEN-187
STORM-1937
OPEN-187
STORM-2010
Nicky Perian
OPEN-1
STORM-1087

13
indra/newview/llviewermessage.cpp
View File

@ -1876,6 +1876,7 @@ void inventory_offer_handler(LLOfferInfo* info)
return;
}
bool bAutoAccept(false);
// Avoid the Accept/Discard dialog if the user so desires. JC
if (gSavedSettings.getBOOL("AutoAcceptNewInventory")
&& (info->mType == LLAssetType::AT_NOTECARD
@ -1884,8 +1885,7 @@ void inventory_offer_handler(LLOfferInfo* info)
{
// For certain types, just accept the items into the inventory,
// and possibly open them on receipt depending upon "ShowNewInventory".
info->forceResponse(IOR_ACCEPT);
return;
bAutoAccept = true;
}
// Strip any SLURL from the message display. (DEV-2754)
@ -1953,7 +1953,7 @@ void inventory_offer_handler(LLOfferInfo* info)
LLNotification::Params p;
// Object -> Agent Inventory Offer
if (info->mFromObject)
if (info->mFromObject && !bAutoAccept)
{
// Inventory Slurls don't currently work for non agent transfers, so only display the object name.
args["ITEM_SLURL"] = msg;
@ -1999,11 +1999,12 @@ void inventory_offer_handler(LLOfferInfo* info)
send_do_not_disturb_message(gMessageSystem, info->mFromID);
}
// Inform user that there is a script floater via toast system
if( !bAutoAccept ) // if we auto accept, do not pester the user
{
// Inform user that there is a script floater via toast system
payload["give_inventory_notification"] = TRUE;
p.payload = payload;
LLPostponedNotification::add<LLPostponedOfferNotification>(p, info->mFromID, false);
p.payload = payload;
LLPostponedNotification::add<LLPostponedOfferNotification>(p, info->mFromID, false);
}
}