Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim

author: Melanie 2010-06-09 03:52:24 +0100
committer: Melanie 2010-06-09 03:52:24 +0100
commit: 796e9b5cb48f1077f5c6ef85a6b2b0bfe3b907e7 (patch)
tree: 068bd7280922296c764cccfe05e12dcaadc7bd45 /OpenSim/Services/InventoryService/XInventoryService.cs
parent: If a script is deleted before it gets compiled, don't even bother to try (diff)
parent: Refactor SendCoarseLocations for better performance. Instead of computing lis... (diff)
download: opensim-SC_OLD-796e9b5cb48f1077f5c6ef85a6b2b0bfe3b907e7.zip
opensim-SC_OLD-796e9b5cb48f1077f5c6ef85a6b2b0bfe3b907e7.tar.gz
opensim-SC_OLD-796e9b5cb48f1077f5c6ef85a6b2b0bfe3b907e7.tar.bz2
opensim-SC_OLD-796e9b5cb48f1077f5c6ef85a6b2b0bfe3b907e7.tar.xz
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;
author	Melanie	2010-06-09 03:52:24 +0100
committer	Melanie	2010-06-09 03:52:24 +0100
commit	796e9b5cb48f1077f5c6ef85a6b2b0bfe3b907e7 (patch)
tree	068bd7280922296c764cccfe05e12dcaadc7bd45 /OpenSim/Services/InventoryService/XInventoryService.cs
parent	If a script is deleted before it gets compiled, don't even bother to try (diff)
parent	Refactor SendCoarseLocations for better performance. Instead of computing lis... (diff)
download	opensim-SC_OLD-796e9b5cb48f1077f5c6ef85a6b2b0bfe3b907e7.zip opensim-SC_OLD-796e9b5cb48f1077f5c6ef85a6b2b0bfe3b907e7.tar.gz opensim-SC_OLD-796e9b5cb48f1077f5c6ef85a6b2b0bfe3b907e7.tar.bz2 opensim-SC_OLD-796e9b5cb48f1077f5c6ef85a6b2b0bfe3b907e7.tar.xz

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
460	newItem.ID = item.inventoryID;	460	newItem.ID = item.inventoryID;
461	newItem.InvType = item.invType;	461	newItem.InvType = item.invType;
462	newItem.Folder = item.parentFolderID;	462	newItem.Folder = item.parentFolderID;
463	newItem.CreatorId = item.creatorID.ToString();	463	newItem.CreatorId = item.creatorID;
464	newItem.Description = item.inventoryDescription;	464	newItem.Description = item.inventoryDescription;
465	newItem.NextPermissions = (uint)item.inventoryNextPermissions;	465	newItem.NextPermissions = (uint)item.inventoryNextPermissions;
466	newItem.CurrentPermissions = (uint)item.inventoryCurrentPermissions;	466	newItem.CurrentPermissions = (uint)item.inventoryCurrentPermissions;
@@ -491,7 +491,7 @@ namespace OpenSim.Services.InventoryService
491	newItem.inventoryID = item.ID;	491	newItem.inventoryID = item.ID;
492	newItem.invType = item.InvType;	492	newItem.invType = item.InvType;
493	newItem.parentFolderID = item.Folder;	493	newItem.parentFolderID = item.Folder;
494	newItem.creatorID = item.CreatorIdAsUuid;	494	newItem.creatorID = item.CreatorId;
495	newItem.inventoryDescription = item.Description;	495	newItem.inventoryDescription = item.Description;
496	newItem.inventoryNextPermissions = (int)item.NextPermissions;	496	newItem.inventoryNextPermissions = (int)item.NextPermissions;
497	newItem.inventoryCurrentPermissions = (int)item.CurrentPermissions;	497	newItem.inventoryCurrentPermissions = (int)item.CurrentPermissions;