diff options
| author | Jonathan Freedman | 2010-11-21 20:01:48 -0800 |
|---|---|---|
| committer | Jonathan Freedman | 2010-11-21 20:01:48 -0800 |
| commit | b7f5e8284360f92e0e102b9546076573c57d9397 (patch) | |
| tree | 132663da8c1882e524241b55a739ef2758ef8958 /OpenSim/Services/InventoryService | |
| parent | Merge https://github.com/opensim/opensim into mantis5110 (diff) | |
| parent | Merge branch 'master' of /var/git/opensim/ (diff) | |
| download | opensim-SC_OLD-b7f5e8284360f92e0e102b9546076573c57d9397.zip opensim-SC_OLD-b7f5e8284360f92e0e102b9546076573c57d9397.tar.gz opensim-SC_OLD-b7f5e8284360f92e0e102b9546076573c57d9397.tar.bz2 opensim-SC_OLD-b7f5e8284360f92e0e102b9546076573c57d9397.tar.xz | |
Merge branch 'master-core' into mantis5110
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 fb395ec..e602412 100644 --- a/OpenSim/Services/InventoryService/XInventoryService.cs +++ b/OpenSim/Services/InventoryService/XInventoryService.cs | |||
| @@ -524,7 +524,7 @@ namespace OpenSim.Services.InventoryService | |||
| 524 | newItem.ID = item.inventoryID; | 524 | newItem.ID = item.inventoryID; |
| 525 | newItem.InvType = item.invType; | 525 | newItem.InvType = item.invType; |
| 526 | newItem.Folder = item.parentFolderID; | 526 | newItem.Folder = item.parentFolderID; |
| 527 | newItem.CreatorId = item.creatorID; | 527 | newItem.CreatorIdentification = item.creatorID; |
| 528 | newItem.Description = item.inventoryDescription; | 528 | newItem.Description = item.inventoryDescription; |
| 529 | newItem.NextPermissions = (uint)item.inventoryNextPermissions; | 529 | newItem.NextPermissions = (uint)item.inventoryNextPermissions; |
| 530 | newItem.CurrentPermissions = (uint)item.inventoryCurrentPermissions; | 530 | newItem.CurrentPermissions = (uint)item.inventoryCurrentPermissions; |
| @@ -555,7 +555,7 @@ namespace OpenSim.Services.InventoryService | |||
| 555 | newItem.inventoryID = item.ID; | 555 | newItem.inventoryID = item.ID; |
| 556 | newItem.invType = item.InvType; | 556 | newItem.invType = item.InvType; |
| 557 | newItem.parentFolderID = item.Folder; | 557 | newItem.parentFolderID = item.Folder; |
| 558 | newItem.creatorID = item.CreatorId; | 558 | newItem.creatorID = item.CreatorIdentification; |
| 559 | newItem.inventoryDescription = item.Description; | 559 | newItem.inventoryDescription = item.Description; |
| 560 | newItem.inventoryNextPermissions = (int)item.NextPermissions; | 560 | newItem.inventoryNextPermissions = (int)item.NextPermissions; |
| 561 | newItem.inventoryCurrentPermissions = (int)item.CurrentPermissions; | 561 | newItem.inventoryCurrentPermissions = (int)item.CurrentPermissions; |