* Added better logging to AssetCache

* AssetCache now ignores duplicate uploads
* some m_ refactoring
* ignored some bins

1 files changed, 1 insertions, 19 deletions

diff --git a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
index 4ff1024..7692057 100644
--- a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
@@ -23,7 +23,7 @@ namespace OpenSim.Framework.Communications.Cache
 
         public void LoadDefaultAssets()
         {
-            MainLog.Instance.Verbose("SQL ASSET SERVER", "Setting up asset database");
+            MainLog.Instance.Verbose("ASSETSERVER", "Setting up asset database");
 
             ForEachDefaultAsset(StoreAsset);
             ForEachXmlAsset(StoreAsset);
@@ -106,24 +106,6 @@ namespace OpenSim.Framework.Communications.Cache
         public virtual List<AssetBase> GetDefaultAssets()
         {
             List<AssetBase> assets = new List<AssetBase>();
-            // These assets have been moved into the OpenSimAssetSet.XML file
-            //assets.Add(CreateImageAsset("00000000-0000-1111-9999-000000000001", "Bricks", "bricks.jp2"));
-            //assets.Add(CreateImageAsset("00000000-0000-1111-9999-000000000002", "Plywood", "plywood.jp2"));
-            //assets.Add(CreateImageAsset("00000000-0000-1111-9999-000000000003", "Rocks", "rocks.jp2"));
-            //assets.Add(CreateImageAsset("00000000-0000-1111-9999-000000000004", "Granite", "granite.jp2"));
-            //assets.Add(CreateImageAsset("00000000-0000-1111-9999-000000000005", "Hardwood", "hardwood.jp2"));
-            //assets.Add(CreateImageAsset("00000000-0000-1111-5005-000000000005", "Prim Base Texture", "plywood.jp2"));
-            //assets.Add(CreateImageAsset("00000000-0000-1111-9999-000000000006", "Map Base Texture", "map_base.jp2"));
-            //assets.Add(CreateImageAsset("00000000-0000-1111-9999-000000000007", "Map Texture", "map1.jp2"));
-            //assets.Add(CreateImageAsset("00000000-0000-1111-9999-000000000010", "Female Body Texture", "femalebody.jp2"));
-            //assets.Add(CreateImageAsset("00000000-0000-1111-9999-000000000011", "Female Bottom Texture", "femalebottom.jp2"));
-            //assets.Add(CreateImageAsset("00000000-0000-1111-9999-000000000012", "Female Face Texture", "femaleface.jp2"));
-
-            //assets.Add(CreateAsset("77c41e39-38f9-f75a-024e-585989bbabbb", "Skin", "base_skin.dat", false));
-            //assets.Add(CreateAsset("66c41e39-38f9-f75a-024e-585989bfab73", "Shape", "base_shape.dat", false));
-            //assets.Add(CreateAsset("00000000-38f9-1111-024e-222222111110", "Shirt", "newshirt.dat", false));
-            //assets.Add(CreateAsset("00000000-38f9-1111-024e-222222111120", "Shirt", "newpants.dat", false));
-
             return assets;
         }