From df76e95aa2dc9f3f3a0c546761b7624adc183ed0 Mon Sep 17 00:00:00 2001
From: John Hurliman
Date: Mon, 22 Feb 2010 14:18:59 -0800
Subject: Changed asset CreatorID to a string

---
 OpenSim/Framework/AssetBase.cs                                | 11 +++++++----
 .../Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs |  2 +-
 OpenSim/Framework/Capabilities/Caps.cs                        |  2 +-
 OpenSim/Framework/Tests/AssetBaseTest.cs                      |  2 +-
 4 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/AssetBase.cs b/OpenSim/Framework/AssetBase.cs
index f21a9b5..19ca232 100644
--- a/OpenSim/Framework/AssetBase.cs
+++ b/OpenSim/Framework/AssetBase.cs
@@ -59,9 +59,10 @@ namespace OpenSim.Framework
             m_metadata.FullID = UUID.Zero;
             m_metadata.ID = UUID.Zero.ToString();
             m_metadata.Type = (sbyte)AssetType.Unknown;
+            m_metadata.CreatorID = String.Empty;
         }
 
-        public AssetBase(UUID assetID, string name, sbyte assetType, UUID creatorID)
+        public AssetBase(UUID assetID, string name, sbyte assetType, string creatorID)
         {
             if (assetType == (sbyte)AssetType.Unknown)
             {
@@ -74,9 +75,10 @@ namespace OpenSim.Framework
             m_metadata.FullID = assetID;
             m_metadata.Name = name;
             m_metadata.Type = assetType;
+            m_metadata.CreatorID = creatorID;
         }
 
-        public AssetBase(string assetID, string name, sbyte assetType, UUID creatorID)
+        public AssetBase(string assetID, string name, sbyte assetType, string creatorID)
         {
             if (assetType == (sbyte)AssetType.Unknown)
             {
@@ -89,6 +91,7 @@ namespace OpenSim.Framework
             m_metadata.ID = assetID;
             m_metadata.Name = name;
             m_metadata.Type = assetType;
+            m_metadata.CreatorID = creatorID;
         }
 
         public bool ContainsReferences
@@ -229,7 +232,7 @@ namespace OpenSim.Framework
         private byte[] m_sha1;
         private bool m_local;
         private bool m_temporary;
-        private UUID m_creatorid;
+        private string m_creatorid;
 
         public UUID FullID
         {
@@ -322,7 +325,7 @@ namespace OpenSim.Framework
             set { m_temporary = value; }
         }
 
-        public UUID CreatorID
+        public string CreatorID
         {
             get { return m_creatorid; }
             set { m_creatorid = value; }
diff --git a/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs b/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs
index 458dfdc..097ad7d 100644
--- a/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs
+++ b/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs
@@ -46,7 +46,7 @@ namespace OpenSim.Framework.AssetLoader.Filesystem
 
         protected static AssetBase CreateAsset(string assetIdStr, string name, string path, sbyte type)
         {
-            AssetBase asset = new AssetBase(new UUID(assetIdStr), name, type, LIBRARY_OWNER_ID);
+            AssetBase asset = new AssetBase(new UUID(assetIdStr), name, type, LIBRARY_OWNER_ID.ToString());
 
             if (!String.IsNullOrEmpty(path))
             {
diff --git a/OpenSim/Framework/Capabilities/Caps.cs b/OpenSim/Framework/Capabilities/Caps.cs
index 323c94c..b27d011 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, m_agentID);
+            asset = new AssetBase(assetID, assetName, assType, m_agentID.ToString());
             asset.Data = data;
             if (AddNewAsset != null)
                 AddNewAsset(asset);
diff --git a/OpenSim/Framework/Tests/AssetBaseTest.cs b/OpenSim/Framework/Tests/AssetBaseTest.cs
index 0f22600..6db1aa0 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, UUID.Zero);
+            AssetBase asset = new AssetBase(UUID.Zero, String.Empty, (sbyte)assetType, UUID.Zero.ToString());
             bool actual = asset.ContainsReferences;
             Assert.AreEqual(expected, actual, "Expected "+assetType+".ContainsReferences to be "+expected+" but was "+actual+".");
         }
-- 
cgit v1.1