From 7665aad002ef066fc31fa9497225d2668641c769 Mon Sep 17 00:00:00 2001
From: John Hurliman
Date: Mon, 22 Feb 2010 13:27:17 -0800
Subject: * Adds CreatorID to asset metadata. This is just the plumbing to
 support CreatorID, it doesn't modify database backends or OAR files to
 support storing/loading it

---
 .../Framework/InventoryAccess/InventoryAccessModule.cs           | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs')

diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index d242a34..eec852e 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -161,7 +161,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                 }
 
                 AssetBase asset =
-                    CreateAsset(item.Name, item.Description, (sbyte)item.AssetType, data);
+                    CreateAsset(item.Name, item.Description, (sbyte)item.AssetType, data, remoteClient.AgentId);
                 item.AssetID = asset.FullID;
                 m_Scene.AssetService.Store(asset);
 
@@ -339,7 +339,8 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                 objectGroup.GetPartName(objectGroup.RootPart.LocalId),
                 objectGroup.GetPartDescription(objectGroup.RootPart.LocalId),
                 (sbyte)AssetType.Object,
-                Utils.StringToBytes(sceneObjectXml));
+                Utils.StringToBytes(sceneObjectXml),
+                objectGroup.OwnerID);
             m_Scene.AssetService.Store(asset);
             assetID = asset.FullID;
 
@@ -640,9 +641,9 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
         /// <param name="assetType"></param>
         /// <param name="data"></param>
         /// <returns></returns>
-        private AssetBase CreateAsset(string name, string description, sbyte assetType, byte[] data)
+        private AssetBase CreateAsset(string name, string description, sbyte assetType, byte[] data, UUID creatorID)
         {
-            AssetBase asset = new AssetBase(UUID.Random(), name, assetType);
+            AssetBase asset = new AssetBase(UUID.Random(), name, assetType, creatorID);
             asset.Description = description;
             asset.Data = (data == null) ? new byte[1] : data;
 
-- 
cgit v1.1