Merge branch 'master' into careminster-presence-refactor

1 files changed, 2 insertions, 2 deletions

diff --git a/OpenSim/Services/InventoryService/XInventoryService.cs b/OpenSim/Services/InventoryService/XInventoryService.cs
index 974caf0..af831fd 100644
--- a/OpenSim/Services/InventoryService/XInventoryService.cs
+++ b/OpenSim/Services/InventoryService/XInventoryService.cs
@@ -460,7 +460,7 @@ namespace OpenSim.Services.InventoryService
             newItem.ID = item.inventoryID;
             newItem.InvType = item.invType;
             newItem.Folder = item.parentFolderID;
-            newItem.CreatorId = item.creatorID.ToString();
+            newItem.CreatorId = item.creatorID;
             newItem.Description = item.inventoryDescription;
             newItem.NextPermissions = (uint)item.inventoryNextPermissions;
             newItem.CurrentPermissions = (uint)item.inventoryCurrentPermissions;
@@ -491,7 +491,7 @@ namespace OpenSim.Services.InventoryService
             newItem.inventoryID = item.ID;
             newItem.invType = item.InvType;
             newItem.parentFolderID = item.Folder;
-            newItem.creatorID = item.CreatorIdAsUuid;
+            newItem.creatorID = item.CreatorId;
             newItem.inventoryDescription = item.Description;
             newItem.inventoryNextPermissions = (int)item.NextPermissions;
             newItem.inventoryCurrentPermissions = (int)item.CurrentPermissions;