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

---
 OpenSim/Framework/AssetBase.cs                     | 24 ++++++++--------------
 OpenSim/Framework/AssetLandmark.cs                 |  2 +-
 .../Filesystem/AssetLoaderFileSystem.cs            |  3 ++-
 OpenSim/Framework/Capabilities/Caps.cs             |  2 +-
 OpenSim/Framework/Tests/AssetBaseTest.cs           |  2 +-
 5 files changed, 13 insertions(+), 20 deletions(-)

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/AssetBase.cs b/OpenSim/Framework/AssetBase.cs
index 3e64e47..f21a9b5 100644
--- a/OpenSim/Framework/AssetBase.cs
+++ b/OpenSim/Framework/AssetBase.cs
@@ -61,7 +61,7 @@ namespace OpenSim.Framework
             m_metadata.Type = (sbyte)AssetType.Unknown;
         }
 
-        public AssetBase(UUID assetID, string name, sbyte assetType)
+        public AssetBase(UUID assetID, string name, sbyte assetType, UUID creatorID)
         {
             if (assetType == (sbyte)AssetType.Unknown)
             {
@@ -76,7 +76,7 @@ namespace OpenSim.Framework
             m_metadata.Type = assetType;
         }
 
-        public AssetBase(string assetID, string name, sbyte assetType)
+        public AssetBase(string assetID, string name, sbyte assetType, UUID creatorID)
         {
             if (assetType == (sbyte)AssetType.Unknown)
             {
@@ -220,7 +220,6 @@ namespace OpenSim.Framework
     public class AssetMetadata
     {
         private UUID m_fullid;
-        // m_id added as a dirty hack to transition from FullID to ID
         private string m_id;
         private string m_name = String.Empty;
         private string m_description = String.Empty;
@@ -230,8 +229,7 @@ namespace OpenSim.Framework
         private byte[] m_sha1;
         private bool m_local;
         private bool m_temporary;
-        //private Dictionary<string, Uri> m_methods = new Dictionary<string, Uri>();
-        //private OSDMap m_extra_data;
+        private UUID m_creatorid;
 
         public UUID FullID
         {
@@ -324,16 +322,10 @@ namespace OpenSim.Framework
             set { m_temporary = value; }
         }
 
-        //public Dictionary<string, Uri> Methods
-        //{
-        //    get { return m_methods; }
-        //    set { m_methods = value; }
-        //}
-
-        //public OSDMap ExtraData
-        //{
-        //    get { return m_extra_data; }
-        //    set { m_extra_data = value; }
-        //}
+        public UUID CreatorID
+        {
+            get { return m_creatorid; }
+            set { m_creatorid = value; }
+        }
     }
 }
diff --git a/OpenSim/Framework/AssetLandmark.cs b/OpenSim/Framework/AssetLandmark.cs
index 058b442..7806c1f 100644
--- a/OpenSim/Framework/AssetLandmark.cs
+++ b/OpenSim/Framework/AssetLandmark.cs
@@ -38,7 +38,7 @@ namespace OpenSim.Framework
         public int Version;
 
         public AssetLandmark(AssetBase a)
-            : base(a.FullID, a.Name, a.Type)
+            : base(a.FullID, a.Name, a.Type, a.Metadata.CreatorID)
         {
             Data = a.Data;
             Description = a.Description;
diff --git a/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs b/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs
index 6ab1b58..458dfdc 100644
--- a/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs
+++ b/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs
@@ -41,11 +41,12 @@ namespace OpenSim.Framework.AssetLoader.Filesystem
 {
     public class AssetLoaderFileSystem : IAssetLoader
     {
+        private static readonly UUID LIBRARY_OWNER_ID = new UUID("11111111-1111-0000-0000-000100bba000");
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         protected static AssetBase CreateAsset(string assetIdStr, string name, string path, sbyte type)
         {
-            AssetBase asset = new AssetBase(new UUID(assetIdStr), name, type);
+            AssetBase asset = new AssetBase(new UUID(assetIdStr), name, type, LIBRARY_OWNER_ID);
 
             if (!String.IsNullOrEmpty(path))
             {
diff --git a/OpenSim/Framework/Capabilities/Caps.cs b/OpenSim/Framework/Capabilities/Caps.cs
index 74c6ab0..323c94c 100644
--- a/OpenSim/Framework/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Capabilities/Caps.cs
@@ -888,7 +888,7 @@ namespace OpenSim.Framework.Capabilities
             }
 
             AssetBase asset;
-            asset = new AssetBase(assetID, assetName, assType);
+            asset = new AssetBase(assetID, assetName, assType, m_agentID);
             asset.Data = data;
             if (AddNewAsset != null)
                 AddNewAsset(asset);
diff --git a/OpenSim/Framework/Tests/AssetBaseTest.cs b/OpenSim/Framework/Tests/AssetBaseTest.cs
index 18a3e01..0f22600 100644
--- a/OpenSim/Framework/Tests/AssetBaseTest.cs
+++ b/OpenSim/Framework/Tests/AssetBaseTest.cs
@@ -67,7 +67,7 @@ namespace OpenSim.Framework.Tests
 
         private void CheckContainsReferences(AssetType assetType, bool expected)
         {
-            AssetBase asset = new AssetBase(UUID.Zero, String.Empty, (sbyte)assetType);
+            AssetBase asset = new AssetBase(UUID.Zero, String.Empty, (sbyte)assetType, UUID.Zero);
             bool actual = asset.ContainsReferences;
             Assert.AreEqual(expected, actual, "Expected "+assetType+".ContainsReferences to be "+expected+" but was "+actual+".");
         }
-- 
cgit v1.1