changed to native line ending encoding

4 files changed, 556 insertions, 556 deletions

diff --git a/OpenSim/Region/GridInterfaces/Local/AssemblyInfo.cs b/OpenSim/Region/GridInterfaces/Local/AssemblyInfo.cs
index b5fc1ef..61adf80 100644
--- a/OpenSim/Region/GridInterfaces/Local/AssemblyInfo.cs
+++ b/OpenSim/Region/GridInterfaces/Local/AssemblyInfo.cs
@@ -1,56 +1,56 @@
-/*

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

-using System.Runtime.InteropServices;

-// Information about this assembly is defined by the following

-// attributes.

-//

-// change them to the information which is associated with the assembly

-// you compile.

-

-[assembly: AssemblyTitle("LocalGridServers")]

-[assembly: AssemblyDescription("")]

-[assembly: AssemblyConfiguration("")]

-[assembly: AssemblyCompany("")]

-[assembly: AssemblyProduct("LocalGridServers")]

-[assembly: AssemblyCopyright("")]

-[assembly: AssemblyTrademark("")]

-[assembly: AssemblyCulture("")]

-

-// This sets the default COM visibility of types in the assembly to invisible.

-// If you need to expose a type to COM, use [ComVisible(true)] on that type.

-[assembly: ComVisible(false)]

-

-// The assembly version has following format :

-//

-// Major.Minor.Build.Revision

-//

-// You can specify all values by your own or you can build default build and revision

-// numbers with the '*' character (the default):

-

-[assembly: AssemblyVersion("1.0.*")]

+/*
+* 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.Reflection;
+using System.Runtime.InteropServices;
+// Information about this assembly is defined by the following
+// attributes.
+//
+// change them to the information which is associated with the assembly
+// you compile.
+
+[assembly: AssemblyTitle("LocalGridServers")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("LocalGridServers")]
+[assembly: AssemblyCopyright("")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// This sets the default COM visibility of types in the assembly to invisible.
+// If you need to expose a type to COM, use [ComVisible(true)] on that type.
+[assembly: ComVisible(false)]
+
+// The assembly version has following format :
+//
+// Major.Minor.Build.Revision
+//
+// You can specify all values by your own or you can build default build and revision
+// numbers with the '*' character (the default):
+
+[assembly: AssemblyVersion("1.0.*")]
diff --git a/OpenSim/Region/GridInterfaces/Local/LocalAssetServer.cs b/OpenSim/Region/GridInterfaces/Local/LocalAssetServer.cs
index 1023820..f3d7a2c 100644
--- a/OpenSim/Region/GridInterfaces/Local/LocalAssetServer.cs
+++ b/OpenSim/Region/GridInterfaces/Local/LocalAssetServer.cs
@@ -1,311 +1,311 @@
-/*

-* 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 Db4objects.Db4o;

-using Db4objects.Db4o.Query;

-using libsecondlife;

-using OpenSim.Framework.Console;

-using OpenSim.Framework.Interfaces;

-using OpenSim.Framework.Types;

-using OpenSim.Framework.Utilities;

-

-namespace OpenSim.Region.GridInterfaces.Local

-{

-    public class LocalAssetPlugin : IAssetPlugin

-    {

-        public LocalAssetPlugin()

-        {

-

-        }

-

-        public IAssetServer GetAssetServer()

-        {

-            return (new LocalAssetServer());

-        }

-    }

-

-    public class LocalAssetServer : IAssetServer

-    {

-        private IAssetReceiver _receiver;

-        private BlockingQueue<ARequest> _assetRequests;

-        private IObjectContainer db;

-        private Thread _localAssetServerThread;

-

-        public LocalAssetServer()

-        {

-            bool yapfile;

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

-            yapfile = File.Exists("regionassets.yap");

-

-            MainLog.Instance.Verbose( "Local Asset Server class created");

-            try

-            {

-                db = Db4oFactory.OpenFile("regionassets.yap");

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

-            }

-            catch (Exception e)

-            {

-                db.Close();

-                MainLog.Instance.WriteLine(LogPriority.MEDIUM, "Db4 Asset server :Constructor - Exception occured");

-                MainLog.Instance.Warn(e.ToString());

-            }

-            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 RequestAsset(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 UploadNewAsset(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;

-                }

-                else

-                {

-                    asset.FullID = LLUUID.Zero;

-                }

-                asset.Data = idata;

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

-            }

-

-        }

-

-        private void SetUpAssetDatabase()

-        {

-            try

-            {

-

-                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("66c41e39-38f9-f75a-024e-585989bfab73");

-                Image.Name = "Shape";

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

-            }

-            catch (Exception e)

-            {

-                Console.WriteLine("exception loading default assets into database");

-                Console.WriteLine(e.Message);

-            }

-

-        }

-

-        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://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 Db4objects.Db4o;
+using Db4objects.Db4o.Query;
+using libsecondlife;
+using OpenSim.Framework.Console;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Utilities;
+
+namespace OpenSim.Region.GridInterfaces.Local
+{
+    public class LocalAssetPlugin : IAssetPlugin
+    {
+        public LocalAssetPlugin()
+        {
+
+        }
+
+        public IAssetServer GetAssetServer()
+        {
+            return (new LocalAssetServer());
+        }
+    }
+
+    public class LocalAssetServer : IAssetServer
+    {
+        private IAssetReceiver _receiver;
+        private BlockingQueue<ARequest> _assetRequests;
+        private IObjectContainer db;
+        private Thread _localAssetServerThread;
+
+        public LocalAssetServer()
+        {
+            bool yapfile;
+            this._assetRequests = new BlockingQueue<ARequest>();
+            yapfile = File.Exists("regionassets.yap");
+
+            MainLog.Instance.Verbose( "Local Asset Server class created");
+            try
+            {
+                db = Db4oFactory.OpenFile("regionassets.yap");
+                MainLog.Instance.Verbose( "Db4 Asset database  creation");
+            }
+            catch (Exception e)
+            {
+                db.Close();
+                MainLog.Instance.WriteLine(LogPriority.MEDIUM, "Db4 Asset server :Constructor - Exception occured");
+                MainLog.Instance.Warn(e.ToString());
+            }
+            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 RequestAsset(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 UploadNewAsset(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;
+                }
+                else
+                {
+                    asset.FullID = LLUUID.Zero;
+                }
+                asset.Data = idata;
+                _receiver.AssetReceived(asset, req.IsTexture);
+            }
+
+        }
+
+        private void SetUpAssetDatabase()
+        {
+            try
+            {
+
+                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("66c41e39-38f9-f75a-024e-585989bfab73");
+                Image.Name = "Shape";
+                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();
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine("exception loading default assets into database");
+                Console.WriteLine(e.Message);
+            }
+
+        }
+
+        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/Region/GridInterfaces/Remote/AssemblyInfo.cs b/OpenSim/Region/GridInterfaces/Remote/AssemblyInfo.cs
index 1e15c5e..a658f2f 100644
--- a/OpenSim/Region/GridInterfaces/Remote/AssemblyInfo.cs
+++ b/OpenSim/Region/GridInterfaces/Remote/AssemblyInfo.cs
@@ -1,56 +1,56 @@
-/*

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

-using System.Runtime.InteropServices;

-// Information about this assembly is defined by the following

-// attributes.

-//

-// change them to the information which is associated with the assembly

-// you compile.

-

-[assembly: AssemblyTitle("RemoteGridServers")]

-[assembly: AssemblyDescription("")]

-[assembly: AssemblyConfiguration("")]

-[assembly: AssemblyCompany("")]

-[assembly: AssemblyProduct("RemoteGridServers")]

-[assembly: AssemblyCopyright("")]

-[assembly: AssemblyTrademark("")]

-[assembly: AssemblyCulture("")]

-

-// This sets the default COM visibility of types in the assembly to invisible.

-// If you need to expose a type to COM, use [ComVisible(true)] on that type.

-[assembly: ComVisible(false)]

-

-// The assembly version has following format :

-//

-// Major.Minor.Build.Revision

-//

-// You can specify all values by your own or you can build default build and revision

-// numbers with the '*' character (the default):

-

-[assembly: AssemblyVersion("1.0.*")]

+/*
+* 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.Reflection;
+using System.Runtime.InteropServices;
+// Information about this assembly is defined by the following
+// attributes.
+//
+// change them to the information which is associated with the assembly
+// you compile.
+
+[assembly: AssemblyTitle("RemoteGridServers")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("RemoteGridServers")]
+[assembly: AssemblyCopyright("")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// This sets the default COM visibility of types in the assembly to invisible.
+// If you need to expose a type to COM, use [ComVisible(true)] on that type.
+[assembly: ComVisible(false)]
+
+// The assembly version has following format :
+//
+// Major.Minor.Build.Revision
+//
+// You can specify all values by your own or you can build default build and revision
+// numbers with the '*' character (the default):
+
+[assembly: AssemblyVersion("1.0.*")]
diff --git a/OpenSim/Region/GridInterfaces/Remote/RemoteAssetServer.cs b/OpenSim/Region/GridInterfaces/Remote/RemoteAssetServer.cs
index 8643736..f81bb8d 100644
--- a/OpenSim/Region/GridInterfaces/Remote/RemoteAssetServer.cs
+++ b/OpenSim/Region/GridInterfaces/Remote/RemoteAssetServer.cs
@@ -1,133 +1,133 @@
-/*

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

-using System.Net;

-using System.Text;

-using System.Threading;

-using libsecondlife;

-using OpenSim.Framework.Console;

-using OpenSim.Framework.Interfaces;

-using OpenSim.Framework.Types;

-using OpenSim.Framework.Utilities;

-

-namespace OpenSim.Region.GridInterfaces.Remote

-{

-    public class RemoteAssetServer : IAssetServer

-    {

-        private IAssetReceiver _receiver;

-        private BlockingQueue<ARequest> _assetRequests;

-        private Thread _remoteAssetServerThread;

-        private string AssetServerUrl;

-        private string AssetSendKey;

-

-        public RemoteAssetServer()

-        {

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

-            this._remoteAssetServerThread = new Thread(new ThreadStart(RunRequests));

-            this._remoteAssetServerThread.IsBackground = true;

-            this._remoteAssetServerThread.Start();

-            MainLog.Instance.Verbose("Remote Asset Server class created");

-        }

-

-        public void SetReceiver(IAssetReceiver receiver)

-        {

-            this._receiver = receiver;

-        }

-

-        public void RequestAsset(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 UploadNewAsset(AssetBase asset)

-        {

-            Encoding Windows1252Encoding = Encoding.GetEncoding(1252);

-            string ret = Windows1252Encoding.GetString(asset.Data);

-            byte[] buffer = Windows1252Encoding.GetBytes(ret);

-            WebClient client = new WebClient();

-            client.UploadData(this.AssetServerUrl + "assets/" + asset.FullID, buffer);

-

-        }

-

-        public void SetServerInfo(string ServerUrl, string ServerKey)

-        {

-            this.AssetServerUrl = ServerUrl;

-            this.AssetSendKey = ServerKey;

-        }

-

-        private void RunRequests()

-        {

-            while (true)

-            {

-                //we need to add support for the asset server not knowing about a requested asset

-                // 404... THE MAGIC FILE NOT FOUND ERROR, very useful for telling you things such as a file (or asset ;) ) not being found!!!!!!!!!!! it's 2:22AM

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

-                LLUUID assetID = req.AssetID;

-              //  OpenSim.Framework.Console.MainLog.Instance.Verbose(" RemoteAssetServer- Got a AssetServer request, processing it - " + this.AssetServerUrl + "assets/" + assetID);

-                WebRequest AssetLoad = WebRequest.Create(this.AssetServerUrl + "assets/" + assetID);

-                WebResponse AssetResponse = AssetLoad.GetResponse();

-                byte[] idata = new byte[(int)AssetResponse.ContentLength];

-                BinaryReader br = new BinaryReader(AssetResponse.GetResponseStream());

-                idata = br.ReadBytes((int)AssetResponse.ContentLength);

-                br.Close();

-                

-                AssetBase asset = new AssetBase();

-                asset.FullID = assetID;

-                asset.Data = idata;

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

-            }

-        }

-

-        public void Close()

-        {

-

-        }

-    }

-

-    public class RemoteAssetPlugin : IAssetPlugin

-    {

-        public RemoteAssetPlugin()

-        {

-

-        }

-

-        public IAssetServer GetAssetServer()

-        {

-            return (new RemoteAssetServer());

-        }

-    }

-

-}

+/*
+* 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.IO;
+using System.Net;
+using System.Text;
+using System.Threading;
+using libsecondlife;
+using OpenSim.Framework.Console;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Utilities;
+
+namespace OpenSim.Region.GridInterfaces.Remote
+{
+    public class RemoteAssetServer : IAssetServer
+    {
+        private IAssetReceiver _receiver;
+        private BlockingQueue<ARequest> _assetRequests;
+        private Thread _remoteAssetServerThread;
+        private string AssetServerUrl;
+        private string AssetSendKey;
+
+        public RemoteAssetServer()
+        {
+            this._assetRequests = new BlockingQueue<ARequest>();
+            this._remoteAssetServerThread = new Thread(new ThreadStart(RunRequests));
+            this._remoteAssetServerThread.IsBackground = true;
+            this._remoteAssetServerThread.Start();
+            MainLog.Instance.Verbose("Remote Asset Server class created");
+        }
+
+        public void SetReceiver(IAssetReceiver receiver)
+        {
+            this._receiver = receiver;
+        }
+
+        public void RequestAsset(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 UploadNewAsset(AssetBase asset)
+        {
+            Encoding Windows1252Encoding = Encoding.GetEncoding(1252);
+            string ret = Windows1252Encoding.GetString(asset.Data);
+            byte[] buffer = Windows1252Encoding.GetBytes(ret);
+            WebClient client = new WebClient();
+            client.UploadData(this.AssetServerUrl + "assets/" + asset.FullID, buffer);
+
+        }
+
+        public void SetServerInfo(string ServerUrl, string ServerKey)
+        {
+            this.AssetServerUrl = ServerUrl;
+            this.AssetSendKey = ServerKey;
+        }
+
+        private void RunRequests()
+        {
+            while (true)
+            {
+                //we need to add support for the asset server not knowing about a requested asset
+                // 404... THE MAGIC FILE NOT FOUND ERROR, very useful for telling you things such as a file (or asset ;) ) not being found!!!!!!!!!!! it's 2:22AM
+                ARequest req = this._assetRequests.Dequeue();
+                LLUUID assetID = req.AssetID;
+              //  OpenSim.Framework.Console.MainLog.Instance.Verbose(" RemoteAssetServer- Got a AssetServer request, processing it - " + this.AssetServerUrl + "assets/" + assetID);
+                WebRequest AssetLoad = WebRequest.Create(this.AssetServerUrl + "assets/" + assetID);
+                WebResponse AssetResponse = AssetLoad.GetResponse();
+                byte[] idata = new byte[(int)AssetResponse.ContentLength];
+                BinaryReader br = new BinaryReader(AssetResponse.GetResponseStream());
+                idata = br.ReadBytes((int)AssetResponse.ContentLength);
+                br.Close();
+                
+                AssetBase asset = new AssetBase();
+                asset.FullID = assetID;
+                asset.Data = idata;
+                _receiver.AssetReceived(asset, req.IsTexture);
+            }
+        }
+
+        public void Close()
+        {
+
+        }
+    }
+
+    public class RemoteAssetPlugin : IAssetPlugin
+    {
+        public RemoteAssetPlugin()
+        {
+
+        }
+
+        public IAssetServer GetAssetServer()
+        {
+            return (new RemoteAssetServer());
+        }
+    }
+
+}