* Total refactoring of Asset Server for massive win

* There is now a AssetServerBase
* lolcat in ur assets

6 files changed, 339 insertions, 566 deletions

diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs
index 4ae8595..17829b2 100644
--- a/OpenSim/Framework/Communications/Cache/AssetCache.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs
@@ -91,7 +91,12 @@ namespace OpenSim.Framework.Communications.Cache
         {
             System.Console.WriteLine("Creating Asset cache");
             _assetServer = this.LoadAssetDll(assetServerDLLName);
+
+
+            // TODO: This actually does nothing to no IAssetServer implementor. Delete?
             _assetServer.SetServerInfo(assetServerURL, assetServerKey);
+            
+            
             _assetServer.SetReceiver(this);
             Assets = new Dictionary<LLUUID, AssetInfo>();
             Textures = new Dictionary<LLUUID, TextureImage>();
@@ -159,7 +164,7 @@ namespace OpenSim.Framework.Communications.Cache
                 { //texture
                     TextureImage textur = new TextureImage(asset);
                     this.Textures.Add(textur.FullID, textur);
-                    this._assetServer.CreateAsset(asset);
+                    this._assetServer.StoreAndCommitAsset(asset);
                 }
                 else
                 {
@@ -173,7 +178,7 @@ namespace OpenSim.Framework.Communications.Cache
                 {
                     AssetInfo assetInf = new AssetInfo(asset);
                     this.Assets.Add(assetInf.FullID, assetInf);
-                    this._assetServer.CreateAsset(asset);
+                    this._assetServer.StoreAndCommitAsset(asset);
                 }
             }
         }
diff --git a/OpenSim/Framework/Communications/Cache/AssetServer.cs b/OpenSim/Framework/Communications/Cache/AssetServer.cs
index e5329ec..a374df2 100644
--- a/OpenSim/Framework/Communications/Cache/AssetServer.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetServer.cs
@@ -24,370 +24,137 @@
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 * 
-*/
-using System;
-using System.IO;
-using System.Threading;
-using Db4objects.Db4o;
-using Db4objects.Db4o.Query;
-using libsecondlife;
-using Nini.Config;
-using OpenSim.Framework.Console;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Utilities;
-
-namespace OpenSim.Framework.Communications.Caches
-{
-
-    public class LocalAssetServer : IAssetServer
-    {
-        private IAssetReceiver _receiver;
-        private BlockingQueue<ARequest> _assetRequests;
-        private IObjectContainer db;
-        private Thread _localAssetServerThread;
-
-        public LocalAssetServer()
-        {
-            System.Console.WriteLine("Starting Db4o asset storage system");
-            bool yapfile;
-            this._assetRequests = new BlockingQueue<ARequest>();
-            yapfile = File.Exists(Path.Combine(Util.dataDir(), "regionassets.yap"));
-
-            MainLog.Instance.Verbose("Local Asset Server class created");
-            db = Db4oFactory.OpenFile(Path.Combine(Util.dataDir(), "regionassets.yap"));
-            MainLog.Instance.Verbose("Db4 Asset database  creation");
-
-            if (!yapfile)
-            {
-                this.SetUpAssetDatabase();
-            }
-
-            this._localAssetServerThread = new Thread(new ThreadStart(RunRequests));
-            this._localAssetServerThread.IsBackground = true;
-            this._localAssetServerThread.Start();
-
-        }
-
-        public void SetReceiver(IAssetReceiver receiver)
-        {
-            this._receiver = receiver;
-        }
-
-        public void FetchAsset(LLUUID assetID, bool isTexture)
-        {
-            ARequest req = new ARequest();
-            req.AssetID = assetID;
-            req.IsTexture = isTexture;
-            this._assetRequests.Enqueue(req);
-        }
-
-        public void UpdateAsset(AssetBase asset)
-        {
-
-        }
-
-        public void CreateAsset(AssetBase asset)
-        {
-            AssetStorage store = new AssetStorage();
-            store.Data = asset.Data;
-            store.Name = asset.Name;
-            store.UUID = asset.FullID;
-            db.Set(store);
-            db.Commit();
-        }
-
-        public void SetServerInfo(string ServerUrl, string ServerKey)
-        {
-
-        }
-        public void Close()
-        {
-            if (db != null)
-            {
-                MainLog.Instance.Verbose("Closing local asset server database");
-                db.Close();
-            }
-        }
-
-        private void RunRequests()
-        {
-            while (true)
-            {
-                byte[] idata = null;
-                bool found = false;
-                AssetStorage foundAsset = null;
-                ARequest req = this._assetRequests.Dequeue();
-                IObjectSet result = db.Query(new AssetUUIDQuery(req.AssetID));
-                if (result.Count > 0)
-                {
-                    foundAsset = (AssetStorage)result.Next();
-                    found = true;
-                }
-
-                AssetBase asset = new AssetBase();
-                if (found)
-                {
-                    asset.FullID = foundAsset.UUID;
-                    asset.Type = foundAsset.Type;
-                    asset.InvType = foundAsset.Type;
-                    asset.Name = foundAsset.Name;
-                    idata = foundAsset.Data;
-                    asset.Data = idata;
-                    _receiver.AssetReceived(asset, req.IsTexture);
-                }
-                else
-                {
-                    //asset.FullID = ;
-                    _receiver.AssetNotFound(req.AssetID);
-                }
-
-            }
-
-        }
-
-        private void SetUpAssetDatabase()
-        {
-            MainLog.Instance.Verbose("Setting up asset database");
-
-            AssetBase Image = new AssetBase();
-            Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000001");
-            Image.Name = "Bricks";
-            this.LoadAsset(Image, true, "bricks.jp2");
-            AssetStorage store = new AssetStorage();
-            store.Data = Image.Data;
-            store.Name = Image.Name;
-            store.UUID = Image.FullID;
-            db.Set(store);
-            db.Commit();
-
-            Image = new AssetBase();
-            Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000002");
-            Image.Name = "Plywood";
-            this.LoadAsset(Image, true, "plywood.jp2");
-            store = new AssetStorage();
-            store.Data = Image.Data;
-            store.Name = Image.Name;
-            store.UUID = Image.FullID;
-            db.Set(store);
-            db.Commit();
-
-            Image = new AssetBase();
-            Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000003");
-            Image.Name = "Rocks";
-            this.LoadAsset(Image, true, "rocks.jp2");
-            store = new AssetStorage();
-            store.Data = Image.Data;
-            store.Name = Image.Name;
-            store.UUID = Image.FullID;
-            db.Set(store);
-            db.Commit();
-
-            Image = new AssetBase();
-            Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000004");
-            Image.Name = "Granite";
-            this.LoadAsset(Image, true, "granite.jp2");
-            store = new AssetStorage();
-            store.Data = Image.Data;
-            store.Name = Image.Name;
-            store.UUID = Image.FullID;
-            db.Set(store);
-            db.Commit();
-
-            Image = new AssetBase();
-            Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000005");
-            Image.Name = "Hardwood";
-            this.LoadAsset(Image, true, "hardwood.jp2");
-            store = new AssetStorage();
-            store.Data = Image.Data;
-            store.Name = Image.Name;
-            store.UUID = Image.FullID;
-            db.Set(store);
-            db.Commit();
-
-            Image = new AssetBase();
-            Image.FullID = new LLUUID("00000000-0000-0000-5005-000000000005");
-            Image.Name = "Prim Base Texture";
-            this.LoadAsset(Image, true, "plywood.jp2");
-            store = new AssetStorage();
-            store.Data = Image.Data;
-            store.Name = Image.Name;
-            store.UUID = Image.FullID;
-            db.Set(store);
-            db.Commit();
-
-            Image = new AssetBase();
-            Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000006");
-            Image.Name = "Map Base Texture";
-            this.LoadAsset(Image, true, "map_base.jp2");
-            store = new AssetStorage();
-            store.Data = Image.Data;
-            store.Name = Image.Name;
-            store.UUID = Image.FullID;
-            db.Set(store);
-            db.Commit();
-
-            Image = new AssetBase();
-            Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000007");
-            Image.Name = "Map Texture";
-            this.LoadAsset(Image, true, "map1.jp2");
-            store = new AssetStorage();
-            store.Data = Image.Data;
-            store.Name = Image.Name;
-            store.UUID = Image.FullID;
-            db.Set(store);
-            db.Commit();
-
-            Image = new AssetBase();
-            Image.FullID = new LLUUID("00000000-0000-1111-9999-000000000010");
-            Image.Name = "Female Body Texture";
-            this.LoadAsset(Image, true, "femalebody.jp2");
-            store = new AssetStorage();
-            store.Data = Image.Data;
-            store.Name = Image.Name;
-            store.UUID = Image.FullID;
-            db.Set(store);
-            db.Commit();
-
-            Image = new AssetBase();
-            Image.FullID = new LLUUID("00000000-0000-1111-9999-000000000011");
-            Image.Name = "Female Bottom Texture";
-            this.LoadAsset(Image, true, "femalebottom.jp2");
-            store = new AssetStorage();
-            store.Data = Image.Data;
-            store.Name = Image.Name;
-            store.UUID = Image.FullID;
-            db.Set(store);
-            db.Commit();
-
-            Image = new AssetBase();
-            Image.FullID = new LLUUID("00000000-0000-1111-9999-000000000012");
-            Image.Name = "Female Face Texture";
-            this.LoadAsset(Image, true, "femaleface.jp2");
-            store = new AssetStorage();
-            store.Data = Image.Data;
-            store.Name = Image.Name;
-            store.UUID = Image.FullID;
-            db.Set(store);
-            db.Commit();
-
-            Image = new AssetBase();
-            Image.FullID = new LLUUID("77c41e39-38f9-f75a-024e-585989bbabbb");
-            Image.Name = "Skin";
-            Image.Type = 13;
-            Image.InvType = 13;
-            this.LoadAsset(Image, false, "base_skin.dat");
-            store = new AssetStorage();
-            store.Data = Image.Data;
-            store.Name = Image.Name;
-            store.UUID = Image.FullID;
-            db.Set(store);
-            db.Commit();
-
-
-            Image = new AssetBase();
-            Image.FullID = new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73");
-            Image.Name = "Shape";
-            Image.Type = 13;
-            Image.InvType = 13;
-            this.LoadAsset(Image, false, "base_shape.dat");
-            store = new AssetStorage();
-            store.Data = Image.Data;
-            store.Name = Image.Name;
-            store.UUID = Image.FullID;
-            db.Set(store);
-            db.Commit();
-
-            Image = new AssetBase();
-            Image.FullID = new LLUUID("00000000-38f9-1111-024e-222222111110");
-            Image.Name = "Shirt";
-            Image.Type = 5;
-            Image.InvType = 18;
-            this.LoadAsset(Image, false, "newshirt.dat");
-            store = new AssetStorage();
-            store.Data = Image.Data;
-            store.Name = Image.Name;
-            store.UUID = Image.FullID;
-            db.Set(store);
-            db.Commit();
-
-            Image = new AssetBase();
-            Image.FullID = new LLUUID("00000000-38f9-1111-024e-222222111120");
-            Image.Name = "Shirt";
-            Image.Type = 5;
-            Image.InvType = 18;
-            this.LoadAsset(Image, false, "newpants.dat");
-            store = new AssetStorage();
-            store.Data = Image.Data;
-            store.Name = Image.Name;
-            store.UUID = Image.FullID;
-            db.Set(store);
-            db.Commit();
-
-            string filePath = Path.Combine(Util.configDir(), "OpenSimAssetSet.xml");
-            if (File.Exists(filePath))
-            {
-                XmlConfigSource source = new XmlConfigSource(filePath);
-                ReadAssetDetails(source);
-            }
-        }
-
-        protected void ReadAssetDetails(IConfigSource source)
-        {
-            AssetBase newAsset = null;
-            for (int i = 0; i < source.Configs.Count; i++)
-            {
-                newAsset = new AssetBase();
-                newAsset.FullID = new LLUUID(source.Configs[i].GetString("assetID", LLUUID.Random().ToStringHyphenated()));
-                newAsset.Name = source.Configs[i].GetString("name", "");
-                newAsset.Type = (sbyte)source.Configs[i].GetInt("assetType", 0);
-                newAsset.InvType = (sbyte)source.Configs[i].GetInt("inventoryType", 0);
-                string fileName = source.Configs[i].GetString("fileName", "");
-                if (fileName != "")
-                {
-                    this.LoadAsset(newAsset, false, fileName);
-                    AssetStorage store = new AssetStorage();
-                    store.Data = newAsset.Data;
-                    store.Name = newAsset.Name;
-                    store.UUID = newAsset.FullID;
-                    db.Set(store);
-                    db.Commit();
-                }
-            }
-        }
-
-        private void LoadAsset(AssetBase info, bool image, string filename)
-        {
-            //should request Asset from storage manager
-            //but for now read from file
-
-            string dataPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "assets"); //+ folder;
-            string fileName = Path.Combine(dataPath, filename);
-            FileInfo fInfo = new FileInfo(fileName);
-            long numBytes = fInfo.Length;
-            FileStream fStream = new FileStream(fileName, FileMode.Open, FileAccess.Read);
-            byte[] idata = new byte[numBytes];
-            BinaryReader br = new BinaryReader(fStream);
-            idata = br.ReadBytes((int)numBytes);
-            br.Close();
-            fStream.Close();
-            info.Data = idata;
-            //info.loaded=true;
-        }
-    }
-    public class AssetUUIDQuery : Predicate
-    {
-        private LLUUID _findID;
-
-        public AssetUUIDQuery(LLUUID find)
-        {
-            _findID = find;
-        }
-        public bool Match(AssetStorage asset)
-        {
-            return (asset.UUID == _findID);
-        }
-    }
-
-}
-
+*/

+using System;

+using System.Collections.Generic;

+using System.IO;

+using System.Threading;

+using Db4objects.Db4o;

+using Db4objects.Db4o.Query;

+using libsecondlife;

+using Nini.Config;

+using OpenSim.Framework.Communications.Cache;

+using OpenSim.Framework.Console;

+using OpenSim.Framework.Interfaces;

+using OpenSim.Framework.Types;

+using OpenSim.Framework.Utilities;

+

+namespace OpenSim.Framework.Communications.Cache

+{

+    public class LocalAssetServer : AssetServerBase

+    {

+        private IObjectContainer db;

+

+        public LocalAssetServer()

+        {

+            bool yapfile;

+            yapfile = File.Exists(Path.Combine(Util.dataDir(), "regionassets.yap"));

+

+            db = Db4oFactory.OpenFile(Path.Combine(Util.dataDir(), "regionassets.yap"));

+            MainLog.Instance.Verbose("Db4 Asset database  creation");

+

+            if (!yapfile)

+            {

+                SetUpAssetDatabase();

+            }

+

+            this._localAssetServerThread = new Thread(new ThreadStart(RunRequests));

+            this._localAssetServerThread.IsBackground = true;

+            this._localAssetServerThread.Start();

+

+        }

+

+        public void CreateAndCommitAsset(AssetBase asset)

+        {

+            AssetStorage store = new AssetStorage();

+            store.Data = asset.Data;

+            store.Name = asset.Name;

+            store.UUID = asset.FullID;

+            db.Set(store);

+            db.Commit();

+        }

+

+        override public void Close()

+        {

+            if (db != null)

+            {

+                MainLog.Instance.Verbose("Closing local asset server database");

+                db.Close();

+            }

+        }

+

+        private void RunRequests()

+        {

+            while (true)

+            {

+                byte[] idata = null;

+                bool found = false;

+                AssetStorage foundAsset = null;

+                ARequest req = this._assetRequests.Dequeue();

+                IObjectSet result = db.Query(new AssetUUIDQuery(req.AssetID));

+                if (result.Count > 0)

+                {

+                    foundAsset = (AssetStorage)result.Next();

+                    found = true;

+                }

+

+                AssetBase asset = new AssetBase();

+                if (found)

+                {

+                    asset.FullID = foundAsset.UUID;

+                    asset.Type = foundAsset.Type;

+                    asset.InvType = foundAsset.Type;

+                    asset.Name = foundAsset.Name;

+                    idata = foundAsset.Data;

+                    asset.Data = idata;

+                    _receiver.AssetReceived(asset, req.IsTexture);

+                }

+                else

+                {

+                    //asset.FullID = ;

+                    _receiver.AssetNotFound(req.AssetID);

+                }

+

+            }

+

+        }

+

+        override protected void StoreAsset(AssetBase asset)

+        {

+            AssetStorage store = new AssetStorage();

+            store.Data = asset.Data;

+            store.Name = asset.Name;

+            store.UUID = asset.FullID;

+            db.Set(store);

+

+            CommitAssets();

+        }

+

+        protected override void CommitAssets()

+        {

+            db.Commit();

+        }

+

+        private void SetUpAssetDatabase()

+        {

+            MainLog.Instance.Verbose("LOCAL ASSET SERVER", "Setting up asset database");

+

+            ForEachDefaultAsset(this, StoreAsset);

+            ForEachXmlAsset(this, StoreAsset);

+        }

+    }

+

+    public class AssetUUIDQuery : Predicate

+    {

+        private LLUUID _findID;

+

+        public AssetUUIDQuery(LLUUID find)

+        {

+            _findID = find;

+        }

+        public bool Match(AssetStorage asset)

+        {

+            return (asset.UUID == _findID);

+        }

+    }

+}
\ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
new file mode 100644
index 0000000..7073000
--- /dev/null
+++ b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
@@ -0,0 +1,180 @@
+using System;

+using System.Collections.Generic;

+using System.IO;

+using System.Threading;

+using libsecondlife;

+using Nini.Config;

+using OpenSim.Framework.Console;

+using OpenSim.Framework.Interfaces;

+using OpenSim.Framework.Types;

+using OpenSim.Framework.Utilities;

+

+namespace OpenSim.Framework.Communications.Cache

+{

+    public abstract class AssetServerBase : IAssetServer

+    {

+        protected IAssetReceiver _receiver;

+        protected BlockingQueue<ARequest> _assetRequests;

+        protected Thread _localAssetServerThread;

+        protected IAssetProvider m_assetProviderPlugin;

+        protected object syncLock = new object();

+        

+        protected abstract void StoreAsset(AssetBase asset);

+        protected abstract void CommitAssets();

+

+        public void LoadDefaultAssets()

+        {

+            MainLog.Instance.Verbose("SQL ASSET SERVER", "Setting up asset database");

+

+            ForEachDefaultAsset( this, StoreAsset );

+            ForEachXmlAsset( this, StoreAsset );

+

+            CommitAssets();

+        }

+

+

+        public static AssetBase CreateAsset(IAssetServer assetServer, string assetIdStr, string name, string filename, bool isImage)

+        {

+            AssetBase asset = new AssetBase(

+                new LLUUID(assetIdStr),

+                name

+                );

+

+            if (!String.IsNullOrEmpty(filename))

+            {

+                MainLog.Instance.Verbose("ASSETS", "Loading: [{0}][{1}]", name, filename );

+

+                assetServer.LoadAsset(asset, isImage, filename);

+            }

+            else

+            {

+                MainLog.Instance.Verbose("ASSETS", "Instantiated: [{0}]", name );                

+            }

+

+            return asset;

+        }

+

+        private static AssetBase CreateImageAsset(IAssetServer assetServer, string assetIdStr, string name, string filename)

+        {

+            return CreateAsset(assetServer, assetIdStr, name, filename, true);

+        }

+

+        public static List<AssetBase> GetDefaultAssets(IAssetServer assetServer)

+        {

+            List<AssetBase> assets = new List<AssetBase>();

+

+            assets.Add(CreateImageAsset(assetServer, "00000000-0000-0000-9999-000000000001", "Bricks", "bricks.jp2"));

+            assets.Add(CreateImageAsset(assetServer, "00000000-0000-0000-9999-000000000002", "Plywood", "plywood.jp2"));

+            assets.Add(CreateImageAsset(assetServer, "00000000-0000-0000-9999-000000000003", "Rocks", "rocks.jp2"));

+            assets.Add(CreateImageAsset(assetServer, "00000000-0000-0000-9999-000000000004", "Granite", "granite.jp2"));

+            assets.Add(CreateImageAsset(assetServer, "00000000-0000-0000-9999-000000000005", "Hardwood", "hardwood.jp2"));

+            assets.Add(CreateImageAsset(assetServer, "00000000-0000-0000-5005-000000000005", "Prim Base Texture", "plywood.jp2"));

+            assets.Add(CreateImageAsset(assetServer, "00000000-0000-0000-9999-000000000006", "Map Base Texture", "map_base.jp2"));

+            assets.Add(CreateImageAsset(assetServer, "00000000-0000-0000-9999-000000000007", "Map Texture", "map1.jp2"));

+            assets.Add(CreateImageAsset(assetServer, "00000000-0000-0000-9999-000000000010", "Female Body Texture", "femalebody.jp2"));

+            assets.Add(CreateImageAsset(assetServer, "00000000-0000-0000-9999-000000000011", "Female Bottom Texture", "femalebottom.jp2"));

+            assets.Add(CreateImageAsset(assetServer, "00000000-0000-0000-9999-000000000012", "Female Face Texture", "femaleface.jp2"));

+            assets.Add(CreateImageAsset(assetServer, "00000000-0000-0000-9999-000000000001", "Bricks", "bricks.jp2"));

+

+            assets.Add(CreateAsset(assetServer, "77c41e39-38f9-f75a-024e-585989bbabbb", "Skin", "base_skin.dat", false));

+            assets.Add(CreateAsset(assetServer, "66c41e39-38f9-f75a-024e-585989bfab73", "Shape", "base_shape.dat", false));

+            assets.Add(CreateAsset(assetServer, "00000000-38f9-1111-024e-222222111110", "Shirt", "newshirt.dat", false));

+            assets.Add(CreateAsset(assetServer, "00000000-38f9-1111-024e-222222111120", "Shirt", "newpants.dat", false));

+

+            return assets;

+        }

+

+        public static void ForEachDefaultAsset(IAssetServer assetServer, Action<AssetBase> action)

+        {

+            List<AssetBase> assets = GetDefaultAssets(assetServer);

+            assets.ForEach(action);

+        }

+

+        public AssetServerBase()

+        {

+            System.Console.WriteLine("Starting Db4o asset storage system");            

+            this._assetRequests = new BlockingQueue<ARequest>();

+        }

+

+        public void LoadAsset(AssetBase info, bool image, string filename)

+        {

+            //should request Asset from storage manager

+            //but for now read from file

+

+            string dataPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "assets"); //+ folder;

+            string fileName = Path.Combine(dataPath, filename);

+            FileInfo fInfo = new FileInfo(fileName);

+            long numBytes = fInfo.Length;

+            FileStream fStream = new FileStream(fileName, FileMode.Open, FileAccess.Read);

+            byte[] idata = new byte[numBytes];

+            BinaryReader br = new BinaryReader(fStream);

+            idata = br.ReadBytes((int)numBytes);

+            br.Close();

+            fStream.Close();

+            info.Data = idata;

+            //info.loaded=true;

+        }

+

+        public static void ForEachXmlAsset(IAssetServer assetServer, Action<AssetBase> action)

+        {

+            string filePath = Path.Combine(Util.configDir(), "OpenSimAssetSet.xml");

+            if (File.Exists(filePath))

+            {

+                XmlConfigSource source = new XmlConfigSource(filePath);

+

+                for (int i = 0; i < source.Configs.Count; i++)

+                {

+                    string assetIdStr = source.Configs[i].GetString("assetID", LLUUID.Random().ToStringHyphenated());

+                    string name = source.Configs[i].GetString("name", "");

+                    sbyte type = (sbyte)source.Configs[i].GetInt("assetType", 0);

+                    sbyte invType = (sbyte)source.Configs[i].GetInt("inventoryType", 0);

+                    string fileName = source.Configs[i].GetString("fileName", "");

+

+                    AssetBase newAsset = CreateAsset(assetServer, assetIdStr, name, fileName, false);

+

+                    newAsset.Type = type;

+                    newAsset.InvType = invType;

+

+                }

+            }

+        }

+

+        public void SetReceiver(IAssetReceiver receiver)

+        {

+            this._receiver = receiver;

+        }

+

+        public void FetchAsset(LLUUID assetID, bool isTexture)

+        {

+            ARequest req = new ARequest();

+            req.AssetID = assetID;

+            req.IsTexture = isTexture;

+            this._assetRequests.Enqueue(req);

+        }

+

+        public void UpdateAsset(AssetBase asset)

+        {

+            lock (syncLock)

+            {

+                m_assetProviderPlugin.UpdateAsset(asset);

+                m_assetProviderPlugin.CommitAssets();

+            }

+        }

+

+        public void StoreAndCommitAsset(AssetBase asset)

+        {

+            lock (syncLock)

+            {

+                StoreAsset(asset);

+                CommitAssets();

+            }

+        }

+

+        public void SetServerInfo(string ServerUrl, string ServerKey)

+        {

+           

+        }

+

+        public abstract void Close();

+    }

+}
\ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs b/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs
index 35ec1cf..cf54b81 100644
--- a/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs
+++ b/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs
@@ -36,32 +36,22 @@ using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;

 using OpenSim.Framework.Utilities;

 

-namespace OpenSim.Framework.Communications.Caches

+namespace OpenSim.Framework.Communications.Cache

 {

-

-    public class SQLAssetServer : IAssetServer

+    public class SQLAssetServer : AssetServerBase

     {

-        private IAssetReceiver _receiver;

-        private BlockingQueue<ARequest> _assetRequests;

-        private Thread _localAssetServerThread;

-        protected IAssetProvider m_assetProviderPlugin;

-        private object syncLock = new object();

-

-

         public SQLAssetServer(string pluginName)

         {

             _assetRequests = new BlockingQueue<ARequest>();

             AddPlugin(pluginName);

 

-            SetUpAssetDatabase();

-

             this._localAssetServerThread = new Thread(new ThreadStart(RunRequests));

             this._localAssetServerThread.IsBackground = true;

             this._localAssetServerThread.Start();

 

         }

 

-        public SQLAssetServer( IAssetProvider assetProvider )

+        public SQLAssetServer(IAssetProvider assetProvider)

         {

             m_assetProviderPlugin = assetProvider;

         }

@@ -93,49 +83,15 @@ namespace OpenSim.Framework.Communications.Caches
             pluginAssembly = null;

         }

 

-        public void SetReceiver(IAssetReceiver receiver)

-        {

-            this._receiver = receiver;

-        }

-

-        public void FetchAsset(LLUUID assetID, bool isTexture)

-        {

-            ARequest req = new ARequest();

-            req.AssetID = assetID;

-            req.IsTexture = isTexture;

-            this._assetRequests.Enqueue(req);

-        }

-

-        public void UpdateAsset(AssetBase asset)

-        {

-            lock (syncLock)

-            {

-                m_assetProviderPlugin.UpdateAsset(asset);

-                m_assetProviderPlugin.CommitAssets();

-            }

-        }

 

-        public void CreateAsset(AssetBase asset)

-        {

-            lock (syncLock)

-            {

-                m_assetProviderPlugin.CreateAsset(asset);

-                m_assetProviderPlugin.CommitAssets();

-            }

-        }

-

-        public void SetServerInfo(string ServerUrl, string ServerKey)

-        {

-

-        }

-        public void Close()

+        public override void Close()

         {

             m_assetProviderPlugin.CommitAssets();

         }

 

         private void RunRequests()

         {

-            

+

             while (true)

             {

                 ARequest req = this._assetRequests.Dequeue();

@@ -160,156 +116,14 @@ namespace OpenSim.Framework.Communications.Caches
 

         }

 

-        private void SetUpAssetDatabase()

+        protected override void StoreAsset(AssetBase asset)

         {

-            MainLog.Instance.Verbose("Setting up asset database");

-

-            AssetBase Image = new AssetBase();

-            Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000001");

-            Image.Name = "Bricks";

-            this.LoadAsset(Image, true, "bricks.jp2");

-            m_assetProviderPlugin.CreateAsset(Image);

-

-            Image = new AssetBase();

-            Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000002");

-            Image.Name = "Plywood";

-            this.LoadAsset(Image, true, "plywood.jp2");

-            m_assetProviderPlugin.CreateAsset(Image);

-

-            Image = new AssetBase();

-            Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000003");

-            Image.Name = "Rocks";

-            this.LoadAsset(Image, true, "rocks.jp2");

-            m_assetProviderPlugin.CreateAsset(Image);

-

-            Image = new AssetBase();

-            Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000004");

-            Image.Name = "Granite";

-            this.LoadAsset(Image, true, "granite.jp2");

-            m_assetProviderPlugin.CreateAsset(Image);

-

-            Image = new AssetBase();

-            Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000005");

-            Image.Name = "Hardwood";

-            this.LoadAsset(Image, true, "hardwood.jp2");

-            m_assetProviderPlugin.CreateAsset(Image);

-

-            Image = new AssetBase();

-            Image.FullID = new LLUUID("00000000-0000-0000-5005-000000000005");

-            Image.Name = "Prim Base Texture";

-            this.LoadAsset(Image, true, "plywood.jp2");

-            m_assetProviderPlugin.CreateAsset(Image);

-

-            Image = new AssetBase();

-            Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000006");

-            Image.Name = "Map Base Texture";

-            this.LoadAsset(Image, true, "map_base.jp2");

-            m_assetProviderPlugin.CreateAsset(Image);

-

-            Image = new AssetBase();

-            Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000007");

-            Image.Name = "Map Texture";

-            this.LoadAsset(Image, true, "map1.jp2");

-            m_assetProviderPlugin.CreateAsset(Image);

-

-            Image = new AssetBase();

-            Image.FullID = new LLUUID("00000000-0000-1111-9999-000000000010");

-            Image.Name = "Female Body Texture";

-            this.LoadAsset(Image, true, "femalebody.jp2");

-            m_assetProviderPlugin.CreateAsset(Image);

-

-            Image = new AssetBase();

-            Image.FullID = new LLUUID("00000000-0000-1111-9999-000000000011");

-            Image.Name = "Female Bottom Texture";

-            this.LoadAsset(Image, true, "femalebottom.jp2");

-            m_assetProviderPlugin.CreateAsset(Image);

-

-            Image = new AssetBase();

-            Image.FullID = new LLUUID("00000000-0000-1111-9999-000000000012");

-            Image.Name = "Female Face Texture";

-            this.LoadAsset(Image, true, "femaleface.jp2");

-            m_assetProviderPlugin.CreateAsset(Image);

-

-            Image = new AssetBase();

-            Image.FullID = new LLUUID("77c41e39-38f9-f75a-024e-585989bbabbb");

-            Image.Name = "Skin";

-            Image.Type = 13;

-            Image.InvType = 13;

-            this.LoadAsset(Image, false, "base_skin.dat");

-            m_assetProviderPlugin.CreateAsset(Image);

-

-            Image = new AssetBase();

-            Image.FullID = new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73");

-            Image.Name = "Shape";

-            Image.Type = 13;

-            Image.InvType = 13;

-            this.LoadAsset(Image, false, "base_shape.dat");

-            m_assetProviderPlugin.CreateAsset(Image);

-

-            Image = new AssetBase();

-            Image.FullID = new LLUUID("00000000-38f9-1111-024e-222222111110");

-            Image.Name = "Shirt";

-            Image.Type = 5;

-            Image.InvType = 18;

-            this.LoadAsset(Image, false, "newshirt.dat");

-            m_assetProviderPlugin.CreateAsset(Image);

-

-            Image = new AssetBase();

-            Image.FullID = new LLUUID("00000000-38f9-1111-024e-222222111120");

-            Image.Name = "Shirt";

-            Image.Type = 5;

-            Image.InvType = 18;

-            this.LoadAsset(Image, false, "newpants.dat");

-            m_assetProviderPlugin.CreateAsset(Image);

-

-            string filePath = Path.Combine(Util.configDir(), "OpenSimAssetSet.xml");

-            if (File.Exists(filePath))

-            {

-                XmlConfigSource source = new XmlConfigSource(filePath);

-                ReadAssetDetails(source);

-            }

-

-            m_assetProviderPlugin.CommitAssets();

+            m_assetProviderPlugin.CreateAsset(asset);

         }

 

-        protected void ReadAssetDetails(IConfigSource source)

+        protected override void CommitAssets()

         {

-            AssetBase newAsset = null;

-            for (int i = 0; i < source.Configs.Count; i++)

-            {

-                newAsset = new AssetBase();

-                newAsset.FullID = new LLUUID(source.Configs[i].GetString("assetID", LLUUID.Random().ToStringHyphenated()));

-                newAsset.Name = source.Configs[i].GetString("name", "");

-                newAsset.Type = (sbyte)source.Configs[i].GetInt("assetType", 0);

-                newAsset.InvType = (sbyte)source.Configs[i].GetInt("inventoryType", 0);

-                string fileName = source.Configs[i].GetString("fileName", "");

-                if (fileName != "")

-                {

-                    MainLog.Instance.Verbose("Creating new asset: " + newAsset.Name);

-                    this.LoadAsset(newAsset, false, fileName);

-                    m_assetProviderPlugin.CreateAsset(newAsset);

-                }

-            }

-        }

-

-        private void LoadAsset(AssetBase info, bool image, string filename)

-        {

-            //should request Asset from storage manager

-            //but for now read from file

-

-            string dataPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "assets"); //+ folder;

-            string fileName = Path.Combine(dataPath, filename);

-            FileInfo fInfo = new FileInfo(fileName);

-            long numBytes = fInfo.Length;

-            FileStream fStream = new FileStream(fileName, FileMode.Open, FileAccess.Read);

-            byte[] idata = new byte[numBytes];

-            BinaryReader br = new BinaryReader(fStream);

-            idata = br.ReadBytes((int)numBytes);

-            br.Close();

-            fStream.Close();

-            info.Data = idata;

-            //info.loaded=true;

+            m_assetProviderPlugin.CommitAssets();

         }

     }

-

-}

+}
\ No newline at end of file
diff --git a/OpenSim/Framework/General/Interfaces/IAssetServer.cs b/OpenSim/Framework/General/Interfaces/IAssetServer.cs
index f6849bf..e7401eb 100644
--- a/OpenSim/Framework/General/Interfaces/IAssetServer.cs
+++ b/OpenSim/Framework/General/Interfaces/IAssetServer.cs
@@ -39,9 +39,10 @@ namespace OpenSim.Framework.Interfaces
         void SetReceiver(IAssetReceiver receiver);
         void FetchAsset(LLUUID assetID, bool isTexture);
         void UpdateAsset(AssetBase asset);
-        void CreateAsset(AssetBase asset);
+        void StoreAndCommitAsset(AssetBase asset);
         void SetServerInfo(string ServerUrl, string ServerKey);
         void Close();
+        void LoadAsset(AssetBase info, bool image, string filename);
     }
 
     // could change to delegate?
diff --git a/OpenSim/Framework/General/Types/AssetBase.cs b/OpenSim/Framework/General/Types/AssetBase.cs
index ddd033f..628724d 100644
--- a/OpenSim/Framework/General/Types/AssetBase.cs
+++ b/OpenSim/Framework/General/Types/AssetBase.cs
@@ -44,5 +44,11 @@ namespace OpenSim.Framework.Types
         {
      
         }
+
+        public AssetBase(LLUUID assetId, string name)
+        {
+            FullID = assetId;
+            Name = name;
+        }
     }
 }