aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs6
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs1
2 files changed, 6 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);
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());