From 62d0a0cdbf076b0d763afe5bf7c6f8ae780f5efb Mon Sep 17 00:00:00 2001
From: Melanie <melanie@t-data.com>
Date: Tue, 6 Dec 2011 22:58:00 +0100
Subject: [PATCH] Remove harmless merge artefact

---
 .../Avatar/Inventory/Transfer/InventoryTransferModule.cs        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
index b33342fcc6..aa211ba179 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
@@ -244,7 +244,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                     im.imSessionID = itemID.Guid;
                 }
 
-                im.offline = 1; // Remember these
+                im.offline = 0;
 
                 // Send the IM to the recipient. The item is already
                 // in their inventory, so it will not be lost if