36 files changed, 3536 insertions, 3536 deletions

diff --git a/OpenSim/Framework/General/AgentInventory.cs b/OpenSim/Framework/General/AgentInventory.cs
index e45a0cd..0aeb0b3 100644
--- a/OpenSim/Framework/General/AgentInventory.cs
+++ b/OpenSim/Framework/General/AgentInventory.cs
@@ -1,265 +1,265 @@
-/*

-* 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.Collections.Generic;

-using libsecondlife;

-using libsecondlife.Packets;

-using OpenSim.Framework.Types;

-using OpenSim.Framework.Utilities;

-

-namespace OpenSim.Framework.Inventory

-{

-    public class AgentInventory

-    {

-        //Holds the local copy of Inventory info for a agent

-        public Dictionary<LLUUID, InventoryFolder> InventoryFolders;

-        public Dictionary<LLUUID, InventoryItem> InventoryItems;

-        public InventoryFolder InventoryRoot;

-        public int LastCached;  //maybe used by opensim app, time this was last stored/compared to user server

-        public LLUUID AgentID;

-        public AvatarWearable[] Wearables;

-

-        public AgentInventory()

-        {

-            InventoryFolders = new Dictionary<LLUUID, InventoryFolder>();

-            InventoryItems = new Dictionary<LLUUID, InventoryItem>();

-            this.Initialise();

-        }

-

-        public virtual void Initialise()

-        {

-            Wearables = new AvatarWearable[13]; //should be 12 of these

-            for (int i = 0; i < 13; i++)

-            {

-                Wearables[i] = new AvatarWearable();

-            }

-      

-        }

-

-        public bool CreateNewFolder(LLUUID folderID, ushort type)

-        {

-            InventoryFolder Folder = new InventoryFolder();

-            Folder.FolderID = folderID;

-            Folder.OwnerID = this.AgentID;

-            Folder.DefaultType = type;

-            this.InventoryFolders.Add(Folder.FolderID, Folder);

-            return (true);

-        }

-

-        public void CreateRootFolder(LLUUID newAgentID, bool createTextures)

-        {

-            this.AgentID = newAgentID;

-            InventoryRoot = new InventoryFolder();

-            InventoryRoot.FolderID = LLUUID.Random();

-            InventoryRoot.ParentID = new LLUUID();

-            InventoryRoot.Version = 1;

-            InventoryRoot.DefaultType = 8;

-            InventoryRoot.OwnerID = this.AgentID;

-            InventoryRoot.FolderName = "My Inventory";

-            InventoryFolders.Add(InventoryRoot.FolderID, InventoryRoot);

-            InventoryRoot.OwnerID = this.AgentID;

-            if (createTextures)

-            {

-                this.CreateNewFolder(LLUUID.Random(), 0, "Textures", InventoryRoot.FolderID);

-            }

-        }

-

-        public bool CreateNewFolder(LLUUID folderID, ushort type, string folderName)

-        {

-            InventoryFolder Folder = new InventoryFolder();

-            Folder.FolderID = folderID;

-            Folder.OwnerID = this.AgentID;

-            Folder.DefaultType = type;

-            Folder.FolderName = folderName;

-            this.InventoryFolders.Add(Folder.FolderID, Folder);

-

-            return (true);

-        }

-

-        public bool CreateNewFolder(LLUUID folderID, ushort type, string folderName, LLUUID parent)

-        {

-            if (!this.InventoryFolders.ContainsKey(folderID))

-            {

-                System.Console.WriteLine("creating new folder called " + folderName + " in agents inventory");

-                InventoryFolder Folder = new InventoryFolder();

-                Folder.FolderID = folderID;

-                Folder.OwnerID = this.AgentID;

-                Folder.DefaultType = type;

-                Folder.FolderName = folderName;

-                Folder.ParentID = parent;

-                this.InventoryFolders.Add(Folder.FolderID, Folder);

-            }

-

-            return (true);

-        }

-

-        public bool HasFolder(LLUUID folderID)

-        {

-            if (this.InventoryFolders.ContainsKey(folderID))

-            {

-                return true;

-            }

-            return false;

-        }

-

-        public LLUUID GetFolderID(string folderName)

-        {

-            foreach (InventoryFolder inv in this.InventoryFolders.Values)

-            {

-                if (inv.FolderName == folderName)

-                {

-                    return inv.FolderID;

-                }

-            }

-

-            return LLUUID.Zero;

-        }

-

-        public bool UpdateItemAsset(LLUUID itemID, AssetBase asset)

-        {

-            if(this.InventoryItems.ContainsKey(itemID))

-            {

-                InventoryItem Item = this.InventoryItems[itemID];

-                Item.AssetID = asset.FullID;

-                System.Console.WriteLine("updated inventory item " + itemID.ToStringHyphenated() + " so it now is set to asset " + asset.FullID.ToStringHyphenated());

-                //TODO need to update the rest of the info

-            }

-            return true;

-        }

-

-        public bool UpdateItemDetails(LLUUID itemID, UpdateInventoryItemPacket.InventoryDataBlock packet)

-        {

-            System.Console.WriteLine("updating inventory item details");

-            if (this.InventoryItems.ContainsKey(itemID))

-            {

-                System.Console.WriteLine("changing name to "+ Util.FieldToString(packet.Name));

-                InventoryItem Item = this.InventoryItems[itemID];

-                Item.Name = Util.FieldToString(packet.Name);

-                System.Console.WriteLine("updated inventory item " + itemID.ToStringHyphenated());

-                //TODO need to update the rest of the info

-            }

-            return true;

-        }

-

-        public LLUUID AddToInventory(LLUUID folderID, AssetBase asset)

-        {

-            if (this.InventoryFolders.ContainsKey(folderID))

-            {

-                LLUUID NewItemID = LLUUID.Random();

-

-                InventoryItem Item = new InventoryItem();

-                Item.FolderID = folderID;

-                Item.OwnerID = AgentID;

-                Item.AssetID = asset.FullID;

-                Item.ItemID = NewItemID;

-                Item.Type = asset.Type;

-                Item.Name = asset.Name;

-                Item.Description = asset.Description;

-                Item.InvType = asset.InvType;

-                this.InventoryItems.Add(Item.ItemID, Item);

-                InventoryFolder Folder = InventoryFolders[Item.FolderID];

-                Folder.Items.Add(Item);

-                return (Item.ItemID);

-            }

-            else

-            {

-                return (null);

-            }

-        }

-

-        public bool DeleteFromInventory(LLUUID itemID)

-        {

-            bool res = false;

-            if (this.InventoryItems.ContainsKey(itemID))

-            {

-                InventoryItem item = this.InventoryItems[itemID];

-                this.InventoryItems.Remove(itemID);

-                foreach (InventoryFolder fold in InventoryFolders.Values)

-                {

-                    if (fold.Items.Contains(item))

-                    {

-                        fold.Items.Remove(item);

-                        break;

-                    }

-                }

-                res = true;

-                

-            }

-            return res;

-        }

-    }

-

-    public class InventoryFolder

-    {

-        public List<InventoryItem> Items;

-        //public List<InventoryFolder> Subfolders;

-        public LLUUID FolderID;

-        public LLUUID OwnerID;

-        public LLUUID ParentID = LLUUID.Zero;

-        public string FolderName;

-        public ushort DefaultType;

-        public ushort Version;

-

-        public InventoryFolder()

-        {

-            Items = new List<InventoryItem>();

-            //Subfolders = new List<InventoryFolder>();

-        }

-

-    }

-

-    public class InventoryItem

-    {

-        public LLUUID FolderID;

-        public LLUUID OwnerID;

-        public LLUUID ItemID;

-        public LLUUID AssetID;

-        public LLUUID CreatorID;

-        public sbyte InvType;

-        public sbyte Type;

-        public string Name ="";

-        public string Description;

-

-        public InventoryItem()

-        {

-            this.CreatorID = LLUUID.Zero;

-        }

-

-        public string ExportString()

-        {

-            string typ = "notecard";

-            string result = "";

-            result += "\tinv_object\t0\n\t{\n";

-            result += "\t\tobj_id\t%s\n";

-            result +=  "\t\tparent_id\t"+ ItemID.ToString() +"\n";

-            result += "\t\ttype\t"+ typ +"\n";

-            result += "\t\tname\t" + Name+"|\n";

-            result += "\t}\n";

-            return result;

-        }

-    }

-}

+/*
+* 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.Collections.Generic;
+using libsecondlife;
+using libsecondlife.Packets;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Utilities;
+
+namespace OpenSim.Framework.Inventory
+{
+    public class AgentInventory
+    {
+        //Holds the local copy of Inventory info for a agent
+        public Dictionary<LLUUID, InventoryFolder> InventoryFolders;
+        public Dictionary<LLUUID, InventoryItem> InventoryItems;
+        public InventoryFolder InventoryRoot;
+        public int LastCached;  //maybe used by opensim app, time this was last stored/compared to user server
+        public LLUUID AgentID;
+        public AvatarWearable[] Wearables;
+
+        public AgentInventory()
+        {
+            InventoryFolders = new Dictionary<LLUUID, InventoryFolder>();
+            InventoryItems = new Dictionary<LLUUID, InventoryItem>();
+            this.Initialise();
+        }
+
+        public virtual void Initialise()
+        {
+            Wearables = new AvatarWearable[13]; //should be 12 of these
+            for (int i = 0; i < 13; i++)
+            {
+                Wearables[i] = new AvatarWearable();
+            }
+      
+        }
+
+        public bool CreateNewFolder(LLUUID folderID, ushort type)
+        {
+            InventoryFolder Folder = new InventoryFolder();
+            Folder.FolderID = folderID;
+            Folder.OwnerID = this.AgentID;
+            Folder.DefaultType = type;
+            this.InventoryFolders.Add(Folder.FolderID, Folder);
+            return (true);
+        }
+
+        public void CreateRootFolder(LLUUID newAgentID, bool createTextures)
+        {
+            this.AgentID = newAgentID;
+            InventoryRoot = new InventoryFolder();
+            InventoryRoot.FolderID = LLUUID.Random();
+            InventoryRoot.ParentID = new LLUUID();
+            InventoryRoot.Version = 1;
+            InventoryRoot.DefaultType = 8;
+            InventoryRoot.OwnerID = this.AgentID;
+            InventoryRoot.FolderName = "My Inventory";
+            InventoryFolders.Add(InventoryRoot.FolderID, InventoryRoot);
+            InventoryRoot.OwnerID = this.AgentID;
+            if (createTextures)
+            {
+                this.CreateNewFolder(LLUUID.Random(), 0, "Textures", InventoryRoot.FolderID);
+            }
+        }
+
+        public bool CreateNewFolder(LLUUID folderID, ushort type, string folderName)
+        {
+            InventoryFolder Folder = new InventoryFolder();
+            Folder.FolderID = folderID;
+            Folder.OwnerID = this.AgentID;
+            Folder.DefaultType = type;
+            Folder.FolderName = folderName;
+            this.InventoryFolders.Add(Folder.FolderID, Folder);
+
+            return (true);
+        }
+
+        public bool CreateNewFolder(LLUUID folderID, ushort type, string folderName, LLUUID parent)
+        {
+            if (!this.InventoryFolders.ContainsKey(folderID))
+            {
+                System.Console.WriteLine("creating new folder called " + folderName + " in agents inventory");
+                InventoryFolder Folder = new InventoryFolder();
+                Folder.FolderID = folderID;
+                Folder.OwnerID = this.AgentID;
+                Folder.DefaultType = type;
+                Folder.FolderName = folderName;
+                Folder.ParentID = parent;
+                this.InventoryFolders.Add(Folder.FolderID, Folder);
+            }
+
+            return (true);
+        }
+
+        public bool HasFolder(LLUUID folderID)
+        {
+            if (this.InventoryFolders.ContainsKey(folderID))
+            {
+                return true;
+            }
+            return false;
+        }
+
+        public LLUUID GetFolderID(string folderName)
+        {
+            foreach (InventoryFolder inv in this.InventoryFolders.Values)
+            {
+                if (inv.FolderName == folderName)
+                {
+                    return inv.FolderID;
+                }
+            }
+
+            return LLUUID.Zero;
+        }
+
+        public bool UpdateItemAsset(LLUUID itemID, AssetBase asset)
+        {
+            if(this.InventoryItems.ContainsKey(itemID))
+            {
+                InventoryItem Item = this.InventoryItems[itemID];
+                Item.AssetID = asset.FullID;
+                System.Console.WriteLine("updated inventory item " + itemID.ToStringHyphenated() + " so it now is set to asset " + asset.FullID.ToStringHyphenated());
+                //TODO need to update the rest of the info
+            }
+            return true;
+        }
+
+        public bool UpdateItemDetails(LLUUID itemID, UpdateInventoryItemPacket.InventoryDataBlock packet)
+        {
+            System.Console.WriteLine("updating inventory item details");
+            if (this.InventoryItems.ContainsKey(itemID))
+            {
+                System.Console.WriteLine("changing name to "+ Util.FieldToString(packet.Name));
+                InventoryItem Item = this.InventoryItems[itemID];
+                Item.Name = Util.FieldToString(packet.Name);
+                System.Console.WriteLine("updated inventory item " + itemID.ToStringHyphenated());
+                //TODO need to update the rest of the info
+            }
+            return true;
+        }
+
+        public LLUUID AddToInventory(LLUUID folderID, AssetBase asset)
+        {
+            if (this.InventoryFolders.ContainsKey(folderID))
+            {
+                LLUUID NewItemID = LLUUID.Random();
+
+                InventoryItem Item = new InventoryItem();
+                Item.FolderID = folderID;
+                Item.OwnerID = AgentID;
+                Item.AssetID = asset.FullID;
+                Item.ItemID = NewItemID;
+                Item.Type = asset.Type;
+                Item.Name = asset.Name;
+                Item.Description = asset.Description;
+                Item.InvType = asset.InvType;
+                this.InventoryItems.Add(Item.ItemID, Item);
+                InventoryFolder Folder = InventoryFolders[Item.FolderID];
+                Folder.Items.Add(Item);
+                return (Item.ItemID);
+            }
+            else
+            {
+                return (null);
+            }
+        }
+
+        public bool DeleteFromInventory(LLUUID itemID)
+        {
+            bool res = false;
+            if (this.InventoryItems.ContainsKey(itemID))
+            {
+                InventoryItem item = this.InventoryItems[itemID];
+                this.InventoryItems.Remove(itemID);
+                foreach (InventoryFolder fold in InventoryFolders.Values)
+                {
+                    if (fold.Items.Contains(item))
+                    {
+                        fold.Items.Remove(item);
+                        break;
+                    }
+                }
+                res = true;
+                
+            }
+            return res;
+        }
+    }
+
+    public class InventoryFolder
+    {
+        public List<InventoryItem> Items;
+        //public List<InventoryFolder> Subfolders;
+        public LLUUID FolderID;
+        public LLUUID OwnerID;
+        public LLUUID ParentID = LLUUID.Zero;
+        public string FolderName;
+        public ushort DefaultType;
+        public ushort Version;
+
+        public InventoryFolder()
+        {
+            Items = new List<InventoryItem>();
+            //Subfolders = new List<InventoryFolder>();
+        }
+
+    }
+
+    public class InventoryItem
+    {
+        public LLUUID FolderID;
+        public LLUUID OwnerID;
+        public LLUUID ItemID;
+        public LLUUID AssetID;
+        public LLUUID CreatorID;
+        public sbyte InvType;
+        public sbyte Type;
+        public string Name ="";
+        public string Description;
+
+        public InventoryItem()
+        {
+            this.CreatorID = LLUUID.Zero;
+        }
+
+        public string ExportString()
+        {
+            string typ = "notecard";
+            string result = "";
+            result += "\tinv_object\t0\n\t{\n";
+            result += "\t\tobj_id\t%s\n";
+            result +=  "\t\tparent_id\t"+ ItemID.ToString() +"\n";
+            result += "\t\ttype\t"+ typ +"\n";
+            result += "\t\tname\t" + Name+"|\n";
+            result += "\t}\n";
+            return result;
+        }
+    }
+}
diff --git a/OpenSim/Framework/General/AuthenticateSessionBase.cs b/OpenSim/Framework/General/AuthenticateSessionBase.cs
index 71616e3..2d02286 100644
--- a/OpenSim/Framework/General/AuthenticateSessionBase.cs
+++ b/OpenSim/Framework/General/AuthenticateSessionBase.cs
@@ -1,130 +1,130 @@
-/*

-* 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.Collections.Generic;

-using libsecondlife;

-using OpenSim.Framework.Interfaces;

-using OpenSim.Framework.Types;

-

-namespace OpenSim.Framework

-{

-    public class AuthenticateSessionsBase

-    {

-        public Dictionary<uint, AgentCircuitData> AgentCircuits = new Dictionary<uint, AgentCircuitData>();

-

-        public AuthenticateSessionsBase()

-        {

-

-        }

-

-        public virtual AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitcode)

-        {

-            AgentCircuitData validcircuit = null;

-            if (this.AgentCircuits.ContainsKey(circuitcode))

-            {

-                validcircuit = this.AgentCircuits[circuitcode];

-            }

-            AuthenticateResponse user = new AuthenticateResponse();

-            if (validcircuit == null)

-            {

-                //don't have this circuit code in our list

-                user.Authorised = false;

-                return (user);

-            }

-

-            if ((sessionID == validcircuit.SessionID) && (agentID == validcircuit.AgentID))

-            {

-                user.Authorised = true;

-                user.LoginInfo = new Login();

-                user.LoginInfo.Agent = agentID;

-                user.LoginInfo.Session = sessionID;

-                user.LoginInfo.SecureSession = validcircuit.SecureSessionID;

-                user.LoginInfo.First = validcircuit.firstname;

-                user.LoginInfo.Last = validcircuit.lastname;

-                user.LoginInfo.InventoryFolder = validcircuit.InventoryFolder;

-                user.LoginInfo.BaseFolder = validcircuit.BaseFolder;

-            }

-            else

-            {

-                // Invalid

-                user.Authorised = false;

-            }

-

-            return (user);

-        }

-

-        public virtual void AddNewCircuit(uint circuitCode, AgentCircuitData agentData)

-        {

-            if (this.AgentCircuits.ContainsKey(circuitCode))

-            {

-                this.AgentCircuits[circuitCode] = agentData;

-            }

-            else

-            {

-                this.AgentCircuits.Add(circuitCode, agentData);

-            }

-        }

-

-        public LLVector3 GetPosition(uint circuitCode)

-        {

-            LLVector3 vec = new LLVector3();

-            if (this.AgentCircuits.ContainsKey(circuitCode))

-            {

-                vec = this.AgentCircuits[circuitCode].startpos;

-            }

-            return vec;

-        }

-

-        public void UpdateAgentData(AgentCircuitData agentData)

-        {

-            if (this.AgentCircuits.ContainsKey((uint)agentData.circuitcode))

-            {

-                this.AgentCircuits[(uint)agentData.circuitcode].firstname = agentData.firstname;

-                this.AgentCircuits[(uint)agentData.circuitcode].lastname = agentData.lastname;

-                this.AgentCircuits[(uint)agentData.circuitcode].startpos = agentData.startpos;

-               // Console.WriteLine("update user start pos is " + agentData.startpos.X + " , " + agentData.startpos.Y + " , " + agentData.startpos.Z);

-            }

-        }

-

-        public void UpdateAgentChildStatus(uint circuitcode, bool childstatus)

-        {

-            if (this.AgentCircuits.ContainsKey(circuitcode))

-            {

-                this.AgentCircuits[circuitcode].child = childstatus;

-            }

-        }

-

-        public bool GetAgentChildStatus(uint circuitcode)

-        {

-            if (this.AgentCircuits.ContainsKey(circuitcode))

-            {

-                return this.AgentCircuits[circuitcode].child;

-            }

-            return false;

-        }

-    }

+/*
+* 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.Collections.Generic;
+using libsecondlife;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+
+namespace OpenSim.Framework
+{
+    public class AuthenticateSessionsBase
+    {
+        public Dictionary<uint, AgentCircuitData> AgentCircuits = new Dictionary<uint, AgentCircuitData>();
+
+        public AuthenticateSessionsBase()
+        {
+
+        }
+
+        public virtual AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitcode)
+        {
+            AgentCircuitData validcircuit = null;
+            if (this.AgentCircuits.ContainsKey(circuitcode))
+            {
+                validcircuit = this.AgentCircuits[circuitcode];
+            }
+            AuthenticateResponse user = new AuthenticateResponse();
+            if (validcircuit == null)
+            {
+                //don't have this circuit code in our list
+                user.Authorised = false;
+                return (user);
+            }
+
+            if ((sessionID == validcircuit.SessionID) && (agentID == validcircuit.AgentID))
+            {
+                user.Authorised = true;
+                user.LoginInfo = new Login();
+                user.LoginInfo.Agent = agentID;
+                user.LoginInfo.Session = sessionID;
+                user.LoginInfo.SecureSession = validcircuit.SecureSessionID;
+                user.LoginInfo.First = validcircuit.firstname;
+                user.LoginInfo.Last = validcircuit.lastname;
+                user.LoginInfo.InventoryFolder = validcircuit.InventoryFolder;
+                user.LoginInfo.BaseFolder = validcircuit.BaseFolder;
+            }
+            else
+            {
+                // Invalid
+                user.Authorised = false;
+            }
+
+            return (user);
+        }
+
+        public virtual void AddNewCircuit(uint circuitCode, AgentCircuitData agentData)
+        {
+            if (this.AgentCircuits.ContainsKey(circuitCode))
+            {
+                this.AgentCircuits[circuitCode] = agentData;
+            }
+            else
+            {
+                this.AgentCircuits.Add(circuitCode, agentData);
+            }
+        }
+
+        public LLVector3 GetPosition(uint circuitCode)
+        {
+            LLVector3 vec = new LLVector3();
+            if (this.AgentCircuits.ContainsKey(circuitCode))
+            {
+                vec = this.AgentCircuits[circuitCode].startpos;
+            }
+            return vec;
+        }
+
+        public void UpdateAgentData(AgentCircuitData agentData)
+        {
+            if (this.AgentCircuits.ContainsKey((uint)agentData.circuitcode))
+            {
+                this.AgentCircuits[(uint)agentData.circuitcode].firstname = agentData.firstname;
+                this.AgentCircuits[(uint)agentData.circuitcode].lastname = agentData.lastname;
+                this.AgentCircuits[(uint)agentData.circuitcode].startpos = agentData.startpos;
+               // Console.WriteLine("update user start pos is " + agentData.startpos.X + " , " + agentData.startpos.Y + " , " + agentData.startpos.Z);
+            }
+        }
+
+        public void UpdateAgentChildStatus(uint circuitcode, bool childstatus)
+        {
+            if (this.AgentCircuits.ContainsKey(circuitcode))
+            {
+                this.AgentCircuits[circuitcode].child = childstatus;
+            }
+        }
+
+        public bool GetAgentChildStatus(uint circuitcode)
+        {
+            if (this.AgentCircuits.ContainsKey(circuitcode))
+            {
+                return this.AgentCircuits[circuitcode].child;
+            }
+            return false;
+        }
+    }
 }
\ No newline at end of file
diff --git a/OpenSim/Framework/General/BlockingQueue.cs b/OpenSim/Framework/General/BlockingQueue.cs
index 0cc8124..e263d71 100644
--- a/OpenSim/Framework/General/BlockingQueue.cs
+++ b/OpenSim/Framework/General/BlockingQueue.cs
@@ -1,58 +1,58 @@
-/*

-* 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.Collections.Generic;

-using System.Threading;

-

-namespace OpenSim.Framework.Utilities

-{

-    public class BlockingQueue<T>

-    {

-        private Queue<T> _queue = new Queue<T>();

-        private object _queueSync = new object();

-

-        public void Enqueue(T value)

-        {

-            lock (_queueSync)

-            {

-                _queue.Enqueue(value);

-                Monitor.Pulse(_queueSync);

-            }

-        }

-

-        public T Dequeue()

-        {

-            lock (_queueSync)

-            {

-                if (_queue.Count < 1)

-                    Monitor.Wait(_queueSync);

-

-                return _queue.Dequeue();

-            }

-        }

-    }

-}

+/*
+* 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.Collections.Generic;
+using System.Threading;
+
+namespace OpenSim.Framework.Utilities
+{
+    public class BlockingQueue<T>
+    {
+        private Queue<T> _queue = new Queue<T>();
+        private object _queueSync = new object();
+
+        public void Enqueue(T value)
+        {
+            lock (_queueSync)
+            {
+                _queue.Enqueue(value);
+                Monitor.Pulse(_queueSync);
+            }
+        }
+
+        public T Dequeue()
+        {
+            lock (_queueSync)
+            {
+                if (_queue.Count < 1)
+                    Monitor.Wait(_queueSync);
+
+                return _queue.Dequeue();
+            }
+        }
+    }
+}
diff --git a/OpenSim/Framework/General/ClientManager.cs b/OpenSim/Framework/General/ClientManager.cs
index b560ca8..0e45d03 100644
--- a/OpenSim/Framework/General/ClientManager.cs
+++ b/OpenSim/Framework/General/ClientManager.cs
@@ -1,36 +1,36 @@
-using System;

-using System.Collections.Generic;

-using System.Text;

-using OpenSim.Framework.Interfaces;

-

-namespace OpenSim.Framework

-{

-    public delegate void ForEachClientDelegate( IClientAPI client );

-    public class ClientManager

-    {

-        private Dictionary<uint, IClientAPI> m_clients;

-                

-        public void ForEachClient(ForEachClientDelegate whatToDo)

-        {

-            foreach (IClientAPI client in m_clients.Values)

-            {

-                whatToDo(client);

-            }

-        }

-        

-        public ClientManager()

-        {

-            m_clients = new Dictionary<uint, IClientAPI>();

-        }

-

-        public void Remove(uint id)

-        {

-            m_clients.Remove(id);

-        }

-

-        public void Add(uint id, IClientAPI client )

-        {

-            m_clients.Add( id, client );

-        }

-    }

-}

+using System;
+using System.Collections.Generic;
+using System.Text;
+using OpenSim.Framework.Interfaces;
+
+namespace OpenSim.Framework
+{
+    public delegate void ForEachClientDelegate( IClientAPI client );
+    public class ClientManager
+    {
+        private Dictionary<uint, IClientAPI> m_clients;
+                
+        public void ForEachClient(ForEachClientDelegate whatToDo)
+        {
+            foreach (IClientAPI client in m_clients.Values)
+            {
+                whatToDo(client);
+            }
+        }
+        
+        public ClientManager()
+        {
+            m_clients = new Dictionary<uint, IClientAPI>();
+        }
+
+        public void Remove(uint id)
+        {
+            m_clients.Remove(id);
+        }
+
+        public void Add(uint id, IClientAPI client )
+        {
+            m_clients.Add( id, client );
+        }
+    }
+}
diff --git a/OpenSim/Framework/General/IRegionCommsListener.cs b/OpenSim/Framework/General/IRegionCommsListener.cs
index 32444f9..81da5d4 100644
--- a/OpenSim/Framework/General/IRegionCommsListener.cs
+++ b/OpenSim/Framework/General/IRegionCommsListener.cs
@@ -1,46 +1,46 @@
-/*

-* 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.Collections.Generic;

-using libsecondlife;

-using OpenSim.Framework.Interfaces;

-using OpenSim.Framework.Types;

-

-namespace OpenSim.Framework

-{

-    public delegate void ExpectUserDelegate(ulong regionHandle, AgentCircuitData agent);

-    public delegate void UpdateNeighbours(List<RegionInfo> neighbours);

-    public delegate void AgentCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position);

-

-    public interface IRegionCommsListener

-    {

-        event ExpectUserDelegate OnExpectUser;

-        event GenericCall2 OnExpectChildAgent;

-        event AgentCrossing OnAvatarCrossingIntoRegion;

-        event UpdateNeighbours OnNeighboursUpdate;

-    }

-}

+/*
+* 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.Collections.Generic;
+using libsecondlife;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+
+namespace OpenSim.Framework
+{
+    public delegate void ExpectUserDelegate(ulong regionHandle, AgentCircuitData agent);
+    public delegate void UpdateNeighbours(List<RegionInfo> neighbours);
+    public delegate void AgentCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position);
+
+    public interface IRegionCommsListener
+    {
+        event ExpectUserDelegate OnExpectUser;
+        event GenericCall2 OnExpectChildAgent;
+        event AgentCrossing OnAvatarCrossingIntoRegion;
+        event UpdateNeighbours OnNeighboursUpdate;
+    }
+}
diff --git a/OpenSim/Framework/General/Interfaces/AuthenticateResponse.cs b/OpenSim/Framework/General/Interfaces/AuthenticateResponse.cs
index 508485b..7c49785 100644
--- a/OpenSim/Framework/General/Interfaces/AuthenticateResponse.cs
+++ b/OpenSim/Framework/General/Interfaces/AuthenticateResponse.cs
@@ -1,43 +1,43 @@
-/*

-* 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 OpenSim.Framework.Types;

-

-namespace OpenSim.Framework.Interfaces

-{

-    public class AuthenticateResponse

-    {

-        public bool Authorised;

-        public Login LoginInfo;

-

-        public AuthenticateResponse()

-        {

-

-        }

-

-    }

-}

+/*
+* 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 OpenSim.Framework.Types;
+
+namespace OpenSim.Framework.Interfaces
+{
+    public class AuthenticateResponse
+    {
+        public bool Authorised;
+        public Login LoginInfo;
+
+        public AuthenticateResponse()
+        {
+
+        }
+
+    }
+}
diff --git a/OpenSim/Framework/General/Interfaces/Config/IGenericConfig.cs b/OpenSim/Framework/General/Interfaces/Config/IGenericConfig.cs
index 2c379dd..57aa0c0 100644
--- a/OpenSim/Framework/General/Interfaces/Config/IGenericConfig.cs
+++ b/OpenSim/Framework/General/Interfaces/Config/IGenericConfig.cs
@@ -1,38 +1,38 @@
-/*

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

-* 

-*/

-namespace OpenSim.Framework.Interfaces

-{

-    public interface IGenericConfig

-    {

-        void LoadData();

-        string GetAttribute(string attributeName);

-        bool SetAttribute(string attributeName, string attributeValue);

-        void Commit();

-        void Close();

-    }

-}

+/*
+* 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.
+* 
+*/
+namespace OpenSim.Framework.Interfaces
+{
+    public interface IGenericConfig
+    {
+        void LoadData();
+        string GetAttribute(string attributeName);
+        bool SetAttribute(string attributeName, string attributeValue);
+        void Commit();
+        void Close();
+    }
+}
diff --git a/OpenSim/Framework/General/Interfaces/Config/IGridConfig.cs b/OpenSim/Framework/General/Interfaces/Config/IGridConfig.cs
index 81dc293..20cc320 100644
--- a/OpenSim/Framework/General/Interfaces/Config/IGridConfig.cs
+++ b/OpenSim/Framework/General/Interfaces/Config/IGridConfig.cs
@@ -1,59 +1,59 @@
-/*

-* 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 OpenSim.world;

-

-namespace OpenSim.Framework.Interfaces

-{

-    /// <summary>

-    /// </summary>

-

-

-    public abstract class GridConfig

-    {

-        public string GridOwner;

-        public string DefaultStartupMsg;

-        public string DefaultAssetServer;

-        public string AssetSendKey;

-        public string AssetRecvKey;

-        public string DefaultUserServer;

-        public string UserSendKey;

-        public string UserRecvKey;

-        public string SimSendKey;

-        public string SimRecvKey;

-

-

-        public abstract void InitConfig();

-

-    }

-

-    public interface IGridConfig

-    {

-        GridConfig GetConfigObject();

-    }

-}

+/*
+* 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 OpenSim.world;
+
+namespace OpenSim.Framework.Interfaces
+{
+    /// <summary>
+    /// </summary>
+
+
+    public abstract class GridConfig
+    {
+        public string GridOwner;
+        public string DefaultStartupMsg;
+        public string DefaultAssetServer;
+        public string AssetSendKey;
+        public string AssetRecvKey;
+        public string DefaultUserServer;
+        public string UserSendKey;
+        public string UserRecvKey;
+        public string SimSendKey;
+        public string SimRecvKey;
+
+
+        public abstract void InitConfig();
+
+    }
+
+    public interface IGridConfig
+    {
+        GridConfig GetConfigObject();
+    }
+}
diff --git a/OpenSim/Framework/General/Interfaces/Config/IUserConfig.cs b/OpenSim/Framework/General/Interfaces/Config/IUserConfig.cs
index ae6cedb..a17804a 100644
--- a/OpenSim/Framework/General/Interfaces/Config/IUserConfig.cs
+++ b/OpenSim/Framework/General/Interfaces/Config/IUserConfig.cs
@@ -1,53 +1,53 @@
-/*

-* 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 OpenSim.world;

-

-namespace OpenSim.Framework.Interfaces

-{

-    /// <summary>

-    /// </summary>

-

-

-    public abstract class UserConfig

-    {

-        public string DefaultStartupMsg;

-        public string GridServerURL;

-        public string GridSendKey;

-        public string GridRecvKey;

-

-

-        public abstract void InitConfig();

-

-    }

-

-    public interface IUserConfig

-    {

-        UserConfig GetConfigObject();

-    }

-}

+/*
+* 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 OpenSim.world;
+
+namespace OpenSim.Framework.Interfaces
+{
+    /// <summary>
+    /// </summary>
+
+
+    public abstract class UserConfig
+    {
+        public string DefaultStartupMsg;
+        public string GridServerURL;
+        public string GridSendKey;
+        public string GridRecvKey;
+
+
+        public abstract void InitConfig();
+
+    }
+
+    public interface IUserConfig
+    {
+        UserConfig GetConfigObject();
+    }
+}
diff --git a/OpenSim/Framework/General/Interfaces/IAssetServer.cs b/OpenSim/Framework/General/Interfaces/IAssetServer.cs
index ab60dd7..cbb5c36 100644
--- a/OpenSim/Framework/General/Interfaces/IAssetServer.cs
+++ b/OpenSim/Framework/General/Interfaces/IAssetServer.cs
@@ -1,64 +1,64 @@
-/*

-* 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 libsecondlife;

-using OpenSim.Framework.Types;

-

-namespace OpenSim.Framework.Interfaces

-{

-    /// <summary>

-    /// Description of IAssetServer.

-    /// </summary>

-

-    public interface IAssetServer

-    {

-        void SetReceiver(IAssetReceiver receiver);

-        void RequestAsset(LLUUID assetID, bool isTexture);

-        void UpdateAsset(AssetBase asset);

-        void UploadNewAsset(AssetBase asset);

-        void SetServerInfo(string ServerUrl, string ServerKey);

-        void Close();

-    }

-

-    // could change to delegate?

-    public interface IAssetReceiver

-    {

-        void AssetReceived(AssetBase asset, bool IsTexture);

-        void AssetNotFound(AssetBase asset);

-    }

-

-    public interface IAssetPlugin

-    {

-        IAssetServer GetAssetServer();

-    }

-

-    public struct ARequest

-    {

-        public LLUUID AssetID;

-        public bool IsTexture;

-    }

-}

+/*
+* 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 libsecondlife;
+using OpenSim.Framework.Types;
+
+namespace OpenSim.Framework.Interfaces
+{
+    /// <summary>
+    /// Description of IAssetServer.
+    /// </summary>
+
+    public interface IAssetServer
+    {
+        void SetReceiver(IAssetReceiver receiver);
+        void RequestAsset(LLUUID assetID, bool isTexture);
+        void UpdateAsset(AssetBase asset);
+        void UploadNewAsset(AssetBase asset);
+        void SetServerInfo(string ServerUrl, string ServerKey);
+        void Close();
+    }
+
+    // could change to delegate?
+    public interface IAssetReceiver
+    {
+        void AssetReceived(AssetBase asset, bool IsTexture);
+        void AssetNotFound(AssetBase asset);
+    }
+
+    public interface IAssetPlugin
+    {
+        IAssetServer GetAssetServer();
+    }
+
+    public struct ARequest
+    {
+        public LLUUID AssetID;
+        public bool IsTexture;
+    }
+}
diff --git a/OpenSim/Framework/General/Interfaces/IClientAPI.cs b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
index bd258a3..0606e43 100644
--- a/OpenSim/Framework/General/Interfaces/IClientAPI.cs
+++ b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
@@ -1,195 +1,195 @@
-/*

-* 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.Collections.Generic;

-using System.Net;

-using libsecondlife;

-using libsecondlife.Packets;

-using OpenSim.Framework.Types;

-using OpenSim.Framework.Data;

-

-namespace OpenSim.Framework.Interfaces

-{

-    public delegate void ChatFromViewer(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID);

-    public delegate void ImprovedInstantMessage(LLUUID fromAgentID, LLUUID toAgentID, uint timestamp, string fromAgentName, string message); // Cut down from full list

-    public delegate void RezObject(AssetBase primAsset, LLVector3 pos);

-    public delegate void ModifyTerrain(float height, float seconds, byte size, byte action, float north, float west);

-    public delegate void SetAppearance(byte[] texture, AgentSetAppearancePacket.VisualParamBlock[] visualParam);

-    public delegate void StartAnim(LLUUID animID, int seq);

-    public delegate void LinkObjects(uint parent, List<uint> children);

-    public delegate void RequestMapBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY);

-    public delegate void TeleportLocationRequest(IClientAPI remoteClient, ulong regionHandle, LLVector3 position, LLVector3 lookAt, uint flags);

-

-    public delegate void GenericCall(IClientAPI remoteClient);

-    public delegate void GenericCall2();

-    public delegate void GenericCall3(Packet packet); // really don't want to be passing packets in these events, so this is very temporary.

-    public delegate void GenericCall4(Packet packet, IClientAPI remoteClient);

-    public delegate void GenericCall5(IClientAPI remoteClient, bool status);

-    public delegate void GenericCall6(LLUUID uid);

-    public delegate void GenericCall7(uint localID, string message);

-

-    public delegate void UpdateShape(uint localID, ObjectShapePacket.ObjectDataBlock shapeBlock);

-    public delegate void ObjectSelect(uint localID, IClientAPI remoteClient);

-    public delegate void ObjectDeselect(uint localID, IClientAPI remoteClient);

-    public delegate void UpdatePrimFlags(uint localID, Packet packet, IClientAPI remoteClient);

-    public delegate void UpdatePrimTexture(uint localID, byte[] texture, IClientAPI remoteClient);

-    public delegate void UpdateVector(uint localID, LLVector3 pos, IClientAPI remoteClient);

-    public delegate void UpdatePrimRotation(uint localID, LLQuaternion rot, IClientAPI remoteClient);

-    public delegate void UpdatePrimSingleRotation(uint localID, LLQuaternion rot, IClientAPI remoteClient);

-    public delegate void UpdatePrimGroupRotation(uint localID,LLVector3 pos, LLQuaternion rot, IClientAPI remoteClient);

-    public delegate void ObjectDuplicate(uint localID, LLVector3 offset, uint dupeFlags);

-    public delegate void StatusChange(bool status);

-    public delegate void NewAvatar(IClientAPI remoteClient, LLUUID agentID, bool status);

-    public delegate void UpdateAgent(IClientAPI remoteClient, uint flags, LLQuaternion bodyRotation);

-    public delegate void MoveObject(LLUUID objectID, LLVector3 offset, LLVector3 grapPos, IClientAPI remoteClient);

-

-    public delegate void ParcelPropertiesRequest(int start_x, int start_y, int end_x, int end_y, int sequence_id, bool snap_selection, IClientAPI remote_client);

-    public delegate void ParcelDivideRequest(int west, int south, int east, int north, IClientAPI remote_client);

-    public delegate void ParcelJoinRequest(int west, int south, int east, int north, IClientAPI remote_client);

-    public delegate void ParcelPropertiesUpdateRequest(ParcelPropertiesUpdatePacket packet, IClientAPI remote_client);

-    public delegate void ParcelSelectObjects(int parcel_local_id, int request_type, IClientAPI remote_client);

-    public delegate void ParcelObjectOwnerRequest(int local_id, IClientAPI remote_client);

-    public delegate void EstateOwnerMessageRequest(EstateOwnerMessagePacket packet, IClientAPI remote_client);

-

-    public delegate void UUIDNameRequest(LLUUID id, IClientAPI remote_client);

-

-    public delegate void AddNewPrim(LLUUID ownerID, LLVector3 pos, PrimitiveBaseShape shape);

-

-    

-

-    public interface IClientAPI

-    {

-        event ImprovedInstantMessage OnInstantMessage;

-        event ChatFromViewer OnChatFromViewer;

-        event RezObject OnRezObject;

-        event ModifyTerrain OnModifyTerrain;

-        event SetAppearance OnSetAppearance;

-        event StartAnim OnStartAnim;

-        event LinkObjects OnLinkObjects;

-        event RequestMapBlocks OnRequestMapBlocks;

-        event TeleportLocationRequest OnTeleportLocationRequest;

-

-        event GenericCall4 OnDeRezObject;

-        event GenericCall OnRegionHandShakeReply;

-        event GenericCall OnRequestWearables;

-        event GenericCall2 OnCompleteMovementToRegion;

-        event UpdateAgent OnAgentUpdate;

-        event GenericCall OnRequestAvatarsData;

-        event AddNewPrim OnAddPrim;

-        event ObjectDuplicate OnObjectDuplicate;

-        event UpdateVector OnGrapObject;

-        event ObjectSelect OnDeGrapObject;

-        event MoveObject OnGrapUpdate;

-

-        event UpdateShape OnUpdatePrimShape;

-        event ObjectSelect OnObjectSelect;

-        event ObjectDeselect OnObjectDeselect;

-        event GenericCall7 OnObjectDescription;

-        event GenericCall7 OnObjectName;

-        event UpdatePrimFlags OnUpdatePrimFlags;

-        event UpdatePrimTexture OnUpdatePrimTexture;

-        event UpdateVector OnUpdatePrimGroupPosition;

-        event UpdateVector OnUpdatePrimSinglePosition;

-        event UpdatePrimRotation OnUpdatePrimGroupRotation;

-        event UpdatePrimSingleRotation OnUpdatePrimSingleRotation;

-        event UpdatePrimGroupRotation OnUpdatePrimGroupMouseRotation;

-        event UpdateVector OnUpdatePrimScale;

-        event StatusChange OnChildAgentStatus;

-        event GenericCall2 OnStopMovement;

-        event NewAvatar OnNewAvatar;

-        event GenericCall6 OnRemoveAvatar;

-

-        event UUIDNameRequest OnNameFromUUIDRequest;

-

-        event ParcelPropertiesRequest OnParcelPropertiesRequest;

-        event ParcelDivideRequest OnParcelDivideRequest;

-        event ParcelJoinRequest OnParcelJoinRequest;

-        event ParcelPropertiesUpdateRequest OnParcelPropertiesUpdateRequest;

-        event ParcelSelectObjects OnParcelSelectObjects;

-        event ParcelObjectOwnerRequest OnParcelObjectOwnerRequest;

-        event EstateOwnerMessageRequest OnEstateOwnerMessage;

-

-        LLVector3 StartPos

-        {

-            get;

-            set;

-        }

-

-        LLUUID AgentId

-        {

-            get;

-        }

-

-        string FirstName

-        {

-            get;

-        }

-

-        string LastName

-        {

-            get;

-        }

-

-        void OutPacket(Packet newPack);

-        void SendWearables(AvatarWearable[] wearables);

-        void SendStartPingCheck(byte seq);

-        void SendKillObject(ulong regionHandle, uint avatarLocalID);

-        void SendAnimation(LLUUID animID, int seq, LLUUID sourceAgentId);

-        void SendRegionHandshake(RegionInfo regionInfo);

-        void SendChatMessage(string message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID);

-        void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID);

-        void SendInstantMessage(string message, LLUUID target, string fromName);

-        void SendLayerData(float[] map);

-        void SendLayerData(int px, int py, float[] map);

-        void MoveAgentIntoRegion(RegionInfo regInfo, LLVector3 pos, LLVector3 look);

-        void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourExternalEndPoint );

-        AgentCircuitData RequestClientInfo();

-        void CrossRegion(ulong newRegionHandle, LLVector3 pos, LLVector3 lookAt, IPEndPoint newRegionExternalEndPoint );

-        void SendMapBlock(List<MapBlockData> mapBlocks);

-        void SendLocalTeleport(LLVector3 position, LLVector3 lookAt, uint flags);

-        void SendRegionTeleport(ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint, uint locationID, uint flags);

-        void SendTeleportCancel();

-        void SendTeleportLocationStart();

-        void SendMoneyBalance(LLUUID transaction, bool success, byte[] description, int balance);

-

-        void SendAvatarData(ulong regionHandle, string firstName, string lastName, LLUUID avatarID, uint avatarLocalID, LLVector3 Pos, byte[] textureEntry);

-        void SendAvatarTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, LLVector3 velocity);

-

-        void AttachObject(uint localID, LLQuaternion rotation, byte attachPoint);

-        void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimData primData, LLVector3 pos, LLQuaternion rotation, LLUUID textureID , uint flags);

-        void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimData primData, LLVector3 pos, LLUUID textureID, uint flags);

-        void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, LLVector3 pos, LLQuaternion rotation, uint flags, LLUUID objectID, LLUUID ownerID, string text, uint parentID);

-        void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, LLVector3 pos, uint flags, LLUUID objectID, LLUUID ownerID, string text, uint parentID);

-        void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, LLQuaternion rotation);

-    

-        void SendInventoryFolderDetails(LLUUID ownerID, LLUUID folderID, List<InventoryItemBase> items);

-        void SendInventoryItemDetails(LLUUID ownerID, LLUUID folderID, InventoryItemBase item);

-        void SendNameReply(LLUUID profileId, string firstname, string lastname);

-

-        

-    }

-}

+/*
+* 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.Collections.Generic;
+using System.Net;
+using libsecondlife;
+using libsecondlife.Packets;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Data;
+
+namespace OpenSim.Framework.Interfaces
+{
+    public delegate void ChatFromViewer(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID);
+    public delegate void ImprovedInstantMessage(LLUUID fromAgentID, LLUUID toAgentID, uint timestamp, string fromAgentName, string message); // Cut down from full list
+    public delegate void RezObject(AssetBase primAsset, LLVector3 pos);
+    public delegate void ModifyTerrain(float height, float seconds, byte size, byte action, float north, float west);
+    public delegate void SetAppearance(byte[] texture, AgentSetAppearancePacket.VisualParamBlock[] visualParam);
+    public delegate void StartAnim(LLUUID animID, int seq);
+    public delegate void LinkObjects(uint parent, List<uint> children);
+    public delegate void RequestMapBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY);
+    public delegate void TeleportLocationRequest(IClientAPI remoteClient, ulong regionHandle, LLVector3 position, LLVector3 lookAt, uint flags);
+
+    public delegate void GenericCall(IClientAPI remoteClient);
+    public delegate void GenericCall2();
+    public delegate void GenericCall3(Packet packet); // really don't want to be passing packets in these events, so this is very temporary.
+    public delegate void GenericCall4(Packet packet, IClientAPI remoteClient);
+    public delegate void GenericCall5(IClientAPI remoteClient, bool status);
+    public delegate void GenericCall6(LLUUID uid);
+    public delegate void GenericCall7(uint localID, string message);
+
+    public delegate void UpdateShape(uint localID, ObjectShapePacket.ObjectDataBlock shapeBlock);
+    public delegate void ObjectSelect(uint localID, IClientAPI remoteClient);
+    public delegate void ObjectDeselect(uint localID, IClientAPI remoteClient);
+    public delegate void UpdatePrimFlags(uint localID, Packet packet, IClientAPI remoteClient);
+    public delegate void UpdatePrimTexture(uint localID, byte[] texture, IClientAPI remoteClient);
+    public delegate void UpdateVector(uint localID, LLVector3 pos, IClientAPI remoteClient);
+    public delegate void UpdatePrimRotation(uint localID, LLQuaternion rot, IClientAPI remoteClient);
+    public delegate void UpdatePrimSingleRotation(uint localID, LLQuaternion rot, IClientAPI remoteClient);
+    public delegate void UpdatePrimGroupRotation(uint localID,LLVector3 pos, LLQuaternion rot, IClientAPI remoteClient);
+    public delegate void ObjectDuplicate(uint localID, LLVector3 offset, uint dupeFlags);
+    public delegate void StatusChange(bool status);
+    public delegate void NewAvatar(IClientAPI remoteClient, LLUUID agentID, bool status);
+    public delegate void UpdateAgent(IClientAPI remoteClient, uint flags, LLQuaternion bodyRotation);
+    public delegate void MoveObject(LLUUID objectID, LLVector3 offset, LLVector3 grapPos, IClientAPI remoteClient);
+
+    public delegate void ParcelPropertiesRequest(int start_x, int start_y, int end_x, int end_y, int sequence_id, bool snap_selection, IClientAPI remote_client);
+    public delegate void ParcelDivideRequest(int west, int south, int east, int north, IClientAPI remote_client);
+    public delegate void ParcelJoinRequest(int west, int south, int east, int north, IClientAPI remote_client);
+    public delegate void ParcelPropertiesUpdateRequest(ParcelPropertiesUpdatePacket packet, IClientAPI remote_client);
+    public delegate void ParcelSelectObjects(int parcel_local_id, int request_type, IClientAPI remote_client);
+    public delegate void ParcelObjectOwnerRequest(int local_id, IClientAPI remote_client);
+    public delegate void EstateOwnerMessageRequest(EstateOwnerMessagePacket packet, IClientAPI remote_client);
+
+    public delegate void UUIDNameRequest(LLUUID id, IClientAPI remote_client);
+
+    public delegate void AddNewPrim(LLUUID ownerID, LLVector3 pos, PrimitiveBaseShape shape);
+
+    
+
+    public interface IClientAPI
+    {
+        event ImprovedInstantMessage OnInstantMessage;
+        event ChatFromViewer OnChatFromViewer;
+        event RezObject OnRezObject;
+        event ModifyTerrain OnModifyTerrain;
+        event SetAppearance OnSetAppearance;
+        event StartAnim OnStartAnim;
+        event LinkObjects OnLinkObjects;
+        event RequestMapBlocks OnRequestMapBlocks;
+        event TeleportLocationRequest OnTeleportLocationRequest;
+
+        event GenericCall4 OnDeRezObject;
+        event GenericCall OnRegionHandShakeReply;
+        event GenericCall OnRequestWearables;
+        event GenericCall2 OnCompleteMovementToRegion;
+        event UpdateAgent OnAgentUpdate;
+        event GenericCall OnRequestAvatarsData;
+        event AddNewPrim OnAddPrim;
+        event ObjectDuplicate OnObjectDuplicate;
+        event UpdateVector OnGrapObject;
+        event ObjectSelect OnDeGrapObject;
+        event MoveObject OnGrapUpdate;
+
+        event UpdateShape OnUpdatePrimShape;
+        event ObjectSelect OnObjectSelect;
+        event ObjectDeselect OnObjectDeselect;
+        event GenericCall7 OnObjectDescription;
+        event GenericCall7 OnObjectName;
+        event UpdatePrimFlags OnUpdatePrimFlags;
+        event UpdatePrimTexture OnUpdatePrimTexture;
+        event UpdateVector OnUpdatePrimGroupPosition;
+        event UpdateVector OnUpdatePrimSinglePosition;
+        event UpdatePrimRotation OnUpdatePrimGroupRotation;
+        event UpdatePrimSingleRotation OnUpdatePrimSingleRotation;
+        event UpdatePrimGroupRotation OnUpdatePrimGroupMouseRotation;
+        event UpdateVector OnUpdatePrimScale;
+        event StatusChange OnChildAgentStatus;
+        event GenericCall2 OnStopMovement;
+        event NewAvatar OnNewAvatar;
+        event GenericCall6 OnRemoveAvatar;
+
+        event UUIDNameRequest OnNameFromUUIDRequest;
+
+        event ParcelPropertiesRequest OnParcelPropertiesRequest;
+        event ParcelDivideRequest OnParcelDivideRequest;
+        event ParcelJoinRequest OnParcelJoinRequest;
+        event ParcelPropertiesUpdateRequest OnParcelPropertiesUpdateRequest;
+        event ParcelSelectObjects OnParcelSelectObjects;
+        event ParcelObjectOwnerRequest OnParcelObjectOwnerRequest;
+        event EstateOwnerMessageRequest OnEstateOwnerMessage;
+
+        LLVector3 StartPos
+        {
+            get;
+            set;
+        }
+
+        LLUUID AgentId
+        {
+            get;
+        }
+
+        string FirstName
+        {
+            get;
+        }
+
+        string LastName
+        {
+            get;
+        }
+
+        void OutPacket(Packet newPack);
+        void SendWearables(AvatarWearable[] wearables);
+        void SendStartPingCheck(byte seq);
+        void SendKillObject(ulong regionHandle, uint avatarLocalID);
+        void SendAnimation(LLUUID animID, int seq, LLUUID sourceAgentId);
+        void SendRegionHandshake(RegionInfo regionInfo);
+        void SendChatMessage(string message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID);
+        void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID);
+        void SendInstantMessage(string message, LLUUID target, string fromName);
+        void SendLayerData(float[] map);
+        void SendLayerData(int px, int py, float[] map);
+        void MoveAgentIntoRegion(RegionInfo regInfo, LLVector3 pos, LLVector3 look);
+        void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourExternalEndPoint );
+        AgentCircuitData RequestClientInfo();
+        void CrossRegion(ulong newRegionHandle, LLVector3 pos, LLVector3 lookAt, IPEndPoint newRegionExternalEndPoint );
+        void SendMapBlock(List<MapBlockData> mapBlocks);
+        void SendLocalTeleport(LLVector3 position, LLVector3 lookAt, uint flags);
+        void SendRegionTeleport(ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint, uint locationID, uint flags);
+        void SendTeleportCancel();
+        void SendTeleportLocationStart();
+        void SendMoneyBalance(LLUUID transaction, bool success, byte[] description, int balance);
+
+        void SendAvatarData(ulong regionHandle, string firstName, string lastName, LLUUID avatarID, uint avatarLocalID, LLVector3 Pos, byte[] textureEntry);
+        void SendAvatarTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, LLVector3 velocity);
+
+        void AttachObject(uint localID, LLQuaternion rotation, byte attachPoint);
+        void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimData primData, LLVector3 pos, LLQuaternion rotation, LLUUID textureID , uint flags);
+        void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimData primData, LLVector3 pos, LLUUID textureID, uint flags);
+        void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, LLVector3 pos, LLQuaternion rotation, uint flags, LLUUID objectID, LLUUID ownerID, string text, uint parentID);
+        void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, LLVector3 pos, uint flags, LLUUID objectID, LLUUID ownerID, string text, uint parentID);
+        void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, LLQuaternion rotation);
+    
+        void SendInventoryFolderDetails(LLUUID ownerID, LLUUID folderID, List<InventoryItemBase> items);
+        void SendInventoryItemDetails(LLUUID ownerID, LLUUID folderID, InventoryItemBase item);
+        void SendNameReply(LLUUID profileId, string firstname, string lastname);
+
+        
+    }
+}
diff --git a/OpenSim/Framework/General/Interfaces/ILocalStorage.cs b/OpenSim/Framework/General/Interfaces/ILocalStorage.cs
index 7093121..c7c0b5f 100644
--- a/OpenSim/Framework/General/Interfaces/ILocalStorage.cs
+++ b/OpenSim/Framework/General/Interfaces/ILocalStorage.cs
@@ -1,71 +1,71 @@
-/*

-* 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 libsecondlife;

-using OpenSim.Framework.Types;

-

-namespace OpenSim.Framework.Interfaces

-{

-    /// <summary>

-    /// ILocalStorage. Really hacked together right now needs cleaning up

-    /// </summary>

-    [System.Obsolete("Redundant, use IRegionDataStore instead")]

-    public interface ILocalStorage

-    {

-        void Initialise(string datastore);

-

-        void StorePrim(PrimData prim);

-        void RemovePrim(LLUUID primID);

-        void LoadPrimitives(ILocalStorageReceiver receiver);

-

-        [System.Obsolete("Use DataStorage instead")]

-        float[] LoadWorld();

-        [System.Obsolete("Use DataStorage instead")]

-        void SaveMap(float[] heightmap);

-

-        void SaveParcels(ParcelData[] parcels);

-        void SaveParcel(ParcelData parcel);

-        void RemoveParcel(ParcelData parcel);

-        void RemoveAllParcels();

-        void LoadParcels(ILocalStorageParcelReceiver recv);

-

-        void ShutDown();

-    }

-

-    public interface ILocalStorageReceiver

-    {

-        void PrimFromStorage(PrimData prim);

-    }

-

-    public interface ILocalStorageParcelReceiver

-    {

-        void ParcelFromStorage(ParcelData data);

-        void NoParcelDataFromStorage();

-    }

-}

-

+/*
+* 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 libsecondlife;
+using OpenSim.Framework.Types;
+
+namespace OpenSim.Framework.Interfaces
+{
+    /// <summary>
+    /// ILocalStorage. Really hacked together right now needs cleaning up
+    /// </summary>
+    [System.Obsolete("Redundant, use IRegionDataStore instead")]
+    public interface ILocalStorage
+    {
+        void Initialise(string datastore);
+
+        void StorePrim(PrimData prim);
+        void RemovePrim(LLUUID primID);
+        void LoadPrimitives(ILocalStorageReceiver receiver);
+
+        [System.Obsolete("Use DataStorage instead")]
+        float[] LoadWorld();
+        [System.Obsolete("Use DataStorage instead")]
+        void SaveMap(float[] heightmap);
+
+        void SaveParcels(ParcelData[] parcels);
+        void SaveParcel(ParcelData parcel);
+        void RemoveParcel(ParcelData parcel);
+        void RemoveAllParcels();
+        void LoadParcels(ILocalStorageParcelReceiver recv);
+
+        void ShutDown();
+    }
+
+    public interface ILocalStorageReceiver
+    {
+        void PrimFromStorage(PrimData prim);
+    }
+
+    public interface ILocalStorageParcelReceiver
+    {
+        void ParcelFromStorage(ParcelData data);
+        void NoParcelDataFromStorage();
+    }
+}
+
diff --git a/OpenSim/Framework/General/Interfaces/IUserServer.cs b/OpenSim/Framework/General/Interfaces/IUserServer.cs
index b3700d2..ca5816d 100644
--- a/OpenSim/Framework/General/Interfaces/IUserServer.cs
+++ b/OpenSim/Framework/General/Interfaces/IUserServer.cs
@@ -1,39 +1,39 @@
-/*

-* 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 libsecondlife;

-using OpenSim.Framework.Inventory;

-

-namespace OpenSim.Framework.Interfaces

-{

-    public interface IUserServer

-    {

-        AgentInventory RequestAgentsInventory(LLUUID agentID);

-        void SetServerInfo(string ServerUrl, string SendKey, string RecvKey);

-        bool UpdateAgentsInventory(LLUUID agentID, AgentInventory inventory);

-    }

-}

+/*
+* 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 libsecondlife;
+using OpenSim.Framework.Inventory;
+
+namespace OpenSim.Framework.Interfaces
+{
+    public interface IUserServer
+    {
+        AgentInventory RequestAgentsInventory(LLUUID agentID);
+        void SetServerInfo(string ServerUrl, string SendKey, string RecvKey);
+        bool UpdateAgentsInventory(LLUUID agentID, AgentInventory inventory);
+    }
+}
diff --git a/OpenSim/Framework/General/Interfaces/IWorld.cs b/OpenSim/Framework/General/Interfaces/IWorld.cs
index 204c01b..a474636 100644
--- a/OpenSim/Framework/General/Interfaces/IWorld.cs
+++ b/OpenSim/Framework/General/Interfaces/IWorld.cs
@@ -1,42 +1,42 @@
-/*

-* 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 libsecondlife;

-using OpenSim.Framework.Types;

-

-namespace OpenSim.Framework.Interfaces

-{

-    public interface IWorld

-    {

-        void AddNewClient(IClientAPI client, bool child);

-        void RemoveClient(LLUUID agentID);

-        

-        RegionInfo RegionInfo { get; }

-        object SyncRoot { get; }

-        uint NextLocalId { get; }

-    }

-}

+/*
+* 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 libsecondlife;
+using OpenSim.Framework.Types;
+
+namespace OpenSim.Framework.Interfaces
+{
+    public interface IWorld
+    {
+        void AddNewClient(IClientAPI client, bool child);
+        void RemoveClient(LLUUID agentID);
+        
+        RegionInfo RegionInfo { get; }
+        object SyncRoot { get; }
+        uint NextLocalId { get; }
+    }
+}
diff --git a/OpenSim/Framework/General/NpcClientBase.cs b/OpenSim/Framework/General/NpcClientBase.cs
index 44d6d3c..044431b 100644
--- a/OpenSim/Framework/General/NpcClientBase.cs
+++ b/OpenSim/Framework/General/NpcClientBase.cs
@@ -1,127 +1,127 @@
-using System.Collections.Generic;

-using System.Net;

-using OpenSim.Framework.Interfaces;

-using OpenSim.Framework.Types;

-using OpenSim.Framework.Data;

-using libsecondlife;

-using libsecondlife.Packets;

-

-

-namespace OpenSim.Framework

-{

-   public  class NpcClientBase :IClientAPI

-   {

-       public event ImprovedInstantMessage OnInstantMessage;

-       public event ChatFromViewer OnChatFromViewer;

-       public event RezObject OnRezObject;

-       public event ModifyTerrain OnModifyTerrain;

-       public event SetAppearance OnSetAppearance;

-       public event StartAnim OnStartAnim;

-       public event LinkObjects OnLinkObjects;

-       public event RequestMapBlocks OnRequestMapBlocks;

-       public event TeleportLocationRequest OnTeleportLocationRequest;

-

-       public event GenericCall4 OnDeRezObject;

-       public event GenericCall OnRegionHandShakeReply;

-       public event GenericCall OnRequestWearables;

-       public event GenericCall2 OnCompleteMovementToRegion;

-       public event UpdateAgent OnAgentUpdate;

-       public event GenericCall OnRequestAvatarsData;

-       public event AddNewPrim OnAddPrim;

-       public event ObjectDuplicate OnObjectDuplicate;

-       public event UpdateVector OnGrapObject;

-       public event ObjectSelect OnDeGrapObject;

-       public event MoveObject OnGrapUpdate;

-

-       public event UpdateShape OnUpdatePrimShape;

-       public event ObjectSelect OnObjectSelect;

-       public event GenericCall7 OnObjectDescription;

-       public event GenericCall7 OnObjectName;

-       public event UpdatePrimFlags OnUpdatePrimFlags;

-       public event UpdatePrimTexture OnUpdatePrimTexture;

-       public event UpdateVector OnUpdatePrimGroupPosition;

-       public event UpdateVector OnUpdatePrimSinglePosition;

-       public event UpdatePrimRotation OnUpdatePrimGroupRotation;

-       public event UpdatePrimSingleRotation OnUpdatePrimSingleRotation;

-       public event UpdatePrimGroupRotation OnUpdatePrimGroupMouseRotation;

-       public event UpdateVector OnUpdatePrimScale;

-       public event StatusChange OnChildAgentStatus;

-       public event GenericCall2 OnStopMovement;

-       public event NewAvatar OnNewAvatar;

-       public event GenericCall6 OnRemoveAvatar;

-

-       public event UUIDNameRequest OnNameFromUUIDRequest;

-

-       public event ParcelPropertiesRequest OnParcelPropertiesRequest;

-       public event ParcelDivideRequest OnParcelDivideRequest;

-       public event ParcelJoinRequest OnParcelJoinRequest;

-       public event ParcelPropertiesUpdateRequest OnParcelPropertiesUpdateRequest;

-       public event ParcelSelectObjects OnParcelSelectObjects;

-       public event ParcelObjectOwnerRequest OnParcelObjectOwnerRequest;

-       public event ObjectDeselect OnObjectDeselect;

-

-

-       public event EstateOwnerMessageRequest OnEstateOwnerMessage;

-

-       public virtual LLVector3 StartPos

-       {

-           get { return new LLVector3(); }

-           set {  }

-       }

-

-       public virtual LLUUID AgentId

-       {

-           get { return LLUUID.Random(); }

-       }

-

-       public virtual string FirstName

-       {

-           get { return ""; }

-       }

-

-       public virtual string LastName

-       {

-           get { return ""; }

-       }

-

-       public NpcClientBase()

-       {

-       }

-

-       public virtual void OutPacket(Packet newPack){}

-       public virtual void SendWearables(AvatarWearable[] wearables){}

-       public virtual void SendStartPingCheck(byte seq){}

-       public virtual void SendKillObject(ulong regionHandle, uint avatarLocalID){}

-       public virtual void SendAnimation(LLUUID animID, int seq, LLUUID sourceAgentId){}

-       public virtual void SendRegionHandshake(RegionInfo regionInfo){}

-       public virtual void SendChatMessage(string message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID){}

-       public virtual void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID){}

-       public virtual void SendInstantMessage(string message, LLUUID target, string fromName){}

-       public virtual void SendLayerData(float[] map){}

-       public virtual void SendLayerData(int px, int py, float[] map){}

-       public virtual void MoveAgentIntoRegion(RegionInfo regInfo, LLVector3 pos, LLVector3 look){}

-       public virtual void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourExternalEndPoint){}

-       public virtual AgentCircuitData RequestClientInfo() { return new AgentCircuitData(); }

-       public virtual void CrossRegion(ulong newRegionHandle, LLVector3 pos, LLVector3 lookAt, IPEndPoint newRegionExternalEndPoint){}

-       public virtual void SendMapBlock(List<MapBlockData> mapBlocks){}

-       public virtual void SendLocalTeleport(LLVector3 position, LLVector3 lookAt, uint flags){}

-       public virtual void SendRegionTeleport(ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint, uint locationID, uint flags){}

-       public virtual void SendTeleportCancel(){}

-       public virtual void SendTeleportLocationStart(){}

-       public virtual void SendMoneyBalance(LLUUID transaction, bool success, byte[] description, int balance){}

-

-       public virtual void SendAvatarData(ulong regionHandle, string firstName, string lastName, LLUUID avatarID, uint avatarLocalID, LLVector3 Pos, byte[] textureEntry){}

-       public virtual void SendAvatarTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, LLVector3 velocity){}

-

-       public virtual void AttachObject(uint localID, LLQuaternion rotation, byte attachPoint){}

-       public virtual void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimData primData, LLVector3 pos, LLQuaternion rotation, LLUUID textureID, uint flags){}

-       public virtual void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimData primData, LLVector3 pos, LLUUID textureID, uint flags){}

-       public virtual void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, LLVector3 pos, LLQuaternion rotation, uint flags, LLUUID objectID, LLUUID ownerID, string text, uint parentID){}

-       public virtual void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, LLVector3 pos, uint flags, LLUUID objectID, LLUUID ownerID, string text, uint parentID){}

-       public virtual void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, LLQuaternion rotation){}

-

-       public virtual void SendInventoryFolderDetails(LLUUID ownerID, LLUUID folderID, List<InventoryItemBase> items){}

-       public virtual void SendInventoryItemDetails(LLUUID ownerID, LLUUID folderID, InventoryItemBase item){}

-       public virtual void SendNameReply(LLUUID profileId, string firstname, string lastname){}

-    }

-}

+using System.Collections.Generic;
+using System.Net;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Data;
+using libsecondlife;
+using libsecondlife.Packets;
+
+
+namespace OpenSim.Framework
+{
+   public  class NpcClientBase :IClientAPI
+   {
+       public event ImprovedInstantMessage OnInstantMessage;
+       public event ChatFromViewer OnChatFromViewer;
+       public event RezObject OnRezObject;
+       public event ModifyTerrain OnModifyTerrain;
+       public event SetAppearance OnSetAppearance;
+       public event StartAnim OnStartAnim;
+       public event LinkObjects OnLinkObjects;
+       public event RequestMapBlocks OnRequestMapBlocks;
+       public event TeleportLocationRequest OnTeleportLocationRequest;
+
+       public event GenericCall4 OnDeRezObject;
+       public event GenericCall OnRegionHandShakeReply;
+       public event GenericCall OnRequestWearables;
+       public event GenericCall2 OnCompleteMovementToRegion;
+       public event UpdateAgent OnAgentUpdate;
+       public event GenericCall OnRequestAvatarsData;
+       public event AddNewPrim OnAddPrim;
+       public event ObjectDuplicate OnObjectDuplicate;
+       public event UpdateVector OnGrapObject;
+       public event ObjectSelect OnDeGrapObject;
+       public event MoveObject OnGrapUpdate;
+
+       public event UpdateShape OnUpdatePrimShape;
+       public event ObjectSelect OnObjectSelect;
+       public event GenericCall7 OnObjectDescription;
+       public event GenericCall7 OnObjectName;
+       public event UpdatePrimFlags OnUpdatePrimFlags;
+       public event UpdatePrimTexture OnUpdatePrimTexture;
+       public event UpdateVector OnUpdatePrimGroupPosition;
+       public event UpdateVector OnUpdatePrimSinglePosition;
+       public event UpdatePrimRotation OnUpdatePrimGroupRotation;
+       public event UpdatePrimSingleRotation OnUpdatePrimSingleRotation;
+       public event UpdatePrimGroupRotation OnUpdatePrimGroupMouseRotation;
+       public event UpdateVector OnUpdatePrimScale;
+       public event StatusChange OnChildAgentStatus;
+       public event GenericCall2 OnStopMovement;
+       public event NewAvatar OnNewAvatar;
+       public event GenericCall6 OnRemoveAvatar;
+
+       public event UUIDNameRequest OnNameFromUUIDRequest;
+
+       public event ParcelPropertiesRequest OnParcelPropertiesRequest;
+       public event ParcelDivideRequest OnParcelDivideRequest;
+       public event ParcelJoinRequest OnParcelJoinRequest;
+       public event ParcelPropertiesUpdateRequest OnParcelPropertiesUpdateRequest;
+       public event ParcelSelectObjects OnParcelSelectObjects;
+       public event ParcelObjectOwnerRequest OnParcelObjectOwnerRequest;
+       public event ObjectDeselect OnObjectDeselect;
+
+
+       public event EstateOwnerMessageRequest OnEstateOwnerMessage;
+
+       public virtual LLVector3 StartPos
+       {
+           get { return new LLVector3(); }
+           set {  }
+       }
+
+       public virtual LLUUID AgentId
+       {
+           get { return LLUUID.Random(); }
+       }
+
+       public virtual string FirstName
+       {
+           get { return ""; }
+       }
+
+       public virtual string LastName
+       {
+           get { return ""; }
+       }
+
+       public NpcClientBase()
+       {
+       }
+
+       public virtual void OutPacket(Packet newPack){}
+       public virtual void SendWearables(AvatarWearable[] wearables){}
+       public virtual void SendStartPingCheck(byte seq){}
+       public virtual void SendKillObject(ulong regionHandle, uint avatarLocalID){}
+       public virtual void SendAnimation(LLUUID animID, int seq, LLUUID sourceAgentId){}
+       public virtual void SendRegionHandshake(RegionInfo regionInfo){}
+       public virtual void SendChatMessage(string message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID){}
+       public virtual void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID){}
+       public virtual void SendInstantMessage(string message, LLUUID target, string fromName){}
+       public virtual void SendLayerData(float[] map){}
+       public virtual void SendLayerData(int px, int py, float[] map){}
+       public virtual void MoveAgentIntoRegion(RegionInfo regInfo, LLVector3 pos, LLVector3 look){}
+       public virtual void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourExternalEndPoint){}
+       public virtual AgentCircuitData RequestClientInfo() { return new AgentCircuitData(); }
+       public virtual void CrossRegion(ulong newRegionHandle, LLVector3 pos, LLVector3 lookAt, IPEndPoint newRegionExternalEndPoint){}
+       public virtual void SendMapBlock(List<MapBlockData> mapBlocks){}
+       public virtual void SendLocalTeleport(LLVector3 position, LLVector3 lookAt, uint flags){}
+       public virtual void SendRegionTeleport(ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint, uint locationID, uint flags){}
+       public virtual void SendTeleportCancel(){}
+       public virtual void SendTeleportLocationStart(){}
+       public virtual void SendMoneyBalance(LLUUID transaction, bool success, byte[] description, int balance){}
+
+       public virtual void SendAvatarData(ulong regionHandle, string firstName, string lastName, LLUUID avatarID, uint avatarLocalID, LLVector3 Pos, byte[] textureEntry){}
+       public virtual void SendAvatarTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, LLVector3 velocity){}
+
+       public virtual void AttachObject(uint localID, LLQuaternion rotation, byte attachPoint){}
+       public virtual void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimData primData, LLVector3 pos, LLQuaternion rotation, LLUUID textureID, uint flags){}
+       public virtual void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimData primData, LLVector3 pos, LLUUID textureID, uint flags){}
+       public virtual void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, LLVector3 pos, LLQuaternion rotation, uint flags, LLUUID objectID, LLUUID ownerID, string text, uint parentID){}
+       public virtual void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, LLVector3 pos, uint flags, LLUUID objectID, LLUUID ownerID, string text, uint parentID){}
+       public virtual void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, LLQuaternion rotation){}
+
+       public virtual void SendInventoryFolderDetails(LLUUID ownerID, LLUUID folderID, List<InventoryItemBase> items){}
+       public virtual void SendInventoryItemDetails(LLUUID ownerID, LLUUID folderID, InventoryItemBase item){}
+       public virtual void SendNameReply(LLUUID profileId, string firstname, string lastname){}
+    }
+}
diff --git a/OpenSim/Framework/General/Properties/AssemblyInfo.cs b/OpenSim/Framework/General/Properties/AssemblyInfo.cs
index 004040b..655cffc 100644
--- a/OpenSim/Framework/General/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/General/Properties/AssemblyInfo.cs
@@ -1,31 +1,31 @@
-using System.Reflection;

-using System.Runtime.InteropServices;

-// General Information about an assembly is controlled through the following 

-// set of attributes. Change these attribute values to modify the information

-// associated with an assembly.

-[assembly: AssemblyTitle("OpenSim.FrameWork")]

-[assembly: AssemblyDescription("")]

-[assembly: AssemblyConfiguration("")]

-[assembly: AssemblyCompany("")]

-[assembly: AssemblyProduct("OpenSim.FrameWork")]

-[assembly: AssemblyCopyright("Copyright ©  2007")]

-[assembly: AssemblyTrademark("")]

-[assembly: AssemblyCulture("")]

-

-// Setting ComVisible to false makes the types in this assembly not visible 

-// to COM components.  If you need to access a type in this assembly from 

-// COM, set the ComVisible attribute to true on that type.

-[assembly: ComVisible(false)]

-

-// The following GUID is for the ID of the typelib if this project is exposed to COM

-[assembly: Guid("a08e20c7-f191-4137-b1f0-9291408fa521")]

-

-// Version information for an assembly consists of the following four values:

-//

-//      Major Version

-//      Minor Version 

-//      Build Number

-//      Revision

-//

-[assembly: AssemblyVersion("1.0.0.0")]

-[assembly: AssemblyFileVersion("1.0.0.0")]

+using System.Reflection;
+using System.Runtime.InteropServices;
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("OpenSim.FrameWork")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("OpenSim.FrameWork")]
+[assembly: AssemblyCopyright("Copyright ©  2007")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("a08e20c7-f191-4137-b1f0-9291408fa521")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/OpenSim/Framework/General/RegionCommsListener.cs b/OpenSim/Framework/General/RegionCommsListener.cs
index 4d6b59c..f5b8272 100644
--- a/OpenSim/Framework/General/RegionCommsListener.cs
+++ b/OpenSim/Framework/General/RegionCommsListener.cs
@@ -1,103 +1,103 @@
-/*

-* 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 libsecondlife;

-using OpenSim.Framework.Interfaces;

-using OpenSim.Framework.Types;

-

-using System.Collections.Generic;

-

-namespace OpenSim.Framework

-{

-    public class RegionCommsListener :IRegionCommsListener

-    {

-        public event ExpectUserDelegate OnExpectUser;

-        public event GenericCall2 OnExpectChildAgent;

-        public event AgentCrossing OnAvatarCrossingIntoRegion;

-        public event UpdateNeighbours OnNeighboursUpdate;

-

-        /// <summary>

-        /// 

-        /// </summary>

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

-        /// <returns></returns>

-        public virtual bool TriggerExpectUser(ulong regionHandle, AgentCircuitData  agent)

-        {

-            if(OnExpectUser != null)

-            {

-                

-                OnExpectUser(regionHandle, agent);

-                return true;

-            }

-

-            return false;

-        }

-

-        public virtual bool TriggerExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position)

-        {

-            if (OnAvatarCrossingIntoRegion != null)

-            {

-                OnAvatarCrossingIntoRegion(regionHandle, agentID, position);

-                return true;

-            }

-            return false;

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

-        /// <remarks>TODO: Doesnt take any args??</remarks>

-        /// <returns></returns>

-        public virtual bool TriggerExpectChildAgent()

-        {

-            if (OnExpectChildAgent != null)

-            {

-                OnExpectChildAgent();

-                return true;

-            }

-

-            return false;

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

-        /// <remarks>Added to avoid a unused compiler warning on OnNeighboursUpdate, TODO: Check me</remarks>

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

-        /// <returns></returns>

-        public virtual bool TriggerOnNeighboursUpdate(List<RegionInfo> neighbours)

-        {

-            if (OnNeighboursUpdate != null)

-            {

-                OnNeighboursUpdate(neighbours);

-                return true;

-            }

-

-            return false;

-        }

-    }

-}

+/*
+* 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 libsecondlife;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+
+using System.Collections.Generic;
+
+namespace OpenSim.Framework
+{
+    public class RegionCommsListener :IRegionCommsListener
+    {
+        public event ExpectUserDelegate OnExpectUser;
+        public event GenericCall2 OnExpectChildAgent;
+        public event AgentCrossing OnAvatarCrossingIntoRegion;
+        public event UpdateNeighbours OnNeighboursUpdate;
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="agent"></param>
+        /// <returns></returns>
+        public virtual bool TriggerExpectUser(ulong regionHandle, AgentCircuitData  agent)
+        {
+            if(OnExpectUser != null)
+            {
+                
+                OnExpectUser(regionHandle, agent);
+                return true;
+            }
+
+            return false;
+        }
+
+        public virtual bool TriggerExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position)
+        {
+            if (OnAvatarCrossingIntoRegion != null)
+            {
+                OnAvatarCrossingIntoRegion(regionHandle, agentID, position);
+                return true;
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>TODO: Doesnt take any args??</remarks>
+        /// <returns></returns>
+        public virtual bool TriggerExpectChildAgent()
+        {
+            if (OnExpectChildAgent != null)
+            {
+                OnExpectChildAgent();
+                return true;
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>Added to avoid a unused compiler warning on OnNeighboursUpdate, TODO: Check me</remarks>
+        /// <param name="neighbours"></param>
+        /// <returns></returns>
+        public virtual bool TriggerOnNeighboursUpdate(List<RegionInfo> neighbours)
+        {
+            if (OnNeighboursUpdate != null)
+            {
+                OnNeighboursUpdate(neighbours);
+                return true;
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/OpenSim/Framework/General/Remoting.cs b/OpenSim/Framework/General/Remoting.cs
index df32db2..0e94b90 100644
--- a/OpenSim/Framework/General/Remoting.cs
+++ b/OpenSim/Framework/General/Remoting.cs
@@ -1,135 +1,135 @@
-/*

-* 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.Security.Cryptography;

-using System.Text;

-

-namespace OpenSim.Framework

-{

-    /// <summary>

-    /// NEEDS AUDIT.

-    /// </summary>

-    /// <remarks>

-    /// Suggested implementation

-    /// <para>Store two digests for each foreign host. A local copy of the local hash using the local challenge (when issued), and a local copy of the remote hash using the remote challenge.</para>

-    /// <para>When sending data to the foreign host - run 'Sign' on the data and affix the returned byte[] to the message.</para>

-    /// <para>When recieving data from the foreign host - run 'Authenticate' against the data and the attached byte[].</para>

-    /// <para>Both hosts should be performing these operations for this to be effective.</para>

-    /// </remarks>

-    class RemoteDigest

-    {

-        private byte[] currentHash;

-        private byte[] secret;

-

-        private SHA512Managed SHA512;

-

-        /// <summary>

-        /// Initialises a new RemoteDigest authentication mechanism

-        /// </summary>

-        /// <remarks>Needs an audit by a cryptographic professional - was not "roll your own"'d by choice but rather a serious lack of decent authentication mechanisms in .NET remoting</remarks>

-        /// <param name="sharedSecret">The shared secret between systems (for inter-sim, this is provided in encrypted form during connection, for grid this is input manually in setup)</param>

-        /// <param name="salt">Binary salt - some common value - to be decided what</param>

-        /// <param name="challenge">The challenge key provided by the third party</param>

-        public RemoteDigest(string sharedSecret, byte[] salt, string challenge)

-        {

-            SHA512 = new SHA512Managed();

-            Rfc2898DeriveBytes RFC2898 = new Rfc2898DeriveBytes(sharedSecret,salt);

-            secret = RFC2898.GetBytes(512);

-            ASCIIEncoding ASCII = new ASCIIEncoding();

-

-            currentHash = SHA512.ComputeHash(AppendArrays(secret, ASCII.GetBytes(challenge)));

-        }

-

-        /// <summary>

-        /// Authenticates a piece of incoming data against the local digest. Upon successful authentication, digest string is incremented.

-        /// </summary>

-        /// <param name="data">The incoming data</param>

-        /// <param name="digest">The remote digest</param>

-        /// <returns></returns>

-        public bool Authenticate(byte[] data, byte[] digest)

-        {

-            byte[] newHash = SHA512.ComputeHash(AppendArrays(AppendArrays(currentHash, secret), data));

-            if (digest == newHash)

-            {

-                currentHash = newHash;

-                return true;

-            }

-            else

-            {

-                throw new Exception("Hash comparison failed. Key resync required.");

-            }

-        }

-

-        /// <summary>

-        /// Signs a new bit of data with the current hash. Returns a byte array which should be affixed to the message.

-        /// Signing a piece of data will automatically increment the hash - if you sign data and do not send it, the 

-        /// hashes will get out of sync and throw an exception when validation is attempted.

-        /// </summary>

-        /// <param name="data">The outgoing data</param>

-        /// <returns>The local digest</returns>

-        public byte[] Sign(byte[] data)

-        {

-            currentHash = SHA512.ComputeHash(AppendArrays(AppendArrays(currentHash, secret), data));

-            return currentHash;

-        }

-

-        /// <summary>

-        /// Generates a new challenge string to be issued to a foreign host. Challenges are 1024-bit (effective strength of less than 512-bits) messages generated using the Crytographic Random Number Generator.

-        /// </summary>

-        /// <returns>A 128-character hexadecimal string containing the challenge.</returns>

-        public static string GenerateChallenge()

-        {

-            RNGCryptoServiceProvider RNG = new RNGCryptoServiceProvider();

-            byte[] bytes = new byte[64];

-            RNG.GetBytes(bytes);

-

-            StringBuilder sb = new StringBuilder(bytes.Length * 2);

-            foreach (byte b in bytes)

-            {

-                sb.AppendFormat("{0:x2}", b);

-            }

-            return sb.ToString();

-        }

-

-        /// <summary>

-        /// Helper function, merges two byte arrays

-        /// </summary>

-        /// <remarks>Sourced from MSDN Forum</remarks>

-        /// <param name="a">A</param>

-        /// <param name="b">B</param>

-        /// <returns>C</returns>

-        private byte[] AppendArrays(byte[] a, byte[] b)

-        {

-            byte[] c = new byte[a.Length + b.Length];

-            Buffer.BlockCopy(a, 0, c, 0, a.Length);

-            Buffer.BlockCopy(b, 0, c, a.Length, b.Length);

-            return c;

-        }

-

-    }

-}

+/*
+* 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.Security.Cryptography;
+using System.Text;
+
+namespace OpenSim.Framework
+{
+    /// <summary>
+    /// NEEDS AUDIT.
+    /// </summary>
+    /// <remarks>
+    /// Suggested implementation
+    /// <para>Store two digests for each foreign host. A local copy of the local hash using the local challenge (when issued), and a local copy of the remote hash using the remote challenge.</para>
+    /// <para>When sending data to the foreign host - run 'Sign' on the data and affix the returned byte[] to the message.</para>
+    /// <para>When recieving data from the foreign host - run 'Authenticate' against the data and the attached byte[].</para>
+    /// <para>Both hosts should be performing these operations for this to be effective.</para>
+    /// </remarks>
+    class RemoteDigest
+    {
+        private byte[] currentHash;
+        private byte[] secret;
+
+        private SHA512Managed SHA512;
+
+        /// <summary>
+        /// Initialises a new RemoteDigest authentication mechanism
+        /// </summary>
+        /// <remarks>Needs an audit by a cryptographic professional - was not "roll your own"'d by choice but rather a serious lack of decent authentication mechanisms in .NET remoting</remarks>
+        /// <param name="sharedSecret">The shared secret between systems (for inter-sim, this is provided in encrypted form during connection, for grid this is input manually in setup)</param>
+        /// <param name="salt">Binary salt - some common value - to be decided what</param>
+        /// <param name="challenge">The challenge key provided by the third party</param>
+        public RemoteDigest(string sharedSecret, byte[] salt, string challenge)
+        {
+            SHA512 = new SHA512Managed();
+            Rfc2898DeriveBytes RFC2898 = new Rfc2898DeriveBytes(sharedSecret,salt);
+            secret = RFC2898.GetBytes(512);
+            ASCIIEncoding ASCII = new ASCIIEncoding();
+
+            currentHash = SHA512.ComputeHash(AppendArrays(secret, ASCII.GetBytes(challenge)));
+        }
+
+        /// <summary>
+        /// Authenticates a piece of incoming data against the local digest. Upon successful authentication, digest string is incremented.
+        /// </summary>
+        /// <param name="data">The incoming data</param>
+        /// <param name="digest">The remote digest</param>
+        /// <returns></returns>
+        public bool Authenticate(byte[] data, byte[] digest)
+        {
+            byte[] newHash = SHA512.ComputeHash(AppendArrays(AppendArrays(currentHash, secret), data));
+            if (digest == newHash)
+            {
+                currentHash = newHash;
+                return true;
+            }
+            else
+            {
+                throw new Exception("Hash comparison failed. Key resync required.");
+            }
+        }
+
+        /// <summary>
+        /// Signs a new bit of data with the current hash. Returns a byte array which should be affixed to the message.
+        /// Signing a piece of data will automatically increment the hash - if you sign data and do not send it, the 
+        /// hashes will get out of sync and throw an exception when validation is attempted.
+        /// </summary>
+        /// <param name="data">The outgoing data</param>
+        /// <returns>The local digest</returns>
+        public byte[] Sign(byte[] data)
+        {
+            currentHash = SHA512.ComputeHash(AppendArrays(AppendArrays(currentHash, secret), data));
+            return currentHash;
+        }
+
+        /// <summary>
+        /// Generates a new challenge string to be issued to a foreign host. Challenges are 1024-bit (effective strength of less than 512-bits) messages generated using the Crytographic Random Number Generator.
+        /// </summary>
+        /// <returns>A 128-character hexadecimal string containing the challenge.</returns>
+        public static string GenerateChallenge()
+        {
+            RNGCryptoServiceProvider RNG = new RNGCryptoServiceProvider();
+            byte[] bytes = new byte[64];
+            RNG.GetBytes(bytes);
+
+            StringBuilder sb = new StringBuilder(bytes.Length * 2);
+            foreach (byte b in bytes)
+            {
+                sb.AppendFormat("{0:x2}", b);
+            }
+            return sb.ToString();
+        }
+
+        /// <summary>
+        /// Helper function, merges two byte arrays
+        /// </summary>
+        /// <remarks>Sourced from MSDN Forum</remarks>
+        /// <param name="a">A</param>
+        /// <param name="b">B</param>
+        /// <returns>C</returns>
+        private byte[] AppendArrays(byte[] a, byte[] b)
+        {
+            byte[] c = new byte[a.Length + b.Length];
+            Buffer.BlockCopy(a, 0, c, 0, a.Length);
+            Buffer.BlockCopy(b, 0, c, a.Length, b.Length);
+            return c;
+        }
+
+    }
+}
diff --git a/OpenSim/Framework/General/Types/AgentCiruitData.cs b/OpenSim/Framework/General/Types/AgentCiruitData.cs
index ed9ee3c..36bb26d 100644
--- a/OpenSim/Framework/General/Types/AgentCiruitData.cs
+++ b/OpenSim/Framework/General/Types/AgentCiruitData.cs
@@ -1,49 +1,49 @@
-/*

-* 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 libsecondlife;

-using System;

-

-namespace OpenSim.Framework.Types

-{

-    [Serializable]

-    public class AgentCircuitData

-    {

-        public AgentCircuitData() { }

-        public LLUUID AgentID;

-        public LLUUID SessionID;

-        public LLUUID SecureSessionID;

-        public LLVector3 startpos;

-        public string firstname;

-        public string lastname;

-        public uint circuitcode;

-        public bool child;

-        public LLUUID InventoryFolder;

-        public LLUUID BaseFolder;

-        public string CapsPath = ""; 

-    }

-}

+/*
+* 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 libsecondlife;
+using System;
+
+namespace OpenSim.Framework.Types
+{
+    [Serializable]
+    public class AgentCircuitData
+    {
+        public AgentCircuitData() { }
+        public LLUUID AgentID;
+        public LLUUID SessionID;
+        public LLUUID SecureSessionID;
+        public LLVector3 startpos;
+        public string firstname;
+        public string lastname;
+        public uint circuitcode;
+        public bool child;
+        public LLUUID InventoryFolder;
+        public LLUUID BaseFolder;
+        public string CapsPath = ""; 
+    }
+}
diff --git a/OpenSim/Framework/General/Types/AgentWearable.cs b/OpenSim/Framework/General/Types/AgentWearable.cs
index 6152b7d..404df0d 100644
--- a/OpenSim/Framework/General/Types/AgentWearable.cs
+++ b/OpenSim/Framework/General/Types/AgentWearable.cs
@@ -1,57 +1,57 @@
-/*

-* 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 libsecondlife;

-

-namespace OpenSim.Framework.Types

-{

-    public class AvatarWearable

-    {

-        public LLUUID AssetID = new LLUUID("00000000-0000-0000-0000-000000000000");

-        public LLUUID ItemID = new LLUUID("00000000-0000-0000-0000-000000000000");

-

-        public AvatarWearable()

-        {

-

-        }

-

-        public static AvatarWearable[] DefaultWearables

-        {

-            get

-            {

-                AvatarWearable[] defaultWearables =  new AvatarWearable[13]; //should be 13 of these

-                for (int i = 0; i < 13; i++)

-                {

-                    defaultWearables[i] = new AvatarWearable();

-                }

-                defaultWearables[0].AssetID = new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73");

-                defaultWearables[0].ItemID = LLUUID.Random();

-                return defaultWearables;

-            }

-        }

-    }

-}

+/*
+* 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 libsecondlife;
+
+namespace OpenSim.Framework.Types
+{
+    public class AvatarWearable
+    {
+        public LLUUID AssetID = new LLUUID("00000000-0000-0000-0000-000000000000");
+        public LLUUID ItemID = new LLUUID("00000000-0000-0000-0000-000000000000");
+
+        public AvatarWearable()
+        {
+
+        }
+
+        public static AvatarWearable[] DefaultWearables
+        {
+            get
+            {
+                AvatarWearable[] defaultWearables =  new AvatarWearable[13]; //should be 13 of these
+                for (int i = 0; i < 13; i++)
+                {
+                    defaultWearables[i] = new AvatarWearable();
+                }
+                defaultWearables[0].AssetID = new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73");
+                defaultWearables[0].ItemID = LLUUID.Random();
+                return defaultWearables;
+            }
+        }
+    }
+}
diff --git a/OpenSim/Framework/General/Types/AssetBase.cs b/OpenSim/Framework/General/Types/AssetBase.cs
index c203f51..181e1e3 100644
--- a/OpenSim/Framework/General/Types/AssetBase.cs
+++ b/OpenSim/Framework/General/Types/AssetBase.cs
@@ -1,46 +1,46 @@
-/*

-* 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 libsecondlife;

-

-namespace OpenSim.Framework.Types

-{

-    public class AssetBase

-    {

-        public byte[] Data;

-        public LLUUID FullID;

-        public sbyte Type;

-        public sbyte InvType;

-        public string Name;

-        public string Description;

-

-        public AssetBase()

-        {

-

-        }

-    }

-}

+/*
+* 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 libsecondlife;
+
+namespace OpenSim.Framework.Types
+{
+    public class AssetBase
+    {
+        public byte[] Data;
+        public LLUUID FullID;
+        public sbyte Type;
+        public sbyte InvType;
+        public string Name;
+        public string Description;
+
+        public AssetBase()
+        {
+
+        }
+    }
+}
diff --git a/OpenSim/Framework/General/Types/AssetLandmark.cs b/OpenSim/Framework/General/Types/AssetLandmark.cs
index 8aa872e..7cec6f6 100644
--- a/OpenSim/Framework/General/Types/AssetLandmark.cs
+++ b/OpenSim/Framework/General/Types/AssetLandmark.cs
@@ -1,59 +1,59 @@
-/*

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

-using libsecondlife;

-

-namespace OpenSim.Framework.Types

-{

-    public class AssetLandmark : AssetBase

-    {

-        public int Version;

-        public LLVector3 Position;

-        public LLUUID RegionID;

-

-        public AssetLandmark(AssetBase a)

-        {

-            this.Data = a.Data;

-            this.FullID = a.FullID;

-            this.Type = a.Type;

-            this.InvType = a.InvType;

-            this.Name = a.Name;

-            this.Description = a.Description;

-            InternData();

-        }

-

-        private void InternData()

-        {

-            string temp = Encoding.UTF8.GetString(Data).Trim(); 

-            string[] parts = temp.Split('\n');

-            int.TryParse(parts[0].Substring(17, 1), out Version);

-            LLUUID.TryParse(parts[1].Substring(10, 36), out RegionID);

-            LLVector3.TryParse(parts[2].Substring(11, parts[2].Length - 11), out Position);

-        }

-    }

-}

+/*
+* 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.Text;
+using libsecondlife;
+
+namespace OpenSim.Framework.Types
+{
+    public class AssetLandmark : AssetBase
+    {
+        public int Version;
+        public LLVector3 Position;
+        public LLUUID RegionID;
+
+        public AssetLandmark(AssetBase a)
+        {
+            this.Data = a.Data;
+            this.FullID = a.FullID;
+            this.Type = a.Type;
+            this.InvType = a.InvType;
+            this.Name = a.Name;
+            this.Description = a.Description;
+            InternData();
+        }
+
+        private void InternData()
+        {
+            string temp = Encoding.UTF8.GetString(Data).Trim(); 
+            string[] parts = temp.Split('\n');
+            int.TryParse(parts[0].Substring(17, 1), out Version);
+            LLUUID.TryParse(parts[1].Substring(10, 36), out RegionID);
+            LLVector3.TryParse(parts[2].Substring(11, parts[2].Length - 11), out Position);
+        }
+    }
+}
diff --git a/OpenSim/Framework/General/Types/AssetStorage.cs b/OpenSim/Framework/General/Types/AssetStorage.cs
index 3681336..d49e9e8 100644
--- a/OpenSim/Framework/General/Types/AssetStorage.cs
+++ b/OpenSim/Framework/General/Types/AssetStorage.cs
@@ -1,47 +1,47 @@
-/*

-* 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 libsecondlife;

-

-namespace OpenSim.Framework.Types

-{

-        public class AssetStorage

-        {

-

-                public AssetStorage() {

-                }

-

-                public AssetStorage(LLUUID assetUUID) {

-                        UUID=assetUUID;

-                }

-

-                public byte[] Data;

-                public sbyte Type;

-                public string Name;

-                public LLUUID UUID;

-        }

-}

+/*
+* 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 libsecondlife;
+
+namespace OpenSim.Framework.Types
+{
+        public class AssetStorage
+        {
+
+                public AssetStorage() {
+                }
+
+                public AssetStorage(LLUUID assetUUID) {
+                        UUID=assetUUID;
+                }
+
+                public byte[] Data;
+                public sbyte Type;
+                public string Name;
+                public LLUUID UUID;
+        }
+}
diff --git a/OpenSim/Framework/General/Types/EstateSettings.cs b/OpenSim/Framework/General/Types/EstateSettings.cs
index 436b109..25b3b18 100644
--- a/OpenSim/Framework/General/Types/EstateSettings.cs
+++ b/OpenSim/Framework/General/Types/EstateSettings.cs
@@ -1,93 +1,93 @@
-/*

-* 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 libsecondlife;

-

-namespace OpenSim.Framework.Types

-{

-    public class EstateSettings

-    {

-        //Settings to this island

-        public float billableFactor = (float)0.0;

-        public uint estateID = 0;

-        public uint parentEstateID = 0;

-

-        public byte maxAgents = 40;

-        public float objectBonusFactor = (float)1.0;

-

-        public int redirectGridX = 0; //??

-        public int redirectGridY = 0; //??

-        public Simulator.RegionFlags regionFlags = Simulator.RegionFlags.None; //Booleam values of various region settings

-        public Simulator.SimAccess simAccess = Simulator.SimAccess.Mature; //Is sim PG, Mature, etc? Mature by default.

-        public float sunHour = 0;

-

-        public float terrainRaiseLimit = 0;

-        public float terrainLowerLimit = 0;

-

-        public bool useFixedSun = false;

-        public int pricePerMeter = 1;

-

-        public ushort regionWaterHeight = 20;

-        public bool regionAllowTerraform = true;

-

-        // Region Information

-        // Low resolution 'base' textures. No longer used.

-        public LLUUID terrainBase0 = new LLUUID("b8d3965a-ad78-bf43-699b-bff8eca6c975"); // Default

-        public LLUUID terrainBase1 = new LLUUID("abb783e6-3e93-26c0-248a-247666855da3"); // Default

-        public LLUUID terrainBase2 = new LLUUID("179cdabd-398a-9b6b-1391-4dc333ba321f"); // Default

-        public LLUUID terrainBase3 = new LLUUID("beb169c7-11ea-fff2-efe5-0f24dc881df2"); // Default

-

-        // Higher resolution terrain textures

-        public LLUUID terrainDetail0 = new LLUUID("00000000-0000-0000-0000-000000000000");

-        public LLUUID terrainDetail1 = new LLUUID("00000000-0000-0000-0000-000000000000");

-        public LLUUID terrainDetail2 = new LLUUID("00000000-0000-0000-0000-000000000000");

-        public LLUUID terrainDetail3 = new LLUUID("00000000-0000-0000-0000-000000000000");

-

-        // First quad - each point is bilinearly interpolated at each meter of terrain

-        public float terrainStartHeight0 = 10.0f;      

-        public float terrainStartHeight1 = 10.0f;      

-        public float terrainStartHeight2 = 10.0f;       

-        public float terrainStartHeight3 = 10.0f;       

-

-        // Second quad - also bilinearly interpolated.

-        // Terrain texturing is done that:

-        // 0..3 (0 = base0, 3 = base3) = (terrain[x,y] - start[x,y]) / range[x,y]

-        public float terrainHeightRange0 = 60.0f; //00

-        public float terrainHeightRange1 = 60.0f; //01

-        public float terrainHeightRange2 = 60.0f; //10

-        public float terrainHeightRange3 = 60.0f; //11

-

-        // Terrain Default (Must be in F32 Format!)

-        public string terrainFile = "default.r32";

-        public double terrainMultiplier = 60.0;

-        public float waterHeight = (float)20.0;

-

-        public LLUUID terrainImageID = LLUUID.Zero; // the assetID that is the current Map image for this region

-

-    }

-}

+/*
+* 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 libsecondlife;
+
+namespace OpenSim.Framework.Types
+{
+    public class EstateSettings
+    {
+        //Settings to this island
+        public float billableFactor = (float)0.0;
+        public uint estateID = 0;
+        public uint parentEstateID = 0;
+
+        public byte maxAgents = 40;
+        public float objectBonusFactor = (float)1.0;
+
+        public int redirectGridX = 0; //??
+        public int redirectGridY = 0; //??
+        public Simulator.RegionFlags regionFlags = Simulator.RegionFlags.None; //Booleam values of various region settings
+        public Simulator.SimAccess simAccess = Simulator.SimAccess.Mature; //Is sim PG, Mature, etc? Mature by default.
+        public float sunHour = 0;
+
+        public float terrainRaiseLimit = 0;
+        public float terrainLowerLimit = 0;
+
+        public bool useFixedSun = false;
+        public int pricePerMeter = 1;
+
+        public ushort regionWaterHeight = 20;
+        public bool regionAllowTerraform = true;
+
+        // Region Information
+        // Low resolution 'base' textures. No longer used.
+        public LLUUID terrainBase0 = new LLUUID("b8d3965a-ad78-bf43-699b-bff8eca6c975"); // Default
+        public LLUUID terrainBase1 = new LLUUID("abb783e6-3e93-26c0-248a-247666855da3"); // Default
+        public LLUUID terrainBase2 = new LLUUID("179cdabd-398a-9b6b-1391-4dc333ba321f"); // Default
+        public LLUUID terrainBase3 = new LLUUID("beb169c7-11ea-fff2-efe5-0f24dc881df2"); // Default
+
+        // Higher resolution terrain textures
+        public LLUUID terrainDetail0 = new LLUUID("00000000-0000-0000-0000-000000000000");
+        public LLUUID terrainDetail1 = new LLUUID("00000000-0000-0000-0000-000000000000");
+        public LLUUID terrainDetail2 = new LLUUID("00000000-0000-0000-0000-000000000000");
+        public LLUUID terrainDetail3 = new LLUUID("00000000-0000-0000-0000-000000000000");
+
+        // First quad - each point is bilinearly interpolated at each meter of terrain
+        public float terrainStartHeight0 = 10.0f;      
+        public float terrainStartHeight1 = 10.0f;      
+        public float terrainStartHeight2 = 10.0f;       
+        public float terrainStartHeight3 = 10.0f;       
+
+        // Second quad - also bilinearly interpolated.
+        // Terrain texturing is done that:
+        // 0..3 (0 = base0, 3 = base3) = (terrain[x,y] - start[x,y]) / range[x,y]
+        public float terrainHeightRange0 = 60.0f; //00
+        public float terrainHeightRange1 = 60.0f; //01
+        public float terrainHeightRange2 = 60.0f; //10
+        public float terrainHeightRange3 = 60.0f; //11
+
+        // Terrain Default (Must be in F32 Format!)
+        public string terrainFile = "default.r32";
+        public double terrainMultiplier = 60.0;
+        public float waterHeight = (float)20.0;
+
+        public LLUUID terrainImageID = LLUUID.Zero; // the assetID that is the current Map image for this region
+
+    }
+}
diff --git a/OpenSim/Framework/General/Types/Login.cs b/OpenSim/Framework/General/Types/Login.cs
index d54c019..3aaf613 100644
--- a/OpenSim/Framework/General/Types/Login.cs
+++ b/OpenSim/Framework/General/Types/Login.cs
@@ -1,49 +1,49 @@
-/*

-* 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 libsecondlife;

-

-namespace OpenSim.Framework.Types

-{

-    public class Login

-    {

-        public string First = "Test";

-        public string Last = "User";

-        public LLUUID Agent;

-        public LLUUID Session;

-        public LLUUID SecureSession = LLUUID.Zero;

-        public LLUUID InventoryFolder;

-        public LLUUID BaseFolder;

-        public uint CircuitCode;

-        public string CapsPath ="";

-

-        public Login()

-        {

-

-        }

-    }

-}

+/*
+* 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 libsecondlife;
+
+namespace OpenSim.Framework.Types
+{
+    public class Login
+    {
+        public string First = "Test";
+        public string Last = "User";
+        public LLUUID Agent;
+        public LLUUID Session;
+        public LLUUID SecureSession = LLUUID.Zero;
+        public LLUUID InventoryFolder;
+        public LLUUID BaseFolder;
+        public uint CircuitCode;
+        public string CapsPath ="";
+
+        public Login()
+        {
+
+        }
+    }
+}
diff --git a/OpenSim/Framework/General/Types/MapBlockData.cs b/OpenSim/Framework/General/Types/MapBlockData.cs
index fbb3b73..212ce4b 100644
--- a/OpenSim/Framework/General/Types/MapBlockData.cs
+++ b/OpenSim/Framework/General/Types/MapBlockData.cs
@@ -1,23 +1,23 @@
-using System;

-using libsecondlife;

-

-namespace OpenSim.Framework.Types

-{

-    public class MapBlockData

-    {

-        public uint Flags;

-        public ushort X;

-        public ushort Y;

-        public byte Agents;

-        public byte Access;

-        public byte WaterHeight;

-        public LLUUID MapImageId;

-        public String Name;

-        public uint RegionFlags;

-

-        public MapBlockData()

-        {

-

-        }

-    }

-}

+using System;
+using libsecondlife;
+
+namespace OpenSim.Framework.Types
+{
+    public class MapBlockData
+    {
+        public uint Flags;
+        public ushort X;
+        public ushort Y;
+        public byte Agents;
+        public byte Access;
+        public byte WaterHeight;
+        public LLUUID MapImageId;
+        public String Name;
+        public uint RegionFlags;
+
+        public MapBlockData()
+        {
+
+        }
+    }
+}
diff --git a/OpenSim/Framework/General/Types/NeighbourInfo.cs b/OpenSim/Framework/General/Types/NeighbourInfo.cs
index bb67981..7e83ffc 100644
--- a/OpenSim/Framework/General/Types/NeighbourInfo.cs
+++ b/OpenSim/Framework/General/Types/NeighbourInfo.cs
@@ -1,42 +1,42 @@
-/*

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

-* 

-*/

-namespace OpenSim.Framework.Types

-{

-    public class NeighbourInfo

-    {

-        public NeighbourInfo()

-        {

-        }

-

-        public ulong regionhandle;

-        public uint RegionLocX;

-        public uint RegionLocY;

-        public string sim_ip;

-        public uint sim_port;

-    }

-}

+/*
+* 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.
+* 
+*/
+namespace OpenSim.Framework.Types
+{
+    public class NeighbourInfo
+    {
+        public NeighbourInfo()
+        {
+        }
+
+        public ulong regionhandle;
+        public uint RegionLocX;
+        public uint RegionLocY;
+        public string sim_ip;
+        public uint sim_port;
+    }
+}
diff --git a/OpenSim/Framework/General/Types/NetworkServersInfo.cs b/OpenSim/Framework/General/Types/NetworkServersInfo.cs
index 900354c..6259d7b 100644
--- a/OpenSim/Framework/General/Types/NetworkServersInfo.cs
+++ b/OpenSim/Framework/General/Types/NetworkServersInfo.cs
@@ -1,219 +1,219 @@
-/*

-* 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 OpenSim.Framework.Console;

-using OpenSim.Framework.Interfaces;

-

-namespace OpenSim.Framework.Types

-{

-    public class NetworkServersInfo

-    {

-        public string AssetURL = "http://127.0.0.1:8003/";

-        public string AssetSendKey = "";

-

-        public string GridURL = "";

-        public string GridSendKey = "";

-        public string GridRecvKey = "";

-        public string UserURL = "";

-        public string UserSendKey = "";

-        public string UserRecvKey = "";

-        public bool isSandbox;

-

-        public uint DefaultHomeLocX = 1000;

-        public uint DefaultHomeLocY = 1000;

-

-        public int HttpListenerPort = 9000;

-        public int RemotingListenerPort = 8895;

-

-        public void InitConfig(bool sandboxMode, IGenericConfig configData)

-        {

-            this.isSandbox = sandboxMode;

-

-            try

-            {

-                string attri = "";

-

-                attri = "";

-                attri = configData.GetAttribute("HttpListenerPort");

-                if (attri == "")

-                {

-                    string location = MainLog.Instance.CmdPrompt("Http Listener Port", "9000");

-                    configData.SetAttribute("HttpListenerPort", location);

-                    this.HttpListenerPort = Convert.ToInt32(location);

-                }

-                else

-                {

-                    this.HttpListenerPort = Convert.ToInt32(attri);

-                }

-

-                attri = "";

-                attri = configData.GetAttribute("RemotingListenerPort");

-                if (attri == "")

-                {

-                    string location = MainLog.Instance.CmdPrompt("Remoting Listener Port", "8895");

-                    configData.SetAttribute("RemotingListenerPort", location);

-                    this.RemotingListenerPort = Convert.ToInt32(location);

-                }

-                else

-                {

-                    this.RemotingListenerPort = Convert.ToInt32(attri);

-                }

-

-                if (sandboxMode)

-                {

-                    // default home location X

-                    attri = "";

-                    attri = configData.GetAttribute("DefaultLocationX");

-                    if (attri == "")

-                    {

-                        string location = MainLog.Instance.CmdPrompt("Default Home Location X", "1000");

-                        configData.SetAttribute("DefaultLocationX", location);

-                        this.DefaultHomeLocX = (uint)Convert.ToUInt32(location);

-                    }

-                    else

-                    {

-                        this.DefaultHomeLocX = (uint)Convert.ToUInt32(attri);

-                    }

-

-                    // default home location Y

-                    attri = "";

-                    attri = configData.GetAttribute("DefaultLocationY");

-                    if (attri == "")

-                    {

-                        string location = MainLog.Instance.CmdPrompt("Default Home Location Y", "1000");

-                        configData.SetAttribute("DefaultLocationY", location);

-                        this.DefaultHomeLocY = (uint)Convert.ToUInt32(location);

-                    }

-                    else

-                    {

-                        this.DefaultHomeLocY = (uint)Convert.ToUInt32(attri);

-                    }

-                }

-                if (!isSandbox)

-                {

-                    //Grid Server 

-                    attri = "";

-                    attri = configData.GetAttribute("GridServerURL");

-                    if (attri == "")

-                    {

-                        this.GridURL = MainLog.Instance.CmdPrompt("Grid server URL", "http://127.0.0.1:8001/");

-                        configData.SetAttribute("GridServerURL", this.GridURL);

-                    }

-                    else

-                    {

-                        this.GridURL = attri;

-                    }

-

-                    //Grid Send Key

-                    attri = "";

-                    attri = configData.GetAttribute("GridSendKey");

-                    if (attri == "")

-                    {

-                        this.GridSendKey = MainLog.Instance.CmdPrompt("Key to send to grid server", "null");

-                        configData.SetAttribute("GridSendKey", this.GridSendKey);

-                    }

-                    else

-                    {

-                        this.GridSendKey = attri;

-                    }

-

-                    //Grid Receive Key

-                    attri = "";

-                    attri = configData.GetAttribute("GridRecvKey");

-                    if (attri == "")

-                    {

-                        this.GridRecvKey = MainLog.Instance.CmdPrompt("Key to expect from grid server", "null");

-                        configData.SetAttribute("GridRecvKey", this.GridRecvKey);

-                    }

-                    else

-                    {

-                        this.GridRecvKey = attri;

-                    }

-

-                    //Grid Server 

-                    attri = "";

-                    attri = configData.GetAttribute("UserServerURL");

-                    if (attri == "")

-                    {

-                        this.UserURL= MainLog.Instance.CmdPrompt("User server URL", "http://127.0.0.1:8002/");

-                        configData.SetAttribute("UserServerURL", this.UserURL);

-                    }

-                    else

-                    {

-                        this.UserURL = attri;

-                    }

-

-                    //Grid Send Key

-                    attri = "";

-                    attri = configData.GetAttribute("UserSendKey");

-                    if (attri == "")

-                    {

-                        this.UserSendKey = MainLog.Instance.CmdPrompt("Key to send to user server", "null");

-                        configData.SetAttribute("UserSendKey", this.UserSendKey);

-                    }

-                    else

-                    {

-                        this.UserSendKey = attri;

-                    }

-

-                    //Grid Receive Key

-                    attri = "";

-                    attri = configData.GetAttribute("UserRecvKey");

-                    if (attri == "")

-                    {

-                        this.UserRecvKey = MainLog.Instance.CmdPrompt("Key to expect from user server", "null");

-                        configData.SetAttribute("UserRecvKey", this.UserRecvKey);

-                    }

-                    else

-                    {

-                        this.UserRecvKey = attri;

-                    }

-

-                    attri = "";

-                    attri = configData.GetAttribute("AssetServerURL");

-                    if (attri == "")

-                    {

-                        this.AssetURL = MainLog.Instance.CmdPrompt("Asset server URL", "http://127.0.0.1:8003/");

-                        configData.SetAttribute("AssetServerURL", this.GridURL);

-                    }

-                    else

-                    {

-                        this.AssetURL = attri;

-                    }

-

-                }

-                configData.Commit();

-            }

-            catch (Exception e)

-            {

-                MainLog.Instance.Warn("Config.cs:InitConfig() - Exception occured");

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

-            }

-        }

-    }

-}

+/*
+* 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 OpenSim.Framework.Console;
+using OpenSim.Framework.Interfaces;
+
+namespace OpenSim.Framework.Types
+{
+    public class NetworkServersInfo
+    {
+        public string AssetURL = "http://127.0.0.1:8003/";
+        public string AssetSendKey = "";
+
+        public string GridURL = "";
+        public string GridSendKey = "";
+        public string GridRecvKey = "";
+        public string UserURL = "";
+        public string UserSendKey = "";
+        public string UserRecvKey = "";
+        public bool isSandbox;
+
+        public uint DefaultHomeLocX = 1000;
+        public uint DefaultHomeLocY = 1000;
+
+        public int HttpListenerPort = 9000;
+        public int RemotingListenerPort = 8895;
+
+        public void InitConfig(bool sandboxMode, IGenericConfig configData)
+        {
+            this.isSandbox = sandboxMode;
+
+            try
+            {
+                string attri = "";
+
+                attri = "";
+                attri = configData.GetAttribute("HttpListenerPort");
+                if (attri == "")
+                {
+                    string location = MainLog.Instance.CmdPrompt("Http Listener Port", "9000");
+                    configData.SetAttribute("HttpListenerPort", location);
+                    this.HttpListenerPort = Convert.ToInt32(location);
+                }
+                else
+                {
+                    this.HttpListenerPort = Convert.ToInt32(attri);
+                }
+
+                attri = "";
+                attri = configData.GetAttribute("RemotingListenerPort");
+                if (attri == "")
+                {
+                    string location = MainLog.Instance.CmdPrompt("Remoting Listener Port", "8895");
+                    configData.SetAttribute("RemotingListenerPort", location);
+                    this.RemotingListenerPort = Convert.ToInt32(location);
+                }
+                else
+                {
+                    this.RemotingListenerPort = Convert.ToInt32(attri);
+                }
+
+                if (sandboxMode)
+                {
+                    // default home location X
+                    attri = "";
+                    attri = configData.GetAttribute("DefaultLocationX");
+                    if (attri == "")
+                    {
+                        string location = MainLog.Instance.CmdPrompt("Default Home Location X", "1000");
+                        configData.SetAttribute("DefaultLocationX", location);
+                        this.DefaultHomeLocX = (uint)Convert.ToUInt32(location);
+                    }
+                    else
+                    {
+                        this.DefaultHomeLocX = (uint)Convert.ToUInt32(attri);
+                    }
+
+                    // default home location Y
+                    attri = "";
+                    attri = configData.GetAttribute("DefaultLocationY");
+                    if (attri == "")
+                    {
+                        string location = MainLog.Instance.CmdPrompt("Default Home Location Y", "1000");
+                        configData.SetAttribute("DefaultLocationY", location);
+                        this.DefaultHomeLocY = (uint)Convert.ToUInt32(location);
+                    }
+                    else
+                    {
+                        this.DefaultHomeLocY = (uint)Convert.ToUInt32(attri);
+                    }
+                }
+                if (!isSandbox)
+                {
+                    //Grid Server 
+                    attri = "";
+                    attri = configData.GetAttribute("GridServerURL");
+                    if (attri == "")
+                    {
+                        this.GridURL = MainLog.Instance.CmdPrompt("Grid server URL", "http://127.0.0.1:8001/");
+                        configData.SetAttribute("GridServerURL", this.GridURL);
+                    }
+                    else
+                    {
+                        this.GridURL = attri;
+                    }
+
+                    //Grid Send Key
+                    attri = "";
+                    attri = configData.GetAttribute("GridSendKey");
+                    if (attri == "")
+                    {
+                        this.GridSendKey = MainLog.Instance.CmdPrompt("Key to send to grid server", "null");
+                        configData.SetAttribute("GridSendKey", this.GridSendKey);
+                    }
+                    else
+                    {
+                        this.GridSendKey = attri;
+                    }
+
+                    //Grid Receive Key
+                    attri = "";
+                    attri = configData.GetAttribute("GridRecvKey");
+                    if (attri == "")
+                    {
+                        this.GridRecvKey = MainLog.Instance.CmdPrompt("Key to expect from grid server", "null");
+                        configData.SetAttribute("GridRecvKey", this.GridRecvKey);
+                    }
+                    else
+                    {
+                        this.GridRecvKey = attri;
+                    }
+
+                    //Grid Server 
+                    attri = "";
+                    attri = configData.GetAttribute("UserServerURL");
+                    if (attri == "")
+                    {
+                        this.UserURL= MainLog.Instance.CmdPrompt("User server URL", "http://127.0.0.1:8002/");
+                        configData.SetAttribute("UserServerURL", this.UserURL);
+                    }
+                    else
+                    {
+                        this.UserURL = attri;
+                    }
+
+                    //Grid Send Key
+                    attri = "";
+                    attri = configData.GetAttribute("UserSendKey");
+                    if (attri == "")
+                    {
+                        this.UserSendKey = MainLog.Instance.CmdPrompt("Key to send to user server", "null");
+                        configData.SetAttribute("UserSendKey", this.UserSendKey);
+                    }
+                    else
+                    {
+                        this.UserSendKey = attri;
+                    }
+
+                    //Grid Receive Key
+                    attri = "";
+                    attri = configData.GetAttribute("UserRecvKey");
+                    if (attri == "")
+                    {
+                        this.UserRecvKey = MainLog.Instance.CmdPrompt("Key to expect from user server", "null");
+                        configData.SetAttribute("UserRecvKey", this.UserRecvKey);
+                    }
+                    else
+                    {
+                        this.UserRecvKey = attri;
+                    }
+
+                    attri = "";
+                    attri = configData.GetAttribute("AssetServerURL");
+                    if (attri == "")
+                    {
+                        this.AssetURL = MainLog.Instance.CmdPrompt("Asset server URL", "http://127.0.0.1:8003/");
+                        configData.SetAttribute("AssetServerURL", this.GridURL);
+                    }
+                    else
+                    {
+                        this.AssetURL = attri;
+                    }
+
+                }
+                configData.Commit();
+            }
+            catch (Exception e)
+            {
+                MainLog.Instance.Warn("Config.cs:InitConfig() - Exception occured");
+                MainLog.Instance.Warn(e.ToString());
+            }
+        }
+    }
+}
diff --git a/OpenSim/Framework/General/Types/ParcelData.cs b/OpenSim/Framework/General/Types/ParcelData.cs
index 17de655..5626299 100644
--- a/OpenSim/Framework/General/Types/ParcelData.cs
+++ b/OpenSim/Framework/General/Types/ParcelData.cs
@@ -1,120 +1,120 @@
-/*

-* 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 libsecondlife;

-

-namespace OpenSim.Framework.Types

-{

-    

-        public class ParcelData

-        {

-            public byte[] parcelBitmapByteArray = new byte[512];

-            public string parcelName = "Your Parcel";

-            public string parcelDesc = "";

-            public LLUUID ownerID = new LLUUID();

-            public bool isGroupOwned = false;

-            public LLVector3 AABBMin = new LLVector3();

-            public LLVector3 AABBMax = new LLVector3();

-            public int area = 0;

-            public uint auctionID = 0; //Unemplemented. If set to 0, not being auctioned

-            public LLUUID authBuyerID = new LLUUID(); //Unemplemented. Authorized Buyer's UUID

-            public Parcel.ParcelCategory category = new Parcel.ParcelCategory(); //Unemplemented. Parcel's chosen category

-            public int claimDate = 0; //Unemplemented

-            public int claimPrice = 0; //Unemplemented

-            public LLUUID groupID = new LLUUID(); //Unemplemented

-            public int groupPrims = 0;

-            public int otherPrims = 0;

-            public int ownerPrims = 0;

-            public int selectedPrims = 0;

-            public int simwidePrims = 0;

-            public int simwideArea = 0;

-            public int salePrice = 0; //Unemeplemented. Parcels price.

-            public Parcel.ParcelStatus parcelStatus = Parcel.ParcelStatus.Leased;

-            public uint parcelFlags = (uint)Parcel.ParcelFlags.AllowFly | (uint)Parcel.ParcelFlags.AllowLandmark | (uint)Parcel.ParcelFlags.AllowAllObjectEntry | (uint)Parcel.ParcelFlags.AllowDeedToGroup | (uint)Parcel.ParcelFlags.AllowTerraform | (uint)Parcel.ParcelFlags.CreateObjects | (uint)Parcel.ParcelFlags.AllowOtherScripts;

-            public byte landingType = 0;

-            public byte mediaAutoScale = 0;

-            public LLUUID mediaID = LLUUID.Zero;

-            public int localID = 0;

-            public LLUUID globalID = new LLUUID();

-

-            public string mediaURL = "";

-            public string musicURL = "";

-            public float passHours = 0;

-            public int passPrice = 0;

-            public LLUUID snapshotID = LLUUID.Zero;

-            public LLVector3 userLocation = new LLVector3();

-            public LLVector3 userLookAt = new LLVector3();

-

-            public ParcelData()

-            {

-                globalID = LLUUID.Random();

-            }

-

-            public ParcelData Copy()

-            {

-                ParcelData parcelData = new ParcelData();

-

-                parcelData.AABBMax = this.AABBMax;

-                parcelData.AABBMin = this.AABBMin;

-                parcelData.area = this.area;

-                parcelData.auctionID = this.auctionID;

-                parcelData.authBuyerID = this.authBuyerID;

-                parcelData.category = this.category;

-                parcelData.claimDate = this.claimDate;

-                parcelData.claimPrice = this.claimPrice;

-                parcelData.globalID = this.globalID;

-                parcelData.groupID = this.groupID;

-                parcelData.groupPrims = this.groupPrims;

-                parcelData.otherPrims = this.otherPrims;

-                parcelData.ownerPrims = this.ownerPrims;

-                parcelData.selectedPrims = this.selectedPrims;

-                parcelData.isGroupOwned = this.isGroupOwned;

-                parcelData.localID = this.localID;

-                parcelData.landingType = this.landingType;

-                parcelData.mediaAutoScale = this.mediaAutoScale;

-                parcelData.mediaID = this.mediaID;

-                parcelData.mediaURL = this.mediaURL;

-                parcelData.musicURL = this.musicURL;

-                parcelData.ownerID = this.ownerID;

-                parcelData.parcelBitmapByteArray = (byte[])this.parcelBitmapByteArray.Clone();

-                parcelData.parcelDesc = this.parcelDesc;

-                parcelData.parcelFlags = this.parcelFlags;

-                parcelData.parcelName = this.parcelName;

-                parcelData.parcelStatus = this.parcelStatus;

-                parcelData.passHours = this.passHours;

-                parcelData.passPrice = this.passPrice;

-                parcelData.salePrice = this.salePrice;

-                parcelData.snapshotID = this.snapshotID;

-                parcelData.userLocation = this.userLocation;

-                parcelData.userLookAt = this.userLookAt;

-

-                return parcelData;

-           

-            }

-        }

-    

-}

+/*
+* 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 libsecondlife;
+
+namespace OpenSim.Framework.Types
+{
+    
+        public class ParcelData
+        {
+            public byte[] parcelBitmapByteArray = new byte[512];
+            public string parcelName = "Your Parcel";
+            public string parcelDesc = "";
+            public LLUUID ownerID = new LLUUID();
+            public bool isGroupOwned = false;
+            public LLVector3 AABBMin = new LLVector3();
+            public LLVector3 AABBMax = new LLVector3();
+            public int area = 0;
+            public uint auctionID = 0; //Unemplemented. If set to 0, not being auctioned
+            public LLUUID authBuyerID = new LLUUID(); //Unemplemented. Authorized Buyer's UUID
+            public Parcel.ParcelCategory category = new Parcel.ParcelCategory(); //Unemplemented. Parcel's chosen category
+            public int claimDate = 0; //Unemplemented
+            public int claimPrice = 0; //Unemplemented
+            public LLUUID groupID = new LLUUID(); //Unemplemented
+            public int groupPrims = 0;
+            public int otherPrims = 0;
+            public int ownerPrims = 0;
+            public int selectedPrims = 0;
+            public int simwidePrims = 0;
+            public int simwideArea = 0;
+            public int salePrice = 0; //Unemeplemented. Parcels price.
+            public Parcel.ParcelStatus parcelStatus = Parcel.ParcelStatus.Leased;
+            public uint parcelFlags = (uint)Parcel.ParcelFlags.AllowFly | (uint)Parcel.ParcelFlags.AllowLandmark | (uint)Parcel.ParcelFlags.AllowAllObjectEntry | (uint)Parcel.ParcelFlags.AllowDeedToGroup | (uint)Parcel.ParcelFlags.AllowTerraform | (uint)Parcel.ParcelFlags.CreateObjects | (uint)Parcel.ParcelFlags.AllowOtherScripts;
+            public byte landingType = 0;
+            public byte mediaAutoScale = 0;
+            public LLUUID mediaID = LLUUID.Zero;
+            public int localID = 0;
+            public LLUUID globalID = new LLUUID();
+
+            public string mediaURL = "";
+            public string musicURL = "";
+            public float passHours = 0;
+            public int passPrice = 0;
+            public LLUUID snapshotID = LLUUID.Zero;
+            public LLVector3 userLocation = new LLVector3();
+            public LLVector3 userLookAt = new LLVector3();
+
+            public ParcelData()
+            {
+                globalID = LLUUID.Random();
+            }
+
+            public ParcelData Copy()
+            {
+                ParcelData parcelData = new ParcelData();
+
+                parcelData.AABBMax = this.AABBMax;
+                parcelData.AABBMin = this.AABBMin;
+                parcelData.area = this.area;
+                parcelData.auctionID = this.auctionID;
+                parcelData.authBuyerID = this.authBuyerID;
+                parcelData.category = this.category;
+                parcelData.claimDate = this.claimDate;
+                parcelData.claimPrice = this.claimPrice;
+                parcelData.globalID = this.globalID;
+                parcelData.groupID = this.groupID;
+                parcelData.groupPrims = this.groupPrims;
+                parcelData.otherPrims = this.otherPrims;
+                parcelData.ownerPrims = this.ownerPrims;
+                parcelData.selectedPrims = this.selectedPrims;
+                parcelData.isGroupOwned = this.isGroupOwned;
+                parcelData.localID = this.localID;
+                parcelData.landingType = this.landingType;
+                parcelData.mediaAutoScale = this.mediaAutoScale;
+                parcelData.mediaID = this.mediaID;
+                parcelData.mediaURL = this.mediaURL;
+                parcelData.musicURL = this.musicURL;
+                parcelData.ownerID = this.ownerID;
+                parcelData.parcelBitmapByteArray = (byte[])this.parcelBitmapByteArray.Clone();
+                parcelData.parcelDesc = this.parcelDesc;
+                parcelData.parcelFlags = this.parcelFlags;
+                parcelData.parcelName = this.parcelName;
+                parcelData.parcelStatus = this.parcelStatus;
+                parcelData.passHours = this.passHours;
+                parcelData.passPrice = this.passPrice;
+                parcelData.salePrice = this.salePrice;
+                parcelData.snapshotID = this.snapshotID;
+                parcelData.userLocation = this.userLocation;
+                parcelData.userLookAt = this.userLookAt;
+
+                return parcelData;
+           
+            }
+        }
+    
+}
diff --git a/OpenSim/Framework/General/Types/PrimData.cs b/OpenSim/Framework/General/Types/PrimData.cs
index ff81bcd..6b8fa3a 100644
--- a/OpenSim/Framework/General/Types/PrimData.cs
+++ b/OpenSim/Framework/General/Types/PrimData.cs
@@ -1,228 +1,228 @@
-/*

-* 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 libsecondlife;

-

-namespace OpenSim.Framework.Types

-{

-    public class PrimData

-    {

-        private const uint FULL_MASK_PERMISSIONS = 2147483647;

-

-        public LLUUID OwnerID;

-        public byte PCode;

-        public ushort PathBegin;

-        public ushort PathEnd;

-        public byte PathScaleX;

-        public byte PathScaleY;

-        public byte PathShearX;

-        public byte PathShearY;

-        public sbyte PathSkew;

-        public ushort ProfileBegin;

-        public ushort ProfileEnd;

-        public LLVector3 Scale;

-        public byte PathCurve;

-        public byte ProfileCurve;

-        public uint ParentID = 0;

-        public ushort ProfileHollow;

-        public sbyte PathRadiusOffset;

-        public byte PathRevolutions;

-        public sbyte PathTaperX;

-        public sbyte PathTaperY;

-        public sbyte PathTwist;

-        public sbyte PathTwistBegin;

-        public byte[] TextureEntry; // a LL textureEntry in byte[] format

-

-        public Int32 CreationDate;

-        public uint OwnerMask = FULL_MASK_PERMISSIONS;

-        public uint NextOwnerMask = FULL_MASK_PERMISSIONS;

-        public uint GroupMask = FULL_MASK_PERMISSIONS;

-        public uint EveryoneMask = FULL_MASK_PERMISSIONS;

-        public uint BaseMask = FULL_MASK_PERMISSIONS;

-

-        //following only used during prim storage

-        public LLVector3 Position;

-        public LLQuaternion Rotation = new LLQuaternion(0, 1, 0, 0);

-        public uint LocalID;

-        public LLUUID FullID;

-

-        public PrimData()

-        {

-

-        }

-

-        public PrimData(byte[] data)

-        {

-            int i = 0;

-

-            this.OwnerID = new LLUUID(data, i); i += 16;

-            this.PCode = data[i++];

-            this.PathBegin = (ushort)(data[i++] + (data[i++] << 8));

-            this.PathEnd = (ushort)(data[i++] + (data[i++] << 8));

-            this.PathScaleX = data[i++];

-            this.PathScaleY = data[i++];

-            this.PathShearX = data[i++];

-            this.PathShearY = data[i++];

-            this.PathSkew = (sbyte)data[i++];

-            this.ProfileBegin = (ushort)(data[i++] + (data[i++] << 8));

-            this.ProfileEnd = (ushort)(data[i++] + (data[i++] << 8));

-            this.Scale = new LLVector3(data, i); i += 12;

-            this.PathCurve = data[i++];

-            this.ProfileCurve = data[i++];

-            this.ParentID = (uint)(data[i++] + (data[i++] << 8) + (data[i++] << 16) + (data[i++] << 24));

-            this.ProfileHollow = (ushort)(data[i++] + (data[i++] << 8));

-            this.PathRadiusOffset = (sbyte)data[i++];

-            this.PathRevolutions = data[i++];

-            this.PathTaperX = (sbyte)data[i++];

-            this.PathTaperY = (sbyte)data[i++];

-            this.PathTwist = (sbyte)data[i++];

-            this.PathTwistBegin = (sbyte)data[i++];

-            ushort length = (ushort)(data[i++] + (data[i++] << 8));

-            this.TextureEntry = new byte[length];

-            Array.Copy(data, i, TextureEntry, 0, length); i += length;

-            this.CreationDate = (Int32)(data[i++] + (data[i++] << 8) + (data[i++] << 16) + (data[i++] << 24));

-            this.OwnerMask = (uint)(data[i++] + (data[i++] << 8) + (data[i++] << 16) + (data[i++] << 24));

-            this.NextOwnerMask = (uint)(data[i++] + (data[i++] << 8) + (data[i++] << 16) + (data[i++] << 24));

-            this.GroupMask = (uint)(data[i++] + (data[i++] << 8) + (data[i++] << 16) + (data[i++] << 24));

-            this.EveryoneMask = (uint)(data[i++] + (data[i++] << 8) + (data[i++] << 16) + (data[i++] << 24));

-            this.BaseMask = (uint)(data[i++] + (data[i++] << 8) + (data[i++] << 16) + (data[i++] << 24));

-            this.Position = new LLVector3(data, i); i += 12;

-            this.Rotation = new LLQuaternion(data, i, true); i += 12;

-            this.LocalID = (uint)(data[i++] + (data[i++] << 8) + (data[i++] << 16) + (data[i++] << 24));

-            this.FullID = new LLUUID(data, i); i += 16;

-

-        }

-

-        public byte[] ToBytes()

-        {

-            int i = 0;

-            byte[] bytes = new byte[126 + TextureEntry.Length];

-            Array.Copy(OwnerID.GetBytes(), 0, bytes, i, 16); i += 16;

-            bytes[i++] = this.PCode;

-            bytes[i++] = (byte)(this.PathBegin % 256);

-            bytes[i++] = (byte)((this.PathBegin >> 8) % 256);

-            bytes[i++] = (byte)(this.PathEnd % 256);

-            bytes[i++] = (byte)((this.PathEnd >> 8) % 256);

-            bytes[i++] = this.PathScaleX;

-            bytes[i++] = this.PathScaleY;

-            bytes[i++] = this.PathShearX;

-            bytes[i++] = this.PathShearY;

-            bytes[i++] = (byte)this.PathSkew;

-            bytes[i++] = (byte)(this.ProfileBegin % 256);

-            bytes[i++] = (byte)((this.ProfileBegin >> 8) % 256);

-            bytes[i++] = (byte)(this.ProfileEnd % 256);

-            bytes[i++] = (byte)((this.ProfileEnd >> 8) % 256);

-            Array.Copy(Scale.GetBytes(), 0, bytes, i, 12); i += 12;

-            bytes[i++] = this.PathCurve;

-            bytes[i++] = this.ProfileCurve;

-            bytes[i++] = (byte)(ParentID % 256);

-            bytes[i++] = (byte)((ParentID >> 8) % 256);

-            bytes[i++] = (byte)((ParentID >> 16) % 256);

-            bytes[i++] = (byte)((ParentID >> 24) % 256);

-            bytes[i++] = (byte)(this.ProfileHollow % 256);

-            bytes[i++] = (byte)((this.ProfileHollow >> 8) % 256);

-            bytes[i++] = ((byte)this.PathRadiusOffset);

-            bytes[i++] = this.PathRevolutions;

-            bytes[i++] = ((byte)this.PathTaperX);

-            bytes[i++] = ((byte)this.PathTaperY);

-            bytes[i++] = ((byte)this.PathTwist);

-            bytes[i++] = ((byte)this.PathTwistBegin);

-            bytes[i++] = (byte)(TextureEntry.Length % 256);

-            bytes[i++] = (byte)((TextureEntry.Length >> 8) % 256);

-            Array.Copy(TextureEntry, 0, bytes, i, TextureEntry.Length); i += TextureEntry.Length;

-            bytes[i++] = (byte)(this.CreationDate % 256);

-            bytes[i++] = (byte)((this.CreationDate >> 8) % 256);

-            bytes[i++] = (byte)((this.CreationDate >> 16) % 256);

-            bytes[i++] = (byte)((this.CreationDate >> 24) % 256);

-            bytes[i++] = (byte)(this.OwnerMask % 256);

-            bytes[i++] = (byte)((this.OwnerMask >> 8) % 256);

-            bytes[i++] = (byte)((this.OwnerMask >> 16) % 256);

-            bytes[i++] = (byte)((this.OwnerMask >> 24) % 256);

-            bytes[i++] = (byte)(this.NextOwnerMask % 256);

-            bytes[i++] = (byte)((this.NextOwnerMask >> 8) % 256);

-            bytes[i++] = (byte)((this.NextOwnerMask >> 16) % 256);

-            bytes[i++] = (byte)((this.NextOwnerMask >> 24) % 256);

-            bytes[i++] = (byte)(this.GroupMask % 256);

-            bytes[i++] = (byte)((this.GroupMask >> 8) % 256);

-            bytes[i++] = (byte)((this.GroupMask >> 16) % 256);

-            bytes[i++] = (byte)((this.GroupMask >> 24) % 256);

-            bytes[i++] = (byte)(this.EveryoneMask % 256);

-            bytes[i++] = (byte)((this.EveryoneMask >> 8) % 256);

-            bytes[i++] = (byte)((this.EveryoneMask >> 16) % 256);

-            bytes[i++] = (byte)((this.EveryoneMask >> 24) % 256);

-            bytes[i++] = (byte)(this.BaseMask % 256);

-            bytes[i++] = (byte)((this.BaseMask >> 8) % 256);

-            bytes[i++] = (byte)((this.BaseMask >> 16) % 256);

-            bytes[i++] = (byte)((this.BaseMask >> 24) % 256);

-            Array.Copy(this.Position.GetBytes(), 0, bytes, i, 12); i += 12;

-            if (this.Rotation == new LLQuaternion(0, 0, 0, 0))

-            {

-                this.Rotation = new LLQuaternion(0, 1, 0, 0);

-            }

-            Array.Copy(this.Rotation.GetBytes(), 0, bytes, i, 12); i += 12;

-            bytes[i++] = (byte)(this.LocalID % 256);

-            bytes[i++] = (byte)((this.LocalID >> 8) % 256);

-            bytes[i++] = (byte)((this.LocalID >> 16) % 256);

-            bytes[i++] = (byte)((this.LocalID >> 24) % 256);

-            Array.Copy(FullID.GetBytes(), 0, bytes, i, 16); i += 16;

-

-            return bytes;

-        }

-

-        public static PrimData DefaultCube()

-        {

-            PrimData primData = new PrimData();

-            primData.CreationDate = (Int32)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;

-            primData.FullID = LLUUID.Random();

-            primData.Scale = new LLVector3(0.5f, 0.5f, 0.5f);

-            primData.Rotation = new LLQuaternion(0, 0, 0, 1);

-            primData.PCode = 9;

-            primData.ParentID = 0;

-            primData.PathBegin = 0;

-            primData.PathEnd = 0;

-            primData.PathScaleX = 0;

-            primData.PathScaleY = 0;

-            primData.PathShearX = 0;

-            primData.PathShearY = 0;

-            primData.PathSkew = 0;

-            primData.ProfileBegin = 0;

-            primData.ProfileEnd = 0;

-            primData.PathCurve = 16;

-            primData.ProfileCurve = 1;

-            primData.ProfileHollow = 0;

-            primData.PathRadiusOffset = 0;

-            primData.PathRevolutions = 0;

-            primData.PathTaperX = 0;

-            primData.PathTaperY = 0;

-            primData.PathTwist = 0;

-            primData.PathTwistBegin = 0;

-

-            return primData;

-        }

-    }

-}

+/*
+* 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 libsecondlife;
+
+namespace OpenSim.Framework.Types
+{
+    public class PrimData
+    {
+        private const uint FULL_MASK_PERMISSIONS = 2147483647;
+
+        public LLUUID OwnerID;
+        public byte PCode;
+        public ushort PathBegin;
+        public ushort PathEnd;
+        public byte PathScaleX;
+        public byte PathScaleY;
+        public byte PathShearX;
+        public byte PathShearY;
+        public sbyte PathSkew;
+        public ushort ProfileBegin;
+        public ushort ProfileEnd;
+        public LLVector3 Scale;
+        public byte PathCurve;
+        public byte ProfileCurve;
+        public uint ParentID = 0;
+        public ushort ProfileHollow;
+        public sbyte PathRadiusOffset;
+        public byte PathRevolutions;
+        public sbyte PathTaperX;
+        public sbyte PathTaperY;
+        public sbyte PathTwist;
+        public sbyte PathTwistBegin;
+        public byte[] TextureEntry; // a LL textureEntry in byte[] format
+
+        public Int32 CreationDate;
+        public uint OwnerMask = FULL_MASK_PERMISSIONS;
+        public uint NextOwnerMask = FULL_MASK_PERMISSIONS;
+        public uint GroupMask = FULL_MASK_PERMISSIONS;
+        public uint EveryoneMask = FULL_MASK_PERMISSIONS;
+        public uint BaseMask = FULL_MASK_PERMISSIONS;
+
+        //following only used during prim storage
+        public LLVector3 Position;
+        public LLQuaternion Rotation = new LLQuaternion(0, 1, 0, 0);
+        public uint LocalID;
+        public LLUUID FullID;
+
+        public PrimData()
+        {
+
+        }
+
+        public PrimData(byte[] data)
+        {
+            int i = 0;
+
+            this.OwnerID = new LLUUID(data, i); i += 16;
+            this.PCode = data[i++];
+            this.PathBegin = (ushort)(data[i++] + (data[i++] << 8));
+            this.PathEnd = (ushort)(data[i++] + (data[i++] << 8));
+            this.PathScaleX = data[i++];
+            this.PathScaleY = data[i++];
+            this.PathShearX = data[i++];
+            this.PathShearY = data[i++];
+            this.PathSkew = (sbyte)data[i++];
+            this.ProfileBegin = (ushort)(data[i++] + (data[i++] << 8));
+            this.ProfileEnd = (ushort)(data[i++] + (data[i++] << 8));
+            this.Scale = new LLVector3(data, i); i += 12;
+            this.PathCurve = data[i++];
+            this.ProfileCurve = data[i++];
+            this.ParentID = (uint)(data[i++] + (data[i++] << 8) + (data[i++] << 16) + (data[i++] << 24));
+            this.ProfileHollow = (ushort)(data[i++] + (data[i++] << 8));
+            this.PathRadiusOffset = (sbyte)data[i++];
+            this.PathRevolutions = data[i++];
+            this.PathTaperX = (sbyte)data[i++];
+            this.PathTaperY = (sbyte)data[i++];
+            this.PathTwist = (sbyte)data[i++];
+            this.PathTwistBegin = (sbyte)data[i++];
+            ushort length = (ushort)(data[i++] + (data[i++] << 8));
+            this.TextureEntry = new byte[length];
+            Array.Copy(data, i, TextureEntry, 0, length); i += length;
+            this.CreationDate = (Int32)(data[i++] + (data[i++] << 8) + (data[i++] << 16) + (data[i++] << 24));
+            this.OwnerMask = (uint)(data[i++] + (data[i++] << 8) + (data[i++] << 16) + (data[i++] << 24));
+            this.NextOwnerMask = (uint)(data[i++] + (data[i++] << 8) + (data[i++] << 16) + (data[i++] << 24));
+            this.GroupMask = (uint)(data[i++] + (data[i++] << 8) + (data[i++] << 16) + (data[i++] << 24));
+            this.EveryoneMask = (uint)(data[i++] + (data[i++] << 8) + (data[i++] << 16) + (data[i++] << 24));
+            this.BaseMask = (uint)(data[i++] + (data[i++] << 8) + (data[i++] << 16) + (data[i++] << 24));
+            this.Position = new LLVector3(data, i); i += 12;
+            this.Rotation = new LLQuaternion(data, i, true); i += 12;
+            this.LocalID = (uint)(data[i++] + (data[i++] << 8) + (data[i++] << 16) + (data[i++] << 24));
+            this.FullID = new LLUUID(data, i); i += 16;
+
+        }
+
+        public byte[] ToBytes()
+        {
+            int i = 0;
+            byte[] bytes = new byte[126 + TextureEntry.Length];
+            Array.Copy(OwnerID.GetBytes(), 0, bytes, i, 16); i += 16;
+            bytes[i++] = this.PCode;
+            bytes[i++] = (byte)(this.PathBegin % 256);
+            bytes[i++] = (byte)((this.PathBegin >> 8) % 256);
+            bytes[i++] = (byte)(this.PathEnd % 256);
+            bytes[i++] = (byte)((this.PathEnd >> 8) % 256);
+            bytes[i++] = this.PathScaleX;
+            bytes[i++] = this.PathScaleY;
+            bytes[i++] = this.PathShearX;
+            bytes[i++] = this.PathShearY;
+            bytes[i++] = (byte)this.PathSkew;
+            bytes[i++] = (byte)(this.ProfileBegin % 256);
+            bytes[i++] = (byte)((this.ProfileBegin >> 8) % 256);
+            bytes[i++] = (byte)(this.ProfileEnd % 256);
+            bytes[i++] = (byte)((this.ProfileEnd >> 8) % 256);
+            Array.Copy(Scale.GetBytes(), 0, bytes, i, 12); i += 12;
+            bytes[i++] = this.PathCurve;
+            bytes[i++] = this.ProfileCurve;
+            bytes[i++] = (byte)(ParentID % 256);
+            bytes[i++] = (byte)((ParentID >> 8) % 256);
+            bytes[i++] = (byte)((ParentID >> 16) % 256);
+            bytes[i++] = (byte)((ParentID >> 24) % 256);
+            bytes[i++] = (byte)(this.ProfileHollow % 256);
+            bytes[i++] = (byte)((this.ProfileHollow >> 8) % 256);
+            bytes[i++] = ((byte)this.PathRadiusOffset);
+            bytes[i++] = this.PathRevolutions;
+            bytes[i++] = ((byte)this.PathTaperX);
+            bytes[i++] = ((byte)this.PathTaperY);
+            bytes[i++] = ((byte)this.PathTwist);
+            bytes[i++] = ((byte)this.PathTwistBegin);
+            bytes[i++] = (byte)(TextureEntry.Length % 256);
+            bytes[i++] = (byte)((TextureEntry.Length >> 8) % 256);
+            Array.Copy(TextureEntry, 0, bytes, i, TextureEntry.Length); i += TextureEntry.Length;
+            bytes[i++] = (byte)(this.CreationDate % 256);
+            bytes[i++] = (byte)((this.CreationDate >> 8) % 256);
+            bytes[i++] = (byte)((this.CreationDate >> 16) % 256);
+            bytes[i++] = (byte)((this.CreationDate >> 24) % 256);
+            bytes[i++] = (byte)(this.OwnerMask % 256);
+            bytes[i++] = (byte)((this.OwnerMask >> 8) % 256);
+            bytes[i++] = (byte)((this.OwnerMask >> 16) % 256);
+            bytes[i++] = (byte)((this.OwnerMask >> 24) % 256);
+            bytes[i++] = (byte)(this.NextOwnerMask % 256);
+            bytes[i++] = (byte)((this.NextOwnerMask >> 8) % 256);
+            bytes[i++] = (byte)((this.NextOwnerMask >> 16) % 256);
+            bytes[i++] = (byte)((this.NextOwnerMask >> 24) % 256);
+            bytes[i++] = (byte)(this.GroupMask % 256);
+            bytes[i++] = (byte)((this.GroupMask >> 8) % 256);
+            bytes[i++] = (byte)((this.GroupMask >> 16) % 256);
+            bytes[i++] = (byte)((this.GroupMask >> 24) % 256);
+            bytes[i++] = (byte)(this.EveryoneMask % 256);
+            bytes[i++] = (byte)((this.EveryoneMask >> 8) % 256);
+            bytes[i++] = (byte)((this.EveryoneMask >> 16) % 256);
+            bytes[i++] = (byte)((this.EveryoneMask >> 24) % 256);
+            bytes[i++] = (byte)(this.BaseMask % 256);
+            bytes[i++] = (byte)((this.BaseMask >> 8) % 256);
+            bytes[i++] = (byte)((this.BaseMask >> 16) % 256);
+            bytes[i++] = (byte)((this.BaseMask >> 24) % 256);
+            Array.Copy(this.Position.GetBytes(), 0, bytes, i, 12); i += 12;
+            if (this.Rotation == new LLQuaternion(0, 0, 0, 0))
+            {
+                this.Rotation = new LLQuaternion(0, 1, 0, 0);
+            }
+            Array.Copy(this.Rotation.GetBytes(), 0, bytes, i, 12); i += 12;
+            bytes[i++] = (byte)(this.LocalID % 256);
+            bytes[i++] = (byte)((this.LocalID >> 8) % 256);
+            bytes[i++] = (byte)((this.LocalID >> 16) % 256);
+            bytes[i++] = (byte)((this.LocalID >> 24) % 256);
+            Array.Copy(FullID.GetBytes(), 0, bytes, i, 16); i += 16;
+
+            return bytes;
+        }
+
+        public static PrimData DefaultCube()
+        {
+            PrimData primData = new PrimData();
+            primData.CreationDate = (Int32)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;
+            primData.FullID = LLUUID.Random();
+            primData.Scale = new LLVector3(0.5f, 0.5f, 0.5f);
+            primData.Rotation = new LLQuaternion(0, 0, 0, 1);
+            primData.PCode = 9;
+            primData.ParentID = 0;
+            primData.PathBegin = 0;
+            primData.PathEnd = 0;
+            primData.PathScaleX = 0;
+            primData.PathScaleY = 0;
+            primData.PathShearX = 0;
+            primData.PathShearY = 0;
+            primData.PathSkew = 0;
+            primData.ProfileBegin = 0;
+            primData.ProfileEnd = 0;
+            primData.PathCurve = 16;
+            primData.ProfileCurve = 1;
+            primData.ProfileHollow = 0;
+            primData.PathRadiusOffset = 0;
+            primData.PathRevolutions = 0;
+            primData.PathTaperX = 0;
+            primData.PathTaperY = 0;
+            primData.PathTwist = 0;
+            primData.PathTwistBegin = 0;
+
+            return primData;
+        }
+    }
+}
diff --git a/OpenSim/Framework/General/Types/PrimitiveBaseShape.cs b/OpenSim/Framework/General/Types/PrimitiveBaseShape.cs
index a085a44..e058c07 100644
--- a/OpenSim/Framework/General/Types/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/General/Types/PrimitiveBaseShape.cs
@@ -1,109 +1,109 @@
-using libsecondlife;

-using libsecondlife.Packets;

-

-namespace OpenSim.Framework.Types

-{

-    public enum ShapeType

-    {

-        Box,

-        Sphere,

-        Ring,

-        Tube,

-        Torus,

-        Prism,

-        Scuplted,

-        Cylinder,

-        Foliage,

-        Unknown

-    }

-

-    public class PrimitiveBaseShape

-    {

-        private ShapeType type = ShapeType.Unknown;

-

-        public byte PCode;

-        public ushort PathBegin;

-        public ushort PathEnd;

-        public byte PathScaleX;

-        public byte PathScaleY;

-        public byte PathShearX;

-        public byte PathShearY;

-        public sbyte PathSkew;

-        public ushort ProfileBegin;

-        public ushort ProfileEnd;

-        public LLVector3 Scale;

-        public byte PathCurve;

-        public byte ProfileCurve;

-        public ushort ProfileHollow;

-        public sbyte PathRadiusOffset;

-        public byte PathRevolutions;

-        public sbyte PathTaperX;

-        public sbyte PathTaperY;

-        public sbyte PathTwist;

-        public sbyte PathTwistBegin;

-        public byte[] TextureEntry; // a LL textureEntry in byte[] format

-

-        public ShapeType PrimType

-        {

-            get

-            {

-                return this.type;

-            }

-        }

-

-        public LLVector3 PrimScale

-        {

-            get

-            {

-                return this.Scale;

-            }

-        }

-

-        public PrimitiveBaseShape()

-        {

-

-        }

-

-        //void returns need to change of course

-        public void GetMesh()

-        {

-

-        }

-

-        public PrimitiveBaseShape Copy()

-        {

-            return (PrimitiveBaseShape) this.MemberwiseClone();

-        }

-

-        public static PrimitiveBaseShape DefaultBox()

-        {

-            PrimitiveBaseShape primShape = new PrimitiveBaseShape();

-

-            primShape.type = ShapeType.Box;

-            primShape.Scale = new LLVector3(0.5f, 0.5f, 0.5f);

-            primShape.PCode = 9;

-            primShape.PathBegin = 0;

-            primShape.PathEnd = 0;

-            primShape.PathScaleX = 0;

-            primShape.PathScaleY = 0;

-            primShape.PathShearX = 0;

-            primShape.PathShearY = 0;

-            primShape.PathSkew = 0;

-            primShape.ProfileBegin = 0;

-            primShape.ProfileEnd = 0;

-            primShape.PathCurve = 16;

-            primShape.ProfileCurve = 1;

-            primShape.ProfileHollow = 0;

-            primShape.PathRadiusOffset = 0;

-            primShape.PathRevolutions = 0;

-            primShape.PathTaperX = 0;

-            primShape.PathTaperY = 0;

-            primShape.PathTwist = 0;

-            primShape.PathTwistBegin = 0;

-            LLObject.TextureEntry ntex = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-9999-000000000005"));

-            primShape.TextureEntry = ntex.ToBytes();

-

-            return primShape;

-        }

-    }

-}

+using libsecondlife;
+using libsecondlife.Packets;
+
+namespace OpenSim.Framework.Types
+{
+    public enum ShapeType
+    {
+        Box,
+        Sphere,
+        Ring,
+        Tube,
+        Torus,
+        Prism,
+        Scuplted,
+        Cylinder,
+        Foliage,
+        Unknown
+    }
+
+    public class PrimitiveBaseShape
+    {
+        private ShapeType type = ShapeType.Unknown;
+
+        public byte PCode;
+        public ushort PathBegin;
+        public ushort PathEnd;
+        public byte PathScaleX;
+        public byte PathScaleY;
+        public byte PathShearX;
+        public byte PathShearY;
+        public sbyte PathSkew;
+        public ushort ProfileBegin;
+        public ushort ProfileEnd;
+        public LLVector3 Scale;
+        public byte PathCurve;
+        public byte ProfileCurve;
+        public ushort ProfileHollow;
+        public sbyte PathRadiusOffset;
+        public byte PathRevolutions;
+        public sbyte PathTaperX;
+        public sbyte PathTaperY;
+        public sbyte PathTwist;
+        public sbyte PathTwistBegin;
+        public byte[] TextureEntry; // a LL textureEntry in byte[] format
+
+        public ShapeType PrimType
+        {
+            get
+            {
+                return this.type;
+            }
+        }
+
+        public LLVector3 PrimScale
+        {
+            get
+            {
+                return this.Scale;
+            }
+        }
+
+        public PrimitiveBaseShape()
+        {
+
+        }
+
+        //void returns need to change of course
+        public void GetMesh()
+        {
+
+        }
+
+        public PrimitiveBaseShape Copy()
+        {
+            return (PrimitiveBaseShape) this.MemberwiseClone();
+        }
+
+        public static PrimitiveBaseShape DefaultBox()
+        {
+            PrimitiveBaseShape primShape = new PrimitiveBaseShape();
+
+            primShape.type = ShapeType.Box;
+            primShape.Scale = new LLVector3(0.5f, 0.5f, 0.5f);
+            primShape.PCode = 9;
+            primShape.PathBegin = 0;
+            primShape.PathEnd = 0;
+            primShape.PathScaleX = 0;
+            primShape.PathScaleY = 0;
+            primShape.PathShearX = 0;
+            primShape.PathShearY = 0;
+            primShape.PathSkew = 0;
+            primShape.ProfileBegin = 0;
+            primShape.ProfileEnd = 0;
+            primShape.PathCurve = 16;
+            primShape.ProfileCurve = 1;
+            primShape.ProfileHollow = 0;
+            primShape.PathRadiusOffset = 0;
+            primShape.PathRevolutions = 0;
+            primShape.PathTaperX = 0;
+            primShape.PathTaperY = 0;
+            primShape.PathTwist = 0;
+            primShape.PathTwistBegin = 0;
+            LLObject.TextureEntry ntex = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-9999-000000000005"));
+            primShape.TextureEntry = ntex.ToBytes();
+
+            return primShape;
+        }
+    }
+}
diff --git a/OpenSim/Framework/General/Types/RegionHandle.cs b/OpenSim/Framework/General/Types/RegionHandle.cs
index 4a055ad..d90acc6 100644
--- a/OpenSim/Framework/General/Types/RegionHandle.cs
+++ b/OpenSim/Framework/General/Types/RegionHandle.cs
@@ -1,121 +1,121 @@
-using System;

-using System.Net;

-

-namespace OpenSim.Framework.Types

-{

-    /// <summary>

-    /// A class for manipulating RegionHandle coordinates

-    /// </summary>

-    class RegionHandle

-    {

-        private UInt64 handle;

-

-        /// <summary>

-        /// Initialises a new grid-aware RegionHandle

-        /// </summary>

-        /// <param name="ip">IP Address of the Grid Server for this region</param>

-        /// <param name="x">Grid X Coordinate</param>

-        /// <param name="y">Grid Y Coordinate</param>

-        public RegionHandle(string ip, short x, short y)

-        {

-            IPAddress addr = IPAddress.Parse(ip);

-

-            if (addr.AddressFamily != System.Net.Sockets.AddressFamily.InterNetwork)

-                throw new Exception("Bad RegionHandle Parameter - must be an IPv4 address");

-

-            uint baseHandle = BitConverter.ToUInt32(addr.GetAddressBytes(), 0);

-

-            // Split the IP address in half

-            short a = (short)((baseHandle << 16) & 0xFFFF);

-            short b = (short)((baseHandle <<  0) & 0xFFFF);

-

-            // Raise the bounds a little

-            uint nx = (uint)x;

-            uint ny = (uint)y;

-

-            // Multiply grid coords to get region coords

-            nx *= 256;

-            ny *= 256;

-

-            // Stuff the IP address in too

-            nx = (uint)a << 16;

-            ny = (uint)b << 16;

-

-            handle = ((UInt64)nx << 32) | (uint)ny;

-        }

-

-        /// <summary>

-        /// Initialises a new RegionHandle that is not inter-grid aware

-        /// </summary>

-        /// <param name="x">Grid X Coordinate</param>

-        /// <param name="y">Grid Y Coordinate</param>

-        public RegionHandle(uint x, uint y)

-        {

-            handle = ((x * 256) << 32) | (y * 256);

-        }

-

-        /// <summary>

-        /// Initialises a new RegionHandle from an existing value

-        /// </summary>

-        /// <param name="Region">A U64 RegionHandle</param>

-        public RegionHandle(UInt64 Region)

-        {

-            handle = Region;

-        }

-

-        /// <summary>

-        /// Returns the Grid Masked RegionHandle - For use in Teleport packets and other packets where sending the grid IP address may be handy.

-        /// </summary>

-        /// <remarks>Do not use for SimulatorEnable packets. The client will choke.</remarks>

-        /// <returns>Region Handle including IP Address encoding</returns>

-        public UInt64 getTeleportHandle()

-        {

-            return handle;

-        }

-

-        /// <summary>

-        /// Returns a RegionHandle which may be used for SimulatorEnable packets. Removes the IP address encoding and returns the lower bounds.

-        /// </summary>

-        /// <returns>A U64 RegionHandle for use in SimulatorEnable packets.</returns>

-        public UInt64 getNeighbourHandle()

-        {

-            UInt64 mask = 0x0000FFFF0000FFFF;

-

-            return handle | mask;

-        }

-

-        /// <summary>

-        /// Returns the IP Address of the GridServer from a Grid-Encoded RegionHandle

-        /// </summary>

-        /// <returns>Grid Server IP Address</returns>

-        public IPAddress getGridIP()

-        {

-            uint a = (uint)((handle >> 16) & 0xFFFF);

-            uint b = (uint)((handle >> 48) & 0xFFFF);

-

-            return new IPAddress((long)(a << 16) | (long)b);

-        }

-

-        /// <summary>

-        /// Returns the X Coordinate from a Grid-Encoded RegionHandle

-        /// </summary>

-        /// <returns>X Coordinate</returns>

-        public uint getGridX()

-        {

-            uint x = (uint)((handle >> 32) & 0xFFFF);

-

-            return x;

-        }

-

-        /// <summary>

-        /// Returns the Y Coordinate from a Grid-Encoded RegionHandle

-        /// </summary>

-        /// <returns>Y Coordinate</returns>

-        public uint getGridY()

-        {

-            uint y = (uint)((handle >> 0) & 0xFFFF);

-

-            return y;

-        }

-    }

-}

+using System;
+using System.Net;
+
+namespace OpenSim.Framework.Types
+{
+    /// <summary>
+    /// A class for manipulating RegionHandle coordinates
+    /// </summary>
+    class RegionHandle
+    {
+        private UInt64 handle;
+
+        /// <summary>
+        /// Initialises a new grid-aware RegionHandle
+        /// </summary>
+        /// <param name="ip">IP Address of the Grid Server for this region</param>
+        /// <param name="x">Grid X Coordinate</param>
+        /// <param name="y">Grid Y Coordinate</param>
+        public RegionHandle(string ip, short x, short y)
+        {
+            IPAddress addr = IPAddress.Parse(ip);
+
+            if (addr.AddressFamily != System.Net.Sockets.AddressFamily.InterNetwork)
+                throw new Exception("Bad RegionHandle Parameter - must be an IPv4 address");
+
+            uint baseHandle = BitConverter.ToUInt32(addr.GetAddressBytes(), 0);
+
+            // Split the IP address in half
+            short a = (short)((baseHandle << 16) & 0xFFFF);
+            short b = (short)((baseHandle <<  0) & 0xFFFF);
+
+            // Raise the bounds a little
+            uint nx = (uint)x;
+            uint ny = (uint)y;
+
+            // Multiply grid coords to get region coords
+            nx *= 256;
+            ny *= 256;
+
+            // Stuff the IP address in too
+            nx = (uint)a << 16;
+            ny = (uint)b << 16;
+
+            handle = ((UInt64)nx << 32) | (uint)ny;
+        }
+
+        /// <summary>
+        /// Initialises a new RegionHandle that is not inter-grid aware
+        /// </summary>
+        /// <param name="x">Grid X Coordinate</param>
+        /// <param name="y">Grid Y Coordinate</param>
+        public RegionHandle(uint x, uint y)
+        {
+            handle = ((x * 256) << 32) | (y * 256);
+        }
+
+        /// <summary>
+        /// Initialises a new RegionHandle from an existing value
+        /// </summary>
+        /// <param name="Region">A U64 RegionHandle</param>
+        public RegionHandle(UInt64 Region)
+        {
+            handle = Region;
+        }
+
+        /// <summary>
+        /// Returns the Grid Masked RegionHandle - For use in Teleport packets and other packets where sending the grid IP address may be handy.
+        /// </summary>
+        /// <remarks>Do not use for SimulatorEnable packets. The client will choke.</remarks>
+        /// <returns>Region Handle including IP Address encoding</returns>
+        public UInt64 getTeleportHandle()
+        {
+            return handle;
+        }
+
+        /// <summary>
+        /// Returns a RegionHandle which may be used for SimulatorEnable packets. Removes the IP address encoding and returns the lower bounds.
+        /// </summary>
+        /// <returns>A U64 RegionHandle for use in SimulatorEnable packets.</returns>
+        public UInt64 getNeighbourHandle()
+        {
+            UInt64 mask = 0x0000FFFF0000FFFF;
+
+            return handle | mask;
+        }
+
+        /// <summary>
+        /// Returns the IP Address of the GridServer from a Grid-Encoded RegionHandle
+        /// </summary>
+        /// <returns>Grid Server IP Address</returns>
+        public IPAddress getGridIP()
+        {
+            uint a = (uint)((handle >> 16) & 0xFFFF);
+            uint b = (uint)((handle >> 48) & 0xFFFF);
+
+            return new IPAddress((long)(a << 16) | (long)b);
+        }
+
+        /// <summary>
+        /// Returns the X Coordinate from a Grid-Encoded RegionHandle
+        /// </summary>
+        /// <returns>X Coordinate</returns>
+        public uint getGridX()
+        {
+            uint x = (uint)((handle >> 32) & 0xFFFF);
+
+            return x;
+        }
+
+        /// <summary>
+        /// Returns the Y Coordinate from a Grid-Encoded RegionHandle
+        /// </summary>
+        /// <returns>Y Coordinate</returns>
+        public uint getGridY()
+        {
+            uint y = (uint)((handle >> 0) & 0xFFFF);
+
+            return y;
+        }
+    }
+}
diff --git a/OpenSim/Framework/General/Types/RegionInfo.cs b/OpenSim/Framework/General/Types/RegionInfo.cs
index cfc0925..a216b52 100644
--- a/OpenSim/Framework/General/Types/RegionInfo.cs
+++ b/OpenSim/Framework/General/Types/RegionInfo.cs
@@ -1,342 +1,342 @@
-/*

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

-using System.Net;

-using System.Net.Sockets;

-using libsecondlife;

-using OpenSim.Framework.Console;

-using OpenSim.Framework.Interfaces;

-using OpenSim.Framework.Utilities;

-

-namespace OpenSim.Framework.Types

-{

-    public class RegionInfo

-    {

-        public LLUUID SimUUID = new LLUUID();

-        public string RegionName = "";

-

-        private IPEndPoint m_internalEndPoint;

-        public IPEndPoint InternalEndPoint

-        {

-            get

-            {

-                return m_internalEndPoint;

-            }

-        }

-

-        public IPEndPoint ExternalEndPoint

-        {

-            get

-            {

-                // Old one defaults to IPv6

-                //return new IPEndPoint( Dns.GetHostAddresses( m_externalHostName )[0], m_internalEndPoint.Port );

-

-                // New method favors IPv4

-                IPAddress ia = null;

-                foreach (IPAddress Adr in Dns.GetHostAddresses(m_externalHostName))

-                {

-                    if (ia == null)

-                        ia = Adr;

-

-                    if (Adr.AddressFamily == AddressFamily.InterNetwork)

-                    {

-                        ia = Adr;

-                        break;

-                    }

-

-                }

-                

-                return new IPEndPoint(ia, m_internalEndPoint.Port);

-            }

-        }

-        

-        private string m_externalHostName;

-        public string ExternalHostName

-        {

-            get

-            {

-                return m_externalHostName;

-            }

-        }

-

-        private uint? m_regionLocX;

-        public uint RegionLocX

-        {

-            get

-            {

-                return m_regionLocX.Value;

-            }

-        }

-

-        private uint? m_regionLocY;

-        public uint RegionLocY

-        {

-            get

-            {

-                return m_regionLocY.Value;

-            }

-        }

-

-        private ulong? m_regionHandle;

-        public ulong RegionHandle

-        {

-            get

-            {

-                if (!m_regionHandle.HasValue)

-                {

-                    m_regionHandle = Util.UIntsToLong((RegionLocX * 256), (RegionLocY * 256));

-                }

-

-                return m_regionHandle.Value;

-            }

-        }

-

-        // Only used for remote regions , ie ones not in the current instance

-        private uint m_remotingPort;

-        public uint RemotingPort

-        {

-            get

-            {

-                return m_remotingPort;

-            }

-            set

-            {

-                m_remotingPort = value;

-            }

-        }

-        public string RemotingAddress;

-

-        public string DataStore = "";

-        public bool isSandbox = false;

-

-        public LLUUID MasterAvatarAssignedUUID = new LLUUID();

-        public string MasterAvatarFirstName = "";

-        public string MasterAvatarLastName = "";

-        public string MasterAvatarSandboxPassword = "";

-

-        public EstateSettings estateSettings;

-

-        public RegionInfo()

-        {

-            estateSettings = new EstateSettings();

-        }

-

-        public RegionInfo(uint regionLocX, uint regionLocY, IPEndPoint internalEndPoint, string externalUri)

-            : this()

-        {

-            m_regionLocX = regionLocX;

-            m_regionLocY = regionLocY;

-

-            m_internalEndPoint = internalEndPoint;

-            m_externalHostName = externalUri;

-        }

-

-        public void InitConfig(bool sandboxMode, IGenericConfig configData)

-        {

-            this.isSandbox = sandboxMode;

-            try

-            {

-                string attri = "";

-

-                // Sim UUID

-                string simId = configData.GetAttribute("SimUUID");

-                if (String.IsNullOrEmpty( simId ))

-                {

-                    this.SimUUID = LLUUID.Random();

-                }

-                else

-                {

-                    this.SimUUID = new LLUUID(simId);

-                }

-                configData.SetAttribute("SimUUID", this.SimUUID.ToString());

-

-                this.RegionName = GetString(configData, "SimName", "OpenSim test", "Region Name");

-

-                //m_regionLocX = (uint) GetInt(configData, "SimLocationX", 1000, "Grid Location X");

-                

-                attri = "";

-                attri = configData.GetAttribute("SimLocationX");

-                if (attri == "")

-                {

-                    string location = MainLog.Instance.CmdPrompt("Grid Location X", "1000");

-                    configData.SetAttribute("SimLocationX", location);

-                    m_regionLocX = (uint)Convert.ToUInt32(location);

-                }

-                else

-                {

-                    m_regionLocX = (uint)Convert.ToUInt32(attri);

-                }

-                // Sim/Grid location Y

-                attri = "";

-                attri = configData.GetAttribute("SimLocationY");

-                if (attri == "")

-                {

-                    string location = MainLog.Instance.CmdPrompt("Grid Location Y", "1000");

-                    configData.SetAttribute("SimLocationY", location);

-                    m_regionLocY = (uint)Convert.ToUInt32(location);

-                }

-                else

-                {

-                    m_regionLocY = (uint)Convert.ToUInt32(attri);

-                }

-

-                m_regionHandle = null;

-

-                this.DataStore = GetString(configData, "Datastore", "localworld.yap", "Filename for local storage");

-                

-                IPAddress internalAddress = GetIPAddress(configData, "InternalIPAddress", "0.0.0.0", "Internal IP Address for UDP client connections");

-                int internalPort = GetIPPort(configData, "InternalIPPort", "9000", "Internal IP Port for UDP client connections");

-                m_internalEndPoint = new IPEndPoint(internalAddress, internalPort);

-

-                m_externalHostName = GetString(configData, "ExternalHostName", "127.0.0.1", "External Host Name");

-

-                estateSettings.terrainFile =

-                    GetString(configData, "TerrainFile", "default.r32", "GENERAL SETTING: Default Terrain File");                

-                

-                attri = "";

-                attri = configData.GetAttribute("TerrainMultiplier");

-                if (attri == "")

-                {

-                    string re = MainLog.Instance.CmdPrompt("GENERAL SETTING: Terrain Height Multiplier", "60.0");

-                    this.estateSettings.terrainMultiplier = Convert.ToDouble(re, CultureInfo.InvariantCulture);

-                    configData.SetAttribute("TerrainMultiplier", this.estateSettings.terrainMultiplier.ToString());

-                }

-                else

-                {

-                    this.estateSettings.terrainMultiplier = Convert.ToDouble(attri);

-                }

-

-                attri = "";

-                attri = configData.GetAttribute("MasterAvatarFirstName");

-                if (attri == "")

-                {

-                    this.MasterAvatarFirstName = MainLog.Instance.CmdPrompt("First name of Master Avatar (Land and Region Owner)", "Test");

-

-                    configData.SetAttribute("MasterAvatarFirstName", this.MasterAvatarFirstName);

-                }

-                else

-                {

-                    this.MasterAvatarFirstName = attri;

-                }

-

-                attri = "";

-                attri = configData.GetAttribute("MasterAvatarLastName");

-                if (attri == "")

-                {

-                    this.MasterAvatarLastName = MainLog.Instance.CmdPrompt("Last name of Master Avatar (Land and Region Owner)", "User");

-

-                    configData.SetAttribute("MasterAvatarLastName", this.MasterAvatarLastName);

-                }

-                else

-                {

-                    this.MasterAvatarLastName = attri;

-                }

-

-                if (isSandbox) //Sandbox Mode Specific Settings

-                {

-                    attri = "";

-                    attri = configData.GetAttribute("MasterAvatarSandboxPassword");

-                    if (attri == "")

-                    {

-                        this.MasterAvatarSandboxPassword = MainLog.Instance.CmdPrompt("Password of Master Avatar (Needed for sandbox mode account creation only)", "test");

-

-                        //Should I store this?

-                        configData.SetAttribute("MasterAvatarSandboxPassword", this.MasterAvatarSandboxPassword);

-                    }

-                    else

-                    {

-                        this.MasterAvatarSandboxPassword = attri;

-                    }

-                }

-

-                configData.Commit();

-            }

-            catch (Exception e)

-            {

-                MainLog.Instance.Warn("Config.cs:InitConfig() - Exception occured");

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

-            }

-

-            MainLog.Instance.Verbose("Sim settings loaded:");

-            MainLog.Instance.Verbose("UUID: " + this.SimUUID.ToStringHyphenated());

-            MainLog.Instance.Verbose("Name: " + this.RegionName);

-            MainLog.Instance.Verbose("Region Location: [" + this.RegionLocX.ToString() + "," + this.RegionLocY + "]");

-            MainLog.Instance.Verbose("Region Handle: " + this.RegionHandle.ToString());

-            MainLog.Instance.Verbose("Listening on IP end point: " + m_internalEndPoint.ToString() );

-            MainLog.Instance.Verbose("Sandbox Mode? " + isSandbox.ToString());

-

-        }

-

-        private uint GetInt(IGenericConfig configData, string p, int p_3, string p_4)

-        {

-            throw new Exception("The method or operation is not implemented.");

-        }

-

-        private string GetString(IGenericConfig configData, string attrName, string defaultvalue, string prompt)

-        {

-            string s = configData.GetAttribute(attrName);

-

-            if (String.IsNullOrEmpty( s ))

-            {

-                s = MainLog.Instance.CmdPrompt(prompt, defaultvalue);

-                configData.SetAttribute(attrName, s );

-            }

-            return s;

-        }

-

-        private IPAddress GetIPAddress(IGenericConfig configData, string attrName, string defaultvalue, string prompt)

-        {

-            string addressStr = configData.GetAttribute(attrName);

-

-            IPAddress address;

-

-            if (!IPAddress.TryParse(addressStr, out address))

-            {

-                address =  MainLog.Instance.CmdPromptIPAddress(prompt, defaultvalue);

-                configData.SetAttribute(attrName, address.ToString());

-            }

-            return address;

-        }

-        

-        private int GetIPPort(IGenericConfig configData, string attrName, string defaultvalue, string prompt)

-        {

-            string portStr = configData.GetAttribute(attrName);

-

-            int port;

-

-            if (!int.TryParse(portStr, out port))

-            {

-                port = MainLog.Instance.CmdPromptIPPort(prompt, defaultvalue);

-                configData.SetAttribute(attrName, port.ToString());

-            }

-            

-            return port;

-        }

-    }

-}

+/*
+* 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.Globalization;
+using System.Net;
+using System.Net.Sockets;
+using libsecondlife;
+using OpenSim.Framework.Console;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Utilities;
+
+namespace OpenSim.Framework.Types
+{
+    public class RegionInfo
+    {
+        public LLUUID SimUUID = new LLUUID();
+        public string RegionName = "";
+
+        private IPEndPoint m_internalEndPoint;
+        public IPEndPoint InternalEndPoint
+        {
+            get
+            {
+                return m_internalEndPoint;
+            }
+        }
+
+        public IPEndPoint ExternalEndPoint
+        {
+            get
+            {
+                // Old one defaults to IPv6
+                //return new IPEndPoint( Dns.GetHostAddresses( m_externalHostName )[0], m_internalEndPoint.Port );
+
+                // New method favors IPv4
+                IPAddress ia = null;
+                foreach (IPAddress Adr in Dns.GetHostAddresses(m_externalHostName))
+                {
+                    if (ia == null)
+                        ia = Adr;
+
+                    if (Adr.AddressFamily == AddressFamily.InterNetwork)
+                    {
+                        ia = Adr;
+                        break;
+                    }
+
+                }
+                
+                return new IPEndPoint(ia, m_internalEndPoint.Port);
+            }
+        }
+        
+        private string m_externalHostName;
+        public string ExternalHostName
+        {
+            get
+            {
+                return m_externalHostName;
+            }
+        }
+
+        private uint? m_regionLocX;
+        public uint RegionLocX
+        {
+            get
+            {
+                return m_regionLocX.Value;
+            }
+        }
+
+        private uint? m_regionLocY;
+        public uint RegionLocY
+        {
+            get
+            {
+                return m_regionLocY.Value;
+            }
+        }
+
+        private ulong? m_regionHandle;
+        public ulong RegionHandle
+        {
+            get
+            {
+                if (!m_regionHandle.HasValue)
+                {
+                    m_regionHandle = Util.UIntsToLong((RegionLocX * 256), (RegionLocY * 256));
+                }
+
+                return m_regionHandle.Value;
+            }
+        }
+
+        // Only used for remote regions , ie ones not in the current instance
+        private uint m_remotingPort;
+        public uint RemotingPort
+        {
+            get
+            {
+                return m_remotingPort;
+            }
+            set
+            {
+                m_remotingPort = value;
+            }
+        }
+        public string RemotingAddress;
+
+        public string DataStore = "";
+        public bool isSandbox = false;
+
+        public LLUUID MasterAvatarAssignedUUID = new LLUUID();
+        public string MasterAvatarFirstName = "";
+        public string MasterAvatarLastName = "";
+        public string MasterAvatarSandboxPassword = "";
+
+        public EstateSettings estateSettings;
+
+        public RegionInfo()
+        {
+            estateSettings = new EstateSettings();
+        }
+
+        public RegionInfo(uint regionLocX, uint regionLocY, IPEndPoint internalEndPoint, string externalUri)
+            : this()
+        {
+            m_regionLocX = regionLocX;
+            m_regionLocY = regionLocY;
+
+            m_internalEndPoint = internalEndPoint;
+            m_externalHostName = externalUri;
+        }
+
+        public void InitConfig(bool sandboxMode, IGenericConfig configData)
+        {
+            this.isSandbox = sandboxMode;
+            try
+            {
+                string attri = "";
+
+                // Sim UUID
+                string simId = configData.GetAttribute("SimUUID");
+                if (String.IsNullOrEmpty( simId ))
+                {
+                    this.SimUUID = LLUUID.Random();
+                }
+                else
+                {
+                    this.SimUUID = new LLUUID(simId);
+                }
+                configData.SetAttribute("SimUUID", this.SimUUID.ToString());
+
+                this.RegionName = GetString(configData, "SimName", "OpenSim test", "Region Name");
+
+                //m_regionLocX = (uint) GetInt(configData, "SimLocationX", 1000, "Grid Location X");
+                
+                attri = "";
+                attri = configData.GetAttribute("SimLocationX");
+                if (attri == "")
+                {
+                    string location = MainLog.Instance.CmdPrompt("Grid Location X", "1000");
+                    configData.SetAttribute("SimLocationX", location);
+                    m_regionLocX = (uint)Convert.ToUInt32(location);
+                }
+                else
+                {
+                    m_regionLocX = (uint)Convert.ToUInt32(attri);
+                }
+                // Sim/Grid location Y
+                attri = "";
+                attri = configData.GetAttribute("SimLocationY");
+                if (attri == "")
+                {
+                    string location = MainLog.Instance.CmdPrompt("Grid Location Y", "1000");
+                    configData.SetAttribute("SimLocationY", location);
+                    m_regionLocY = (uint)Convert.ToUInt32(location);
+                }
+                else
+                {
+                    m_regionLocY = (uint)Convert.ToUInt32(attri);
+                }
+
+                m_regionHandle = null;
+
+                this.DataStore = GetString(configData, "Datastore", "localworld.yap", "Filename for local storage");
+                
+                IPAddress internalAddress = GetIPAddress(configData, "InternalIPAddress", "0.0.0.0", "Internal IP Address for UDP client connections");
+                int internalPort = GetIPPort(configData, "InternalIPPort", "9000", "Internal IP Port for UDP client connections");
+                m_internalEndPoint = new IPEndPoint(internalAddress, internalPort);
+
+                m_externalHostName = GetString(configData, "ExternalHostName", "127.0.0.1", "External Host Name");
+
+                estateSettings.terrainFile =
+                    GetString(configData, "TerrainFile", "default.r32", "GENERAL SETTING: Default Terrain File");                
+                
+                attri = "";
+                attri = configData.GetAttribute("TerrainMultiplier");
+                if (attri == "")
+                {
+                    string re = MainLog.Instance.CmdPrompt("GENERAL SETTING: Terrain Height Multiplier", "60.0");
+                    this.estateSettings.terrainMultiplier = Convert.ToDouble(re, CultureInfo.InvariantCulture);
+                    configData.SetAttribute("TerrainMultiplier", this.estateSettings.terrainMultiplier.ToString());
+                }
+                else
+                {
+                    this.estateSettings.terrainMultiplier = Convert.ToDouble(attri);
+                }
+
+                attri = "";
+                attri = configData.GetAttribute("MasterAvatarFirstName");
+                if (attri == "")
+                {
+                    this.MasterAvatarFirstName = MainLog.Instance.CmdPrompt("First name of Master Avatar (Land and Region Owner)", "Test");
+
+                    configData.SetAttribute("MasterAvatarFirstName", this.MasterAvatarFirstName);
+                }
+                else
+                {
+                    this.MasterAvatarFirstName = attri;
+                }
+
+                attri = "";
+                attri = configData.GetAttribute("MasterAvatarLastName");
+                if (attri == "")
+                {
+                    this.MasterAvatarLastName = MainLog.Instance.CmdPrompt("Last name of Master Avatar (Land and Region Owner)", "User");
+
+                    configData.SetAttribute("MasterAvatarLastName", this.MasterAvatarLastName);
+                }
+                else
+                {
+                    this.MasterAvatarLastName = attri;
+                }
+
+                if (isSandbox) //Sandbox Mode Specific Settings
+                {
+                    attri = "";
+                    attri = configData.GetAttribute("MasterAvatarSandboxPassword");
+                    if (attri == "")
+                    {
+                        this.MasterAvatarSandboxPassword = MainLog.Instance.CmdPrompt("Password of Master Avatar (Needed for sandbox mode account creation only)", "test");
+
+                        //Should I store this?
+                        configData.SetAttribute("MasterAvatarSandboxPassword", this.MasterAvatarSandboxPassword);
+                    }
+                    else
+                    {
+                        this.MasterAvatarSandboxPassword = attri;
+                    }
+                }
+
+                configData.Commit();
+            }
+            catch (Exception e)
+            {
+                MainLog.Instance.Warn("Config.cs:InitConfig() - Exception occured");
+                MainLog.Instance.Warn(e.ToString());
+            }
+
+            MainLog.Instance.Verbose("Sim settings loaded:");
+            MainLog.Instance.Verbose("UUID: " + this.SimUUID.ToStringHyphenated());
+            MainLog.Instance.Verbose("Name: " + this.RegionName);
+            MainLog.Instance.Verbose("Region Location: [" + this.RegionLocX.ToString() + "," + this.RegionLocY + "]");
+            MainLog.Instance.Verbose("Region Handle: " + this.RegionHandle.ToString());
+            MainLog.Instance.Verbose("Listening on IP end point: " + m_internalEndPoint.ToString() );
+            MainLog.Instance.Verbose("Sandbox Mode? " + isSandbox.ToString());
+
+        }
+
+        private uint GetInt(IGenericConfig configData, string p, int p_3, string p_4)
+        {
+            throw new Exception("The method or operation is not implemented.");
+        }
+
+        private string GetString(IGenericConfig configData, string attrName, string defaultvalue, string prompt)
+        {
+            string s = configData.GetAttribute(attrName);
+
+            if (String.IsNullOrEmpty( s ))
+            {
+                s = MainLog.Instance.CmdPrompt(prompt, defaultvalue);
+                configData.SetAttribute(attrName, s );
+            }
+            return s;
+        }
+
+        private IPAddress GetIPAddress(IGenericConfig configData, string attrName, string defaultvalue, string prompt)
+        {
+            string addressStr = configData.GetAttribute(attrName);
+
+            IPAddress address;
+
+            if (!IPAddress.TryParse(addressStr, out address))
+            {
+                address =  MainLog.Instance.CmdPromptIPAddress(prompt, defaultvalue);
+                configData.SetAttribute(attrName, address.ToString());
+            }
+            return address;
+        }
+        
+        private int GetIPPort(IGenericConfig configData, string attrName, string defaultvalue, string prompt)
+        {
+            string portStr = configData.GetAttribute(attrName);
+
+            int port;
+
+            if (!int.TryParse(portStr, out port))
+            {
+                port = MainLog.Instance.CmdPromptIPPort(prompt, defaultvalue);
+                configData.SetAttribute(attrName, port.ToString());
+            }
+            
+            return port;
+        }
+    }
+}
diff --git a/OpenSim/Framework/General/Types/UUID.cs b/OpenSim/Framework/General/Types/UUID.cs
index 9cde18e..9e9654d 100644
--- a/OpenSim/Framework/General/Types/UUID.cs
+++ b/OpenSim/Framework/General/Types/UUID.cs
@@ -1,127 +1,127 @@
-using System;

-using libsecondlife;

-

-namespace OpenSim.Framework.Types

-{

-    class UUID

-    {

-        public LLUUID llUUID;

-

-        public UUID(string uuid)

-        {

-            llUUID = new LLUUID(uuid);

-        }

-

-        public UUID(byte[] uuid)

-        {

-            llUUID = new LLUUID(uuid, 0);

-        }

-

-        public UUID(byte[] uuid, int offset)

-        {

-            llUUID = new LLUUID(uuid, offset);

-        }

-

-        public UUID()

-        {

-            llUUID = LLUUID.Zero;

-        }

-

-        public UUID(ulong uuid)

-        {

-            llUUID = new LLUUID(uuid);

-        }

-

-        public UUID(UInt32 first, UInt32 second, UInt32 third, UInt32 fourth)

-        {

-            byte[] uuid = new byte[16];

-

-            byte[] n = BitConverter.GetBytes(first);

-            n.CopyTo(uuid, 0);

-            n = BitConverter.GetBytes(second);

-            n.CopyTo(uuid, 4);

-            n = BitConverter.GetBytes(third);

-            n.CopyTo(uuid, 8);

-            n = BitConverter.GetBytes(fourth);

-            n.CopyTo(uuid, 12);

-

-            llUUID = new LLUUID(uuid,0);

-        }

-

-        public override string ToString()

-        {

-            return llUUID.ToString();

-        }

-

-        public string ToStringHyphenated()

-        {

-            return llUUID.ToStringHyphenated();

-        }

-

-        public byte[] GetBytes()

-        {

-            return llUUID.GetBytes();

-        }

-

-        public UInt32[] GetInts()

-        {

-            UInt32[] ints = new UInt32[4];

-            ints[0] = BitConverter.ToUInt32(llUUID.Data, 0);

-            ints[1] = BitConverter.ToUInt32(llUUID.Data, 4);

-            ints[2] = BitConverter.ToUInt32(llUUID.Data, 8);

-            ints[3] = BitConverter.ToUInt32(llUUID.Data, 12);

-

-            return ints;

-        }

-

-        public LLUUID GetLLUUID()

-        {

-            return llUUID;

-        }

-

-        public uint CRC()

-        {

-            return llUUID.CRC();

-        }

-

-        public override int GetHashCode()

-        {

-            return llUUID.GetHashCode();

-        }

-

-        public void Combine(UUID other)

-        {

-            llUUID.Combine(other.GetLLUUID());

-        }

-

-        public void Combine(LLUUID other)

-        {

-            llUUID.Combine(other);

-        }

-

-        public override bool Equals(Object other)

-        {

-            return llUUID.Equals(other);

-        }

-

-        public static bool operator ==(UUID a, UUID b)

-        {

-            return a.llUUID.Equals(b.GetLLUUID());

-        }

-

-        public static bool operator !=(UUID a, UUID b)

-        {

-            return !a.llUUID.Equals(b.GetLLUUID());

-        }

-

-        public static bool operator ==(UUID a, LLUUID b)

-        {

-            return a.Equals(b);

-        }

-

-        public static bool operator !=(UUID a, LLUUID b)

-        {

-            return !a.Equals(b);

-        }

-    }

-}

+using System;
+using libsecondlife;
+
+namespace OpenSim.Framework.Types
+{
+    class UUID
+    {
+        public LLUUID llUUID;
+
+        public UUID(string uuid)
+        {
+            llUUID = new LLUUID(uuid);
+        }
+
+        public UUID(byte[] uuid)
+        {
+            llUUID = new LLUUID(uuid, 0);
+        }
+
+        public UUID(byte[] uuid, int offset)
+        {
+            llUUID = new LLUUID(uuid, offset);
+        }
+
+        public UUID()
+        {
+            llUUID = LLUUID.Zero;
+        }
+
+        public UUID(ulong uuid)
+        {
+            llUUID = new LLUUID(uuid);
+        }
+
+        public UUID(UInt32 first, UInt32 second, UInt32 third, UInt32 fourth)
+        {
+            byte[] uuid = new byte[16];
+
+            byte[] n = BitConverter.GetBytes(first);
+            n.CopyTo(uuid, 0);
+            n = BitConverter.GetBytes(second);
+            n.CopyTo(uuid, 4);
+            n = BitConverter.GetBytes(third);
+            n.CopyTo(uuid, 8);
+            n = BitConverter.GetBytes(fourth);
+            n.CopyTo(uuid, 12);
+
+            llUUID = new LLUUID(uuid,0);
+        }
+
+        public override string ToString()
+        {
+            return llUUID.ToString();
+        }
+
+        public string ToStringHyphenated()
+        {
+            return llUUID.ToStringHyphenated();
+        }
+
+        public byte[] GetBytes()
+        {
+            return llUUID.GetBytes();
+        }
+
+        public UInt32[] GetInts()
+        {
+            UInt32[] ints = new UInt32[4];
+            ints[0] = BitConverter.ToUInt32(llUUID.Data, 0);
+            ints[1] = BitConverter.ToUInt32(llUUID.Data, 4);
+            ints[2] = BitConverter.ToUInt32(llUUID.Data, 8);
+            ints[3] = BitConverter.ToUInt32(llUUID.Data, 12);
+
+            return ints;
+        }
+
+        public LLUUID GetLLUUID()
+        {
+            return llUUID;
+        }
+
+        public uint CRC()
+        {
+            return llUUID.CRC();
+        }
+
+        public override int GetHashCode()
+        {
+            return llUUID.GetHashCode();
+        }
+
+        public void Combine(UUID other)
+        {
+            llUUID.Combine(other.GetLLUUID());
+        }
+
+        public void Combine(LLUUID other)
+        {
+            llUUID.Combine(other);
+        }
+
+        public override bool Equals(Object other)
+        {
+            return llUUID.Equals(other);
+        }
+
+        public static bool operator ==(UUID a, UUID b)
+        {
+            return a.llUUID.Equals(b.GetLLUUID());
+        }
+
+        public static bool operator !=(UUID a, UUID b)
+        {
+            return !a.llUUID.Equals(b.GetLLUUID());
+        }
+
+        public static bool operator ==(UUID a, LLUUID b)
+        {
+            return a.Equals(b);
+        }
+
+        public static bool operator !=(UUID a, LLUUID b)
+        {
+            return !a.Equals(b);
+        }
+    }
+}
diff --git a/OpenSim/Framework/General/UserProfile.cs b/OpenSim/Framework/General/UserProfile.cs
index 243208a..ec5a485 100644
--- a/OpenSim/Framework/General/UserProfile.cs
+++ b/OpenSim/Framework/General/UserProfile.cs
@@ -1,87 +1,87 @@
-/*

-* 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.Collections.Generic;

-using System.Security.Cryptography;

-using libsecondlife;

-using OpenSim.Framework.Inventory;

-

-namespace OpenSim.Framework.User

-{

-    public class UserProfile

-    {

-

-        public string firstname;

-        public string lastname;

-        public ulong homeregionhandle;

-        public LLVector3 homepos;

-        public LLVector3 homelookat;

-

-        public bool IsGridGod = false;

-        public bool IsLocal = true;     // will be used in future for visitors from foreign grids

-        public string AssetURL;

-        public string MD5passwd;

-

-        public LLUUID CurrentSessionID;

-        public LLUUID CurrentSecureSessionID;

-        public LLUUID UUID;

-        public Dictionary<LLUUID, uint> Circuits = new Dictionary<LLUUID, uint>();      // tracks circuit codes

-

-        public AgentInventory Inventory;

-

-        public UserProfile()

-        {

-            Circuits = new Dictionary<LLUUID, uint>();

-            Inventory = new AgentInventory();

-            homeregionhandle = Helpers.UIntsToLong((1000 * 256), (1000 * 256));

-            homepos = new LLVector3();

-            homelookat = new LLVector3();

-        }

-

-        public void InitSessionData()

-        {

-            RNGCryptoServiceProvider rand = new RNGCryptoServiceProvider();

-

-            byte[] randDataS = new byte[16];

-            byte[] randDataSS = new byte[16];

-

-            rand.GetBytes(randDataS);

-            rand.GetBytes(randDataSS);

-

-            CurrentSecureSessionID = new LLUUID(randDataSS,0);

-            CurrentSessionID = new LLUUID(randDataS,0);

-            

-        }

-

-        public void AddSimCircuit(uint circuitCode, LLUUID regionUUID)

-        {

-            if (this.Circuits.ContainsKey(regionUUID) == false)

-                this.Circuits.Add(regionUUID, circuitCode);

-        }

-

-    }

-}

+/*
+* 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.Collections.Generic;
+using System.Security.Cryptography;
+using libsecondlife;
+using OpenSim.Framework.Inventory;
+
+namespace OpenSim.Framework.User
+{
+    public class UserProfile
+    {
+
+        public string firstname;
+        public string lastname;
+        public ulong homeregionhandle;
+        public LLVector3 homepos;
+        public LLVector3 homelookat;
+
+        public bool IsGridGod = false;
+        public bool IsLocal = true;     // will be used in future for visitors from foreign grids
+        public string AssetURL;
+        public string MD5passwd;
+
+        public LLUUID CurrentSessionID;
+        public LLUUID CurrentSecureSessionID;
+        public LLUUID UUID;
+        public Dictionary<LLUUID, uint> Circuits = new Dictionary<LLUUID, uint>();      // tracks circuit codes
+
+        public AgentInventory Inventory;
+
+        public UserProfile()
+        {
+            Circuits = new Dictionary<LLUUID, uint>();
+            Inventory = new AgentInventory();
+            homeregionhandle = Helpers.UIntsToLong((1000 * 256), (1000 * 256));
+            homepos = new LLVector3();
+            homelookat = new LLVector3();
+        }
+
+        public void InitSessionData()
+        {
+            RNGCryptoServiceProvider rand = new RNGCryptoServiceProvider();
+
+            byte[] randDataS = new byte[16];
+            byte[] randDataSS = new byte[16];
+
+            rand.GetBytes(randDataS);
+            rand.GetBytes(randDataSS);
+
+            CurrentSecureSessionID = new LLUUID(randDataSS,0);
+            CurrentSessionID = new LLUUID(randDataS,0);
+            
+        }
+
+        public void AddSimCircuit(uint circuitCode, LLUUID regionUUID)
+        {
+            if (this.Circuits.ContainsKey(regionUUID) == false)
+                this.Circuits.Add(regionUUID, circuitCode);
+        }
+
+    }
+}
diff --git a/OpenSim/Framework/General/Util.cs b/OpenSim/Framework/General/Util.cs
index 13e3af2..3333ced 100644
--- a/OpenSim/Framework/General/Util.cs
+++ b/OpenSim/Framework/General/Util.cs
@@ -1,184 +1,184 @@
-/*

-* 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.Security.Cryptography;

-using System.Text;

-using libsecondlife;

-

-namespace OpenSim.Framework.Utilities

-{

-    public class Util

-    {

-        private static Random randomClass = new Random();

-        private static uint nextXferID = 5000;

-        private static object XferLock = new object();

-

-        public static ulong UIntsToLong(uint X, uint Y)

-        {

-            return Helpers.UIntsToLong(X, Y);

-        }

-

-        public static Random RandomClass

-        {

-            get

-            {

-                return randomClass;

-            }

-        }

-

-        public static uint GetNextXferID()

-        {

-            uint id = 0;

-            lock(XferLock)

-            {

-                id = nextXferID;

-                nextXferID++;

-            }

-            return id;

-        }

-

-        public static int UnixTimeSinceEpoch()

-        {

-            TimeSpan t = (DateTime.UtcNow - new DateTime(1970, 1, 1));

-            int timestamp = (int)t.TotalSeconds;

-            return timestamp;

-        }

-

-        public static string Md5Hash(string pass)

-        {

-            MD5 md5 = MD5CryptoServiceProvider.Create();

-            byte[] dataMd5 = md5.ComputeHash(Encoding.Default.GetBytes(pass));

-            StringBuilder sb = new StringBuilder();

-            for (int i = 0; i < dataMd5.Length; i++)

-                sb.AppendFormat("{0:x2}", dataMd5[i]);

-            return sb.ToString();

-        }

-

-        public static string GetRandomCapsPath()

-        {

-            LLUUID caps = LLUUID.Random();

-            string capsPath = caps.ToStringHyphenated();

-            capsPath = capsPath.Remove(capsPath.Length - 4, 4);

-            return capsPath;

-        }

-

-        //public static int fast_distance2d(int x, int y)

-        //{

-        //    x = System.Math.Abs(x);

-        //    y = System.Math.Abs(y);

-

-        //    int min = System.Math.Min(x, y);

-

-        //    return (x + y - (min >> 1) - (min >> 2) + (min >> 4));

-        //}

-

-        public static string FieldToString(byte[] bytes)

-        {

-            return FieldToString(bytes, String.Empty);

-        }

-

-        /// <summary>

-        /// Convert a variable length field (byte array) to a string, with a

-        /// field name prepended to each line of the output

-        /// </summary>

-        /// <remarks>If the byte array has unprintable characters in it, a 

-        /// hex dump will be put in the string instead</remarks>

-        /// <param name="bytes">The byte array to convert to a string</param>

-        /// <param name="fieldName">A field name to prepend to each line of output</param>

-        /// <returns>An ASCII string or a string containing a hex dump, minus 

-        /// the null terminator</returns>

-        public static string FieldToString(byte[] bytes, string fieldName)

-        {

-            // Check for a common case

-            if (bytes.Length == 0) return String.Empty;

-

-            StringBuilder output = new StringBuilder();

-            bool printable = true;

-

-            for (int i = 0; i < bytes.Length; ++i)

-            {

-                // Check if there are any unprintable characters in the array

-                if ((bytes[i] < 0x20 || bytes[i] > 0x7E) && bytes[i] != 0x09

-                    && bytes[i] != 0x0D && bytes[i] != 0x0A && bytes[i] != 0x00)

-                {

-                    printable = false;

-                    break;

-                }

-            }

-

-            if (printable)

-            {

-                if (fieldName.Length > 0)

-                {

-                    output.Append(fieldName);

-                    output.Append(": ");

-                }

-

-                if (bytes[bytes.Length - 1] == 0x00)

-                    output.Append(UTF8Encoding.UTF8.GetString(bytes, 0, bytes.Length - 1));

-                else

-                    output.Append(UTF8Encoding.UTF8.GetString(bytes));

-            }

-            else

-            {

-                for (int i = 0; i < bytes.Length; i += 16)

-                {

-                    if (i != 0)

-                        output.Append(Environment.NewLine);

-                    if (fieldName.Length > 0)

-                    {

-                        output.Append(fieldName);

-                        output.Append(": ");

-                    }

-

-                    for (int j = 0; j < 16; j++)

-                    {

-                        if ((i + j) < bytes.Length)

-                            output.Append(String.Format("{0:X2} ", bytes[i + j]));

-                        else

-                            output.Append("   ");

-                    }

-

-                    for (int j = 0; j < 16 && (i + j) < bytes.Length; j++)

-                    {

-                        if (bytes[i + j] >= 0x20 && bytes[i + j] < 0x7E)

-                            output.Append((char)bytes[i + j]);

-                        else

-                            output.Append(".");

-                    }

-                }

-            }

-

-            return output.ToString();

-        }

-        public Util()

-        {

-

-        }

-    }

-}

+/*
+* 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.Security.Cryptography;
+using System.Text;
+using libsecondlife;
+
+namespace OpenSim.Framework.Utilities
+{
+    public class Util
+    {
+        private static Random randomClass = new Random();
+        private static uint nextXferID = 5000;
+        private static object XferLock = new object();
+
+        public static ulong UIntsToLong(uint X, uint Y)
+        {
+            return Helpers.UIntsToLong(X, Y);
+        }
+
+        public static Random RandomClass
+        {
+            get
+            {
+                return randomClass;
+            }
+        }
+
+        public static uint GetNextXferID()
+        {
+            uint id = 0;
+            lock(XferLock)
+            {
+                id = nextXferID;
+                nextXferID++;
+            }
+            return id;
+        }
+
+        public static int UnixTimeSinceEpoch()
+        {
+            TimeSpan t = (DateTime.UtcNow - new DateTime(1970, 1, 1));
+            int timestamp = (int)t.TotalSeconds;
+            return timestamp;
+        }
+
+        public static string Md5Hash(string pass)
+        {
+            MD5 md5 = MD5CryptoServiceProvider.Create();
+            byte[] dataMd5 = md5.ComputeHash(Encoding.Default.GetBytes(pass));
+            StringBuilder sb = new StringBuilder();
+            for (int i = 0; i < dataMd5.Length; i++)
+                sb.AppendFormat("{0:x2}", dataMd5[i]);
+            return sb.ToString();
+        }
+
+        public static string GetRandomCapsPath()
+        {
+            LLUUID caps = LLUUID.Random();
+            string capsPath = caps.ToStringHyphenated();
+            capsPath = capsPath.Remove(capsPath.Length - 4, 4);
+            return capsPath;
+        }
+
+        //public static int fast_distance2d(int x, int y)
+        //{
+        //    x = System.Math.Abs(x);
+        //    y = System.Math.Abs(y);
+
+        //    int min = System.Math.Min(x, y);
+
+        //    return (x + y - (min >> 1) - (min >> 2) + (min >> 4));
+        //}
+
+        public static string FieldToString(byte[] bytes)
+        {
+            return FieldToString(bytes, String.Empty);
+        }
+
+        /// <summary>
+        /// Convert a variable length field (byte array) to a string, with a
+        /// field name prepended to each line of the output
+        /// </summary>
+        /// <remarks>If the byte array has unprintable characters in it, a 
+        /// hex dump will be put in the string instead</remarks>
+        /// <param name="bytes">The byte array to convert to a string</param>
+        /// <param name="fieldName">A field name to prepend to each line of output</param>
+        /// <returns>An ASCII string or a string containing a hex dump, minus 
+        /// the null terminator</returns>
+        public static string FieldToString(byte[] bytes, string fieldName)
+        {
+            // Check for a common case
+            if (bytes.Length == 0) return String.Empty;
+
+            StringBuilder output = new StringBuilder();
+            bool printable = true;
+
+            for (int i = 0; i < bytes.Length; ++i)
+            {
+                // Check if there are any unprintable characters in the array
+                if ((bytes[i] < 0x20 || bytes[i] > 0x7E) && bytes[i] != 0x09
+                    && bytes[i] != 0x0D && bytes[i] != 0x0A && bytes[i] != 0x00)
+                {
+                    printable = false;
+                    break;
+                }
+            }
+
+            if (printable)
+            {
+                if (fieldName.Length > 0)
+                {
+                    output.Append(fieldName);
+                    output.Append(": ");
+                }
+
+                if (bytes[bytes.Length - 1] == 0x00)
+                    output.Append(UTF8Encoding.UTF8.GetString(bytes, 0, bytes.Length - 1));
+                else
+                    output.Append(UTF8Encoding.UTF8.GetString(bytes));
+            }
+            else
+            {
+                for (int i = 0; i < bytes.Length; i += 16)
+                {
+                    if (i != 0)
+                        output.Append(Environment.NewLine);
+                    if (fieldName.Length > 0)
+                    {
+                        output.Append(fieldName);
+                        output.Append(": ");
+                    }
+
+                    for (int j = 0; j < 16; j++)
+                    {
+                        if ((i + j) < bytes.Length)
+                            output.Append(String.Format("{0:X2} ", bytes[i + j]));
+                        else
+                            output.Append("   ");
+                    }
+
+                    for (int j = 0; j < 16 && (i + j) < bytes.Length; j++)
+                    {
+                        if (bytes[i + j] >= 0x20 && bytes[i + j] < 0x7E)
+                            output.Append((char)bytes[i + j]);
+                        else
+                            output.Append(".");
+                    }
+                }
+            }
+
+            return output.ToString();
+        }
+        public Util()
+        {
+
+        }
+    }
+}