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, 5 insertions, 4 deletions

diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs
index 49275cb..11be28e 100644
--- a/OpenSim/Data/SQLite/SQLiteAssetData.cs
+++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs
@@ -231,12 +231,13 @@ namespace OpenSim.Data.SQLite
             // TODO: this doesn't work yet because something more
             // interesting has to be done to actually get these values
             // back out.  Not enough time to figure it out yet.
-            AssetBase asset = new AssetBase();
+            AssetBase asset = new AssetBase(
+                new UUID((String)row["UUID"]),
+                (String)row["Name"],
+                Convert.ToSByte(row["Type"])
+            );
 
-            asset.FullID = new UUID((String) row["UUID"]);
-            asset.Name = (String) row["Name"];
             asset.Description = (String) row["Description"];
-            asset.Type = Convert.ToSByte(row["Type"]);
             asset.Local = Convert.ToBoolean(row["Local"]);
             asset.Temporary = Convert.ToBoolean(row["Temporary"]);
             asset.Data = (byte[]) row["Data"];