diff options
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/ApplicationPlugins')
-rw-r--r-- | OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | 6 | ||||
-rw-r--r-- | OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index 3a4f729..7b931d7 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |||
@@ -1702,6 +1702,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
1702 | destinationItem.InvType = item.InvType; | 1702 | destinationItem.InvType = item.InvType; |
1703 | destinationItem.CreatorId = item.CreatorId; | 1703 | destinationItem.CreatorId = item.CreatorId; |
1704 | destinationItem.CreatorIdAsUuid = item.CreatorIdAsUuid; | 1704 | destinationItem.CreatorIdAsUuid = item.CreatorIdAsUuid; |
1705 | destinationItem.CreatorData = item.CreatorData; | ||
1705 | destinationItem.NextPermissions = item.NextPermissions; | 1706 | destinationItem.NextPermissions = item.NextPermissions; |
1706 | destinationItem.CurrentPermissions = item.CurrentPermissions; | 1707 | destinationItem.CurrentPermissions = item.CurrentPermissions; |
1707 | destinationItem.BasePermissions = item.BasePermissions; | 1708 | destinationItem.BasePermissions = item.BasePermissions; |
@@ -1754,6 +1755,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
1754 | destinationItem.InvType = item.InvType; | 1755 | destinationItem.InvType = item.InvType; |
1755 | destinationItem.CreatorId = item.CreatorId; | 1756 | destinationItem.CreatorId = item.CreatorId; |
1756 | destinationItem.CreatorIdAsUuid = item.CreatorIdAsUuid; | 1757 | destinationItem.CreatorIdAsUuid = item.CreatorIdAsUuid; |
1758 | destinationItem.CreatorData = item.CreatorData; | ||
1757 | destinationItem.NextPermissions = item.NextPermissions; | 1759 | destinationItem.NextPermissions = item.NextPermissions; |
1758 | destinationItem.CurrentPermissions = item.CurrentPermissions; | 1760 | destinationItem.CurrentPermissions = item.CurrentPermissions; |
1759 | destinationItem.BasePermissions = item.BasePermissions; | 1761 | destinationItem.BasePermissions = item.BasePermissions; |
@@ -1861,6 +1863,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
1861 | destinationItem.InvType = item.InvType; | 1863 | destinationItem.InvType = item.InvType; |
1862 | destinationItem.CreatorId = item.CreatorId; | 1864 | destinationItem.CreatorId = item.CreatorId; |
1863 | destinationItem.CreatorIdAsUuid = item.CreatorIdAsUuid; | 1865 | destinationItem.CreatorIdAsUuid = item.CreatorIdAsUuid; |
1866 | destinationItem.CreatorData = item.CreatorData; | ||
1864 | destinationItem.NextPermissions = item.NextPermissions; | 1867 | destinationItem.NextPermissions = item.NextPermissions; |
1865 | destinationItem.CurrentPermissions = item.CurrentPermissions; | 1868 | destinationItem.CurrentPermissions = item.CurrentPermissions; |
1866 | destinationItem.BasePermissions = item.BasePermissions; | 1869 | destinationItem.BasePermissions = item.BasePermissions; |
@@ -2144,7 +2147,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
2144 | inventoryItem.InvType = GetIntegerAttribute(item,"invtype",-1); | 2147 | inventoryItem.InvType = GetIntegerAttribute(item,"invtype",-1); |
2145 | inventoryItem.CreatorId = GetStringAttribute(item,"creatorid",""); | 2148 | inventoryItem.CreatorId = GetStringAttribute(item,"creatorid",""); |
2146 | inventoryItem.CreatorIdAsUuid = (UUID)GetStringAttribute(item,"creatoruuid",""); | 2149 | inventoryItem.CreatorIdAsUuid = (UUID)GetStringAttribute(item,"creatoruuid",""); |
2147 | inventoryItem.NextPermissions = GetUnsignedAttribute(perms,"next",0x7fffffff); | 2150 | inventoryItem.CreatorData = GetStringAttribute(item, "creatordata", ""); |
2151 | inventoryItem.NextPermissions = GetUnsignedAttribute(perms, "next", 0x7fffffff); | ||
2148 | inventoryItem.CurrentPermissions = GetUnsignedAttribute(perms,"current",0x7fffffff); | 2152 | inventoryItem.CurrentPermissions = GetUnsignedAttribute(perms,"current",0x7fffffff); |
2149 | inventoryItem.BasePermissions = GetUnsignedAttribute(perms,"base",0x7fffffff); | 2153 | inventoryItem.BasePermissions = GetUnsignedAttribute(perms,"base",0x7fffffff); |
2150 | inventoryItem.EveryOnePermissions = GetUnsignedAttribute(perms,"everyone",0x7fffffff); | 2154 | inventoryItem.EveryOnePermissions = GetUnsignedAttribute(perms,"everyone",0x7fffffff); |
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs index a4135db..c3cf08c 100644 --- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs +++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs | |||
@@ -1295,6 +1295,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory | |||
1295 | rdata.writer.WriteAttributeString("folder", String.Empty, i.Folder.ToString()); | 1295 | rdata.writer.WriteAttributeString("folder", String.Empty, i.Folder.ToString()); |
1296 | rdata.writer.WriteAttributeString("owner", String.Empty, i.Owner.ToString()); | 1296 | rdata.writer.WriteAttributeString("owner", String.Empty, i.Owner.ToString()); |
1297 | rdata.writer.WriteAttributeString("creator", String.Empty, i.CreatorId); | 1297 | rdata.writer.WriteAttributeString("creator", String.Empty, i.CreatorId); |
1298 | rdata.writer.WriteAttributeString("creatordata", String.Empty, i.CreatorData); | ||
1298 | rdata.writer.WriteAttributeString("creationdate", String.Empty, i.CreationDate.ToString()); | 1299 | rdata.writer.WriteAttributeString("creationdate", String.Empty, i.CreationDate.ToString()); |
1299 | rdata.writer.WriteAttributeString("invtype", String.Empty, i.InvType.ToString()); | 1300 | rdata.writer.WriteAttributeString("invtype", String.Empty, i.InvType.ToString()); |
1300 | rdata.writer.WriteAttributeString("assettype", String.Empty, i.AssetType.ToString()); | 1301 | rdata.writer.WriteAttributeString("assettype", String.Empty, i.AssetType.ToString()); |