remove bad merge from master

1 files changed, 0 insertions, 12 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
index 2d15b47..085328c 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
@@ -470,18 +470,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
         /// <param name="im"></param>
         private void OnGridInstantMessage(GridInstantMessage im)
         {
-            // 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)))
-                return;
-
-            m_log.DebugFormat(
-                "[INVENTORY TRANSFER]: {0} IM type received from grid. From={1} ({2}), To={3}",
-                (InstantMessageDialog)im.dialog, im.fromAgentID, im.fromAgentName, im.toAgentID);
-
             // Check if this is ours to handle
             //
             Scene scene = FindClientScene(new UUID(im.toAgentID));