From 20ee6cdb726fe0be2ccb13d71d5bfc5cdbd3ee67 Mon Sep 17 00:00:00 2001 From: Salvatore La Bua Date: Thu, 10 Oct 2013 20:12:35 +0200 Subject: [PATCH 1/2] Add silent keep/discard inventory offer buttons Adapted from Phoenix code --- indra/newview/llviewermessage.cpp | 25 ++++++++++++++++++ .../skins/default/xui/en-us/notifications.xml | 26 +++++++++++++------ 2 files changed, 43 insertions(+), 8 deletions(-) diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 39faf5c61..fbecc880f 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -1603,6 +1603,31 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD& } // end switch (mIM) break; + case -2: // decline silently + { + log_message = "You silently decline " + mDesc + " from " + mFromName + "."; + chat.mText = log_message; + LLFloaterChat::addChatHistory(chat); + } + break; + case -1: // accept silently + { + LLOpenAgentOffer* open_agent_offer = new LLOpenAgentOffer(mObjectID, from_string); + open_agent_offer->startFetch(); + if(catp || (itemp && itemp->isFinished())) + { + open_agent_offer->done(); + } + else + { + opener = open_agent_offer; + } + log_message = "You silently accept " + mDesc + " from " + mFromName + "."; + chat.mText = log_message; + LLFloaterChat::addChatHistory(chat); + } + break; + case IOR_BUSY: //Busy falls through to decline. Says to make busy message. busy=TRUE; diff --git a/indra/newview/skins/default/xui/en-us/notifications.xml b/indra/newview/skins/default/xui/en-us/notifications.xml index c1d04f6be..a7ce30b3e 100644 --- a/indra/newview/skins/default/xui/en-us/notifications.xml +++ b/indra/newview/skins/default/xui/en-us/notifications.xml @@ -6721,7 +6721,25 @@ An object named [OBJECTFROMNAME] owned by (an unknown user) has given you a [OBJ name="UserGiveItem" type="notify"> [NAME] has given you a [OBJECTTYPE] named '[OBJECTNAME]'. + +(Keep)/(Discard) won't send an accepted/declined message.
+