diff options
author | Diva Canto | 2009-08-18 22:17:47 -0700 |
---|---|---|
committer | Diva Canto | 2009-08-18 22:17:47 -0700 |
commit | 124f66bfc25984a01491b8447fa97bea2633281c (patch) | |
tree | 9f6ba47c216457b39a2e5c7bb921e41afa71d795 /OpenSim/Region/CoreModules/Avatar/Inventory/Transfer | |
parent | Added new OpenSim.ini setting: "client_throttle_max_bps" which overrides user... (diff) | |
download | opensim-SC_OLD-124f66bfc25984a01491b8447fa97bea2633281c.zip opensim-SC_OLD-124f66bfc25984a01491b8447fa97bea2633281c.tar.gz opensim-SC_OLD-124f66bfc25984a01491b8447fa97bea2633281c.tar.bz2 opensim-SC_OLD-124f66bfc25984a01491b8447fa97bea2633281c.tar.xz |
jhurliman's patch in http://opensimulator.org/mantis/view.php?id=4024
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Inventory/Transfer')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs index 5315c11..3a65336 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs | |||
@@ -257,8 +257,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
257 | invService.GetFolderForType(client.AgentId, AssetType.TrashFolder); | 257 | invService.GetFolderForType(client.AgentId, AssetType.TrashFolder); |
258 | 258 | ||
259 | UUID inventoryEntityID = new UUID(im.imSessionID); // The inventory item/folder, back from it's trip | 259 | UUID inventoryEntityID = new UUID(im.imSessionID); // The inventory item/folder, back from it's trip |
260 | 260 | ||
261 | InventoryItemBase item = invService.GetItem(new InventoryItemBase(inventoryEntityID)); | 261 | InventoryItemBase item = new InventoryItemBase(inventoryEntityID, client.AgentId); |
262 | item = invService.GetItem(item); | ||
262 | InventoryFolderBase folder = null; | 263 | InventoryFolderBase folder = null; |
263 | 264 | ||
264 | if (item != null && trashFolder != null) | 265 | if (item != null && trashFolder != null) |
@@ -271,7 +272,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
271 | } | 272 | } |
272 | else | 273 | else |
273 | { | 274 | { |
274 | folder = invService.GetFolder(new InventoryFolderBase(inventoryEntityID)); | 275 | folder = new InventoryFolderBase(inventoryEntityID, client.AgentId); |
276 | folder = invService.GetFolder(folder); | ||
275 | 277 | ||
276 | if (folder != null & trashFolder != null) | 278 | if (folder != null & trashFolder != null) |
277 | { | 279 | { |
@@ -451,10 +453,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
451 | else | 453 | else |
452 | { | 454 | { |
453 | UUID itemID = new UUID(msg.binaryBucket, 1); | 455 | UUID itemID = new UUID(msg.binaryBucket, 1); |
454 | InventoryItemBase item = new InventoryItemBase(); | 456 | InventoryItemBase item = new InventoryItemBase(itemID, user.ControllingClient.AgentId); |
455 | |||
456 | item.ID = itemID; | ||
457 | item.Owner = user.ControllingClient.AgentId; | ||
458 | 457 | ||
459 | // Fetch from service | 458 | // Fetch from service |
460 | // | 459 | // |