diff options
| author | Melanie | 2011-12-06 22:58:00 +0100 |
|---|---|---|
| committer | Melanie | 2011-12-06 22:58:00 +0100 |
| commit | 62d0a0cdbf076b0d763afe5bf7c6f8ae780f5efb (patch) | |
| tree | a1641a436613e54dbe6b075fc9dea181f3bd8c11 /OpenSim | |
| parent | Fix phantom and temp flags not taking (diff) | |
| download | opensim-SC-62d0a0cdbf076b0d763afe5bf7c6f8ae780f5efb.zip opensim-SC-62d0a0cdbf076b0d763afe5bf7c6f8ae780f5efb.tar.gz opensim-SC-62d0a0cdbf076b0d763afe5bf7c6f8ae780f5efb.tar.bz2 opensim-SC-62d0a0cdbf076b0d763afe5bf7c6f8ae780f5efb.tar.xz | |
Remove harmless merge artefact
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs index b33342f..aa211ba 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 | |||
| 244 | im.imSessionID = itemID.Guid; | 244 | im.imSessionID = itemID.Guid; |
| 245 | } | 245 | } |
| 246 | 246 | ||
| 247 | im.offline = 1; // Remember these | 247 | im.offline = 0; |
| 248 | 248 | ||
| 249 | // Send the IM to the recipient. The item is already | 249 | // Send the IM to the recipient. The item is already |
| 250 | // in their inventory, so it will not be lost if | 250 | // in their inventory, so it will not be lost if |