diff options
| author | Melanie | 2012-11-17 02:03:24 +0000 |
|---|---|---|
| committer | Melanie | 2012-11-17 02:03:24 +0000 |
| commit | e4659a83f15acc85a7207a1ff60460cae0b86b78 (patch) | |
| tree | d0fc79b1cbdb15ce9296f05aacf696c9ad43bc41 /OpenSim/ApplicationPlugins | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Remove old InventoryService, which has for a long time been replaced by XInve... (diff) | |
| download | opensim-SC_OLD-e4659a83f15acc85a7207a1ff60460cae0b86b78.zip opensim-SC_OLD-e4659a83f15acc85a7207a1ff60460cae0b86b78.tar.gz opensim-SC_OLD-e4659a83f15acc85a7207a1ff60460cae0b86b78.tar.bz2 opensim-SC_OLD-e4659a83f15acc85a7207a1ff60460cae0b86b78.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/ApplicationPlugins')
| -rw-r--r-- | OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index 9c933ee..3d80eb6 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |||
| @@ -2448,7 +2448,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
| 2448 | destinationItem.Description = item.Description; | 2448 | destinationItem.Description = item.Description; |
| 2449 | destinationItem.InvType = item.InvType; | 2449 | destinationItem.InvType = item.InvType; |
| 2450 | destinationItem.CreatorId = item.CreatorId; | 2450 | destinationItem.CreatorId = item.CreatorId; |
| 2451 | destinationItem.CreatorIdAsUuid = item.CreatorIdAsUuid; | ||
| 2452 | destinationItem.CreatorData = item.CreatorData; | 2451 | destinationItem.CreatorData = item.CreatorData; |
| 2453 | destinationItem.NextPermissions = item.NextPermissions; | 2452 | destinationItem.NextPermissions = item.NextPermissions; |
| 2454 | destinationItem.CurrentPermissions = item.CurrentPermissions; | 2453 | destinationItem.CurrentPermissions = item.CurrentPermissions; |
| @@ -2503,7 +2502,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
| 2503 | destinationItem.Description = item.Description; | 2502 | destinationItem.Description = item.Description; |
| 2504 | destinationItem.InvType = item.InvType; | 2503 | destinationItem.InvType = item.InvType; |
| 2505 | destinationItem.CreatorId = item.CreatorId; | 2504 | destinationItem.CreatorId = item.CreatorId; |
| 2506 | destinationItem.CreatorIdAsUuid = item.CreatorIdAsUuid; | ||
| 2507 | destinationItem.CreatorData = item.CreatorData; | 2505 | destinationItem.CreatorData = item.CreatorData; |
| 2508 | destinationItem.NextPermissions = item.NextPermissions; | 2506 | destinationItem.NextPermissions = item.NextPermissions; |
| 2509 | destinationItem.CurrentPermissions = item.CurrentPermissions; | 2507 | destinationItem.CurrentPermissions = item.CurrentPermissions; |
| @@ -2616,7 +2614,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
| 2616 | destinationItem.Description = item.Description; | 2614 | destinationItem.Description = item.Description; |
| 2617 | destinationItem.InvType = item.InvType; | 2615 | destinationItem.InvType = item.InvType; |
| 2618 | destinationItem.CreatorId = item.CreatorId; | 2616 | destinationItem.CreatorId = item.CreatorId; |
| 2619 | destinationItem.CreatorIdAsUuid = item.CreatorIdAsUuid; | ||
| 2620 | destinationItem.CreatorData = item.CreatorData; | 2617 | destinationItem.CreatorData = item.CreatorData; |
| 2621 | destinationItem.NextPermissions = item.NextPermissions; | 2618 | destinationItem.NextPermissions = item.NextPermissions; |
| 2622 | destinationItem.CurrentPermissions = item.CurrentPermissions; | 2619 | destinationItem.CurrentPermissions = item.CurrentPermissions; |
| @@ -2922,7 +2919,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
| 2922 | inventoryItem.Description = GetStringAttribute(item,"desc",""); | 2919 | inventoryItem.Description = GetStringAttribute(item,"desc",""); |
| 2923 | inventoryItem.InvType = GetIntegerAttribute(item,"invtype",-1); | 2920 | inventoryItem.InvType = GetIntegerAttribute(item,"invtype",-1); |
| 2924 | inventoryItem.CreatorId = GetStringAttribute(item,"creatorid",""); | 2921 | inventoryItem.CreatorId = GetStringAttribute(item,"creatorid",""); |
| 2925 | inventoryItem.CreatorIdAsUuid = (UUID)GetStringAttribute(item,"creatoruuid",""); | ||
| 2926 | inventoryItem.CreatorData = GetStringAttribute(item, "creatordata", ""); | 2922 | inventoryItem.CreatorData = GetStringAttribute(item, "creatordata", ""); |
| 2927 | inventoryItem.NextPermissions = GetUnsignedAttribute(perms, "next", 0x7fffffff); | 2923 | inventoryItem.NextPermissions = GetUnsignedAttribute(perms, "next", 0x7fffffff); |
| 2928 | inventoryItem.CurrentPermissions = GetUnsignedAttribute(perms,"current",0x7fffffff); | 2924 | inventoryItem.CurrentPermissions = GetUnsignedAttribute(perms,"current",0x7fffffff); |