aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs14
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 11cee7c..bebf234 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -478,7 +478,7 @@ namespace OpenSim.Region.Framework.Scenes
478 // Insert a copy of the item into the recipient 478 // Insert a copy of the item into the recipient
479 InventoryItemBase itemCopy = new InventoryItemBase(); 479 InventoryItemBase itemCopy = new InventoryItemBase();
480 itemCopy.Owner = recipient; 480 itemCopy.Owner = recipient;
481 itemCopy.Creator = item.Creator; 481 itemCopy.CreatorId = item.CreatorId;
482 itemCopy.ID = UUID.Random(); 482 itemCopy.ID = UUID.Random();
483 itemCopy.AssetID = item.AssetID; 483 itemCopy.AssetID = item.AssetID;
484 itemCopy.Description = item.Description; 484 itemCopy.Description = item.Description;
@@ -836,7 +836,7 @@ namespace OpenSim.Region.Framework.Scenes
836 { 836 {
837 InventoryItemBase item = new InventoryItemBase(); 837 InventoryItemBase item = new InventoryItemBase();
838 item.Owner = remoteClient.AgentId; 838 item.Owner = remoteClient.AgentId;
839 item.Creator = remoteClient.AgentId; 839 item.CreatorId = remoteClient.AgentId.ToString();
840 item.ID = UUID.Random(); 840 item.ID = UUID.Random();
841 item.AssetID = asset.FullID; 841 item.AssetID = asset.FullID;
842 item.Description = asset.Description; 842 item.Description = asset.Description;
@@ -1086,7 +1086,7 @@ namespace OpenSim.Region.Framework.Scenes
1086 InventoryItemBase agentItem = new InventoryItemBase(); 1086 InventoryItemBase agentItem = new InventoryItemBase();
1087 1087
1088 agentItem.ID = UUID.Random(); 1088 agentItem.ID = UUID.Random();
1089 agentItem.Creator = taskItem.CreatorID; 1089 agentItem.CreatorId = taskItem.CreatorID.ToString();
1090 agentItem.Owner = destAgent; 1090 agentItem.Owner = destAgent;
1091 agentItem.AssetID = taskItem.AssetID; 1091 agentItem.AssetID = taskItem.AssetID;
1092 agentItem.Description = taskItem.Description; 1092 agentItem.Description = taskItem.Description;
@@ -1549,7 +1549,7 @@ namespace OpenSim.Region.Framework.Scenes
1549 taskItem.Type = itemBase.AssetType; 1549 taskItem.Type = itemBase.AssetType;
1550 taskItem.InvType = itemBase.InvType; 1550 taskItem.InvType = itemBase.InvType;
1551 taskItem.OwnerID = itemBase.Owner; 1551 taskItem.OwnerID = itemBase.Owner;
1552 taskItem.CreatorID = itemBase.Creator; 1552 taskItem.CreatorID = itemBase.CreatorIdAsUuid;
1553 taskItem.BasePermissions = itemBase.BasePermissions; 1553 taskItem.BasePermissions = itemBase.BasePermissions;
1554 taskItem.CurrentPermissions = itemBase.CurrentPermissions; 1554 taskItem.CurrentPermissions = itemBase.CurrentPermissions;
1555 taskItem.EveryonePermissions = itemBase.EveryOnePermissions; 1555 taskItem.EveryonePermissions = itemBase.EveryOnePermissions;
@@ -1946,12 +1946,11 @@ namespace OpenSim.Region.Framework.Scenes
1946 } 1946 }
1947 1947
1948 item = new InventoryItemBase(); 1948 item = new InventoryItemBase();
1949 item.Creator = objectGroup.RootPart.CreatorID; 1949 item.CreatorId = objectGroup.RootPart.CreatorID.ToString();
1950 item.ID = UUID.Random(); 1950 item.ID = UUID.Random();
1951 item.InvType = (int)InventoryType.Object; 1951 item.InvType = (int)InventoryType.Object;
1952 item.Folder = folder.ID; 1952 item.Folder = folder.ID;
1953 item.Owner = userInfo.UserProfile.ID; 1953 item.Owner = userInfo.UserProfile.ID;
1954
1955 } 1954 }
1956 1955
1957 AssetBase asset = CreateAsset( 1956 AssetBase asset = CreateAsset(
@@ -2115,6 +2114,7 @@ namespace OpenSim.Region.Framework.Scenes
2115 2114
2116 CachedUserInfo userInfo = 2115 CachedUserInfo userInfo =
2117 CommsManager.UserProfileCacheService.GetUserDetails(AgentId); 2116 CommsManager.UserProfileCacheService.GetUserDetails(AgentId);
2117
2118 if (userInfo != null) 2118 if (userInfo != null)
2119 { 2119 {
2120 AssetBase asset = CreateAsset( 2120 AssetBase asset = CreateAsset(
@@ -2125,7 +2125,7 @@ namespace OpenSim.Region.Framework.Scenes
2125 CommsManager.AssetCache.AddAsset(asset); 2125 CommsManager.AssetCache.AddAsset(asset);
2126 2126
2127 InventoryItemBase item = new InventoryItemBase(); 2127 InventoryItemBase item = new InventoryItemBase();
2128 item.Creator = grp.RootPart.CreatorID; 2128 item.CreatorId = grp.RootPart.CreatorID.ToString();
2129 item.Owner = remoteClient.AgentId; 2129 item.Owner = remoteClient.AgentId;
2130 item.ID = UUID.Random(); 2130 item.ID = UUID.Random();
2131 item.AssetID = asset.FullID; 2131 item.AssetID = asset.FullID;