Changing the AssetBase constructors to avoid initializing assets with an unknown asset type, and log an error if it ever does happen

1 files changed, 35 insertions, 7 deletions

diff --git a/OpenSim/Framework/AssetBase.cs b/OpenSim/Framework/AssetBase.cs
index 9679ff2..eed9703 100644
--- a/OpenSim/Framework/AssetBase.cs
+++ b/OpenSim/Framework/AssetBase.cs
@@ -27,6 +27,8 @@
 
 using System;
 using System.Xml.Serialization;
+using System.Reflection;
+using log4net;
 using OpenMetaverse;
 
 namespace OpenSim.Framework
@@ -37,6 +39,8 @@ namespace OpenSim.Framework
     [Serializable]
     public class AssetBase
     {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
         /// <summary>
         /// Data of the Asset
         /// </summary>
@@ -47,16 +51,34 @@ namespace OpenSim.Framework
         /// </summary>
         private AssetMetadata m_metadata;
 
-        public AssetBase()
+        public AssetBase(UUID assetID, string name, sbyte assetType)
         {
+            if (assetType == (sbyte)AssetType.Unknown)
+            {
+                System.Diagnostics.StackTrace trace = new System.Diagnostics.StackTrace(true);
+                m_log.ErrorFormat("[ASSETBASE]: Creating asset '{0}' ({1}) with an unknown asset type\n{2}",
+                    name, assetID, trace.ToString());
+            }
+
             m_metadata = new AssetMetadata();
+            m_metadata.FullID = assetID;
+            m_metadata.Name = name;
+            m_metadata.Type = assetType;
         }
 
-        public AssetBase(UUID assetId, string name)
+        public AssetBase(string assetID, string name, sbyte assetType)
         {
+            if (assetType == (sbyte)AssetType.Unknown)
+            {
+                System.Diagnostics.StackTrace trace = new System.Diagnostics.StackTrace(true);
+                m_log.ErrorFormat("[ASSETBASE]: Creating asset '{0}' ({1}) with an unknown asset type\n{2}",
+                    name, assetID, trace.ToString());
+            }
+
             m_metadata = new AssetMetadata();
-            m_metadata.FullID = assetId;
+            m_metadata.ID = assetID;
             m_metadata.Name = name;
+            m_metadata.Type = assetType;
         }
 
         public bool ContainsReferences
@@ -193,11 +215,11 @@ namespace OpenSim.Framework
         private string m_name = String.Empty;
         private string m_description = String.Empty;
         private DateTime m_creation_date;
-        private sbyte m_type;
+        private sbyte m_type = (sbyte)AssetType.Unknown;
         private string m_content_type;
         private byte[] m_sha1;
-        private bool m_local = false;
-        private bool m_temporary = false;
+        private bool m_local;
+        private bool m_temporary;
         //private Dictionary<string, Uri> m_methods = new Dictionary<string, Uri>();
         //private OSDMap m_extra_data;
 
@@ -211,7 +233,13 @@ namespace OpenSim.Framework
         {
             //get { return m_fullid.ToString(); }
             //set { m_fullid = new UUID(value); }
-            get { return m_id; }
+            get
+            {
+                if (String.IsNullOrEmpty(m_id))
+                    m_id = m_fullid.ToString();
+
+                return m_id;
+            }
             set
             {
                 UUID uuid = UUID.Zero;