Fix cross-grid inventory delivery notifications, fixes http://opensimulator.org/mantis/view.php?id=7113

author: BlueWall 2015-02-21 14:28:31 -0500
committer: BlueWall 2015-02-21 14:29:31 -0500
commit: 023fd71ce5084d0f44dad1a8ff23472e0cfb4702 (patch)
tree: 4cabaf49417cf0c7bb24abcfb477d6494fb26634 /OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
parent: In HGAssetMapper.RewriteSOP(), don't explicitly end the document. (diff)
download: opensim-SC_OLD-023fd71ce5084d0f44dad1a8ff23472e0cfb4702.zip
opensim-SC_OLD-023fd71ce5084d0f44dad1a8ff23472e0cfb4702.tar.gz
opensim-SC_OLD-023fd71ce5084d0f44dad1a8ff23472e0cfb4702.tar.bz2
opensim-SC_OLD-023fd71ce5084d0f44dad1a8ff23472e0cfb4702.tar.xz
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
index c632798..c88141c 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
@@ -455,6 +455,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
        {
            // Check if it's a type of message that we should handle
            if (!((im.dialog == (byte) InstantMessageDialog.InventoryOffered)
+                || (im.dialog == (byte) InstantMessageDialog.TaskInventoryOffered)
                || (im.dialog == (byte) InstantMessageDialog.InventoryAccepted)
                || (im.dialog == (byte) InstantMessageDialog.InventoryDeclined)
                || (im.dialog == (byte) InstantMessageDialog.TaskInventoryDeclined)))
author	BlueWall	2015-02-21 14:28:31 -0500
committer	BlueWall	2015-02-21 14:29:31 -0500
commit	023fd71ce5084d0f44dad1a8ff23472e0cfb4702 (patch)
tree	4cabaf49417cf0c7bb24abcfb477d6494fb26634 /OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
parent	In HGAssetMapper.RewriteSOP(), don't explicitly end the document. (diff)
download	opensim-SC_OLD-023fd71ce5084d0f44dad1a8ff23472e0cfb4702.zip opensim-SC_OLD-023fd71ce5084d0f44dad1a8ff23472e0cfb4702.tar.gz opensim-SC_OLD-023fd71ce5084d0f44dad1a8ff23472e0cfb4702.tar.bz2 opensim-SC_OLD-023fd71ce5084d0f44dad1a8ff23472e0cfb4702.tar.xz

diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs index c632798..c88141c 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
@@ -455,6 +455,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
455	{	455	{
456	// Check if it's a type of message that we should handle	456	// Check if it's a type of message that we should handle
457	if (!((im.dialog == (byte) InstantMessageDialog.InventoryOffered)	457	if (!((im.dialog == (byte) InstantMessageDialog.InventoryOffered)
		458	\|\| (im.dialog == (byte) InstantMessageDialog.TaskInventoryOffered)
458	\|\| (im.dialog == (byte) InstantMessageDialog.InventoryAccepted)	459	\|\| (im.dialog == (byte) InstantMessageDialog.InventoryAccepted)
459	\|\| (im.dialog == (byte) InstantMessageDialog.InventoryDeclined)	460	\|\| (im.dialog == (byte) InstantMessageDialog.InventoryDeclined)
460	\|\| (im.dialog == (byte) InstantMessageDialog.TaskInventoryDeclined)))	461	\|\| (im.dialog == (byte) InstantMessageDialog.TaskInventoryDeclined)))