FIRE-3234 / FIRE-3832: Add silent agent inventory offer actions to legacy accept messages & separate show <-> accept

Wed, 07 Jan 2015 13:23:22 +0100

author
Ansariel
date
Wed, 07 Jan 2015 13:23:22 +0100
changeset 43107
f6a5c7440b7c
parent 43106
f3934808b579
child 43108
d905bf006059

FIRE-3234 / FIRE-3832: Add silent agent inventory offer actions to legacy accept messages & separate show <-> accept

This commit addresses several issues with inventory offers:

1. When enabling legacy accept messages, the notification now allows to perform
silent actions without notifying the sender. This has been implemented only
for legacy style accept messages, because the V3-way will notify the sender
automatically if the offer is received, so that it doesn't make any sense to
add this feature here.

2. Inventory offers from agents now allows to choose between either accepting
the offer OR accepting and showing. This is independent from the ShowNewInventory
debug setting ("Automatically show new notecards, textures, landmarks after
accepting"). However, due to the way inventory offers from groups or inworld
objects work, there is no separation and accepting offers from these sources
will still either open automatically or not, depending on the ShowNewInventory
setting.

3. The debug setting ShowOfferedInventory that was exposed nowhere and therefore
always TRUE has been made obsolete. Since ShowOfferedInventory is tied to
inventory offers from agents, there is no need for this setting anymore, as
inventory offers from agents now show separate options for showing or just
accepting. If an inventory offers is shown depends on either the user's
choice per agent inventory offer or the ShowNewInventory debug setting.

4. Removed the check for ShowNewInventory in check_offer_throttle() as it will
be called by open_inventory_offer(). Instead, check for ShowNewInventory
before actually trying to open an inventory offer.

5. Fix the inventory panel still jumping to the new item despite the debug
setting ShowInInventory has been set to FALSE. The new item will now only be
shown in inventory, if ShowInInventory is TRUE. If the inventory panel is
closed, it will be opened.

indra/newview/llviewerinventory.cpp file | annotate | diff | revisions
indra/newview/llviewermessage.cpp file | annotate | diff | revisions
indra/newview/llviewermessage.h file | annotate | diff | revisions
indra/newview/skins/default/xui/da/notifications.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/de/notifications.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/en/notifications.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/es/notifications.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/fr/notifications.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/it/notifications.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/ja/notifications.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/pl/notifications.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/pt/notifications.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/ru/notifications.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/tr/notifications.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/zh/notifications.xml file | annotate | diff | revisions
     1.1 --- a/indra/newview/llviewerinventory.cpp	Wed Jan 07 01:34:44 2015 +0100
     1.2 +++ b/indra/newview/llviewerinventory.cpp	Wed Jan 07 13:23:22 2015 +0100
     1.3 @@ -247,7 +247,17 @@
     1.4  			uuid_vec_t items_to_open;
     1.5  			items_to_open.push_back(inventory_id);
     1.6  			//inventory_handler is just a stub, because we don't know from who this offer
     1.7 -			open_inventory_offer(items_to_open, "inventory_handler");
     1.8 +			// <FS:Ansariel> Moved check out of check_offer_throttle
     1.9 +			//open_inventory_offer(items_to_open, "inventory_handler");
    1.10 +			if (gSavedSettings.getBOOL("ShowNewInventory"))
    1.11 +			{
    1.12 +				open_inventory_offer(items_to_open, "inventory_handler");
    1.13 +			}
    1.14 +			else if (!items_to_open.empty() && gSavedSettings.getBOOL("ShowInInventory"))
    1.15 +			{
    1.16 +				LLInventoryPanel::openInventoryPanelAndSetSelection(TRUE, items_to_open.back());
    1.17 +			}
    1.18 +			// </FS:Ansariel>
    1.19  			return true;
    1.20  		}
    1.21  		
     2.1 --- a/indra/newview/llviewermessage.cpp	Wed Jan 07 01:34:44 2015 +0100
     2.2 +++ b/indra/newview/llviewermessage.cpp	Wed Jan 07 13:23:22 2015 +0100
     2.3 @@ -853,6 +853,9 @@
     2.4  	}
     2.5  	/*virtual*/ void done()
     2.6  	{
     2.7 +		// <FS:Ansariel> FIRE-3234: Don't need a check for ShowNewInventory here;
     2.8 +		// This only gets called if the user explicity clicks "Show" or
     2.9 +		// AutoAcceptNewInventory and ShowNewInventory are TRUE.
    2.10  		open_inventory_offer(mComplete, mFromName);
    2.11  		gInventory.removeObserver(this);
    2.12  		delete this;
    2.13 @@ -1089,7 +1092,17 @@
    2.14  			else ++it;
    2.15  		}
    2.16  
    2.17 -		open_inventory_offer(mAdded, "");
    2.18 +		// <FS:Ansariel> Moved check out of check_offer_throttle
    2.19 +		//open_inventory_offer(mAdded, "");
    2.20 +		if (gSavedSettings.getBOOL("ShowNewInventory"))
    2.21 +		{
    2.22 +			open_inventory_offer(mAdded, "");
    2.23 +		}
    2.24 +		else if (!mAdded.empty() && gSavedSettings.getBOOL("ShowInInventory"))
    2.25 +		{
    2.26 +			LLInventoryPanel::openInventoryPanelAndSetSelection(TRUE, mAdded.back());
    2.27 +		}
    2.28 +		// </FS:Ansariel>
    2.29  		mAdded.clear();
    2.30  	}
    2.31   };
    2.32 @@ -1099,7 +1112,17 @@
    2.33  protected:
    2.34  	/*virtual*/ void done()
    2.35  	{
    2.36 -		open_inventory_offer(mAdded, "group_offer");
    2.37 +		// <FS:Ansariel> Moved check out of check_offer_throttle
    2.38 +		//open_inventory_offer(mAdded, "group_offer");
    2.39 +		if (gSavedSettings.getBOOL("ShowNewInventory"))
    2.40 +		{
    2.41 +			open_inventory_offer(mAdded, "group_offer");
    2.42 +		}
    2.43 +		else if (!mAdded.empty() && gSavedSettings.getBOOL("ShowInInventory"))
    2.44 +		{
    2.45 +			LLInventoryPanel::openInventoryPanelAndSetSelection(TRUE, mAdded.back());
    2.46 +		}
    2.47 +		// </FS:Ansariel>
    2.48  		mAdded.clear();
    2.49  		gInventory.removeObserver(this);
    2.50  		delete this;
    2.51 @@ -1184,12 +1207,10 @@
    2.52  	LLChat chat;
    2.53  	std::string log_message;
    2.54  
    2.55 -	// <FS:PP> gSavedSettings to LLCachedControl
    2.56 -	// if (!gSavedSettings.getBOOL("ShowNewInventory"))
    2.57 -	static LLCachedControl<bool> showNewInventory(gSavedSettings, "ShowNewInventory");
    2.58 -	if (!showNewInventory)
    2.59 -	// </FS:PP>
    2.60 -		return false;
    2.61 +	// <FS:Ansariel> This controls if items should be opened in open_inventory_offer()??? No way!
    2.62 +	//if (!gSavedSettings.getBOOL("ShowNewInventory"))
    2.63 +	//	return false;
    2.64 +	// </FS:Ansariel>
    2.65  
    2.66  	if (check_only)
    2.67  	{
    2.68 @@ -1412,6 +1433,8 @@
    2.69  		const BOOL auto_open = gSavedSettings.getBOOL("ShowInInventory"); // AO: don't open if showininventory is false, otherwise ignore from_name.
    2.70  			//gSavedSettings.getBOOL("ShowInInventory") && // don't open if showininventory is false
    2.71  			//!from_name.empty(); // don't open if it's not from anyone.
    2.72 +		// <FS:Ansariel> Don't mess with open inventory panels when ShowInInventory is FALSE
    2.73 +		if (auto_open)
    2.74  		LLInventoryPanel::openInventoryPanelAndSetSelection(auto_open, obj_id);
    2.75  	}
    2.76  }
    2.77 @@ -1466,6 +1489,7 @@
    2.78  		{
    2.79  			if(notification->getName() == "ObjectGiveItem" 
    2.80  				|| notification->getName() == "OwnObjectGiveItem"
    2.81 +				|| notification->getName() == "UserGiveItemLegacy" // <FS:Ansariel> FIRE-3832: Silent accept/decline of inventory offers
    2.82  				|| notification->getName() == "UserGiveItem")
    2.83  			{
    2.84  				return (notification->getPayload()["from_id"].asUUID() == blocked_id);
    2.85 @@ -1678,6 +1702,7 @@
    2.86  	switch(button)
    2.87  	{
    2.88  	case IOR_SHOW:
    2.89 +	case IOR_SHOW_SILENT: // <FS:Ansariel> FIRE-3832: Silent accept/decline of inventory offers
    2.90  		// we will want to open this item when it comes back.
    2.91  		LL_DEBUGS("Messaging") << "Initializing an opener for tid: " << mTransactionID
    2.92  				 << LL_ENDL;
    2.93 @@ -1700,7 +1725,10 @@
    2.94  				}
    2.95  // [/RLVa:KB]
    2.96  
    2.97 -				if (gSavedSettings.getBOOL("ShowOfferedInventory"))
    2.98 +				// <FS:Ansariel> FIRE-3234: Ask if items should be previewed;
    2.99 +				// ShowOfferedInventory is always true anyway - instead there is
   2.100 +				// ShowNewInventory that is actually changable by the user!
   2.101 +				//if (gSavedSettings.getBOOL("ShowOfferedInventory"))
   2.102  				{
   2.103  					LLOpenAgentOffer* open_agent_offer = new LLOpenAgentOffer(mObjectID, from_string);
   2.104  					open_agent_offer->startFetch();
   2.105 @@ -1715,7 +1743,7 @@
   2.106  				}
   2.107  
   2.108  				// <FS:Ansariel> Optional V1-like inventory accept messages
   2.109 -				if (gSavedSettings.getBOOL("FSUseLegacyInventoryAcceptMessages"))
   2.110 +				if (gSavedSettings.getBOOL("FSUseLegacyInventoryAcceptMessages") && button == IOR_SHOW)
   2.111  				{
   2.112  					send_auto_receive_response();
   2.113  				}
   2.114 @@ -1746,6 +1774,7 @@
   2.115  		// end switch (mIM)
   2.116  			
   2.117  	case IOR_ACCEPT:
   2.118 +	case IOR_ACCEPT_SILENT: // <FS:Ansariel> FIRE-3832: Silent accept/decline of inventory offers
   2.119  		//don't spam them if they are getting flooded
   2.120  		if (check_offer_throttle(mFromName, true))
   2.121  		{
   2.122 @@ -1755,6 +1784,17 @@
   2.123  			LLNotificationsUtil::add("SystemMessageTip", args);
   2.124  		}
   2.125  
   2.126 +		// <FS:Ansariel> FIRE-3832: Silent accept/decline of inventory offers
   2.127 +		if (gSavedSettings.getBOOL("FSUseLegacyInventoryAcceptMessages") && button == IOR_ACCEPT)
   2.128 +		{
   2.129 +			send_auto_receive_response();
   2.130 +		}
   2.131 +		if (gSavedSettings.getBOOL("ShowInInventory"))
   2.132 +		{
   2.133 +			LLInventoryPanel::openInventoryPanelAndSetSelection(TRUE, mObjectID);
   2.134 +		}
   2.135 +		// </FS:Ansariel>
   2.136 +
   2.137  		break;
   2.138  
   2.139  	case IOR_MUTE:
   2.140 @@ -1764,6 +1804,7 @@
   2.141  		}
   2.142  		// MUTE falls through to decline
   2.143  	case IOR_DECLINE:
   2.144 +	case IOR_DECLINE_SILENT: // <FS:Ansariel> FIRE-3832: Silent accept/decline of inventory offers
   2.145  		{
   2.146  			{
   2.147  				LLStringUtil::format_map_t log_message_args;
   2.148 @@ -1793,7 +1834,7 @@
   2.149  			}
   2.150  
   2.151  			// <FS:Ansariel> Optional V1-like inventory accept messages
   2.152 -			if (gSavedSettings.getBOOL("FSUseLegacyInventoryAcceptMessages"))
   2.153 +			if (gSavedSettings.getBOOL("FSUseLegacyInventoryAcceptMessages") && button == IOR_DECLINE)
   2.154  			{
   2.155  				send_decline_response();
   2.156  			}
   2.157 @@ -2086,6 +2127,8 @@
   2.158  		mRespondFunctions["ObjectGiveItem"] = boost::bind(&LLOfferInfo::inventory_task_offer_callback, this, _1, _2);
   2.159  		mRespondFunctions["OwnObjectGiveItem"] = boost::bind(&LLOfferInfo::inventory_task_offer_callback, this, _1, _2);
   2.160  		mRespondFunctions["UserGiveItem"] = boost::bind(&LLOfferInfo::inventory_offer_callback, this, _1, _2);
   2.161 +		// <FS:Ansariel> FIRE-3832: Silent accept/decline of inventory offers
   2.162 +		mRespondFunctions["UserGiveItemLegacy"] = boost::bind(&LLOfferInfo::inventory_offer_callback, this, _1, _2);
   2.163  	}
   2.164  }
   2.165  
   2.166 @@ -2233,7 +2276,10 @@
   2.167  		// closes viewer(without responding the notification)
   2.168  		p.substitutions(args).payload(payload).functor.responder(LLNotificationResponderPtr(info));
   2.169  		info->mPersist = true;
   2.170 -		p.name = "UserGiveItem";
   2.171 +		// <FS:Ansariel> FIRE-3832: Silent accept/decline of inventory offers
   2.172 +		//p.name = "UserGiveItem";
   2.173 +		p.name = (gSavedSettings.getBOOL("FSUseLegacyInventoryAcceptMessages") ? "UserGiveItemLegacy" : "UserGiveItem");
   2.174 +		// </FS:Ansariel>
   2.175  		p.offer_from_agent = true;
   2.176  		
   2.177  		// Prefetch the item into your local inventory.
   2.178 @@ -2272,7 +2318,7 @@
   2.179  		}
   2.180  
   2.181  		// <FS:Ansariel> Show offered inventory also if auto-accept is enabled (FIRE-5101)
   2.182 -		if (bAutoAccept && gSavedSettings.getBOOL("ShowOfferedInventory"))
   2.183 +		if (bAutoAccept && gSavedSettings.getBOOL("ShowNewInventory"))
   2.184  		{
   2.185  			LLViewerInventoryCategory* catp = NULL;
   2.186  			catp = (LLViewerInventoryCategory*)gInventory.getCategory(info->mObjectID);
     3.1 --- a/indra/newview/llviewermessage.h	Wed Jan 07 01:34:44 2015 +0100
     3.2 +++ b/indra/newview/llviewermessage.h	Wed Jan 07 13:23:22 2015 +0100
     3.3 @@ -60,7 +60,12 @@
     3.4  	IOR_ACCEPT,
     3.5  	IOR_DECLINE,
     3.6  	IOR_MUTE,
     3.7 -	IOR_SHOW
     3.8 +	IOR_SHOW,
     3.9 +	// <FS:Ansariel> FIRE-3832: Silent accept/decline of inventory offers
    3.10 +	IOR_ACCEPT_SILENT,
    3.11 +	IOR_DECLINE_SILENT,
    3.12 +	IOR_SHOW_SILENT
    3.13 +	// </FS:Ansariel>
    3.14  };
    3.15  
    3.16  BOOL can_afford_transaction(S32 cost);
     4.1 --- a/indra/newview/skins/default/xui/da/notifications.xml	Wed Jan 07 01:34:44 2015 +0100
     4.2 +++ b/indra/newview/skins/default/xui/da/notifications.xml	Wed Jan 07 13:23:22 2015 +0100
     4.3 @@ -1346,10 +1346,24 @@
     4.4  [ITEM_SLURL]
     4.5  		<form name="form">
     4.6  			<button name="Show" text="Vis"/>
     4.7 +			<button name="Keep" text="Behold"/>
     4.8  			<button name="Discard" text="Smid væk"/>
     4.9  			<button name="Mute" text="Blokér"/>
    4.10  		</form>
    4.11  	</notification>
    4.12 +	<notification name="UserGiveItemLegacy">
    4.13 +		[NAME_SLURL] har givet dig denne/dette [OBJECTTYPE]:
    4.14 +[ITEM_SLURL]
    4.15 +		<form name="form">
    4.16 +			<button name="Show" text="Vis"/>
    4.17 +			<button name="Accept" text="Behold"/>
    4.18 +			<button name="Discard" text="Smid væk"/>
    4.19 +			<button name="ShowSilent" text="(Vis)"/>
    4.20 +			<button name="AcceptSilent" text="(Behold)"/>
    4.21 +			<button name="DiscardSilent" text="(Smid væk)"/>
    4.22 +			<button name="Mute" text="Blokér"/>
    4.23 +		</form>
    4.24 +	</notification>
    4.25  	<notification name="GodMessage">
    4.26  		[NAME]
    4.27  
     5.1 --- a/indra/newview/skins/default/xui/de/notifications.xml	Wed Jan 07 01:34:44 2015 +0100
     5.2 +++ b/indra/newview/skins/default/xui/de/notifications.xml	Wed Jan 07 13:23:22 2015 +0100
     5.3 @@ -2800,11 +2800,25 @@
     5.4  		[NAME_SLURL] hat Ihnen folgendes [OBJECTTYPE] übergeben:
     5.5  [ITEM_SLURL]
     5.6  		<form name="form">
     5.7 -			<button name="Show" text="Annehmen"/>
     5.8 +			<button name="Show" text="Anzeigen"/>
     5.9 +			<button name="Keep" text="Annehmen"/>
    5.10  			<button name="Discard" text="Verwerfen"/>
    5.11  			<button name="Mute" text="Blockieren"/>
    5.12  		</form>
    5.13  	</notification>
    5.14 +	<notification name="UserGiveItemLegacy">
    5.15 +		[NAME_SLURL] hat Ihnen folgendes [OBJECTTYPE] übergeben:
    5.16 +[ITEM_SLURL]
    5.17 +		<form name="form">
    5.18 +			<button name="Show" text="Anzeigen"/>
    5.19 +			<button name="Accept" text="Annehmen"/>
    5.20 +			<button name="Discard" text="Verwerfen"/>
    5.21 +			<button name="ShowSilent" text="(Anzeigen)"/>
    5.22 +			<button name="AcceptSilent" text="(Annehmen)"/>
    5.23 +			<button name="DiscardSilent" text="(Verwerfen)"/>
    5.24 +			<button name="Mute" text="Blockieren"/>
    5.25 +		</form>
    5.26 +	</notification>
    5.27  	<notification name="GodMessage">
    5.28  		[NAME]
    5.29  
     6.1 --- a/indra/newview/skins/default/xui/en/notifications.xml	Wed Jan 07 01:34:44 2015 +0100
     6.2 +++ b/indra/newview/skins/default/xui/en/notifications.xml	Wed Jan 07 13:23:22 2015 +0100
     6.3 @@ -7194,6 +7194,10 @@
     6.4        <button
     6.5         index="3"
     6.6         name="Show"
     6.7 +       text="Show"/>
     6.8 +      <button
     6.9 +       index="0"
    6.10 +       name="Keep"
    6.11         text="Accept"/>
    6.12        <button
    6.13         index="1"
    6.14 @@ -7208,6 +7212,48 @@
    6.15  
    6.16    <notification
    6.17     icon="notify.tga"
    6.18 +   name="UserGiveItemLegacy"
    6.19 +   label="Inventory offer from [NAME_LABEL]"
    6.20 +   log_to_im ="true"
    6.21 +   type="offer"
    6.22 +   sound="UISndInventoryOffer">
    6.23 +[NAME_SLURL] has given you this [OBJECTTYPE]:
    6.24 +[ITEM_SLURL]
    6.25 +Do you want to keep it? "Mute" will block all future offers or messages from [NAME_SLURL].
    6.26 +    <form name="form">
    6.27 +      <button
    6.28 +       index="3"
    6.29 +       name="Show"
    6.30 +       text="Show"/>
    6.31 +      <button
    6.32 +       index="0"
    6.33 +       name="Accept"
    6.34 +       text="Accept"/>
    6.35 +      <button
    6.36 +       index="1"
    6.37 +       name="Discard"
    6.38 +       text="Discard"/>
    6.39 +      <button
    6.40 +       index="6"
    6.41 +       name="ShowSilent"
    6.42 +       text="(Show)"/>
    6.43 +      <button
    6.44 +       index="4"
    6.45 +       name="AcceptSilent"
    6.46 +       text="(Accept)"/>
    6.47 +      <button
    6.48 +       index="5"
    6.49 +       name="DiscardSilent"
    6.50 +       text="(Discard)"/>
    6.51 +      <button
    6.52 +       index="2"
    6.53 +       name="Mute"
    6.54 +       text="Mute Sender"/>
    6.55 +    </form>
    6.56 +  </notification>
    6.57 +
    6.58 +  <notification
    6.59 +   icon="notify.tga"
    6.60     name="GodMessage"
    6.61     persist="true"
    6.62     type="notify">
     7.1 --- a/indra/newview/skins/default/xui/es/notifications.xml	Wed Jan 07 01:34:44 2015 +0100
     7.2 +++ b/indra/newview/skins/default/xui/es/notifications.xml	Wed Jan 07 13:23:22 2015 +0100
     7.3 @@ -2907,10 +2907,24 @@
     7.4  [ITEM_SLURL]
     7.5  		<form name="form">
     7.6  			<button name="Show" text="Mostrar"/>
     7.7 +			<button name="Keep" text="Guardar"/>
     7.8  			<button name="Discard" text="Descartar"/>
     7.9  			<button name="Mute" text="Bloquear"/>
    7.10  		</form>
    7.11  	</notification>
    7.12 +	<notification name="UserGiveItemLegacy">
    7.13 +		[NAME_SLURL] te ha dado este [OBJECTTYPE]:
    7.14 +[ITEM_SLURL]
    7.15 +		<form name="form">
    7.16 +			<button name="Show" text="Mostrar"/>
    7.17 +			<button name="Accept" text="Guardar"/>
    7.18 +			<button name="Discard" text="Descartar"/>
    7.19 +			<button name="ShowSilent" text="(Mostrar)"/>
    7.20 +			<button name="AcceptSilent" text="(Guardar)"/>
    7.21 +			<button name="DiscardSilent" text="(Descartar)"/>
    7.22 +			<button name="Mute" text="Bloquear"/>
    7.23 +		</form>
    7.24 +	</notification>
    7.25  	<notification name="GodMessage">
    7.26  		[NAME]
    7.27  
     8.1 --- a/indra/newview/skins/default/xui/fr/notifications.xml	Wed Jan 07 01:34:44 2015 +0100
     8.2 +++ b/indra/newview/skins/default/xui/fr/notifications.xml	Wed Jan 07 13:23:22 2015 +0100
     8.3 @@ -2664,10 +2664,24 @@
     8.4  [ITEM_SLURL]
     8.5  		<form name="form">
     8.6  			<button name="Show" text="Afficher"/>
     8.7 +			<button name="Keep" text="Garder"/>
     8.8  			<button name="Discard" text="Jeter"/>
     8.9  			<button name="Mute" text="Ignorer"/>
    8.10  		</form>
    8.11  	</notification>
    8.12 +	<notification name="UserGiveItemLegacy">
    8.13 +		[NAME_SLURL] vous a donné un [OBJECTTYPE] :
    8.14 +[ITEM_SLURL]
    8.15 +		<form name="form">
    8.16 +			<button name="Show" text="Afficher"/>
    8.17 +			<button name="Accept" text="Garder"/>
    8.18 +			<button name="Discard" text="Jeter"/>
    8.19 +			<button name="ShowSilent" text="(Afficher)"/>
    8.20 +			<button name="AcceptSilent" text="(Garder)"/>
    8.21 +			<button name="DiscardSilent" text="(Jeter)"/>
    8.22 +			<button name="Mute" text="Ignorer"/>
    8.23 +		</form>
    8.24 +	</notification>
    8.25  	<notification name="GodMessage">
    8.26  		[NAME]
    8.27  
     9.1 --- a/indra/newview/skins/default/xui/it/notifications.xml	Wed Jan 07 01:34:44 2015 +0100
     9.2 +++ b/indra/newview/skins/default/xui/it/notifications.xml	Wed Jan 07 13:23:22 2015 +0100
     9.3 @@ -2670,10 +2670,24 @@
     9.4  [ITEM_SLURL]
     9.5  		<form name="form">
     9.6  			<button name="Show" text="Mostra"/>
     9.7 +			<button name="Keep" text="Mantieni"/>
     9.8  			<button name="Discard" text="Rifiuta"/>
     9.9  			<button name="Mute" text="Blocca"/>
    9.10  		</form>
    9.11  	</notification>
    9.12 +	<notification name="UserGiveItemLegacy">
    9.13 +		[NAME_SLURL] ti ha dato questo [OBJECTTYPE]:
    9.14 +[ITEM_SLURL]
    9.15 +		<form name="form">
    9.16 +			<button name="Show" text="Mostra"/>
    9.17 +			<button name="Accept" text="Mantieni"/>
    9.18 +			<button name="Discard" text="Rifiuta"/>
    9.19 +			<button name="ShowSilent" text="(Mostra)"/>
    9.20 +			<button name="AcceptSilent" text="(Mantieni)"/>
    9.21 +			<button name="DiscardSilent" text="(Rifiuta)"/>
    9.22 +			<button name="Mute" text="Blocca"/>
    9.23 +		</form>
    9.24 +	</notification>
    9.25  	<notification name="GodMessage">
    9.26  		[NAME]
    9.27  
    10.1 --- a/indra/newview/skins/default/xui/ja/notifications.xml	Wed Jan 07 01:34:44 2015 +0100
    10.2 +++ b/indra/newview/skins/default/xui/ja/notifications.xml	Wed Jan 07 13:23:22 2015 +0100
    10.3 @@ -2742,10 +2742,24 @@
    10.4  [ITEM_SLURL]
    10.5  		<form name="form">
    10.6  			<button name="Show" text="表示"/>
    10.7 +			<button name="Keep" text="キープ"/>
    10.8  			<button name="Discard" text="破棄"/>
    10.9  			<button name="Mute" text="ブロック"/>
   10.10  		</form>
   10.11  	</notification>
   10.12 +	<notification name="UserGiveItemLegacy">
   10.13 +		[NAME_SLURL] があなたに [OBJECTTYPE] を渡しました:
   10.14 +[ITEM_SLURL]
   10.15 +		<form name="form">
   10.16 +			<button name="Show" text="表示"/>
   10.17 +			<button name="Accept" text="キープ"/>
   10.18 +			<button name="Discard" text="破棄"/>
   10.19 +			<button name="ShowSilent" text="(表示)"/>
   10.20 +			<button name="AcceptSilent" text="キープ"/>
   10.21 +			<button name="DiscardSilent" text="破棄"/>
   10.22 +			<button name="Mute" text="ブロック"/>
   10.23 +		</form>
   10.24 +	</notification>
   10.25  	<notification name="GodMessage">
   10.26  		[NAME]
   10.27  
    11.1 --- a/indra/newview/skins/default/xui/pl/notifications.xml	Wed Jan 07 01:34:44 2015 +0100
    11.2 +++ b/indra/newview/skins/default/xui/pl/notifications.xml	Wed Jan 07 13:23:22 2015 +0100
    11.3 @@ -2724,10 +2724,25 @@
    11.4  Chcesz zachować ten obiekt? Wybranie "Zablokuj" sprawi, że nie będziesz już otrzymywać żadnych ofert lub wiadomości od [NAME_SLURL].
    11.5  		<form name="form">
    11.6  			<button name="Show" text="Pokaż"/>
    11.7 +			<button name="Keep" text="Zachowaj"/>
    11.8  			<button name="Discard" text="Wyrzuć"/>
    11.9  			<button name="Mute" text="Zablokuj"/>
   11.10  		</form>
   11.11  	</notification>
   11.12 +	<notification name="UserGiveItemLegacy" label="Propozycja przedmiotu od [NAME_LABEL]">
   11.13 +		[NAME_SLURL] dał Ci [OBJECTTYPE]:
   11.14 +[ITEM_SLURL]
   11.15 +Chcesz zachować ten obiekt? Wybranie "Zablokuj" sprawi, że nie będziesz już otrzymywać żadnych ofert lub wiadomości od [NAME_SLURL].
   11.16 +		<form name="form">
   11.17 +			<button name="Show" text="Pokaż"/>
   11.18 +			<button name="Accept" text="Zachowaj"/>
   11.19 +			<button name="Discard" text="Verwerfen"/>
   11.20 +			<button name="ShowSilent" text="(Wyrzuć)"/>
   11.21 +			<button name="AcceptSilent" text="(Zachowaj)"/>
   11.22 +			<button name="DiscardSilent" text="(Wyrzuć)"/>
   11.23 +			<button name="Mute" text="Zablokuj"/>
   11.24 +		</form>
   11.25 +	</notification>
   11.26  	<notification name="JoinGroup">
   11.27  		[MESSAGE]
   11.28  		<form name="form">
    12.1 --- a/indra/newview/skins/default/xui/pt/notifications.xml	Wed Jan 07 01:34:44 2015 +0100
    12.2 +++ b/indra/newview/skins/default/xui/pt/notifications.xml	Wed Jan 07 13:23:22 2015 +0100
    12.3 @@ -2654,10 +2654,24 @@
    12.4  [ITEM_SLURL]
    12.5  		<form name="form">
    12.6  			<button name="Show" text="Mostrar"/>
    12.7 +			<button name="Keep" text="Manter"/>
    12.8  			<button name="Discard" text="Descarte"/>
    12.9  			<button name="Mute" text="Bloquear"/>
   12.10  		</form>
   12.11  	</notification>
   12.12 +	<notification name="UserGiveItemLegacy">
   12.13 +		[NAME_SLURL] lhe deu [OBJECTTYPE]:
   12.14 +[ITEM_SLURL]
   12.15 +		<form name="form">
   12.16 +			<button name="Show" text="Mostrar"/>
   12.17 +			<button name="Accept" text="Manter"/>
   12.18 +			<button name="Discard" text="Verwerfen"/>
   12.19 +			<button name="ShowSilent" text="(Descarte)"/>
   12.20 +			<button name="AcceptSilent" text="(Manter)"/>
   12.21 +			<button name="DiscardSilent" text="(Descarte)"/>
   12.22 +			<button name="Mute" text="Bloquear"/>
   12.23 +		</form>
   12.24 +	</notification>
   12.25  	<notification name="GodMessage">
   12.26  		[NAME]
   12.27  
    13.1 --- a/indra/newview/skins/default/xui/ru/notifications.xml	Wed Jan 07 01:34:44 2015 +0100
    13.2 +++ b/indra/newview/skins/default/xui/ru/notifications.xml	Wed Jan 07 13:23:22 2015 +0100
    13.3 @@ -2664,10 +2664,24 @@
    13.4  [ITEM_SLURL]
    13.5  		<form name="form">
    13.6  			<button name="Show" text="Показать"/>
    13.7 +			<button name="Keep" text="Оставить"/>
    13.8  			<button name="Discard" text="Удалить"/>
    13.9  			<button name="Mute" text="Заблокировать"/>
   13.10  		</form>
   13.11  	</notification>
   13.12 +	<notification name="UserGiveItemLegacy">
   13.13 +		[NAME_SLURL] дал(а) вам этот [OBJECTTYPE]:
   13.14 +[ITEM_SLURL]
   13.15 +		<form name="form">
   13.16 +			<button name="Show" text="Показать"/>
   13.17 +			<button name="Accept" text="Оставить"/>
   13.18 +			<button name="Discard" text="Удалить"/>
   13.19 +			<button name="ShowSilent" text="(Показать)"/>
   13.20 +			<button name="AcceptSilent" text="(Оставить)"/>
   13.21 +			<button name="DiscardSilent" text="(Удалить)"/>
   13.22 +			<button name="Mute" text="Заблокировать"/>
   13.23 +		</form>
   13.24 +	</notification>
   13.25  	<notification name="GodMessage">
   13.26  		[NAME]
   13.27  
    14.1 --- a/indra/newview/skins/default/xui/tr/notifications.xml	Wed Jan 07 01:34:44 2015 +0100
    14.2 +++ b/indra/newview/skins/default/xui/tr/notifications.xml	Wed Jan 07 13:23:22 2015 +0100
    14.3 @@ -2664,10 +2664,24 @@
    14.4  [ITEM_SLURL]
    14.5  		<form name="form">
    14.6  			<button name="Show" text="Göster"/>
    14.7 +			<button name="Keep" text="Sakla"/>
    14.8  			<button name="Discard" text="At"/>
    14.9  			<button name="Mute" text="Engelle"/>
   14.10  		</form>
   14.11  	</notification>
   14.12 +	<notification name="UserGiveItemLegacy">
   14.13 +		[NAME_SLURL] size [OBJECTTYPE] türündeki nesneyi verdi:
   14.14 +[ITEM_SLURL]
   14.15 +		<form name="form">
   14.16 +			<button name="Show" text="Göster"/>
   14.17 +			<button name="Accept" text="Sakla"/>
   14.18 +			<button name="Discard" text="At"/>
   14.19 +			<button name="ShowSilent" text="(Göster)"/>
   14.20 +			<button name="AcceptSilent" text="(Sakla)"/>
   14.21 +			<button name="DiscardSilent" text="(At)"/>
   14.22 +			<button name="Mute" text="Engelle"/>
   14.23 +		</form>
   14.24 +	</notification>
   14.25  	<notification name="GodMessage">
   14.26  		[NAME]
   14.27  
    15.1 --- a/indra/newview/skins/default/xui/zh/notifications.xml	Wed Jan 07 01:34:44 2015 +0100
    15.2 +++ b/indra/newview/skins/default/xui/zh/notifications.xml	Wed Jan 07 13:23:22 2015 +0100
    15.3 @@ -2654,10 +2654,24 @@
    15.4  [ITEM_SLURL]
    15.5  		<form name="form">
    15.6  			<button name="Show" text="顯示"/>
    15.7 +			<button name="Keep" text="保留"/>
    15.8  			<button name="Discard" text="丟棄"/>
    15.9  			<button name="Mute" text="封鎖"/>
   15.10  		</form>
   15.11  	</notification>
   15.12 +	<notification name="UserGiveItemLegacy">
   15.13 +		[NAME_SLURL] 給了你這個 [OBJECTTYPE]:
   15.14 +[ITEM_SLURL]
   15.15 +		<form name="form">
   15.16 +			<button name="Show" text="顯示"/>
   15.17 +			<button name="Accept" text="保留"/>
   15.18 +			<button name="Discard" text="丟棄"/>
   15.19 +			<button name="ShowSilent" text="(顯示)"/>
   15.20 +			<button name="AcceptSilent" text="(保留)"/>
   15.21 +			<button name="DiscardSilent" text="(丟棄)"/>
   15.22 +			<button name="Mute" text="封鎖"/>
   15.23 +		</form>
   15.24 +	</notification>
   15.25  	<notification name="GodMessage">
   15.26  		[NAME]
   15.27  

mercurial