aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.Inventory.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 78b28d5..229ab1c 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -342,7 +342,7 @@ namespace OpenSim.Region.Environment.Scenes
342 asset.Description = description; 342 asset.Description = description;
343 asset.InvType = invType; 343 asset.InvType = invType;
344 asset.Type = assetType; 344 asset.Type = assetType;
345 asset.FullID = LLUUID.Random(); // TODO: check for conflicts 345 asset.FullID = LLUUID.Random();
346 asset.Data = (data == null) ? new byte[1] : data; 346 asset.Data = (data == null) ? new byte[1] : data;
347 return asset; 347 return asset;
348 } 348 }
@@ -781,7 +781,7 @@ namespace OpenSim.Region.Environment.Scenes
781 InventoryItemBase item = new InventoryItemBase(); 781 InventoryItemBase item = new InventoryItemBase();
782 item.avatarID = remoteClient.AgentId; 782 item.avatarID = remoteClient.AgentId;
783 item.creatorsID = remoteClient.AgentId; 783 item.creatorsID = remoteClient.AgentId;
784 item.inventoryID = LLUUID.Random(); // TODO: check for conflicts 784 item.inventoryID = LLUUID.Random();
785 item.assetID = asset.FullID; 785 item.assetID = asset.FullID;
786 item.inventoryDescription = asset.Description; 786 item.inventoryDescription = asset.Description;
787 item.inventoryName = asset.Name; 787 item.inventoryName = asset.Name;