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/ApplicationPlugins/RemoteController | |
| 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/ApplicationPlugins/RemoteController')
| -rw-r--r-- | OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index 15adb99..c09252a 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |||
| @@ -1584,6 +1584,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
| 1584 | destinationItem.InvType = item.InvType; | 1584 | destinationItem.InvType = item.InvType; |
| 1585 | destinationItem.CreatorId = item.CreatorId; | 1585 | destinationItem.CreatorId = item.CreatorId; |
| 1586 | destinationItem.CreatorIdAsUuid = item.CreatorIdAsUuid; | 1586 | destinationItem.CreatorIdAsUuid = item.CreatorIdAsUuid; |
| 1587 | destinationItem.CreatorData = item.CreatorData; | ||
| 1587 | destinationItem.NextPermissions = item.NextPermissions; | 1588 | destinationItem.NextPermissions = item.NextPermissions; |
| 1588 | destinationItem.CurrentPermissions = item.CurrentPermissions; | 1589 | destinationItem.CurrentPermissions = item.CurrentPermissions; |
| 1589 | destinationItem.BasePermissions = item.BasePermissions; | 1590 | destinationItem.BasePermissions = item.BasePermissions; |
| @@ -1636,6 +1637,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
| 1636 | destinationItem.InvType = item.InvType; | 1637 | destinationItem.InvType = item.InvType; |
| 1637 | destinationItem.CreatorId = item.CreatorId; | 1638 | destinationItem.CreatorId = item.CreatorId; |
| 1638 | destinationItem.CreatorIdAsUuid = item.CreatorIdAsUuid; | 1639 | destinationItem.CreatorIdAsUuid = item.CreatorIdAsUuid; |
| 1640 | destinationItem.CreatorData = item.CreatorData; | ||
| 1639 | destinationItem.NextPermissions = item.NextPermissions; | 1641 | destinationItem.NextPermissions = item.NextPermissions; |
| 1640 | destinationItem.CurrentPermissions = item.CurrentPermissions; | 1642 | destinationItem.CurrentPermissions = item.CurrentPermissions; |
| 1641 | destinationItem.BasePermissions = item.BasePermissions; | 1643 | destinationItem.BasePermissions = item.BasePermissions; |
| @@ -1743,6 +1745,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
| 1743 | destinationItem.InvType = item.InvType; | 1745 | destinationItem.InvType = item.InvType; |
| 1744 | destinationItem.CreatorId = item.CreatorId; | 1746 | destinationItem.CreatorId = item.CreatorId; |
| 1745 | destinationItem.CreatorIdAsUuid = item.CreatorIdAsUuid; | 1747 | destinationItem.CreatorIdAsUuid = item.CreatorIdAsUuid; |
| 1748 | destinationItem.CreatorData = item.CreatorData; | ||
| 1746 | destinationItem.NextPermissions = item.NextPermissions; | 1749 | destinationItem.NextPermissions = item.NextPermissions; |
| 1747 | destinationItem.CurrentPermissions = item.CurrentPermissions; | 1750 | destinationItem.CurrentPermissions = item.CurrentPermissions; |
| 1748 | destinationItem.BasePermissions = item.BasePermissions; | 1751 | destinationItem.BasePermissions = item.BasePermissions; |
| @@ -2026,7 +2029,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
| 2026 | inventoryItem.InvType = GetIntegerAttribute(item,"invtype",-1); | 2029 | inventoryItem.InvType = GetIntegerAttribute(item,"invtype",-1); |
| 2027 | inventoryItem.CreatorId = GetStringAttribute(item,"creatorid",""); | 2030 | inventoryItem.CreatorId = GetStringAttribute(item,"creatorid",""); |
| 2028 | inventoryItem.CreatorIdAsUuid = (UUID)GetStringAttribute(item,"creatoruuid",""); | 2031 | inventoryItem.CreatorIdAsUuid = (UUID)GetStringAttribute(item,"creatoruuid",""); |
| 2029 | inventoryItem.NextPermissions = GetUnsignedAttribute(perms,"next",0x7fffffff); | 2032 | inventoryItem.CreatorData = GetStringAttribute(item, "creatordata", ""); |
| 2033 | inventoryItem.NextPermissions = GetUnsignedAttribute(perms, "next", 0x7fffffff); | ||
| 2030 | inventoryItem.CurrentPermissions = GetUnsignedAttribute(perms,"current",0x7fffffff); | 2034 | inventoryItem.CurrentPermissions = GetUnsignedAttribute(perms,"current",0x7fffffff); |
| 2031 | inventoryItem.BasePermissions = GetUnsignedAttribute(perms,"base",0x7fffffff); | 2035 | inventoryItem.BasePermissions = GetUnsignedAttribute(perms,"base",0x7fffffff); |
| 2032 | inventoryItem.EveryOnePermissions = GetUnsignedAttribute(perms,"everyone",0x7fffffff); | 2036 | inventoryItem.EveryOnePermissions = GetUnsignedAttribute(perms,"everyone",0x7fffffff); |