fixing me some line endings

6 files changed, 772 insertions, 772 deletions

diff --git a/OpenSim/Framework/Communications/Cache/AssetServer.cs b/OpenSim/Framework/Communications/Cache/AssetServer.cs
index 8c63b30..e5329ec 100644
--- a/OpenSim/Framework/Communications/Cache/AssetServer.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetServer.cs
@@ -1,393 +1,393 @@
-/*

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

-        }

-    }

-

-}

-

+/*
+* 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.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);
+        }
+    }
+
+}
+
diff --git a/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs b/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs
index a965ee0..a64d195 100644
--- a/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs
+++ b/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs
@@ -44,7 +44,7 @@ namespace OpenSim.Framework.Communications.Caches
         private IAssetReceiver _receiver;
         private BlockingQueue<ARequest> _assetRequests;
         private Thread _localAssetServerThread;
-        protected IAssetProvider m_plugin;

+        protected IAssetProvider m_plugin;
         private object syncLock = new object();
 
 
@@ -102,20 +102,20 @@ namespace OpenSim.Framework.Communications.Caches
         }
 
         public void UpdateAsset(AssetBase asset)
-        {

-            lock (syncLock)

-            {

-                m_plugin.UpdateAsset(asset);

-                m_plugin.CommitAssets();

+        {
+            lock (syncLock)
+            {
+                m_plugin.UpdateAsset(asset);
+                m_plugin.CommitAssets();
             }
         }
 
         public void CreateAsset(AssetBase asset)
-        {

-            lock (syncLock)

-            {

-                m_plugin.CreateAsset(asset);

-                m_plugin.CommitAssets();

+        {
+            lock (syncLock)
+            {
+                m_plugin.CreateAsset(asset);
+                m_plugin.CommitAssets();
             }
         }
 
@@ -135,12 +135,12 @@ namespace OpenSim.Framework.Communications.Caches
             {
                 ARequest req = this._assetRequests.Dequeue();
 
-                MainLog.Instance.Verbose("Requesting asset: " + req.AssetID);

-

-                AssetBase asset = null;

-                lock (syncLock)

-                {

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

+                MainLog.Instance.Verbose("Requesting asset: " + req.AssetID);
+
+                AssetBase asset = null;
+                lock (syncLock)
+                {
+                    asset = m_plugin.FetchAsset(req.AssetID);
                 }
                 if (asset != null)
                 {
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDItemUpdate.cs b/OpenSim/Framework/Communications/Capabilities/LLSDItemUpdate.cs
index d47bb07..19220ac 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDItemUpdate.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDItemUpdate.cs
@@ -1,17 +1,17 @@
-using System;

-using System.Collections.Generic;

-using System.Text;

-using libsecondlife;

-

-namespace OpenSim.Region.Capabilities

-{

-    [LLSDMap]

-    public class LLSDItemUpdate

-    {

-        public LLUUID item_id;

-

-        public LLSDItemUpdate()

-        {

-        }

-    }

-}

+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+
+namespace OpenSim.Region.Capabilities
+{
+    [LLSDMap]
+    public class LLSDItemUpdate
+    {
+        public LLUUID item_id;
+
+        public LLSDItemUpdate()
+        {
+        }
+    }
+}
diff --git a/OpenSim/Framework/General/Interfaces/IAssetProvider.cs b/OpenSim/Framework/General/Interfaces/IAssetProvider.cs
index a2ef826..daf9d6d 100644
--- a/OpenSim/Framework/General/Interfaces/IAssetProvider.cs
+++ b/OpenSim/Framework/General/Interfaces/IAssetProvider.cs
@@ -1,18 +1,18 @@
-using System;

-using System.Collections.Generic;

-using System.Text;

-using OpenSim.Framework.Types;

-using libsecondlife;

-

-namespace OpenSim.Framework.Interfaces

-{

-    public interface IAssetProvider

-    {

-        void Initialise(string dbfile, string dbname);

-        AssetBase FetchAsset(LLUUID uuid);

-        void CreateAsset(AssetBase asset);

-        void UpdateAsset(AssetBase asset);

-        bool ExistsAsset(LLUUID uuid);

-        void CommitAssets(); // force a sync to the database

-    }

+using System;
+using System.Collections.Generic;
+using System.Text;
+using OpenSim.Framework.Types;
+using libsecondlife;
+
+namespace OpenSim.Framework.Interfaces
+{
+    public interface IAssetProvider
+    {
+        void Initialise(string dbfile, string dbname);
+        AssetBase FetchAsset(LLUUID uuid);
+        void CreateAsset(AssetBase asset);
+        void UpdateAsset(AssetBase asset);
+        bool ExistsAsset(LLUUID uuid);
+        void CommitAssets(); // force a sync to the database
+    }
 }
\ No newline at end of file
diff --git a/OpenSim/Framework/UserManager/CAPSService.cs b/OpenSim/Framework/UserManager/CAPSService.cs
index 39af140..a8eac26 100644
--- a/OpenSim/Framework/UserManager/CAPSService.cs
+++ b/OpenSim/Framework/UserManager/CAPSService.cs
@@ -1,38 +1,38 @@
-using System;

-using System.Collections;

-using System.Collections.Generic;

-using System.Reflection;

-using System.Security.Cryptography;

-using libsecondlife;

-using Nwc.XmlRpc;

-using OpenSim.Framework.Console;

-using OpenSim.Framework.Data;

-using OpenSim.Framework.Interfaces;

-using OpenSim.Framework.Inventory;

-using OpenSim.Framework.Utilities;

-using OpenSim.Framework.Servers;

-

-namespace OpenSim.Framework.UserManagement

-{

-    public class CAPSService

-    {

-        private BaseHttpServer m_server;

-

-        public CAPSService(BaseHttpServer httpServer)

-        {

-            m_server = httpServer;

-            this.AddCapsSeedHandler("/CapsSeed/", CapsRequest);

-        }

-

-        private void AddCapsSeedHandler(string path, RestMethod restMethod)

-        {

-            m_server.AddStreamHandler(new RestStreamHandler("POST",  path, restMethod));

-        }

-

-        public string CapsRequest(string request, string path, string param)

-        {

-            System.Console.WriteLine("new caps request " + request +" from path "+ path);

-            return "";

-        }

-    }

-}

+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Security.Cryptography;
+using libsecondlife;
+using Nwc.XmlRpc;
+using OpenSim.Framework.Console;
+using OpenSim.Framework.Data;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Inventory;
+using OpenSim.Framework.Utilities;
+using OpenSim.Framework.Servers;
+
+namespace OpenSim.Framework.UserManagement
+{
+    public class CAPSService
+    {
+        private BaseHttpServer m_server;
+
+        public CAPSService(BaseHttpServer httpServer)
+        {
+            m_server = httpServer;
+            this.AddCapsSeedHandler("/CapsSeed/", CapsRequest);
+        }
+
+        private void AddCapsSeedHandler(string path, RestMethod restMethod)
+        {
+            m_server.AddStreamHandler(new RestStreamHandler("POST",  path, restMethod));
+        }
+
+        public string CapsRequest(string request, string path, string param)
+        {
+            System.Console.WriteLine("new caps request " + request +" from path "+ path);
+            return "";
+        }
+    }
+}
diff --git a/OpenSim/Framework/UserManager/LoginService.cs b/OpenSim/Framework/UserManager/LoginService.cs
index 0af341e..32f5565 100644
--- a/OpenSim/Framework/UserManager/LoginService.cs
+++ b/OpenSim/Framework/UserManager/LoginService.cs
@@ -1,290 +1,290 @@
-using System;

-using System.Collections;

-using System.Collections.Generic;

-using System.Reflection;

-using System.Security.Cryptography;

-using libsecondlife;

-using Nwc.XmlRpc;

-using OpenSim.Framework.Console;

-using OpenSim.Framework.Data;

-using OpenSim.Framework.Interfaces;

-using OpenSim.Framework.Inventory;

-using OpenSim.Framework.Utilities;

-

-using OpenSim.Framework.Configuration;

-using InventoryFolder = OpenSim.Framework.Inventory.InventoryFolder;

-

-namespace OpenSim.Framework.UserManagement

-{

-    public class LoginService

-    {

-        protected string m_welcomeMessage = "Welcome to OpenSim";

-        protected UserManagerBase m_userManager = null;

-

-        public LoginService(UserManagerBase userManager, string welcomeMess)

-        {

-            m_userManager = userManager;

-            if (welcomeMess != "")

-            {

-                m_welcomeMessage = welcomeMess;

-            }

-        }

-

-        /// <summary>

-        /// Main user login function

-        /// </summary>

-        /// <param name="request">The XMLRPC request</param>

-        /// <returns>The response to send</returns>

-        public XmlRpcResponse XmlRpcLoginMethod(XmlRpcRequest request)

-        {

-

-            System.Console.WriteLine("Attempting login now...");

-            XmlRpcResponse response = new XmlRpcResponse();

-            Hashtable requestData = (Hashtable)request.Params[0];

-

-            bool GoodXML = (requestData.Contains("first") && requestData.Contains("last") && requestData.Contains("passwd"));

-            bool GoodLogin = false;

-            string firstname = "";

-            string lastname = "";

-            string passwd = "";

-

-            UserProfileData userProfile;

-            LoginResponse logResponse = new LoginResponse();

-

-            if (GoodXML)

-            {

-                firstname = (string)requestData["first"];

-                lastname = (string)requestData["last"];

-                passwd = (string)requestData["passwd"];

-

-                userProfile = GetTheUser(firstname, lastname);

-                if (userProfile == null)

-                    return logResponse.CreateLoginFailedResponse();

-

-                GoodLogin = AuthenticateUser(userProfile, passwd);

-            }

-            else

-            {

-                return logResponse.CreateGridErrorResponse();

-            }

-

-            if (!GoodLogin)

-            {

-                return logResponse.CreateLoginFailedResponse();

-            }

-            else

-            {

-                // If we already have a session...

-                if (userProfile.currentAgent != null && userProfile.currentAgent.agentOnline)

-                {

-                    // Reject the login

-                    return logResponse.CreateAlreadyLoggedInResponse();

-                }

-                // Otherwise...

-                // Create a new agent session

-                CreateAgent(userProfile, request);

-

-                try

-                {

-                    LLUUID agentID = userProfile.UUID;

-

-                    // Inventory Library Section

-                    InventoryData inventData = this.CreateInventoryData(agentID);

-                    ArrayList AgentInventoryArray = inventData.InventoryArray;

-

-                    Hashtable InventoryRootHash = new Hashtable();

-                    InventoryRootHash["folder_id"] = inventData.RootFolderID.ToStringHyphenated();

-                    ArrayList InventoryRoot = new ArrayList();

-                    InventoryRoot.Add(InventoryRootHash);

-                    userProfile.rootInventoryFolderID = inventData.RootFolderID;

-

-                    // Circuit Code

-                    uint circode = (uint)(Util.RandomClass.Next());

-

-                    logResponse.Lastname = userProfile.surname;

-                    logResponse.Firstname = userProfile.username;

-                    logResponse.AgentID = agentID.ToStringHyphenated();

-                    logResponse.SessionID = userProfile.currentAgent.sessionID.ToStringHyphenated();

-                    logResponse.SecureSessionID = userProfile.currentAgent.secureSessionID.ToStringHyphenated();

-                    logResponse.InventoryRoot = InventoryRoot;

-                    logResponse.InventorySkeleton = AgentInventoryArray;

-                    logResponse.InventoryLibrary = this.GetInventoryLibrary();

-                    logResponse.InventoryLibraryOwner = this.GetLibraryOwner();

-                    logResponse.CircuitCode = (Int32)circode;

-                    //logResponse.RegionX = 0; //overwritten

-                    //logResponse.RegionY = 0; //overwritten

-                    logResponse.Home = "!!null temporary value {home}!!";   // Overwritten

-                    //logResponse.LookAt = "\n[r" + TheUser.homeLookAt.X.ToString() + ",r" + TheUser.homeLookAt.Y.ToString() + ",r" + TheUser.homeLookAt.Z.ToString() + "]\n";

-                    //logResponse.SimAddress = "127.0.0.1"; //overwritten

-                    //logResponse.SimPort = 0; //overwritten

-                    logResponse.Message = this.GetMessage();

-

-                    try

-                    {

-                        this.CustomiseResponse(logResponse, userProfile);

-                    }

-                    catch (Exception e)

-                    {

-                        System.Console.WriteLine(e.ToString());

-                        return logResponse.CreateDeadRegionResponse();

-                        //return logResponse.ToXmlRpcResponse();

-                    }

-                    CommitAgent(ref userProfile);

-                    return logResponse.ToXmlRpcResponse();

-

-                }

-

-                catch (Exception E)

-                {

-                    System.Console.WriteLine(E.ToString());

-                }

-                //}

-            }

-            return response;

-

-        }

-

-        /// <summary>

-        /// Customises the login response and fills in missing values.

-        /// </summary>

-        /// <param name="response">The existing response</param>

-        /// <param name="theUser">The user profile</param>

-        public virtual void CustomiseResponse(LoginResponse response, UserProfileData theUser)

-        {

-        }

-

-         /// <summary>

-        /// Saves a target agent to the database

-        /// </summary>

-        /// <param name="profile">The users profile</param>

-        /// <returns>Successful?</returns>

-        public bool CommitAgent(ref UserProfileData profile)

-        {

-            // Saves the agent to database

-            return true;

-        }

-

-

-        /// <summary>

-        /// Checks a user against it's password hash

-        /// </summary>

-        /// <param name="profile">The users profile</param>

-        /// <param name="password">The supplied password</param>

-        /// <returns>Authenticated?</returns>

-        public virtual bool AuthenticateUser(UserProfileData profile, string password)

-        {

-            

-            MainLog.Instance.Verbose(

-                "Authenticating " + profile.username + " " + profile.surname);

-

-            password = password.Remove(0, 3); //remove $1$

-

-            string s = Util.Md5Hash(password + ":" + profile.passwordSalt);

-

-            return profile.passwordHash.Equals(s.ToString(), StringComparison.InvariantCultureIgnoreCase);

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

-        /// <param name="profile"></param>

-        /// <param name="request"></param>

-        public void CreateAgent(UserProfileData profile, XmlRpcRequest request)

-        {

-            this.m_userManager.CreateAgent(profile, request);

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

-        /// <param name="firstname"></param>

-        /// <param name="lastname"></param>

-        /// <returns></returns>

-        public virtual UserProfileData GetTheUser(string firstname, string lastname)

-        {

-            return this.m_userManager.getUserProfile(firstname, lastname);

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

-        /// <returns></returns>

-        public virtual string GetMessage()

-        {

-            return m_welcomeMessage;

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

-        /// <returns></returns>

-        protected virtual ArrayList GetInventoryLibrary()

-        {

-            //return new ArrayList();

-            Hashtable TempHash = new Hashtable();

-            TempHash["name"] = "OpenSim Library";

-            TempHash["parent_id"] = LLUUID.Zero.ToStringHyphenated();

-            TempHash["version"] = 1;

-            TempHash["type_default"] = -1;

-            TempHash["folder_id"] = "00000112-000f-0000-0000-000100bba000";

-            ArrayList temp = new ArrayList();

-            temp.Add(TempHash);

-

-            TempHash = new Hashtable();

-            TempHash["name"] = "Texture Library";

-            TempHash["parent_id"] = "00000112-000f-0000-0000-000100bba000";

-            TempHash["version"] = 1;

-            TempHash["type_default"] = -1;

-            TempHash["folder_id"] = "00000112-000f-0000-0000-000100bba001";

-            temp.Add(TempHash);

-            return temp;

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

-        /// <returns></returns>

-        protected virtual ArrayList GetLibraryOwner()

-        {

-            //for now create random inventory library owner

-            Hashtable TempHash = new Hashtable();

-            TempHash["agent_id"] = "11111111-1111-0000-0000-000100bba000";

-            ArrayList inventoryLibOwner = new ArrayList();

-            inventoryLibOwner.Add(TempHash);

-            return inventoryLibOwner;

-        }

-

-        protected virtual InventoryData CreateInventoryData(LLUUID userID)

-        {

-            AgentInventory userInventory = new AgentInventory();

-            userInventory.CreateRootFolder(userID, false);

-

-            ArrayList AgentInventoryArray = new ArrayList();

-            Hashtable TempHash;

-            foreach (InventoryFolder InvFolder in userInventory.InventoryFolders.Values)

-            {

-                TempHash = new Hashtable();

-                TempHash["name"] = InvFolder.FolderName;

-                TempHash["parent_id"] = InvFolder.ParentID.ToStringHyphenated();

-                TempHash["version"] = (Int32)InvFolder.Version;

-                TempHash["type_default"] = (Int32)InvFolder.DefaultType;

-                TempHash["folder_id"] = InvFolder.FolderID.ToStringHyphenated();

-                AgentInventoryArray.Add(TempHash);

-            }

-

-            return new InventoryData(AgentInventoryArray, userInventory.InventoryRoot.FolderID);

-        }

-

-        public class InventoryData

-        {

-            public ArrayList InventoryArray = null;

-            public LLUUID RootFolderID = LLUUID.Zero;

-

-            public InventoryData(ArrayList invList, LLUUID rootID)

-            {

-                InventoryArray = invList;

-                RootFolderID = rootID;

-            }

-        }

-    }

-}

+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Security.Cryptography;
+using libsecondlife;
+using Nwc.XmlRpc;
+using OpenSim.Framework.Console;
+using OpenSim.Framework.Data;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Inventory;
+using OpenSim.Framework.Utilities;
+
+using OpenSim.Framework.Configuration;
+using InventoryFolder = OpenSim.Framework.Inventory.InventoryFolder;
+
+namespace OpenSim.Framework.UserManagement
+{
+    public class LoginService
+    {
+        protected string m_welcomeMessage = "Welcome to OpenSim";
+        protected UserManagerBase m_userManager = null;
+
+        public LoginService(UserManagerBase userManager, string welcomeMess)
+        {
+            m_userManager = userManager;
+            if (welcomeMess != "")
+            {
+                m_welcomeMessage = welcomeMess;
+            }
+        }
+
+        /// <summary>
+        /// Main user login function
+        /// </summary>
+        /// <param name="request">The XMLRPC request</param>
+        /// <returns>The response to send</returns>
+        public XmlRpcResponse XmlRpcLoginMethod(XmlRpcRequest request)
+        {
+
+            System.Console.WriteLine("Attempting login now...");
+            XmlRpcResponse response = new XmlRpcResponse();
+            Hashtable requestData = (Hashtable)request.Params[0];
+
+            bool GoodXML = (requestData.Contains("first") && requestData.Contains("last") && requestData.Contains("passwd"));
+            bool GoodLogin = false;
+            string firstname = "";
+            string lastname = "";
+            string passwd = "";
+
+            UserProfileData userProfile;
+            LoginResponse logResponse = new LoginResponse();
+
+            if (GoodXML)
+            {
+                firstname = (string)requestData["first"];
+                lastname = (string)requestData["last"];
+                passwd = (string)requestData["passwd"];
+
+                userProfile = GetTheUser(firstname, lastname);
+                if (userProfile == null)
+                    return logResponse.CreateLoginFailedResponse();
+
+                GoodLogin = AuthenticateUser(userProfile, passwd);
+            }
+            else
+            {
+                return logResponse.CreateGridErrorResponse();
+            }
+
+            if (!GoodLogin)
+            {
+                return logResponse.CreateLoginFailedResponse();
+            }
+            else
+            {
+                // If we already have a session...
+                if (userProfile.currentAgent != null && userProfile.currentAgent.agentOnline)
+                {
+                    // Reject the login
+                    return logResponse.CreateAlreadyLoggedInResponse();
+                }
+                // Otherwise...
+                // Create a new agent session
+                CreateAgent(userProfile, request);
+
+                try
+                {
+                    LLUUID agentID = userProfile.UUID;
+
+                    // Inventory Library Section
+                    InventoryData inventData = this.CreateInventoryData(agentID);
+                    ArrayList AgentInventoryArray = inventData.InventoryArray;
+
+                    Hashtable InventoryRootHash = new Hashtable();
+                    InventoryRootHash["folder_id"] = inventData.RootFolderID.ToStringHyphenated();
+                    ArrayList InventoryRoot = new ArrayList();
+                    InventoryRoot.Add(InventoryRootHash);
+                    userProfile.rootInventoryFolderID = inventData.RootFolderID;
+
+                    // Circuit Code
+                    uint circode = (uint)(Util.RandomClass.Next());
+
+                    logResponse.Lastname = userProfile.surname;
+                    logResponse.Firstname = userProfile.username;
+                    logResponse.AgentID = agentID.ToStringHyphenated();
+                    logResponse.SessionID = userProfile.currentAgent.sessionID.ToStringHyphenated();
+                    logResponse.SecureSessionID = userProfile.currentAgent.secureSessionID.ToStringHyphenated();
+                    logResponse.InventoryRoot = InventoryRoot;
+                    logResponse.InventorySkeleton = AgentInventoryArray;
+                    logResponse.InventoryLibrary = this.GetInventoryLibrary();
+                    logResponse.InventoryLibraryOwner = this.GetLibraryOwner();
+                    logResponse.CircuitCode = (Int32)circode;
+                    //logResponse.RegionX = 0; //overwritten
+                    //logResponse.RegionY = 0; //overwritten
+                    logResponse.Home = "!!null temporary value {home}!!";   // Overwritten
+                    //logResponse.LookAt = "\n[r" + TheUser.homeLookAt.X.ToString() + ",r" + TheUser.homeLookAt.Y.ToString() + ",r" + TheUser.homeLookAt.Z.ToString() + "]\n";
+                    //logResponse.SimAddress = "127.0.0.1"; //overwritten
+                    //logResponse.SimPort = 0; //overwritten
+                    logResponse.Message = this.GetMessage();
+
+                    try
+                    {
+                        this.CustomiseResponse(logResponse, userProfile);
+                    }
+                    catch (Exception e)
+                    {
+                        System.Console.WriteLine(e.ToString());
+                        return logResponse.CreateDeadRegionResponse();
+                        //return logResponse.ToXmlRpcResponse();
+                    }
+                    CommitAgent(ref userProfile);
+                    return logResponse.ToXmlRpcResponse();
+
+                }
+
+                catch (Exception E)
+                {
+                    System.Console.WriteLine(E.ToString());
+                }
+                //}
+            }
+            return response;
+
+        }
+
+        /// <summary>
+        /// Customises the login response and fills in missing values.
+        /// </summary>
+        /// <param name="response">The existing response</param>
+        /// <param name="theUser">The user profile</param>
+        public virtual void CustomiseResponse(LoginResponse response, UserProfileData theUser)
+        {
+        }
+
+         /// <summary>
+        /// Saves a target agent to the database
+        /// </summary>
+        /// <param name="profile">The users profile</param>
+        /// <returns>Successful?</returns>
+        public bool CommitAgent(ref UserProfileData profile)
+        {
+            // Saves the agent to database
+            return true;
+        }
+
+
+        /// <summary>
+        /// Checks a user against it's password hash
+        /// </summary>
+        /// <param name="profile">The users profile</param>
+        /// <param name="password">The supplied password</param>
+        /// <returns>Authenticated?</returns>
+        public virtual bool AuthenticateUser(UserProfileData profile, string password)
+        {
+            
+            MainLog.Instance.Verbose(
+                "Authenticating " + profile.username + " " + profile.surname);
+
+            password = password.Remove(0, 3); //remove $1$
+
+            string s = Util.Md5Hash(password + ":" + profile.passwordSalt);
+
+            return profile.passwordHash.Equals(s.ToString(), StringComparison.InvariantCultureIgnoreCase);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="profile"></param>
+        /// <param name="request"></param>
+        public void CreateAgent(UserProfileData profile, XmlRpcRequest request)
+        {
+            this.m_userManager.CreateAgent(profile, request);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="firstname"></param>
+        /// <param name="lastname"></param>
+        /// <returns></returns>
+        public virtual UserProfileData GetTheUser(string firstname, string lastname)
+        {
+            return this.m_userManager.getUserProfile(firstname, lastname);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <returns></returns>
+        public virtual string GetMessage()
+        {
+            return m_welcomeMessage;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <returns></returns>
+        protected virtual ArrayList GetInventoryLibrary()
+        {
+            //return new ArrayList();
+            Hashtable TempHash = new Hashtable();
+            TempHash["name"] = "OpenSim Library";
+            TempHash["parent_id"] = LLUUID.Zero.ToStringHyphenated();
+            TempHash["version"] = 1;
+            TempHash["type_default"] = -1;
+            TempHash["folder_id"] = "00000112-000f-0000-0000-000100bba000";
+            ArrayList temp = new ArrayList();
+            temp.Add(TempHash);
+
+            TempHash = new Hashtable();
+            TempHash["name"] = "Texture Library";
+            TempHash["parent_id"] = "00000112-000f-0000-0000-000100bba000";
+            TempHash["version"] = 1;
+            TempHash["type_default"] = -1;
+            TempHash["folder_id"] = "00000112-000f-0000-0000-000100bba001";
+            temp.Add(TempHash);
+            return temp;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <returns></returns>
+        protected virtual ArrayList GetLibraryOwner()
+        {
+            //for now create random inventory library owner
+            Hashtable TempHash = new Hashtable();
+            TempHash["agent_id"] = "11111111-1111-0000-0000-000100bba000";
+            ArrayList inventoryLibOwner = new ArrayList();
+            inventoryLibOwner.Add(TempHash);
+            return inventoryLibOwner;
+        }
+
+        protected virtual InventoryData CreateInventoryData(LLUUID userID)
+        {
+            AgentInventory userInventory = new AgentInventory();
+            userInventory.CreateRootFolder(userID, false);
+
+            ArrayList AgentInventoryArray = new ArrayList();
+            Hashtable TempHash;
+            foreach (InventoryFolder InvFolder in userInventory.InventoryFolders.Values)
+            {
+                TempHash = new Hashtable();
+                TempHash["name"] = InvFolder.FolderName;
+                TempHash["parent_id"] = InvFolder.ParentID.ToStringHyphenated();
+                TempHash["version"] = (Int32)InvFolder.Version;
+                TempHash["type_default"] = (Int32)InvFolder.DefaultType;
+                TempHash["folder_id"] = InvFolder.FolderID.ToStringHyphenated();
+                AgentInventoryArray.Add(TempHash);
+            }
+
+            return new InventoryData(AgentInventoryArray, userInventory.InventoryRoot.FolderID);
+        }
+
+        public class InventoryData
+        {
+            public ArrayList InventoryArray = null;
+            public LLUUID RootFolderID = LLUUID.Zero;
+
+            public InventoryData(ArrayList invList, LLUUID rootID)
+            {
+                InventoryArray = invList;
+                RootFolderID = rootID;
+            }
+        }
+    }
+}