diff options
| author | Melanie | 2010-06-09 16:48:37 +0100 |
|---|---|---|
| committer | Melanie | 2010-06-09 16:48:37 +0100 |
| commit | 6b2d2413f7026c41e7abb55c72c583670cb6011d (patch) | |
| tree | 6596f0132d36f74f2e57c9b1bd891d95eb0e5a33 /OpenSim/Services/InventoryService | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| parent | Add the BEGIN; I had missed (diff) | |
| download | opensim-SC-6b2d2413f7026c41e7abb55c72c583670cb6011d.zip opensim-SC-6b2d2413f7026c41e7abb55c72c583670cb6011d.tar.gz opensim-SC-6b2d2413f7026c41e7abb55c72c583670cb6011d.tar.bz2 opensim-SC-6b2d2413f7026c41e7abb55c72c583670cb6011d.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Services/InventoryService')
| -rw-r--r-- | OpenSim/Services/InventoryService/XInventoryService.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Services/InventoryService/XInventoryService.cs b/OpenSim/Services/InventoryService/XInventoryService.cs index 974caf0..af831fd 100644 --- a/OpenSim/Services/InventoryService/XInventoryService.cs +++ b/OpenSim/Services/InventoryService/XInventoryService.cs | |||
| @@ -460,7 +460,7 @@ namespace OpenSim.Services.InventoryService | |||
| 460 | newItem.ID = item.inventoryID; | 460 | newItem.ID = item.inventoryID; |
| 461 | newItem.InvType = item.invType; | 461 | newItem.InvType = item.invType; |
| 462 | newItem.Folder = item.parentFolderID; | 462 | newItem.Folder = item.parentFolderID; |
| 463 | newItem.CreatorId = item.creatorID.ToString(); | 463 | newItem.CreatorId = item.creatorID; |
| 464 | newItem.Description = item.inventoryDescription; | 464 | newItem.Description = item.inventoryDescription; |
| 465 | newItem.NextPermissions = (uint)item.inventoryNextPermissions; | 465 | newItem.NextPermissions = (uint)item.inventoryNextPermissions; |
| 466 | newItem.CurrentPermissions = (uint)item.inventoryCurrentPermissions; | 466 | newItem.CurrentPermissions = (uint)item.inventoryCurrentPermissions; |
| @@ -491,7 +491,7 @@ namespace OpenSim.Services.InventoryService | |||
| 491 | newItem.inventoryID = item.ID; | 491 | newItem.inventoryID = item.ID; |
| 492 | newItem.invType = item.InvType; | 492 | newItem.invType = item.InvType; |
| 493 | newItem.parentFolderID = item.Folder; | 493 | newItem.parentFolderID = item.Folder; |
| 494 | newItem.creatorID = item.CreatorIdAsUuid; | 494 | newItem.creatorID = item.CreatorId; |
| 495 | newItem.inventoryDescription = item.Description; | 495 | newItem.inventoryDescription = item.Description; |
| 496 | newItem.inventoryNextPermissions = (int)item.NextPermissions; | 496 | newItem.inventoryNextPermissions = (int)item.NextPermissions; |
| 497 | newItem.inventoryCurrentPermissions = (int)item.CurrentPermissions; | 497 | newItem.inventoryCurrentPermissions = (int)item.CurrentPermissions; |