Remove harmless merge artefact

2011-12-06 22:58:00 +01:00 · 2011-12-06 22:58:00 +01:00 · 62d0a0cdbf
parent 5490a3e549
commit 62d0a0cdbf
1 changed files with 1 additions and 1 deletions
--- 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