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

SOCIAL-661 FIX Receiving Inventory notification in Basic Mode 

SOCIAL-654 FIX Items purchased on Marketplace.secondlife.com while logged into Minimal skin are declined and not present in inventory
meow-7.2.2
Richard Linden 2011-03-14 17:49:11 -07:00
parent 5b7b82d404
commit 6336022ada
5 changed files with 77 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/app_settings/settings.xml
View File

@ -12575,5 +12575,16 @@
<key>Value</key>
<integer>0</integer>
</map>
<key>ShowOfferedInventory</key>
<map>
<key>Comment</key>
<string>Show inventory window with last inventory offer selected when receiving inventory from other users.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
</map>
</llsd>

11
indra/newview/app_settings/settings_minimal.xml
View File

@ -391,5 +391,16 @@
<key>Value</key>
<integer>1</integer>
</map>
<key>ShowOfferedInventory</key>
<map>
<key>Comment</key>
<string>Show inventory window with last inventory offer selected when receiving inventory from other users.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
</map>
</llsd>

19
indra/newview/llviewermessage.cpp
View File

@ -1463,15 +1463,18 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
// This is an offer from an agent. In this case, the back
// end has already copied the items into your inventory,
// so we can fetch it out of our inventory.
LLOpenAgentOffer* open_agent_offer = new LLOpenAgentOffer(mObjectID, from_string);
open_agent_offer->startFetch();
if(catp || (itemp && itemp->isFinished()))
if (gSavedSettings.getBOOL("ShowOfferedInventory"))
{
open_agent_offer->done();
}
else
{
opener = open_agent_offer;
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;
}
}
}
break;

2
indra/newview/skins/minimal/xui/en/notification_visibility.xml
View File

@ -1,7 +1,5 @@
<?xml version="1.0" ?>
<notification_visibility>
<respond name="UserGiveItem" response="Discard"/>
<respond name="ObjectGiveItem" response="Discard"/>
<respond name="VoiceInviteP2P" response="Decline"/>
<respond name="VoiceInviteAdHoc" response="Decline"/>
<respond name="VoiceInviteGroup" response="Decline"/>

44
indra/newview/skins/minimal/xui/en/notifications.xml Normal file
View File

@ -0,0 +1,44 @@
<?xml version="1.0" ?>
<notifications>
<notification
icon="notify.tga"
name="UserGiveItem"
type="offer">
[NAME_SLURL] is offering you [ITEM_SLURL]. Using this item requires you to switch to Advanced mode where you will find the item in your Inventory. To switch to Advanced mode, quit and restart this application and change the mode setting on the login screen.
<form name="form">
<button
index="4"
name="Show"
text="Keep Item"/>
<button
index="1"
name="Discard"
text="Reject Item"/>
<button
index="2"
name="Mute"
text="Block User"/>
</form>
</notification>
<notification
icon="notify.tga"
name="ObjectGiveItem"
type="offer">
An object named &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; owned by [NAME_SLURL] is offering you [ITEM_SLURL]. Using this item requires you to switch to Advanced mode where you will find the item in your Inventory. To switch to Advanced mode, quit and restart this application and change the mode setting on the login screen.
<form name="form">
<button
index="0"
name="Keep"
text="Keep Item"/>
<button
index="1"
name="Discard"
text="Reject Item"/>
<button
index="2"
name="Mute"
text="Block Object"/>
</form>
</notification>
</notifications>