Merge branch 'master' into careminster-presence-refactor

1 files changed, 5 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
                         destinationItem.InvType = item.InvType;
                         destinationItem.CreatorId = item.CreatorId;
                         destinationItem.CreatorIdAsUuid = item.CreatorIdAsUuid;
+                        destinationItem.CreatorData = item.CreatorData;
                         destinationItem.NextPermissions = item.NextPermissions;
                         destinationItem.CurrentPermissions = item.CurrentPermissions;
                         destinationItem.BasePermissions = item.BasePermissions;
@@ -1754,6 +1755,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                         destinationItem.InvType = item.InvType;
                         destinationItem.CreatorId = item.CreatorId;
                         destinationItem.CreatorIdAsUuid = item.CreatorIdAsUuid;
+                        destinationItem.CreatorData = item.CreatorData;
                         destinationItem.NextPermissions = item.NextPermissions;
                         destinationItem.CurrentPermissions = item.CurrentPermissions;
                         destinationItem.BasePermissions = item.BasePermissions;
@@ -1861,6 +1863,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                     destinationItem.InvType = item.InvType;
                     destinationItem.CreatorId = item.CreatorId;
                     destinationItem.CreatorIdAsUuid = item.CreatorIdAsUuid;
+                    destinationItem.CreatorData = item.CreatorData;
                     destinationItem.NextPermissions = item.NextPermissions;
                     destinationItem.CurrentPermissions = item.CurrentPermissions;
                     destinationItem.BasePermissions = item.BasePermissions;
@@ -2144,7 +2147,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                                             inventoryItem.InvType = GetIntegerAttribute(item,"invtype",-1);
                                             inventoryItem.CreatorId = GetStringAttribute(item,"creatorid","");
                                             inventoryItem.CreatorIdAsUuid = (UUID)GetStringAttribute(item,"creatoruuid","");
-                                            inventoryItem.NextPermissions = GetUnsignedAttribute(perms,"next",0x7fffffff);
+                                            inventoryItem.CreatorData = GetStringAttribute(item, "creatordata", "");
+                                            inventoryItem.NextPermissions = GetUnsignedAttribute(perms, "next", 0x7fffffff);
                                             inventoryItem.CurrentPermissions = GetUnsignedAttribute(perms,"current",0x7fffffff);
                                             inventoryItem.BasePermissions = GetUnsignedAttribute(perms,"base",0x7fffffff);
                                             inventoryItem.EveryOnePermissions = GetUnsignedAttribute(perms,"everyone",0x7fffffff);