get rid of all the ^M line endings

3 files changed, 467 insertions, 467 deletions

diff --git a/OpenSim/Framework/Communications/Cache/AssetServer.cs b/OpenSim/Framework/Communications/Cache/AssetServer.cs
index b17f65a..22bdc5c 100644
--- a/OpenSim/Framework/Communications/Cache/AssetServer.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetServer.cs
@@ -1,157 +1,157 @@
-/*

-* Copyright (c) Contributors, http://opensimulator.org/

-* See CONTRIBUTORS.TXT for a full list of copyright holders.

-*

-* Redistribution and use in source and binary forms, with or without

-* modification, are permitted provided that the following conditions are met:

-*     * Redistributions of source code must retain the above copyright

-*       notice, this list of conditions and the following disclaimer.

-*     * Redistributions in binary form must reproduce the above copyright

-*       notice, this list of conditions and the following disclaimer in the

-*       documentation and/or other materials provided with the distribution.

-*     * Neither the name of the OpenSim Project nor the

-*       names of its contributors may be used to endorse or promote products

-*       derived from this software without specific prior written permission.

-*

-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY

-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

-* (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.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();

-            }

-        }

-

-        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()

-        {

-            base.Close();

-

-            if (db != null)

-            {

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

-                db.Close();

-            }

-        }

-

-        override  protected 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();

-        }

-

-        protected virtual void SetUpAssetDatabase()

-        {

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

-

-            ForEachDefaultAsset(StoreAsset);

-            ForEachXmlAsset(StoreAsset);

-        }

-    }

-

-    public class AssetUUIDQuery : Predicate

-    {

-        private LLUUID _findID;

-

-        public AssetUUIDQuery(LLUUID find)

-        {

-            _findID = find;

-        }

-        public bool Match(AssetStorage asset)

-        {

-            return (asset.UUID == _findID);

-        }

-    }

+/*
+* Copyright (c) Contributors, http://opensimulator.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (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.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();
+            }
+        }
+
+        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()
+        {
+            base.Close();
+
+            if (db != null)
+            {
+                MainLog.Instance.Verbose("Closing local asset server database");
+                db.Close();
+            }
+        }
+
+        override  protected 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();
+        }
+
+        protected virtual void SetUpAssetDatabase()
+        {
+            MainLog.Instance.Verbose("LOCAL ASSET SERVER", "Setting up asset database");
+
+            ForEachDefaultAsset(StoreAsset);
+            ForEachXmlAsset(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
index 858019f..08d5b87 100644
--- a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
@@ -1,188 +1,188 @@
-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();

-

-        protected abstract void RunRequests();

- 

-        public void LoadDefaultAssets()

-        {

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

-

-            ForEachDefaultAsset(StoreAsset );

-            ForEachXmlAsset(StoreAsset );

-

-            CommitAssets();

-        }

-

-

-        public AssetServerBase()

-        {

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

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

-

-            this._localAssetServerThread = new Thread( RunRequests );

-            this._localAssetServerThread.IsBackground = true;

-            this._localAssetServerThread.Start();

-        }

-

-        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 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 virtual void Close()

-    {

-        _localAssetServerThread.Abort( );

-    }

-

-        public void SetServerInfo(string ServerUrl, string ServerKey)

-        {

-           

-        }

-

-        public virtual List<AssetBase> GetDefaultAssets()

-        {

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

-

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

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

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

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

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

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

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

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

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

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

-            assets.Add(CreateImageAsset("00000000-0000-0000-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;

-        }

-

-        public AssetBase CreateImageAsset(string assetIdStr, string name, string filename)

-        {

-            return CreateAsset(assetIdStr, name, filename, true);

-        }

-

-        public void ForEachDefaultAsset(Action<AssetBase> action)

-        {

-            List<AssetBase> assets = GetDefaultAssets();

-            assets.ForEach(action);

-        }

-

-        public AssetBase CreateAsset(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 );

-

-                LoadAsset(asset, isImage, filename);

-            }

-            else

-            {

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

-            }

-

-            return asset;

-        }

-

-        public void ForEachXmlAsset(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(assetIdStr, name, fileName, false);

-

-                    newAsset.Type = type;

-                    newAsset.InvType = invType;

-

-                }

-            }

-        }

-    }

+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();
+
+        protected abstract void RunRequests();
+ 
+        public void LoadDefaultAssets()
+        {
+            MainLog.Instance.Verbose("SQL ASSET SERVER", "Setting up asset database");
+
+            ForEachDefaultAsset(StoreAsset );
+            ForEachXmlAsset(StoreAsset );
+
+            CommitAssets();
+        }
+
+
+        public AssetServerBase()
+        {
+            System.Console.WriteLine("Starting Db4o asset storage system");            
+            this._assetRequests = new BlockingQueue<ARequest>();
+
+            this._localAssetServerThread = new Thread( RunRequests );
+            this._localAssetServerThread.IsBackground = true;
+            this._localAssetServerThread.Start();
+        }
+
+        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 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 virtual void Close()
+    {
+        _localAssetServerThread.Abort( );
+    }
+
+        public void SetServerInfo(string ServerUrl, string ServerKey)
+        {
+           
+        }
+
+        public virtual List<AssetBase> GetDefaultAssets()
+        {
+            List<AssetBase> assets = new List<AssetBase>();
+
+            assets.Add(CreateImageAsset("00000000-0000-0000-9999-000000000001", "Bricks", "bricks.jp2"));
+            assets.Add(CreateImageAsset("00000000-0000-0000-9999-000000000002", "Plywood", "plywood.jp2"));
+            assets.Add(CreateImageAsset("00000000-0000-0000-9999-000000000003", "Rocks", "rocks.jp2"));
+            assets.Add(CreateImageAsset("00000000-0000-0000-9999-000000000004", "Granite", "granite.jp2"));
+            assets.Add(CreateImageAsset("00000000-0000-0000-9999-000000000005", "Hardwood", "hardwood.jp2"));
+            assets.Add(CreateImageAsset("00000000-0000-0000-5005-000000000005", "Prim Base Texture", "plywood.jp2"));
+            assets.Add(CreateImageAsset("00000000-0000-0000-9999-000000000006", "Map Base Texture", "map_base.jp2"));
+            assets.Add(CreateImageAsset("00000000-0000-0000-9999-000000000007", "Map Texture", "map1.jp2"));
+            assets.Add(CreateImageAsset("00000000-0000-0000-9999-000000000010", "Female Body Texture", "femalebody.jp2"));
+            assets.Add(CreateImageAsset("00000000-0000-0000-9999-000000000011", "Female Bottom Texture", "femalebottom.jp2"));
+            assets.Add(CreateImageAsset("00000000-0000-0000-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;
+        }
+
+        public AssetBase CreateImageAsset(string assetIdStr, string name, string filename)
+        {
+            return CreateAsset(assetIdStr, name, filename, true);
+        }
+
+        public void ForEachDefaultAsset(Action<AssetBase> action)
+        {
+            List<AssetBase> assets = GetDefaultAssets();
+            assets.ForEach(action);
+        }
+
+        public AssetBase CreateAsset(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 );
+
+                LoadAsset(asset, isImage, filename);
+            }
+            else
+            {
+                MainLog.Instance.Verbose("ASSETS", "Instantiated: [{0}]", name );                
+            }
+
+            return asset;
+        }
+
+        public void ForEachXmlAsset(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(assetIdStr, name, fileName, false);
+
+                    newAsset.Type = type;
+                    newAsset.InvType = invType;
+
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs b/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs
index 379d609..69f83d2 100644
--- a/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs
+++ b/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs
@@ -1,125 +1,125 @@
-/*

-* Copyright (c) Contributors, http://www.openmetaverse.org/

-* See CONTRIBUTORS.TXT for a full list of copyright holders.

-*

-* Redistribution and use in source and binary forms, with or without

-* modification, are permitted provided that the following conditions are met:

-*     * Redistributions of source code must retain the above copyright

-*       notice, this list of conditions and the following disclaimer.

-*     * Redistributions in binary form must reproduce the above copyright

-*       notice, this list of conditions and the following disclaimer in the

-*       documentation and/or other materials provided with the distribution.

-*     * Neither the name of the OpenSim Project nor the

-*       names of its contributors may be used to endorse or promote products

-*       derived from this software without specific prior written permission.

-*

-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY

-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

-* (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 System.Reflection;

-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 class SQLAssetServer : AssetServerBase

-    {

-        public SQLAssetServer(string pluginName)

-        {

-            _assetRequests = new BlockingQueue<ARequest>();

-            AddPlugin(pluginName);

-        }

-

-        public SQLAssetServer(IAssetProvider assetProvider)

-        {

-            m_assetProviderPlugin = assetProvider;

-        }

-

-        public void AddPlugin(string FileName)

-        {

-            MainLog.Instance.Verbose("SQLAssetServer", "AssetStorage: Attempting to load " + FileName);

-            Assembly pluginAssembly = Assembly.LoadFrom(FileName);

-

-            foreach (Type pluginType in pluginAssembly.GetTypes())

-            {

-                if (!pluginType.IsAbstract)

-                {

-                    Type typeInterface = pluginType.GetInterface("IAssetProvider", true);

-

-                    if (typeInterface != null)

-                    {

-                        IAssetProvider plug = (IAssetProvider)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));

-                        m_assetProviderPlugin = plug;

-                        m_assetProviderPlugin.Initialise();

-

-                        MainLog.Instance.Verbose("AssetStorage: Added " + m_assetProviderPlugin.Name + " " + m_assetProviderPlugin.Version);

-                    }

-

-                    typeInterface = null;

-                }

-            }

-

-            pluginAssembly = null;

-        }

-

-

-        public override void Close()

-        {

-            base.Close();

-

-            m_assetProviderPlugin.CommitAssets();

-        }

-

-        override protected void RunRequests()

-        {

-            while (true)

-            {

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

-

-                MainLog.Instance.Verbose("Requesting asset: " + req.AssetID);

-

-                AssetBase asset = null;

-                lock (syncLock)

-                {

-                    asset = m_assetProviderPlugin.FetchAsset(req.AssetID);

-                }

-                if (asset != null)

-                {

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

-                }

-                else

-                {

-                    _receiver.AssetNotFound(req.AssetID);

-                }

-

-            }

-

-        }

-

-        protected override void StoreAsset(AssetBase asset)

-        {

-            m_assetProviderPlugin.CreateAsset(asset);

-        }

-

-        protected override void CommitAssets()

-        {

-            m_assetProviderPlugin.CommitAssets();

-        }

-    }

+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (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 System.Reflection;
+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 class SQLAssetServer : AssetServerBase
+    {
+        public SQLAssetServer(string pluginName)
+        {
+            _assetRequests = new BlockingQueue<ARequest>();
+            AddPlugin(pluginName);
+        }
+
+        public SQLAssetServer(IAssetProvider assetProvider)
+        {
+            m_assetProviderPlugin = assetProvider;
+        }
+
+        public void AddPlugin(string FileName)
+        {
+            MainLog.Instance.Verbose("SQLAssetServer", "AssetStorage: Attempting to load " + FileName);
+            Assembly pluginAssembly = Assembly.LoadFrom(FileName);
+
+            foreach (Type pluginType in pluginAssembly.GetTypes())
+            {
+                if (!pluginType.IsAbstract)
+                {
+                    Type typeInterface = pluginType.GetInterface("IAssetProvider", true);
+
+                    if (typeInterface != null)
+                    {
+                        IAssetProvider plug = (IAssetProvider)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
+                        m_assetProviderPlugin = plug;
+                        m_assetProviderPlugin.Initialise();
+
+                        MainLog.Instance.Verbose("AssetStorage: Added " + m_assetProviderPlugin.Name + " " + m_assetProviderPlugin.Version);
+                    }
+
+                    typeInterface = null;
+                }
+            }
+
+            pluginAssembly = null;
+        }
+
+
+        public override void Close()
+        {
+            base.Close();
+
+            m_assetProviderPlugin.CommitAssets();
+        }
+
+        override protected void RunRequests()
+        {
+            while (true)
+            {
+                ARequest req = this._assetRequests.Dequeue();
+
+                MainLog.Instance.Verbose("Requesting asset: " + req.AssetID);
+
+                AssetBase asset = null;
+                lock (syncLock)
+                {
+                    asset = m_assetProviderPlugin.FetchAsset(req.AssetID);
+                }
+                if (asset != null)
+                {
+                    _receiver.AssetReceived(asset, req.IsTexture);
+                }
+                else
+                {
+                    _receiver.AssetNotFound(req.AssetID);
+                }
+
+            }
+
+        }
+
+        protected override void StoreAsset(AssetBase asset)
+        {
+            m_assetProviderPlugin.CreateAsset(asset);
+        }
+
+        protected override void CommitAssets()
+        {
+            m_assetProviderPlugin.CommitAssets();
+        }
+    }
 }
\ No newline at end of file