mass update of files to have native line endings

53 files changed, 6255 insertions, 6255 deletions

diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index 5aacecb..05fa963 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -1,362 +1,362 @@
-/*

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

-using System.Collections.Generic;

-using System.Text;

-using System.IO;

-using libsecondlife;

-using OpenSim.Framework.Servers;

-using OpenSim.Framework.Types;

-using OpenSim.Framework.Utilities;

-using OpenSim.Framework.Communications.Caches;

-

-namespace OpenSim.Region.Capabilities

-{

-    public delegate void UpLoadedTexture(string assetName, LLUUID assetID, LLUUID inventoryItem, byte[] data);

-

-    public class Caps

-    {

-        private string m_httpListenerHostName;

-        private int m_httpListenPort;

-        private string m_capsObjectPath = "00001-";

-        private string m_requestPath = "0000/";

-        private string m_mapLayerPath = "0001/";

-        private string m_newInventory = "0002/";

-       // private string m_requestTexture = "0003/";

-        private string m_notecardUpdatePath = "0004/";

-        //private string eventQueue = "0100/";

-        private BaseHttpServer httpListener;

-        private LLUUID agentID;

-        private AssetCache assetCache;

-        private int eventQueueCount = 1;

-        private Queue<string> CapsEventQueue = new Queue<string>();

-

-        public Caps(AssetCache assetCach, BaseHttpServer httpServer, string httpListen, int httpPort, string capsPath, LLUUID agent)

-        {

-            assetCache = assetCach;

-            m_capsObjectPath = capsPath;

-            httpListener = httpServer;

-            m_httpListenerHostName = httpListen;

-            m_httpListenPort = httpPort;

-            agentID = agent;

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

-        public void RegisterHandlers()

-        {

-            Console.WriteLine("registering CAPS handlers");

-            string capsBase = "/CAPS/" + m_capsObjectPath;

-

-            httpListener.AddStreamHandler(new LLSDStreamhandler<LLSDMapRequest, LLSDMapLayerResponse>("POST", capsBase + m_mapLayerPath, this.GetMapLayer ));

-            httpListener.AddStreamHandler( new LLSDStreamhandler<LLSDAssetUploadRequest, LLSDAssetUploadResponse>("POST", capsBase + m_newInventory, this.NewAgentInventoryRequest));

-

-            AddLegacyCapsHandler(httpListener, m_requestPath, CapsRequest);

-            AddLegacyCapsHandler(httpListener, m_notecardUpdatePath, NoteCardAgentInventory);

-        }

-

-

-        //[Obsolete("Use BaseHttpServer.AddStreamHandler(new LLSDStreamHandler( LLSDMethod delegate )) instead.")]

-        //Commented out the obsolete as at this time the first caps request can not use the new Caps method 

-        //as the sent type is a array and not a map and the deserialising doesn't deal properly with arrays.

-        private void AddLegacyCapsHandler(BaseHttpServer httpListener, string path, RestMethod restMethod)

-        {

-            string capsBase = "/CAPS/" + m_capsObjectPath;

-            httpListener.AddStreamHandler(new RestStreamHandler("POST", capsBase + path, restMethod));

-        }

-       

-        /// <summary>

-        /// 

-        /// </summary>

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

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

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

-        /// <returns></returns>

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

-        {

-            //Console.WriteLine("caps request " + request);

-            string result = LLSDHelpers.SerialiseLLSDReply(this.GetCapabilities());

-            return result;

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

-        /// <returns></returns>

-        protected LLSDCapsDetails GetCapabilities()

-        {

-            LLSDCapsDetails caps = new LLSDCapsDetails();

-            string capsBaseUrl = "http://" + m_httpListenerHostName + ":" + m_httpListenPort.ToString() + "/CAPS/" + m_capsObjectPath;

-            caps.MapLayer = capsBaseUrl + m_mapLayerPath;

-            caps.NewFileAgentInventory = capsBaseUrl + m_newInventory;

-            //caps.RequestTextureDownload = capsBaseUrl + m_requestTexture;

-            caps.UpdateNotecardAgentInventory = capsBaseUrl + m_notecardUpdatePath;

-            return caps;

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

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

-        /// <returns></returns>

-        public LLSDMapLayerResponse GetMapLayer(LLSDMapRequest mapReq)

-        {

-            LLSDMapLayerResponse mapResponse = new LLSDMapLayerResponse();

-            mapResponse.LayerData.Array.Add(this.GetLLSDMapLayerResponse());

-            return mapResponse;

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

-        /// <returns></returns>

-        protected LLSDMapLayer GetLLSDMapLayerResponse()

-        {

-            LLSDMapLayer mapLayer = new LLSDMapLayer();

-            mapLayer.Right = 5000;

-            mapLayer.Top = 5000;

-            mapLayer.ImageID = new LLUUID("00000000-0000-0000-9999-000000000006");

-            return mapLayer;

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

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

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

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

-        /// <returns></returns>

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

-        {

-            Console.WriteLine("texture request " + request);

-            // Needs implementing (added to remove compiler warning)

-            return "";

-        }

-

-        #region EventQueue (Currently not enabled)

-        /// <summary>

-        /// 

-        /// </summary>

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

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

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

-        /// <returns></returns>

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

-        {

-            string res = "";

-            

-            if (this.CapsEventQueue.Count > 0)

-            {

-                lock (this.CapsEventQueue)

-                {

-                    string item = CapsEventQueue.Dequeue();

-                    res = item;

-                }

-            }

-            else

-            {

-                res = this.CreateEmptyEventResponse();

-            }

-            return res;

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

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

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

-        /// <returns></returns>

-        public string CreateEstablishAgentComms(string caps, string ipAddressPort)

-        {

-            LLSDCapEvent eventItem = new LLSDCapEvent();

-            eventItem.id = eventQueueCount;

-            //should be creating a EstablishAgentComms item, but there isn't a class for it yet

-            eventItem.events.Array.Add(new LLSDEmpty());

-            string res = LLSDHelpers.SerialiseLLSDReply(eventItem);

-            eventQueueCount++;

-            

-            this.CapsEventQueue.Enqueue(res);

-            return res;

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

-        /// <returns></returns>

-        public string CreateEmptyEventResponse()

-        {

-            LLSDCapEvent eventItem = new LLSDCapEvent();

-            eventItem.id = eventQueueCount;

-            eventItem.events.Array.Add(new LLSDEmpty());

-            string res = LLSDHelpers.SerialiseLLSDReply(eventItem);

-            eventQueueCount++;

-            return res;

-        }

-        #endregion

-

-        /// <summary>

-        /// 

-        /// </summary>

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

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

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

-        /// <returns></returns>

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

-        {

-            Console.WriteLine("notecard update request " + request);

-            string assetName = "notecardupdate";

-            string capsBase = "/CAPS/" + m_capsObjectPath;

-            LLUUID newAsset = LLUUID.Random();

-            LLUUID newInvItem = LLUUID.Random();

-            string uploaderPath = Util.RandomClass.Next(5000, 8000).ToString("0000");

-

-            AssetUploader uploader = new AssetUploader(assetName, newAsset, newInvItem, capsBase + uploaderPath, this.httpListener);

-            httpListener.AddStreamHandler(new BinaryStreamHandler("POST", capsBase + uploaderPath, uploader.uploaderCaps));

-            string uploaderURL = "http://" + m_httpListenerHostName + ":" + m_httpListenPort.ToString() + capsBase + uploaderPath;

-

-            LLSDAssetUploadResponse uploadResponse = new LLSDAssetUploadResponse();

-            uploadResponse.uploader = uploaderURL;

-            uploadResponse.state = "upload";

-            //   uploader.OnUpLoad += this.UploadCompleteHandler;

-            return LLSDHelpers.SerialiseLLSDReply(uploadResponse);

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

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

-        /// <returns></returns>

-        public LLSDAssetUploadResponse NewAgentInventoryRequest(LLSDAssetUploadRequest llsdRequest)

-        {

-          //  Console.WriteLine("asset upload request via CAPS");

-            string assetName = llsdRequest.name;

-            string capsBase = "/CAPS/" + m_capsObjectPath;

-            LLUUID newAsset = LLUUID.Random();

-            LLUUID newInvItem = LLUUID.Random();

-            string uploaderPath = Util.RandomClass.Next(5000, 8000).ToString("0000");

-

-            AssetUploader uploader = new AssetUploader(assetName, newAsset, newInvItem, capsBase + uploaderPath, this.httpListener);

-            httpListener.AddStreamHandler(new BinaryStreamHandler("POST", capsBase + uploaderPath, uploader.uploaderCaps));

-            string uploaderURL = "http://" + m_httpListenerHostName + ":" + m_httpListenPort.ToString() + capsBase + uploaderPath;

-

-            LLSDAssetUploadResponse uploadResponse = new LLSDAssetUploadResponse();

-            uploadResponse.uploader = uploaderURL;

-            uploadResponse.state = "upload";

-            uploader.OnUpLoad += this.UploadCompleteHandler;

-            return uploadResponse;

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

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

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

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

-        public void UploadCompleteHandler(string assetName, LLUUID assetID, LLUUID inventoryItem, byte[] data)

-        {

-            AssetBase asset;

-            asset = new AssetBase();

-            asset.FullID = assetID;

-            asset.Type = 0;

-            asset.InvType = 0;

-            asset.Name = assetName; 

-            asset.Data = data;

-            this.assetCache.AddAsset(asset);

-        }

-

-        public class AssetUploader

-        {

-            public event UpLoadedTexture OnUpLoad;

-

-            private string uploaderPath = "";

-            private LLUUID newAssetID;

-            private LLUUID inventoryItemID;

-            private BaseHttpServer httpListener;

-            private bool SaveImages = false;

-            private string m_assetName = "";

-

-            /// <summary>

-            /// 

-            /// </summary>

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

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

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

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

-            public AssetUploader(string assetName, LLUUID assetID, LLUUID inventoryItem, string path, BaseHttpServer httpServer)

-            {

-                m_assetName = assetName;

-                newAssetID = assetID;

-                inventoryItemID = inventoryItem;

-                uploaderPath = path;

-                httpListener = httpServer;

-            }

-

-            /// <summary>

-            /// 

-            /// </summary>

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

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

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

-            /// <returns></returns>

-            public string uploaderCaps(byte[] data, string path, string param)

-            {

-                LLUUID inv = this.inventoryItemID;

-                string res = "";

-                LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete();

-                uploadComplete.new_asset = newAssetID.ToStringHyphenated();

-                uploadComplete.new_inventory_item = inv;

-                uploadComplete.state = "complete";

-

-                res = LLSDHelpers.SerialiseLLSDReply(uploadComplete);

-             

-                httpListener.RemoveStreamHandler("POST", uploaderPath);

-

-                if(this.SaveImages)

-                    this.SaveImageToFile(m_assetName + ".jp2", data);

-

-                if (OnUpLoad != null)

-                {

-                    OnUpLoad(m_assetName, newAssetID, inv, data);

-                }

-                

-                return res;

-            }

-

-            private void SaveImageToFile(string filename, byte[] data)

-            {

-               FileStream fs = File.Create(filename);

-               BinaryWriter bw = new BinaryWriter(fs);

-               bw.Write(data);

-               bw.Close();

-               fs.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.
+* 
+*/
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Text;
+using System.IO;
+using libsecondlife;
+using OpenSim.Framework.Servers;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Utilities;
+using OpenSim.Framework.Communications.Caches;
+
+namespace OpenSim.Region.Capabilities
+{
+    public delegate void UpLoadedTexture(string assetName, LLUUID assetID, LLUUID inventoryItem, byte[] data);
+
+    public class Caps
+    {
+        private string m_httpListenerHostName;
+        private int m_httpListenPort;
+        private string m_capsObjectPath = "00001-";
+        private string m_requestPath = "0000/";
+        private string m_mapLayerPath = "0001/";
+        private string m_newInventory = "0002/";
+       // private string m_requestTexture = "0003/";
+        private string m_notecardUpdatePath = "0004/";
+        //private string eventQueue = "0100/";
+        private BaseHttpServer httpListener;
+        private LLUUID agentID;
+        private AssetCache assetCache;
+        private int eventQueueCount = 1;
+        private Queue<string> CapsEventQueue = new Queue<string>();
+
+        public Caps(AssetCache assetCach, BaseHttpServer httpServer, string httpListen, int httpPort, string capsPath, LLUUID agent)
+        {
+            assetCache = assetCach;
+            m_capsObjectPath = capsPath;
+            httpListener = httpServer;
+            m_httpListenerHostName = httpListen;
+            m_httpListenPort = httpPort;
+            agentID = agent;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public void RegisterHandlers()
+        {
+            Console.WriteLine("registering CAPS handlers");
+            string capsBase = "/CAPS/" + m_capsObjectPath;
+
+            httpListener.AddStreamHandler(new LLSDStreamhandler<LLSDMapRequest, LLSDMapLayerResponse>("POST", capsBase + m_mapLayerPath, this.GetMapLayer ));
+            httpListener.AddStreamHandler( new LLSDStreamhandler<LLSDAssetUploadRequest, LLSDAssetUploadResponse>("POST", capsBase + m_newInventory, this.NewAgentInventoryRequest));
+
+            AddLegacyCapsHandler(httpListener, m_requestPath, CapsRequest);
+            AddLegacyCapsHandler(httpListener, m_notecardUpdatePath, NoteCardAgentInventory);
+        }
+
+
+        //[Obsolete("Use BaseHttpServer.AddStreamHandler(new LLSDStreamHandler( LLSDMethod delegate )) instead.")]
+        //Commented out the obsolete as at this time the first caps request can not use the new Caps method 
+        //as the sent type is a array and not a map and the deserialising doesn't deal properly with arrays.
+        private void AddLegacyCapsHandler(BaseHttpServer httpListener, string path, RestMethod restMethod)
+        {
+            string capsBase = "/CAPS/" + m_capsObjectPath;
+            httpListener.AddStreamHandler(new RestStreamHandler("POST", capsBase + path, restMethod));
+        }
+       
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="request"></param>
+        /// <param name="path"></param>
+        /// <param name="param"></param>
+        /// <returns></returns>
+        public string CapsRequest(string request, string path, string param)
+        {
+            //Console.WriteLine("caps request " + request);
+            string result = LLSDHelpers.SerialiseLLSDReply(this.GetCapabilities());
+            return result;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <returns></returns>
+        protected LLSDCapsDetails GetCapabilities()
+        {
+            LLSDCapsDetails caps = new LLSDCapsDetails();
+            string capsBaseUrl = "http://" + m_httpListenerHostName + ":" + m_httpListenPort.ToString() + "/CAPS/" + m_capsObjectPath;
+            caps.MapLayer = capsBaseUrl + m_mapLayerPath;
+            caps.NewFileAgentInventory = capsBaseUrl + m_newInventory;
+            //caps.RequestTextureDownload = capsBaseUrl + m_requestTexture;
+            caps.UpdateNotecardAgentInventory = capsBaseUrl + m_notecardUpdatePath;
+            return caps;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="mapReq"></param>
+        /// <returns></returns>
+        public LLSDMapLayerResponse GetMapLayer(LLSDMapRequest mapReq)
+        {
+            LLSDMapLayerResponse mapResponse = new LLSDMapLayerResponse();
+            mapResponse.LayerData.Array.Add(this.GetLLSDMapLayerResponse());
+            return mapResponse;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <returns></returns>
+        protected LLSDMapLayer GetLLSDMapLayerResponse()
+        {
+            LLSDMapLayer mapLayer = new LLSDMapLayer();
+            mapLayer.Right = 5000;
+            mapLayer.Top = 5000;
+            mapLayer.ImageID = new LLUUID("00000000-0000-0000-9999-000000000006");
+            return mapLayer;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="request"></param>
+        /// <param name="path"></param>
+        /// <param name="param"></param>
+        /// <returns></returns>
+        public string RequestTexture(string request, string path, string param)
+        {
+            Console.WriteLine("texture request " + request);
+            // Needs implementing (added to remove compiler warning)
+            return "";
+        }
+
+        #region EventQueue (Currently not enabled)
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="request"></param>
+        /// <param name="path"></param>
+        /// <param name="param"></param>
+        /// <returns></returns>
+        public string ProcessEventQueue(string request, string path, string param)
+        {
+            string res = "";
+            
+            if (this.CapsEventQueue.Count > 0)
+            {
+                lock (this.CapsEventQueue)
+                {
+                    string item = CapsEventQueue.Dequeue();
+                    res = item;
+                }
+            }
+            else
+            {
+                res = this.CreateEmptyEventResponse();
+            }
+            return res;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="caps"></param>
+        /// <param name="ipAddressPort"></param>
+        /// <returns></returns>
+        public string CreateEstablishAgentComms(string caps, string ipAddressPort)
+        {
+            LLSDCapEvent eventItem = new LLSDCapEvent();
+            eventItem.id = eventQueueCount;
+            //should be creating a EstablishAgentComms item, but there isn't a class for it yet
+            eventItem.events.Array.Add(new LLSDEmpty());
+            string res = LLSDHelpers.SerialiseLLSDReply(eventItem);
+            eventQueueCount++;
+            
+            this.CapsEventQueue.Enqueue(res);
+            return res;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <returns></returns>
+        public string CreateEmptyEventResponse()
+        {
+            LLSDCapEvent eventItem = new LLSDCapEvent();
+            eventItem.id = eventQueueCount;
+            eventItem.events.Array.Add(new LLSDEmpty());
+            string res = LLSDHelpers.SerialiseLLSDReply(eventItem);
+            eventQueueCount++;
+            return res;
+        }
+        #endregion
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="request"></param>
+        /// <param name="path"></param>
+        /// <param name="param"></param>
+        /// <returns></returns>
+        public string NoteCardAgentInventory(string request, string path, string param)
+        {
+            Console.WriteLine("notecard update request " + request);
+            string assetName = "notecardupdate";
+            string capsBase = "/CAPS/" + m_capsObjectPath;
+            LLUUID newAsset = LLUUID.Random();
+            LLUUID newInvItem = LLUUID.Random();
+            string uploaderPath = Util.RandomClass.Next(5000, 8000).ToString("0000");
+
+            AssetUploader uploader = new AssetUploader(assetName, newAsset, newInvItem, capsBase + uploaderPath, this.httpListener);
+            httpListener.AddStreamHandler(new BinaryStreamHandler("POST", capsBase + uploaderPath, uploader.uploaderCaps));
+            string uploaderURL = "http://" + m_httpListenerHostName + ":" + m_httpListenPort.ToString() + capsBase + uploaderPath;
+
+            LLSDAssetUploadResponse uploadResponse = new LLSDAssetUploadResponse();
+            uploadResponse.uploader = uploaderURL;
+            uploadResponse.state = "upload";
+            //   uploader.OnUpLoad += this.UploadCompleteHandler;
+            return LLSDHelpers.SerialiseLLSDReply(uploadResponse);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="llsdRequest"></param>
+        /// <returns></returns>
+        public LLSDAssetUploadResponse NewAgentInventoryRequest(LLSDAssetUploadRequest llsdRequest)
+        {
+          //  Console.WriteLine("asset upload request via CAPS");
+            string assetName = llsdRequest.name;
+            string capsBase = "/CAPS/" + m_capsObjectPath;
+            LLUUID newAsset = LLUUID.Random();
+            LLUUID newInvItem = LLUUID.Random();
+            string uploaderPath = Util.RandomClass.Next(5000, 8000).ToString("0000");
+
+            AssetUploader uploader = new AssetUploader(assetName, newAsset, newInvItem, capsBase + uploaderPath, this.httpListener);
+            httpListener.AddStreamHandler(new BinaryStreamHandler("POST", capsBase + uploaderPath, uploader.uploaderCaps));
+            string uploaderURL = "http://" + m_httpListenerHostName + ":" + m_httpListenPort.ToString() + capsBase + uploaderPath;
+
+            LLSDAssetUploadResponse uploadResponse = new LLSDAssetUploadResponse();
+            uploadResponse.uploader = uploaderURL;
+            uploadResponse.state = "upload";
+            uploader.OnUpLoad += this.UploadCompleteHandler;
+            return uploadResponse;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="assetID"></param>
+        /// <param name="inventoryItem"></param>
+        /// <param name="data"></param>
+        public void UploadCompleteHandler(string assetName, LLUUID assetID, LLUUID inventoryItem, byte[] data)
+        {
+            AssetBase asset;
+            asset = new AssetBase();
+            asset.FullID = assetID;
+            asset.Type = 0;
+            asset.InvType = 0;
+            asset.Name = assetName; 
+            asset.Data = data;
+            this.assetCache.AddAsset(asset);
+        }
+
+        public class AssetUploader
+        {
+            public event UpLoadedTexture OnUpLoad;
+
+            private string uploaderPath = "";
+            private LLUUID newAssetID;
+            private LLUUID inventoryItemID;
+            private BaseHttpServer httpListener;
+            private bool SaveImages = false;
+            private string m_assetName = "";
+
+            /// <summary>
+            /// 
+            /// </summary>
+            /// <param name="assetID"></param>
+            /// <param name="inventoryItem"></param>
+            /// <param name="path"></param>
+            /// <param name="httpServer"></param>
+            public AssetUploader(string assetName, LLUUID assetID, LLUUID inventoryItem, string path, BaseHttpServer httpServer)
+            {
+                m_assetName = assetName;
+                newAssetID = assetID;
+                inventoryItemID = inventoryItem;
+                uploaderPath = path;
+                httpListener = httpServer;
+            }
+
+            /// <summary>
+            /// 
+            /// </summary>
+            /// <param name="data"></param>
+            /// <param name="path"></param>
+            /// <param name="param"></param>
+            /// <returns></returns>
+            public string uploaderCaps(byte[] data, string path, string param)
+            {
+                LLUUID inv = this.inventoryItemID;
+                string res = "";
+                LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete();
+                uploadComplete.new_asset = newAssetID.ToStringHyphenated();
+                uploadComplete.new_inventory_item = inv;
+                uploadComplete.state = "complete";
+
+                res = LLSDHelpers.SerialiseLLSDReply(uploadComplete);
+             
+                httpListener.RemoveStreamHandler("POST", uploaderPath);
+
+                if(this.SaveImages)
+                    this.SaveImageToFile(m_assetName + ".jp2", data);
+
+                if (OnUpLoad != null)
+                {
+                    OnUpLoad(m_assetName, newAssetID, inv, data);
+                }
+                
+                return res;
+            }
+
+            private void SaveImageToFile(string filename, byte[] data)
+            {
+               FileStream fs = File.Create(filename);
+               BinaryWriter bw = new BinaryWriter(fs);
+               bw.Write(data);
+               bw.Close();
+               fs.Close();
+            }
+        }
+    }
+}
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDArray.cs b/OpenSim/Framework/Communications/Capabilities/LLSDArray.cs
index e04849f..d3e1979 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDArray.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDArray.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 System.Collections;

-

-namespace OpenSim.Region.Capabilities

-{

-    [LLSDType("ARRAY")]

-    public class LLSDArray

-    {

-        public ArrayList Array = new ArrayList();

-

-        public LLSDArray()

-        {

-

-        }

-    }

-}

+/*
+* 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;
+
+namespace OpenSim.Region.Capabilities
+{
+    [LLSDType("ARRAY")]
+    public class LLSDArray
+    {
+        public ArrayList Array = new ArrayList();
+
+        public LLSDArray()
+        {
+
+        }
+    }
+}
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadComplete.cs b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadComplete.cs
index ce373c0..db9836c 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadComplete.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadComplete.cs
@@ -1,45 +1,45 @@
-/*

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

-{

-    [LLSDType("MAP")]

-    public class LLSDAssetUploadComplete

-    {

-        public string new_asset = "";

-        public LLUUID new_inventory_item = LLUUID.Zero;

-        public string state = "";

-        //public bool success = false;

-

-        public LLSDAssetUploadComplete()

-        {

-

-        }

-    }

-}

+/*
+* 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.Region.Capabilities
+{
+    [LLSDType("MAP")]
+    public class LLSDAssetUploadComplete
+    {
+        public string new_asset = "";
+        public LLUUID new_inventory_item = LLUUID.Zero;
+        public string state = "";
+        //public bool success = false;
+
+        public LLSDAssetUploadComplete()
+        {
+
+        }
+    }
+}
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs
index 7ef77cb..0096fb1 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs
@@ -1,21 +1,21 @@
-using System;

-using System.Collections.Generic;

-using System.Text;

-using libsecondlife;

-

-namespace OpenSim.Region.Capabilities

-{

-    [LLSDMap]

-    public class LLSDAssetUploadRequest

-    {

-        public string asset_type = "";

-        public string description = "";

-        public LLUUID folder_id = LLUUID.Zero;

-        public string inventory_type = "";

-        public string name = "";

-

-        public LLSDAssetUploadRequest()

-        {

-        }

-    }

-}

+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+
+namespace OpenSim.Region.Capabilities
+{
+    [LLSDMap]
+    public class LLSDAssetUploadRequest
+    {
+        public string asset_type = "";
+        public string description = "";
+        public LLUUID folder_id = LLUUID.Zero;
+        public string inventory_type = "";
+        public string name = "";
+
+        public LLSDAssetUploadRequest()
+        {
+        }
+    }
+}
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs
index 1a620ae..2a2a5d1 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs
@@ -1,18 +1,18 @@
-using System;

-using System.Collections.Generic;

-using System.Text;

-

-namespace OpenSim.Region.Capabilities

-{

-    [LLSDMap]

-    public class LLSDAssetUploadResponse

-    {

-        public string uploader = "";

-        public string state = "";

-

-        public LLSDAssetUploadResponse()

-        {

-

-        }

-    }

-}

+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenSim.Region.Capabilities
+{
+    [LLSDMap]
+    public class LLSDAssetUploadResponse
+    {
+        public string uploader = "";
+        public string state = "";
+
+        public LLSDAssetUploadResponse()
+        {
+
+        }
+    }
+}
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDCapEvent.cs b/OpenSim/Framework/Communications/Capabilities/LLSDCapEvent.cs
index 51b4fe0..2c2689b 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDCapEvent.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDCapEvent.cs
@@ -1,41 +1,41 @@
-/*

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

-{

-    [LLSDType("MAP")]

-    public class LLSDCapEvent

-    {

-        public int id = 0;

-        public LLSDArray events = new LLSDArray();

-

-        public LLSDCapEvent()

-        {

-

-        }

-    }

-}

+/*
+* 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.Region.Capabilities
+{
+    [LLSDType("MAP")]
+    public class LLSDCapEvent
+    {
+        public int id = 0;
+        public LLSDArray events = new LLSDArray();
+
+        public LLSDCapEvent()
+        {
+
+        }
+    }
+}
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDCapsDetails.cs b/OpenSim/Framework/Communications/Capabilities/LLSDCapsDetails.cs
index 3b6a629..cae7e97 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDCapsDetails.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDCapsDetails.cs
@@ -1,18 +1,18 @@
-namespace OpenSim.Region.Capabilities

-{

-    [LLSDType("MAP")]

-    public class LLSDCapsDetails

-    {

-        public string MapLayer = "";

-        public string NewFileAgentInventory = "";

-        //public string EventQueueGet = "";

-        //public string RequestTextureDownload = "";

-        //public string ChatSessionRequest = "";

-        public string UpdateNotecardAgentInventory = "";

-

-        public LLSDCapsDetails()

-        {

-

-        }

-    }

-}

+namespace OpenSim.Region.Capabilities
+{
+    [LLSDType("MAP")]
+    public class LLSDCapsDetails
+    {
+        public string MapLayer = "";
+        public string NewFileAgentInventory = "";
+        //public string EventQueueGet = "";
+        //public string RequestTextureDownload = "";
+        //public string ChatSessionRequest = "";
+        public string UpdateNotecardAgentInventory = "";
+
+        public LLSDCapsDetails()
+        {
+
+        }
+    }
+}
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDEmpty.cs b/OpenSim/Framework/Communications/Capabilities/LLSDEmpty.cs
index d79c09e..ca27c9d 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDEmpty.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDEmpty.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.Region.Capabilities

-{

-    [LLSDType("MAP")]

-    public class LLSDEmpty

-    {

-        public LLSDEmpty()

-        {

-

-        }

-    }

-}

+/*
+* 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.Region.Capabilities
+{
+    [LLSDType("MAP")]
+    public class LLSDEmpty
+    {
+        public LLSDEmpty()
+        {
+
+        }
+    }
+}
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDHelpers.cs b/OpenSim/Framework/Communications/Capabilities/LLSDHelpers.cs
index 19ef0c9..efeb9b1 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDHelpers.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDHelpers.cs
@@ -1,164 +1,164 @@
-/*

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

-using System.IO;

-using System.Reflection;

-using System.Xml;

-using libsecondlife;

-

-namespace OpenSim.Region.Capabilities

-{

-    public class LLSDHelpers

-    {

-        public static string SerialiseLLSDReply(object obj)

-        {

-            StringWriter sw = new StringWriter();

-            XmlTextWriter writer = new XmlTextWriter(sw);

-            writer.Formatting = Formatting.None;

-            writer.WriteStartElement(String.Empty, "llsd", String.Empty);

-            SerializeLLSDType(writer, obj);

-            writer.WriteEndElement();

-            writer.Close();

-            return sw.ToString();

-        }

-

-        public static void SerializeLLSDType(XmlTextWriter writer, object obj)

-        {

-            Type myType = obj.GetType();

-            LLSDType[] llsdattributes = (LLSDType[])myType.GetCustomAttributes(typeof(LLSDType), false);

-            if (llsdattributes.Length > 0)

-            {

-                switch (llsdattributes[0].ObjectType)

-                {

-                    case "MAP":

-                        writer.WriteStartElement(String.Empty, "map", String.Empty);

-                        FieldInfo[] fields = myType.GetFields();

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

-                        {

-                            object fieldValue = fields[i].GetValue(obj);

-                            LLSDType[] fieldAttributes = (LLSDType[])fieldValue.GetType().GetCustomAttributes(typeof(LLSDType), false);

-                            if (fieldAttributes.Length > 0)

-                            {

-                                writer.WriteStartElement(String.Empty, "key", String.Empty);

-                                writer.WriteString(fields[i].Name);

-                                writer.WriteEndElement();

-                                SerializeLLSDType(writer, fieldValue);

-                            }

-                            else

-                            {

-                                writer.WriteStartElement(String.Empty, "key", String.Empty);

-                                writer.WriteString(fields[i].Name);

-                                writer.WriteEndElement();

-                                LLSD.LLSDWriteOne(writer, fieldValue);

-                            }

-                        }

-                        writer.WriteEndElement();

-                        break;

-                    case "ARRAY":

-                        // LLSDArray arrayObject = obj as LLSDArray;

-                        // ArrayList a = arrayObject.Array;

-                        ArrayList a = (ArrayList)obj.GetType().GetField("Array").GetValue(obj);

-                        if (a != null)

-                        {

-                            writer.WriteStartElement(String.Empty, "array", String.Empty);

-                            foreach (object item in a)

-                            {

-                                SerializeLLSDType(writer, item);

-                            }

-                            writer.WriteEndElement();

-                        }

-                        break;

-                }

-            }

-            else

-            {

-                LLSD.LLSDWriteOne(writer, obj);

-            }

-        }

-

-        public static object DeserialiseLLSDMap(Hashtable llsd, object obj)

-        {

-            Type myType = obj.GetType();

-            LLSDType[] llsdattributes = (LLSDType[])myType.GetCustomAttributes(typeof(LLSDType), false);

-            if (llsdattributes.Length > 0)

-            {

-                switch (llsdattributes[0].ObjectType)

-                {

-                    case "MAP":

-                        IDictionaryEnumerator enumerator = llsd.GetEnumerator();

-                        while (enumerator.MoveNext())

-                        {

-                            FieldInfo field = myType.GetField((string)enumerator.Key);

-                            if (field != null)

-                            {

-                                if (enumerator.Value is Hashtable)

-                                {

-                                    object fieldValue = field.GetValue(obj);

-                                    DeserialiseLLSDMap((Hashtable) enumerator.Value, fieldValue);

-                                }

-                                else if (enumerator.Value is ArrayList)

-                                {

-                                    object fieldValue = field.GetValue(obj);

-                                    fieldValue.GetType().GetField("Array").SetValue(fieldValue, enumerator.Value);

-                                    //TODO

-                                    // the LLSD map/array types in the array need to be deserialised

-                                    // but first we need to know the right class to deserialise them into. 

-                                }

-                                else

-                                {

-                                    field.SetValue(obj, enumerator.Value);

-                                }

-                            }

-                        }

-                        break;

-                }

-            }

-            return obj;

-        }

-    }

-

-    

-

-    

-

-   

-

-    

-

-    

-

-    

-

-    

-

-    

-

-

-    

-}

+/*
+* 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.Collections;
+using System.IO;
+using System.Reflection;
+using System.Xml;
+using libsecondlife;
+
+namespace OpenSim.Region.Capabilities
+{
+    public class LLSDHelpers
+    {
+        public static string SerialiseLLSDReply(object obj)
+        {
+            StringWriter sw = new StringWriter();
+            XmlTextWriter writer = new XmlTextWriter(sw);
+            writer.Formatting = Formatting.None;
+            writer.WriteStartElement(String.Empty, "llsd", String.Empty);
+            SerializeLLSDType(writer, obj);
+            writer.WriteEndElement();
+            writer.Close();
+            return sw.ToString();
+        }
+
+        public static void SerializeLLSDType(XmlTextWriter writer, object obj)
+        {
+            Type myType = obj.GetType();
+            LLSDType[] llsdattributes = (LLSDType[])myType.GetCustomAttributes(typeof(LLSDType), false);
+            if (llsdattributes.Length > 0)
+            {
+                switch (llsdattributes[0].ObjectType)
+                {
+                    case "MAP":
+                        writer.WriteStartElement(String.Empty, "map", String.Empty);
+                        FieldInfo[] fields = myType.GetFields();
+                        for (int i = 0; i < fields.Length; i++)
+                        {
+                            object fieldValue = fields[i].GetValue(obj);
+                            LLSDType[] fieldAttributes = (LLSDType[])fieldValue.GetType().GetCustomAttributes(typeof(LLSDType), false);
+                            if (fieldAttributes.Length > 0)
+                            {
+                                writer.WriteStartElement(String.Empty, "key", String.Empty);
+                                writer.WriteString(fields[i].Name);
+                                writer.WriteEndElement();
+                                SerializeLLSDType(writer, fieldValue);
+                            }
+                            else
+                            {
+                                writer.WriteStartElement(String.Empty, "key", String.Empty);
+                                writer.WriteString(fields[i].Name);
+                                writer.WriteEndElement();
+                                LLSD.LLSDWriteOne(writer, fieldValue);
+                            }
+                        }
+                        writer.WriteEndElement();
+                        break;
+                    case "ARRAY":
+                        // LLSDArray arrayObject = obj as LLSDArray;
+                        // ArrayList a = arrayObject.Array;
+                        ArrayList a = (ArrayList)obj.GetType().GetField("Array").GetValue(obj);
+                        if (a != null)
+                        {
+                            writer.WriteStartElement(String.Empty, "array", String.Empty);
+                            foreach (object item in a)
+                            {
+                                SerializeLLSDType(writer, item);
+                            }
+                            writer.WriteEndElement();
+                        }
+                        break;
+                }
+            }
+            else
+            {
+                LLSD.LLSDWriteOne(writer, obj);
+            }
+        }
+
+        public static object DeserialiseLLSDMap(Hashtable llsd, object obj)
+        {
+            Type myType = obj.GetType();
+            LLSDType[] llsdattributes = (LLSDType[])myType.GetCustomAttributes(typeof(LLSDType), false);
+            if (llsdattributes.Length > 0)
+            {
+                switch (llsdattributes[0].ObjectType)
+                {
+                    case "MAP":
+                        IDictionaryEnumerator enumerator = llsd.GetEnumerator();
+                        while (enumerator.MoveNext())
+                        {
+                            FieldInfo field = myType.GetField((string)enumerator.Key);
+                            if (field != null)
+                            {
+                                if (enumerator.Value is Hashtable)
+                                {
+                                    object fieldValue = field.GetValue(obj);
+                                    DeserialiseLLSDMap((Hashtable) enumerator.Value, fieldValue);
+                                }
+                                else if (enumerator.Value is ArrayList)
+                                {
+                                    object fieldValue = field.GetValue(obj);
+                                    fieldValue.GetType().GetField("Array").SetValue(fieldValue, enumerator.Value);
+                                    //TODO
+                                    // the LLSD map/array types in the array need to be deserialised
+                                    // but first we need to know the right class to deserialise them into. 
+                                }
+                                else
+                                {
+                                    field.SetValue(obj, enumerator.Value);
+                                }
+                            }
+                        }
+                        break;
+                }
+            }
+            return obj;
+        }
+    }
+
+    
+
+    
+
+   
+
+    
+
+    
+
+    
+
+    
+
+    
+
+
+    
+}
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDMapLayer.cs b/OpenSim/Framework/Communications/Capabilities/LLSDMapLayer.cs
index 566d0e9..e0c006c 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDMapLayer.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDMapLayer.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.Region.Capabilities

-{

-    [LLSDType("MAP")]

-    public class LLSDMapLayer

-    {

-        public int Left = 0;

-        public int Right = 0;

-        public int Top = 0;

-        public int Bottom = 0;

-        public LLUUID ImageID = LLUUID.Zero;

-

-        public LLSDMapLayer()

-        {

-

-        }

-    }

-}

+/*
+* 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.Region.Capabilities
+{
+    [LLSDType("MAP")]
+    public class LLSDMapLayer
+    {
+        public int Left = 0;
+        public int Right = 0;
+        public int Top = 0;
+        public int Bottom = 0;
+        public LLUUID ImageID = LLUUID.Zero;
+
+        public LLSDMapLayer()
+        {
+
+        }
+    }
+}
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDMapLayerResponse.cs b/OpenSim/Framework/Communications/Capabilities/LLSDMapLayerResponse.cs
index ce746ae..8b9837b 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDMapLayerResponse.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDMapLayerResponse.cs
@@ -1,41 +1,41 @@
-/*

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

-{

-    [LLSDType("MAP")]

-    public class LLSDMapLayerResponse

-    {

-        public LLSDMapRequest AgentData = new LLSDMapRequest();

-        public LLSDArray LayerData = new LLSDArray();

-

-        public LLSDMapLayerResponse()

-        {

-

-        }

-    }

-}

+/*
+* 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.Region.Capabilities
+{
+    [LLSDType("MAP")]
+    public class LLSDMapLayerResponse
+    {
+        public LLSDMapRequest AgentData = new LLSDMapRequest();
+        public LLSDArray LayerData = new LLSDArray();
+
+        public LLSDMapLayerResponse()
+        {
+
+        }
+    }
+}
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDMapRequest.cs b/OpenSim/Framework/Communications/Capabilities/LLSDMapRequest.cs
index fb739cd..8ac7943 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDMapRequest.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDMapRequest.cs
@@ -1,13 +1,13 @@
-namespace OpenSim.Region.Capabilities

-{

-    [LLSDType("MAP")]

-    public class LLSDMapRequest

-    {

-        public int Flags = 0;

-

-        public LLSDMapRequest()

-        {

-

-        }

-    }

-}

+namespace OpenSim.Region.Capabilities
+{
+    [LLSDType("MAP")]
+    public class LLSDMapRequest
+    {
+        public int Flags = 0;
+
+        public LLSDMapRequest()
+        {
+
+        }
+    }
+}
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDMethod.cs b/OpenSim/Framework/Communications/Capabilities/LLSDMethod.cs
index 5f42f44..068d539 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDMethod.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDMethod.cs
@@ -1,8 +1,8 @@
-using System;

-using System.Collections.Generic;

-using System.Text;

-

-namespace OpenSim.Region.Capabilities

-{

-    public delegate TResponse LLSDMethod<TRequest, TResponse>(TRequest request);

-}

+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenSim.Region.Capabilities
+{
+    public delegate TResponse LLSDMethod<TRequest, TResponse>(TRequest request);
+}
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs b/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs
index 7d99b6e..d98e23f 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs
@@ -1,42 +1,42 @@
-using System;

-using System.Collections.Generic;

-using System.Text;

-using OpenSim.Framework.Servers;

-using System.IO;

-using System.Collections;

-using libsecondlife;

-

-namespace OpenSim.Region.Capabilities

-{

-    public class LLSDStreamhandler<TRequest, TResponse> : BaseStreamHandler

-        where TRequest : new()

-    {

-        private LLSDMethod<TRequest, TResponse> m_method;

-

-        public LLSDStreamhandler(string httpMethod, string path, LLSDMethod<TRequest, TResponse> method)

-            : base(httpMethod, path )

-        {

-            m_method = method;

-        }

-        

-        public override byte[] Handle(string path, Stream request)

-        {

-            //Encoding encoding = Encoding.UTF8;

-            //StreamReader streamReader = new StreamReader(request, false);

-

-            //string requestBody = streamReader.ReadToEnd();

-            //streamReader.Close();

-

-            Hashtable hash = (Hashtable)LLSD.LLSDDeserialize( request );

-            TRequest llsdRequest = new TRequest();

-            LLSDHelpers.DeserialiseLLSDMap(hash, llsdRequest);

-

-            TResponse response = m_method(llsdRequest);

-

-            Encoding encoding = new UTF8Encoding(false);

-            

-            return encoding.GetBytes( LLSDHelpers.SerialiseLLSDReply(response) );

-

-        }

-    }

-}

+using System;
+using System.Collections.Generic;
+using System.Text;
+using OpenSim.Framework.Servers;
+using System.IO;
+using System.Collections;
+using libsecondlife;
+
+namespace OpenSim.Region.Capabilities
+{
+    public class LLSDStreamhandler<TRequest, TResponse> : BaseStreamHandler
+        where TRequest : new()
+    {
+        private LLSDMethod<TRequest, TResponse> m_method;
+
+        public LLSDStreamhandler(string httpMethod, string path, LLSDMethod<TRequest, TResponse> method)
+            : base(httpMethod, path )
+        {
+            m_method = method;
+        }
+        
+        public override byte[] Handle(string path, Stream request)
+        {
+            //Encoding encoding = Encoding.UTF8;
+            //StreamReader streamReader = new StreamReader(request, false);
+
+            //string requestBody = streamReader.ReadToEnd();
+            //streamReader.Close();
+
+            Hashtable hash = (Hashtable)LLSD.LLSDDeserialize( request );
+            TRequest llsdRequest = new TRequest();
+            LLSDHelpers.DeserialiseLLSDMap(hash, llsdRequest);
+
+            TResponse response = m_method(llsdRequest);
+
+            Encoding encoding = new UTF8Encoding(false);
+            
+            return encoding.GetBytes( LLSDHelpers.SerialiseLLSDReply(response) );
+
+        }
+    }
+}
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDTest.cs b/OpenSim/Framework/Communications/Capabilities/LLSDTest.cs
index f23e327..78ccf67 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDTest.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDTest.cs
@@ -1,41 +1,41 @@
-/*

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

-{

-    [LLSDType("MAP")]

-    public class LLSDTest

-    {

-        public int Test1 = 20;

-        public int Test2 = 10;

-

-        public LLSDTest()

-        {

-

-        }

-    }

-}

+/*
+* 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.Region.Capabilities
+{
+    [LLSDType("MAP")]
+    public class LLSDTest
+    {
+        public int Test1 = 20;
+        public int Test2 = 10;
+
+        public LLSDTest()
+        {
+
+        }
+    }
+}
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDType.cs b/OpenSim/Framework/Communications/Capabilities/LLSDType.cs
index c58a937..04f4d9a 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDType.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDType.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;

-

-namespace OpenSim.Region.Capabilities

-{

-    [AttributeUsage(AttributeTargets.Class)]

-    public class LLSDType : Attribute

-    {

-        protected string myType;

-

-        public LLSDType(string type)

-        {

-            myType = type;

-

-        }

-

-        public string ObjectType

-        {

-            get

-            {

-                return myType;

-            }

-        }

-    }

-

-    [AttributeUsage(AttributeTargets.Class)]

-    public class LLSDMap : LLSDType

-    {

-        public LLSDMap() : base( "MAP" )

-        {

-        }

-    }

-}

+/*
+* 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;
+
+namespace OpenSim.Region.Capabilities
+{
+    [AttributeUsage(AttributeTargets.Class)]
+    public class LLSDType : Attribute
+    {
+        protected string myType;
+
+        public LLSDType(string type)
+        {
+            myType = type;
+
+        }
+
+        public string ObjectType
+        {
+            get
+            {
+                return myType;
+            }
+        }
+    }
+
+    [AttributeUsage(AttributeTargets.Class)]
+    public class LLSDMap : LLSDType
+    {
+        public LLSDMap() : base( "MAP" )
+        {
+        }
+    }
+}
diff --git a/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs b/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs
index d72c40f..8b74195 100644
--- a/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs
+++ b/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs
@@ -1,89 +1,89 @@
-using System;

-using System.Collections.Generic;

-using System.Net;

-using System.IO;

-using System.Text;

-

-using OpenSim.Framework.Configuration.Interfaces;

-

-namespace OpenSim.Framework.Configuration.HTTP

-{

-    public class HTTPConfiguration : IGenericConfig

-    {

-        RemoteConfigSettings remoteConfigSettings;

-

-        XmlConfiguration xmlConfig;

-

-        private string configFileName = "";

-

-        public HTTPConfiguration()

-        {

-            remoteConfigSettings = new RemoteConfigSettings("remoteconfig.xml");

-            xmlConfig = new XmlConfiguration();

-        }

-

-        public void SetFileName(string fileName)

-        {

-            configFileName = fileName;

-        }

-

-        public void LoadData()

-        {

-            try

-            {

-                StringBuilder sb = new StringBuilder();

-

-                byte[] buf = new byte[8192];

-                HttpWebRequest request = (HttpWebRequest)WebRequest.Create(this.remoteConfigSettings.baseConfigURL + this.configFileName);

-                HttpWebResponse response = (HttpWebResponse)request.GetResponse();

-

-                Stream resStream = response.GetResponseStream();

-

-                string tempString = null;

-                int count = 0;

-

-                do

-                {

-                    count = resStream.Read(buf, 0, buf.Length);

-                    if (count != 0)

-                    {

-                        tempString = Encoding.ASCII.GetString(buf, 0, count);

-                        sb.Append(tempString);

-                    }

-                }

-                while (count > 0);

-                LoadDataFromString(sb.ToString());

-            }

-            catch (WebException)

-            {

-                Console.MainLog.Instance.Warn("Unable to connect to remote configuration file (" + remoteConfigSettings.baseConfigURL + configFileName + "). Creating local file instead.");

-                xmlConfig.SetFileName(configFileName);

-                xmlConfig.LoadData();

-            }

-        }

-

-        public void LoadDataFromString(string data)

-        {

-            xmlConfig.LoadDataFromString(data);

-            

-        }

-

-        public string GetAttribute(string attributeName)

-        {

-            return xmlConfig.GetAttribute(attributeName);

-        }

-

-        public bool SetAttribute(string attributeName, string attributeValue)

-        {

-            return true;

-        }

-

-        public void Commit()

-        {

-        }

-

-        public void Close()

-        {

-        }

-    }

-}

+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.IO;
+using System.Text;
+
+using OpenSim.Framework.Configuration.Interfaces;
+
+namespace OpenSim.Framework.Configuration.HTTP
+{
+    public class HTTPConfiguration : IGenericConfig
+    {
+        RemoteConfigSettings remoteConfigSettings;
+
+        XmlConfiguration xmlConfig;
+
+        private string configFileName = "";
+
+        public HTTPConfiguration()
+        {
+            remoteConfigSettings = new RemoteConfigSettings("remoteconfig.xml");
+            xmlConfig = new XmlConfiguration();
+        }
+
+        public void SetFileName(string fileName)
+        {
+            configFileName = fileName;
+        }
+
+        public void LoadData()
+        {
+            try
+            {
+                StringBuilder sb = new StringBuilder();
+
+                byte[] buf = new byte[8192];
+                HttpWebRequest request = (HttpWebRequest)WebRequest.Create(this.remoteConfigSettings.baseConfigURL + this.configFileName);
+                HttpWebResponse response = (HttpWebResponse)request.GetResponse();
+
+                Stream resStream = response.GetResponseStream();
+
+                string tempString = null;
+                int count = 0;
+
+                do
+                {
+                    count = resStream.Read(buf, 0, buf.Length);
+                    if (count != 0)
+                    {
+                        tempString = Encoding.ASCII.GetString(buf, 0, count);
+                        sb.Append(tempString);
+                    }
+                }
+                while (count > 0);
+                LoadDataFromString(sb.ToString());
+            }
+            catch (WebException)
+            {
+                Console.MainLog.Instance.Warn("Unable to connect to remote configuration file (" + remoteConfigSettings.baseConfigURL + configFileName + "). Creating local file instead.");
+                xmlConfig.SetFileName(configFileName);
+                xmlConfig.LoadData();
+            }
+        }
+
+        public void LoadDataFromString(string data)
+        {
+            xmlConfig.LoadDataFromString(data);
+            
+        }
+
+        public string GetAttribute(string attributeName)
+        {
+            return xmlConfig.GetAttribute(attributeName);
+        }
+
+        public bool SetAttribute(string attributeName, string attributeValue)
+        {
+            return true;
+        }
+
+        public void Commit()
+        {
+        }
+
+        public void Close()
+        {
+        }
+    }
+}
diff --git a/OpenSim/Framework/Configuration/HTTP/RemoteConfigSettings.cs b/OpenSim/Framework/Configuration/HTTP/RemoteConfigSettings.cs
index e3cfac7..77719ee 100644
--- a/OpenSim/Framework/Configuration/HTTP/RemoteConfigSettings.cs
+++ b/OpenSim/Framework/Configuration/HTTP/RemoteConfigSettings.cs
@@ -1,34 +1,34 @@
-using System;

-using System.Collections.Generic;

-using System.Text;

-

-using OpenSim.Framework.Configuration;

-

-namespace OpenSim.Framework.Configuration.HTTP

-{

-    public class RemoteConfigSettings

-    {

-        private ConfigurationMember configMember;

-

-        public string baseConfigURL = "";

-        public RemoteConfigSettings(string filename)

-        {

-            configMember = new ConfigurationMember(filename, "REMOTE CONFIG SETTINGS", loadConfigurationOptions, handleIncomingConfiguration);

-            configMember.forceConfigurationPluginLibrary("OpenSim.Framework.Configuration.XML.dll");

-            configMember.performConfigurationRetrieve();

-        }

-

-        public void loadConfigurationOptions()

-        {

-            configMember.addConfigurationOption("base_config_url", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "URL Containing Configuration Files", "http://localhost/", false);

-        }

-        public bool handleIncomingConfiguration(string configuration_key, object configuration_result)

-        {

-            if (configuration_key == "base_config_url")

-            {

-                baseConfigURL = (string)configuration_result;

-            }

-            return true;

-        }

-    }

-}

+using System;
+using System.Collections.Generic;
+using System.Text;
+
+using OpenSim.Framework.Configuration;
+
+namespace OpenSim.Framework.Configuration.HTTP
+{
+    public class RemoteConfigSettings
+    {
+        private ConfigurationMember configMember;
+
+        public string baseConfigURL = "";
+        public RemoteConfigSettings(string filename)
+        {
+            configMember = new ConfigurationMember(filename, "REMOTE CONFIG SETTINGS", loadConfigurationOptions, handleIncomingConfiguration);
+            configMember.forceConfigurationPluginLibrary("OpenSim.Framework.Configuration.XML.dll");
+            configMember.performConfigurationRetrieve();
+        }
+
+        public void loadConfigurationOptions()
+        {
+            configMember.addConfigurationOption("base_config_url", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "URL Containing Configuration Files", "http://localhost/", false);
+        }
+        public bool handleIncomingConfiguration(string configuration_key, object configuration_result)
+        {
+            if (configuration_key == "base_config_url")
+            {
+                baseConfigURL = (string)configuration_result;
+            }
+            return true;
+        }
+    }
+}
diff --git a/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs b/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs
index 5b66035..72faed6 100644
--- a/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs
+++ b/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs
@@ -1,133 +1,133 @@
-/*

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

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

-*

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

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

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

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

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

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

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

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

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

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

-*

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

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

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

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

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

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

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

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

-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-* 

-*/

-using System;

-using System.IO;

-using System.Xml;

-

-using OpenSim.Framework.Interfaces;

-using OpenSim.Framework.Configuration.Interfaces;

-

-namespace OpenSim.Framework.Configuration

-{

-    public class XmlConfiguration : IGenericConfig

-    {

-        private XmlDocument doc;

-        private XmlNode rootNode;

-        private XmlNode configNode;

-        private string fileName;

-        private bool createdFile = false;

-

-        public void SetFileName(string file)

-        {

-            fileName = file;

-        }

-

-        private void LoadDataToClass()

-        {

-            rootNode = doc.FirstChild;

-            if (rootNode.Name != "Root")

-                throw new Exception("Error: Invalid .xml File. Missing <Root>");

-

-            configNode = rootNode.FirstChild;

-            if (configNode.Name != "Config")

-                throw new Exception("Error: Invalid .xml File. <Root> first child should be <Config>");

-        }

-        public void LoadData()

-        {

-            doc = new XmlDocument();

-            if (File.Exists(fileName))

-            {

-                XmlTextReader reader = new XmlTextReader(fileName);

-                reader.WhitespaceHandling = WhitespaceHandling.None;

-                doc.Load(reader);

-                reader.Close();

-            }

-            else

-            {

-                createdFile = true;

-                rootNode = doc.CreateNode(XmlNodeType.Element, "Root", "");

-                doc.AppendChild(rootNode);

-                configNode = doc.CreateNode(XmlNodeType.Element, "Config", "");

-                rootNode.AppendChild(configNode);

-            }

-

-            LoadDataToClass();            

-

-            if (createdFile)

-            {

-                this.Commit();

-            }

-        }

-

-        public void LoadDataFromString(string data)

-        {

-            doc = new XmlDocument();

-            doc.LoadXml(data);

-

-            LoadDataToClass();

-        }

-        public string GetAttribute(string attributeName)

-        {

-            string result = null;

-            if (configNode.Attributes[attributeName] != null)

-            {

-                result = ((XmlAttribute)configNode.Attributes.GetNamedItem(attributeName)).Value;

-            }

-            return result;

-        }

-

-        public bool SetAttribute(string attributeName, string attributeValue)

-        {

-            if (configNode.Attributes[attributeName] != null)

-            {

-                ((XmlAttribute)configNode.Attributes.GetNamedItem(attributeName)).Value = attributeValue;

-            }

-            else

-            {

-                XmlAttribute attri;

-                attri = doc.CreateAttribute(attributeName);

-                attri.Value = attributeValue;

-                configNode.Attributes.Append(attri);

-            }

-            return true;

-        }

-

-        public void Commit()

-        {

-            doc.Save(fileName);

-        }

-

-        public void Close()

-        {

-            configNode = null;

-            rootNode = null;

-            doc = null;

-        }

-

-    }

-}

+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.IO;
+using System.Xml;
+
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Configuration.Interfaces;
+
+namespace OpenSim.Framework.Configuration
+{
+    public class XmlConfiguration : IGenericConfig
+    {
+        private XmlDocument doc;
+        private XmlNode rootNode;
+        private XmlNode configNode;
+        private string fileName;
+        private bool createdFile = false;
+
+        public void SetFileName(string file)
+        {
+            fileName = file;
+        }
+
+        private void LoadDataToClass()
+        {
+            rootNode = doc.FirstChild;
+            if (rootNode.Name != "Root")
+                throw new Exception("Error: Invalid .xml File. Missing <Root>");
+
+            configNode = rootNode.FirstChild;
+            if (configNode.Name != "Config")
+                throw new Exception("Error: Invalid .xml File. <Root> first child should be <Config>");
+        }
+        public void LoadData()
+        {
+            doc = new XmlDocument();
+            if (File.Exists(fileName))
+            {
+                XmlTextReader reader = new XmlTextReader(fileName);
+                reader.WhitespaceHandling = WhitespaceHandling.None;
+                doc.Load(reader);
+                reader.Close();
+            }
+            else
+            {
+                createdFile = true;
+                rootNode = doc.CreateNode(XmlNodeType.Element, "Root", "");
+                doc.AppendChild(rootNode);
+                configNode = doc.CreateNode(XmlNodeType.Element, "Config", "");
+                rootNode.AppendChild(configNode);
+            }
+
+            LoadDataToClass();            
+
+            if (createdFile)
+            {
+                this.Commit();
+            }
+        }
+
+        public void LoadDataFromString(string data)
+        {
+            doc = new XmlDocument();
+            doc.LoadXml(data);
+
+            LoadDataToClass();
+        }
+        public string GetAttribute(string attributeName)
+        {
+            string result = null;
+            if (configNode.Attributes[attributeName] != null)
+            {
+                result = ((XmlAttribute)configNode.Attributes.GetNamedItem(attributeName)).Value;
+            }
+            return result;
+        }
+
+        public bool SetAttribute(string attributeName, string attributeValue)
+        {
+            if (configNode.Attributes[attributeName] != null)
+            {
+                ((XmlAttribute)configNode.Attributes.GetNamedItem(attributeName)).Value = attributeValue;
+            }
+            else
+            {
+                XmlAttribute attri;
+                attri = doc.CreateAttribute(attributeName);
+                attri.Value = attributeValue;
+                configNode.Attributes.Append(attri);
+            }
+            return true;
+        }
+
+        public void Commit()
+        {
+            doc.Save(fileName);
+        }
+
+        public void Close()
+        {
+            configNode = null;
+            rootNode = null;
+            doc = null;
+        }
+
+    }
+}
diff --git a/OpenSim/Framework/General/Configuration/ConfigurationMember.cs b/OpenSim/Framework/General/Configuration/ConfigurationMember.cs
index b8dfc0c..eb5465f 100644
--- a/OpenSim/Framework/General/Configuration/ConfigurationMember.cs
+++ b/OpenSim/Framework/General/Configuration/ConfigurationMember.cs
@@ -1,379 +1,379 @@
-using System;

-using System.Reflection;

-using System.Collections;

-using System.Collections.Generic;

-using System.Text;

-using System.Net;

-

-using libsecondlife;

-

-using OpenSim.Framework.Console;

-using OpenSim.Framework.Configuration.Interfaces;

-

-namespace OpenSim.Framework.Configuration

-{

-    public class ConfigurationMember

-    {

-        public delegate bool ConfigurationOptionResult(string configuration_key, object configuration_result);

-        public delegate void ConfigurationOptionsLoad();

-

-        private List<ConfigurationOption> configurationOptions = new List<ConfigurationOption>();

-        private string configurationFilename = "";

-        private string configurationDescription = "";

-

-        private ConfigurationOptionsLoad loadFunction;

-        private ConfigurationOptionResult resultFunction;

-

-        private IGenericConfig configurationPlugin = null;

-        /// <summary>

-        /// This is the default configuration DLL loaded

-        /// </summary>

-        private string configurationPluginFilename = "OpenSim.Framework.Configuration.XML.dll";

-        public ConfigurationMember(string configuration_filename, string configuration_description, ConfigurationOptionsLoad load_function, ConfigurationOptionResult result_function)

-        {

-            this.configurationFilename = configuration_filename;

-            this.configurationDescription = configuration_description;

-            this.loadFunction = load_function;

-            this.resultFunction = result_function;

-        }

-

-        public void setConfigurationFilename(string filename)

-        {

-            configurationFilename = filename;

-        }

-        public void setConfigurationDescription(string desc)

-        {

-            configurationDescription = desc;

-        }

-

-        public void setConfigurationResultFunction(ConfigurationOptionResult result)

-        {

-            resultFunction = result;

-        }

-

-        public void forceConfigurationPluginLibrary(string dll_filename)

-        {

-            configurationPluginFilename = dll_filename;

-        }

-        public void addConfigurationOption(string configuration_key, ConfigurationOption.ConfigurationTypes configuration_type, string configuration_question, string configuration_default, bool use_default_no_prompt)

-        {

-            ConfigurationOption configOption = new ConfigurationOption();

-            configOption.configurationKey = configuration_key;

-            configOption.configurationQuestion = configuration_question;

-            configOption.configurationDefault = configuration_default;

-            configOption.configurationType = configuration_type;

-            configOption.configurationUseDefaultNoPrompt = use_default_no_prompt;

-

-            if (configuration_key != "" && configuration_question != "")

-            {

-                if (!configurationOptions.Contains(configOption))

-                {

-                    configurationOptions.Add(configOption);

-                }

-            }

-            else

-            {

-                MainLog.Instance.Notice("Required fields for adding a configuration option is invalid. Will not add this option (" + configuration_key + ")");

-            }

-        }

-

-        public void performConfigurationRetrieve()

-        {

-            configurationPlugin = this.LoadConfigDll(configurationPluginFilename);

-            configurationOptions.Clear();

-            if(loadFunction == null)

-            {

-                MainLog.Instance.Error("Load Function for '" + this.configurationDescription + "' is null. Refusing to run configuration.");

-                return;

-            }

-

-            if(resultFunction == null)

-            {

-                MainLog.Instance.Error("Result Function for '" + this.configurationDescription + "' is null. Refusing to run configuration.");

-                return;

-            }

-

-            MainLog.Instance.Verbose("Calling Configuration Load Function...");

-            this.loadFunction();

-

-            if(configurationOptions.Count <= 0)

-            {

-                MainLog.Instance.Error("No configuration options were specified for '" + this.configurationOptions + "'. Refusing to continue configuration.");

-                return;

-            }

-

-            bool useFile = true;

-            if (configurationPlugin == null)

-            {

-                MainLog.Instance.Error("Configuration Plugin NOT LOADED!");

-                return;

-            }

-

-            if (configurationFilename.Trim() != "")

-            {

-                configurationPlugin.SetFileName(configurationFilename);

-                configurationPlugin.LoadData();

-                useFile = true;

-            }

-

-            else

-            {

-                MainLog.Instance.Notice("XML Configuration Filename is not valid; will not save to the file.");

-                useFile = false;

-            }

-

-            foreach (ConfigurationOption configOption in configurationOptions)

-            {

-                bool convertSuccess = false;

-                object return_result = null;

-                string errorMessage = "";

-                bool ignoreNextFromConfig = false;

-                while (convertSuccess == false)

-                {

-                    

-                    string console_result = "";

-                    string attribute = null;

-                    if (useFile)

-                    {

-                        if (!ignoreNextFromConfig)

-                        {

-                            attribute = configurationPlugin.GetAttribute(configOption.configurationKey);

-                        }

-                        else

-                        {

-                            ignoreNextFromConfig = false;

-                        }

-                    }

-

-                    if (attribute == null)

-                    {

-                        if (configOption.configurationUseDefaultNoPrompt)

-                        {

-                            console_result = configOption.configurationDefault;

-                        }

-                        else

-                        {

-                        

-                            if (configurationDescription.Trim() != "")

-                            {

-                                console_result = MainLog.Instance.CmdPrompt(configurationDescription + ": " + configOption.configurationQuestion, configOption.configurationDefault);

-                            }

-                            else

-                            {

-                                console_result = MainLog.Instance.CmdPrompt(configOption.configurationQuestion, configOption.configurationDefault);

-                            }

-                        }                        

-                    }

-                    else

-                    {

-                        console_result = attribute;

-                    }

-

-                    switch (configOption.configurationType)

-                    {

-                        case ConfigurationOption.ConfigurationTypes.TYPE_STRING:

-                            return_result = console_result;

-                            convertSuccess = true;

-                            break;

-                        case ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY:

-                            if (console_result.Length > 0)

-                            {

-                                return_result = console_result;

-                                convertSuccess = true;

-                            }

-                            errorMessage = "a string that is not empty";

-                            break;

-                        case ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN:

-                            bool boolResult;

-                            if (Boolean.TryParse(console_result, out boolResult))

-                            {

-                                convertSuccess = true;

-                                return_result = boolResult;

-                            }

-                            errorMessage = "'true' or 'false' (Boolean)";

-                            break;

-                        case ConfigurationOption.ConfigurationTypes.TYPE_BYTE:

-                            byte byteResult;

-                            if (Byte.TryParse(console_result, out byteResult))

-                            {

-                                convertSuccess = true;

-                                return_result = byteResult;

-                            }

-                            errorMessage = "a byte (Byte)";

-                            break;

-                        case ConfigurationOption.ConfigurationTypes.TYPE_CHARACTER:

-                            char charResult;

-                            if (Char.TryParse(console_result, out charResult))

-                            {

-                                convertSuccess = true;

-                                return_result = charResult;

-                            }

-                            errorMessage = "a character (Char)";

-                            break;

-                        case ConfigurationOption.ConfigurationTypes.TYPE_INT16:

-                            short shortResult;

-                            if (Int16.TryParse(console_result, out shortResult))

-                            {

-                                convertSuccess = true;

-                                return_result = shortResult;

-                            }

-                            errorMessage = "a signed 32 bit integer (short)";

-                            break;

-                        case ConfigurationOption.ConfigurationTypes.TYPE_INT32:

-                            int intResult;

-                            if (Int32.TryParse(console_result, out intResult))

-                            {

-                                convertSuccess = true;

-                                return_result = intResult;

-

-                            }

-                            errorMessage = "a signed 32 bit integer (int)";

-                            break;

-                        case ConfigurationOption.ConfigurationTypes.TYPE_INT64:

-                            long longResult;

-                            if (Int64.TryParse(console_result, out longResult))

-                            {

-                                convertSuccess = true;

-                                return_result = longResult;

-                            }

-                            errorMessage = "a signed 32 bit integer (long)";

-                            break;

-                        case ConfigurationOption.ConfigurationTypes.TYPE_IP_ADDRESS:

-                            IPAddress ipAddressResult;

-                            if (IPAddress.TryParse(console_result, out ipAddressResult))

-                            {

-                                convertSuccess = true;

-                                return_result = ipAddressResult;

-                            }

-                            errorMessage = "an IP Address (IPAddress)";

-                            break;

-                        case ConfigurationOption.ConfigurationTypes.TYPE_LLUUID:

-                            LLUUID uuidResult;

-                            if (LLUUID.TryParse(console_result, out uuidResult))

-                            {

-                                convertSuccess = true;

-                                return_result = uuidResult;

-                            }

-                            errorMessage = "a UUID (LLUUID)";

-                            break;

-                        case ConfigurationOption.ConfigurationTypes.TYPE_LLVECTOR3:

-                            LLVector3 vectorResult;

-                            if (LLVector3.TryParse(console_result, out vectorResult))

-                            {

-                                convertSuccess = true;

-                                return_result = vectorResult;

-                            }

-                            errorMessage = "a vector (LLVector3)";

-                            break;

-                        case ConfigurationOption.ConfigurationTypes.TYPE_UINT16:

-                            ushort ushortResult;

-                            if (UInt16.TryParse(console_result, out ushortResult))

-                            {

-                                convertSuccess = true;

-                                return_result = ushortResult;

-                            }

-                            errorMessage = "an unsigned 16 bit integer (ushort)";

-                            break;

-                        case ConfigurationOption.ConfigurationTypes.TYPE_UINT32:

-                            uint uintResult;

-                            if (UInt32.TryParse(console_result, out uintResult))

-                            {

-                                convertSuccess = true;

-                                return_result = uintResult;

-                                

-                            }

-                            errorMessage = "an unsigned 32 bit integer (uint)";

-                            break;

-                        case ConfigurationOption.ConfigurationTypes.TYPE_UINT64:

-                            ulong ulongResult;

-                            if (UInt64.TryParse(console_result, out ulongResult))

-                            {

-                                convertSuccess = true;

-                                return_result = ulongResult;

-                            }

-                            errorMessage = "an unsigned 64 bit integer (ulong)";

-                            break;

-                        case ConfigurationOption.ConfigurationTypes.TYPE_FLOAT:

-                            float floatResult;

-                            if (float.TryParse(console_result, out floatResult))

-                            {

-                                convertSuccess = true;

-                                return_result = floatResult;

-                            }

-                            errorMessage = "a single-precision floating point number (float)";

-                            break;

-                        case ConfigurationOption.ConfigurationTypes.TYPE_DOUBLE:

-                            double doubleResult;

-                            if (Double.TryParse(console_result, out doubleResult))

-                            {

-                                convertSuccess = true;

-                                return_result = doubleResult;

-                            }

-                            errorMessage = "an double-precision floating point number (double)";

-                            break;

-                    }

-

-                    if (convertSuccess)

-                    {

-                        if (useFile)

-                        {

-                            configurationPlugin.SetAttribute(configOption.configurationKey, console_result);

-                        }

-

-

-                        if (!this.resultFunction(configOption.configurationKey, return_result))

-                        {

-                            Console.MainLog.Instance.Notice("The handler for the last configuration option denied that input, please try again.");

-                            convertSuccess = false;

-                            ignoreNextFromConfig = true;

-                        }

-                    }

-                    else

-                    {

-                        if (configOption.configurationUseDefaultNoPrompt)

-                        {

-                            MainLog.Instance.Error("Default given for '" + configOption.configurationKey + "' is not valid; the configuration result must be " + errorMessage + ". Will skip this option...");

-                            convertSuccess = true;

-                        }

-                        else

-                        {

-                            MainLog.Instance.Warn("configuration","Incorrect result given, the configuration option must be " + errorMessage + ". Prompting for same option...");

-                            ignoreNextFromConfig = true;

-                        }

-                    }

-                }

-            }

-

-            if(useFile)

-            {

-                configurationPlugin.Commit();

-                configurationPlugin.Close();

-            }

-        }

-

-        private IGenericConfig LoadConfigDll(string dllName)

-        {

-            Assembly pluginAssembly = Assembly.LoadFrom(dllName);

-            IGenericConfig plug = null;

-

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

-            {

-                if (pluginType.IsPublic)

-                {

-                    if (!pluginType.IsAbstract)

-                    {

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

-

-                        if (typeInterface != null)

-                        {

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

-                        }

-                    }

-                }

-            }

-

-            pluginAssembly = null;

-            return plug;

-        }

-    }

-}

+using System;
+using System.Reflection;
+using System.Collections;
+using System.Collections.Generic;
+using System.Text;
+using System.Net;
+
+using libsecondlife;
+
+using OpenSim.Framework.Console;
+using OpenSim.Framework.Configuration.Interfaces;
+
+namespace OpenSim.Framework.Configuration
+{
+    public class ConfigurationMember
+    {
+        public delegate bool ConfigurationOptionResult(string configuration_key, object configuration_result);
+        public delegate void ConfigurationOptionsLoad();
+
+        private List<ConfigurationOption> configurationOptions = new List<ConfigurationOption>();
+        private string configurationFilename = "";
+        private string configurationDescription = "";
+
+        private ConfigurationOptionsLoad loadFunction;
+        private ConfigurationOptionResult resultFunction;
+
+        private IGenericConfig configurationPlugin = null;
+        /// <summary>
+        /// This is the default configuration DLL loaded
+        /// </summary>
+        private string configurationPluginFilename = "OpenSim.Framework.Configuration.XML.dll";
+        public ConfigurationMember(string configuration_filename, string configuration_description, ConfigurationOptionsLoad load_function, ConfigurationOptionResult result_function)
+        {
+            this.configurationFilename = configuration_filename;
+            this.configurationDescription = configuration_description;
+            this.loadFunction = load_function;
+            this.resultFunction = result_function;
+        }
+
+        public void setConfigurationFilename(string filename)
+        {
+            configurationFilename = filename;
+        }
+        public void setConfigurationDescription(string desc)
+        {
+            configurationDescription = desc;
+        }
+
+        public void setConfigurationResultFunction(ConfigurationOptionResult result)
+        {
+            resultFunction = result;
+        }
+
+        public void forceConfigurationPluginLibrary(string dll_filename)
+        {
+            configurationPluginFilename = dll_filename;
+        }
+        public void addConfigurationOption(string configuration_key, ConfigurationOption.ConfigurationTypes configuration_type, string configuration_question, string configuration_default, bool use_default_no_prompt)
+        {
+            ConfigurationOption configOption = new ConfigurationOption();
+            configOption.configurationKey = configuration_key;
+            configOption.configurationQuestion = configuration_question;
+            configOption.configurationDefault = configuration_default;
+            configOption.configurationType = configuration_type;
+            configOption.configurationUseDefaultNoPrompt = use_default_no_prompt;
+
+            if (configuration_key != "" && configuration_question != "")
+            {
+                if (!configurationOptions.Contains(configOption))
+                {
+                    configurationOptions.Add(configOption);
+                }
+            }
+            else
+            {
+                MainLog.Instance.Notice("Required fields for adding a configuration option is invalid. Will not add this option (" + configuration_key + ")");
+            }
+        }
+
+        public void performConfigurationRetrieve()
+        {
+            configurationPlugin = this.LoadConfigDll(configurationPluginFilename);
+            configurationOptions.Clear();
+            if(loadFunction == null)
+            {
+                MainLog.Instance.Error("Load Function for '" + this.configurationDescription + "' is null. Refusing to run configuration.");
+                return;
+            }
+
+            if(resultFunction == null)
+            {
+                MainLog.Instance.Error("Result Function for '" + this.configurationDescription + "' is null. Refusing to run configuration.");
+                return;
+            }
+
+            MainLog.Instance.Verbose("Calling Configuration Load Function...");
+            this.loadFunction();
+
+            if(configurationOptions.Count <= 0)
+            {
+                MainLog.Instance.Error("No configuration options were specified for '" + this.configurationOptions + "'. Refusing to continue configuration.");
+                return;
+            }
+
+            bool useFile = true;
+            if (configurationPlugin == null)
+            {
+                MainLog.Instance.Error("Configuration Plugin NOT LOADED!");
+                return;
+            }
+
+            if (configurationFilename.Trim() != "")
+            {
+                configurationPlugin.SetFileName(configurationFilename);
+                configurationPlugin.LoadData();
+                useFile = true;
+            }
+
+            else
+            {
+                MainLog.Instance.Notice("XML Configuration Filename is not valid; will not save to the file.");
+                useFile = false;
+            }
+
+            foreach (ConfigurationOption configOption in configurationOptions)
+            {
+                bool convertSuccess = false;
+                object return_result = null;
+                string errorMessage = "";
+                bool ignoreNextFromConfig = false;
+                while (convertSuccess == false)
+                {
+                    
+                    string console_result = "";
+                    string attribute = null;
+                    if (useFile)
+                    {
+                        if (!ignoreNextFromConfig)
+                        {
+                            attribute = configurationPlugin.GetAttribute(configOption.configurationKey);
+                        }
+                        else
+                        {
+                            ignoreNextFromConfig = false;
+                        }
+                    }
+
+                    if (attribute == null)
+                    {
+                        if (configOption.configurationUseDefaultNoPrompt)
+                        {
+                            console_result = configOption.configurationDefault;
+                        }
+                        else
+                        {
+                        
+                            if (configurationDescription.Trim() != "")
+                            {
+                                console_result = MainLog.Instance.CmdPrompt(configurationDescription + ": " + configOption.configurationQuestion, configOption.configurationDefault);
+                            }
+                            else
+                            {
+                                console_result = MainLog.Instance.CmdPrompt(configOption.configurationQuestion, configOption.configurationDefault);
+                            }
+                        }                        
+                    }
+                    else
+                    {
+                        console_result = attribute;
+                    }
+
+                    switch (configOption.configurationType)
+                    {
+                        case ConfigurationOption.ConfigurationTypes.TYPE_STRING:
+                            return_result = console_result;
+                            convertSuccess = true;
+                            break;
+                        case ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY:
+                            if (console_result.Length > 0)
+                            {
+                                return_result = console_result;
+                                convertSuccess = true;
+                            }
+                            errorMessage = "a string that is not empty";
+                            break;
+                        case ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN:
+                            bool boolResult;
+                            if (Boolean.TryParse(console_result, out boolResult))
+                            {
+                                convertSuccess = true;
+                                return_result = boolResult;
+                            }
+                            errorMessage = "'true' or 'false' (Boolean)";
+                            break;
+                        case ConfigurationOption.ConfigurationTypes.TYPE_BYTE:
+                            byte byteResult;
+                            if (Byte.TryParse(console_result, out byteResult))
+                            {
+                                convertSuccess = true;
+                                return_result = byteResult;
+                            }
+                            errorMessage = "a byte (Byte)";
+                            break;
+                        case ConfigurationOption.ConfigurationTypes.TYPE_CHARACTER:
+                            char charResult;
+                            if (Char.TryParse(console_result, out charResult))
+                            {
+                                convertSuccess = true;
+                                return_result = charResult;
+                            }
+                            errorMessage = "a character (Char)";
+                            break;
+                        case ConfigurationOption.ConfigurationTypes.TYPE_INT16:
+                            short shortResult;
+                            if (Int16.TryParse(console_result, out shortResult))
+                            {
+                                convertSuccess = true;
+                                return_result = shortResult;
+                            }
+                            errorMessage = "a signed 32 bit integer (short)";
+                            break;
+                        case ConfigurationOption.ConfigurationTypes.TYPE_INT32:
+                            int intResult;
+                            if (Int32.TryParse(console_result, out intResult))
+                            {
+                                convertSuccess = true;
+                                return_result = intResult;
+
+                            }
+                            errorMessage = "a signed 32 bit integer (int)";
+                            break;
+                        case ConfigurationOption.ConfigurationTypes.TYPE_INT64:
+                            long longResult;
+                            if (Int64.TryParse(console_result, out longResult))
+                            {
+                                convertSuccess = true;
+                                return_result = longResult;
+                            }
+                            errorMessage = "a signed 32 bit integer (long)";
+                            break;
+                        case ConfigurationOption.ConfigurationTypes.TYPE_IP_ADDRESS:
+                            IPAddress ipAddressResult;
+                            if (IPAddress.TryParse(console_result, out ipAddressResult))
+                            {
+                                convertSuccess = true;
+                                return_result = ipAddressResult;
+                            }
+                            errorMessage = "an IP Address (IPAddress)";
+                            break;
+                        case ConfigurationOption.ConfigurationTypes.TYPE_LLUUID:
+                            LLUUID uuidResult;
+                            if (LLUUID.TryParse(console_result, out uuidResult))
+                            {
+                                convertSuccess = true;
+                                return_result = uuidResult;
+                            }
+                            errorMessage = "a UUID (LLUUID)";
+                            break;
+                        case ConfigurationOption.ConfigurationTypes.TYPE_LLVECTOR3:
+                            LLVector3 vectorResult;
+                            if (LLVector3.TryParse(console_result, out vectorResult))
+                            {
+                                convertSuccess = true;
+                                return_result = vectorResult;
+                            }
+                            errorMessage = "a vector (LLVector3)";
+                            break;
+                        case ConfigurationOption.ConfigurationTypes.TYPE_UINT16:
+                            ushort ushortResult;
+                            if (UInt16.TryParse(console_result, out ushortResult))
+                            {
+                                convertSuccess = true;
+                                return_result = ushortResult;
+                            }
+                            errorMessage = "an unsigned 16 bit integer (ushort)";
+                            break;
+                        case ConfigurationOption.ConfigurationTypes.TYPE_UINT32:
+                            uint uintResult;
+                            if (UInt32.TryParse(console_result, out uintResult))
+                            {
+                                convertSuccess = true;
+                                return_result = uintResult;
+                                
+                            }
+                            errorMessage = "an unsigned 32 bit integer (uint)";
+                            break;
+                        case ConfigurationOption.ConfigurationTypes.TYPE_UINT64:
+                            ulong ulongResult;
+                            if (UInt64.TryParse(console_result, out ulongResult))
+                            {
+                                convertSuccess = true;
+                                return_result = ulongResult;
+                            }
+                            errorMessage = "an unsigned 64 bit integer (ulong)";
+                            break;
+                        case ConfigurationOption.ConfigurationTypes.TYPE_FLOAT:
+                            float floatResult;
+                            if (float.TryParse(console_result, out floatResult))
+                            {
+                                convertSuccess = true;
+                                return_result = floatResult;
+                            }
+                            errorMessage = "a single-precision floating point number (float)";
+                            break;
+                        case ConfigurationOption.ConfigurationTypes.TYPE_DOUBLE:
+                            double doubleResult;
+                            if (Double.TryParse(console_result, out doubleResult))
+                            {
+                                convertSuccess = true;
+                                return_result = doubleResult;
+                            }
+                            errorMessage = "an double-precision floating point number (double)";
+                            break;
+                    }
+
+                    if (convertSuccess)
+                    {
+                        if (useFile)
+                        {
+                            configurationPlugin.SetAttribute(configOption.configurationKey, console_result);
+                        }
+
+
+                        if (!this.resultFunction(configOption.configurationKey, return_result))
+                        {
+                            Console.MainLog.Instance.Notice("The handler for the last configuration option denied that input, please try again.");
+                            convertSuccess = false;
+                            ignoreNextFromConfig = true;
+                        }
+                    }
+                    else
+                    {
+                        if (configOption.configurationUseDefaultNoPrompt)
+                        {
+                            MainLog.Instance.Error("Default given for '" + configOption.configurationKey + "' is not valid; the configuration result must be " + errorMessage + ". Will skip this option...");
+                            convertSuccess = true;
+                        }
+                        else
+                        {
+                            MainLog.Instance.Warn("configuration","Incorrect result given, the configuration option must be " + errorMessage + ". Prompting for same option...");
+                            ignoreNextFromConfig = true;
+                        }
+                    }
+                }
+            }
+
+            if(useFile)
+            {
+                configurationPlugin.Commit();
+                configurationPlugin.Close();
+            }
+        }
+
+        private IGenericConfig LoadConfigDll(string dllName)
+        {
+            Assembly pluginAssembly = Assembly.LoadFrom(dllName);
+            IGenericConfig plug = null;
+
+            foreach (Type pluginType in pluginAssembly.GetTypes())
+            {
+                if (pluginType.IsPublic)
+                {
+                    if (!pluginType.IsAbstract)
+                    {
+                        Type typeInterface = pluginType.GetInterface("IGenericConfig", true);
+
+                        if (typeInterface != null)
+                        {
+                            plug = (IGenericConfig)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
+                        }
+                    }
+                }
+            }
+
+            pluginAssembly = null;
+            return plug;
+        }
+    }
+}
diff --git a/OpenSim/Framework/General/Configuration/ConfigurationOption.cs b/OpenSim/Framework/General/Configuration/ConfigurationOption.cs
index 38f60a0..c94ba4c 100644
--- a/OpenSim/Framework/General/Configuration/ConfigurationOption.cs
+++ b/OpenSim/Framework/General/Configuration/ConfigurationOption.cs
@@ -1,36 +1,36 @@
-using System;

-using System.Collections.Generic;

-using System.Text;

-

-namespace OpenSim.Framework.Configuration

-{

-    public class ConfigurationOption

-    {

-        public enum ConfigurationTypes

-        {

-            TYPE_STRING,

-            TYPE_STRING_NOT_EMPTY,

-            TYPE_UINT16,

-            TYPE_UINT32,

-            TYPE_UINT64, 

-            TYPE_INT16,

-            TYPE_INT32,

-            TYPE_INT64,

-            TYPE_IP_ADDRESS,

-            TYPE_CHARACTER,

-            TYPE_BOOLEAN,

-            TYPE_BYTE,

-            TYPE_LLUUID,

-            TYPE_LLVECTOR3,

-            TYPE_FLOAT,

-            TYPE_DOUBLE

-        };

-

-        public string configurationKey = "";

-        public string configurationQuestion = "";

-        public string configurationDefault = "";

-

-        public ConfigurationTypes configurationType = ConfigurationTypes.TYPE_STRING;

-        public bool configurationUseDefaultNoPrompt = false;

-    }

-}

+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenSim.Framework.Configuration
+{
+    public class ConfigurationOption
+    {
+        public enum ConfigurationTypes
+        {
+            TYPE_STRING,
+            TYPE_STRING_NOT_EMPTY,
+            TYPE_UINT16,
+            TYPE_UINT32,
+            TYPE_UINT64, 
+            TYPE_INT16,
+            TYPE_INT32,
+            TYPE_INT64,
+            TYPE_IP_ADDRESS,
+            TYPE_CHARACTER,
+            TYPE_BOOLEAN,
+            TYPE_BYTE,
+            TYPE_LLUUID,
+            TYPE_LLVECTOR3,
+            TYPE_FLOAT,
+            TYPE_DOUBLE
+        };
+
+        public string configurationKey = "";
+        public string configurationQuestion = "";
+        public string configurationDefault = "";
+
+        public ConfigurationTypes configurationType = ConfigurationTypes.TYPE_STRING;
+        public bool configurationUseDefaultNoPrompt = false;
+    }
+}
diff --git a/OpenSim/Framework/General/Configuration/GridConfig.cs b/OpenSim/Framework/General/Configuration/GridConfig.cs
index 3d07d9b..a81cac2 100644
--- a/OpenSim/Framework/General/Configuration/GridConfig.cs
+++ b/OpenSim/Framework/General/Configuration/GridConfig.cs
@@ -1,85 +1,85 @@
-using System;

-using System.Collections.Generic;

-using System.Text;

-

-namespace OpenSim.Framework.Configuration

-{

-    public class GridConfig

-    {

-        public string GridOwner = "";

-        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 string DatabaseProvider = "";

-        

-        private ConfigurationMember configMember;

-        public GridConfig(string description, string filename)

-        {

-            configMember = new ConfigurationMember(filename, description, this.loadConfigurationOptions, this.handleIncomingConfiguration);

-            configMember.performConfigurationRetrieve();

-        }

-

-        public void loadConfigurationOptions()

-        {

-            configMember.addConfigurationOption("grid_owner", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "OGS Grid Owner", "OGS development team", false);

-            configMember.addConfigurationOption("default_asset_server", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default Asset Server URI", "http://127.0.0.1:8003/", false);

-            configMember.addConfigurationOption("asset_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to send to asset server", "null", false);

-            configMember.addConfigurationOption("asset_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to expect from asset server", "null", false);

-

-            configMember.addConfigurationOption("default_user_server", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default User Server URI", "http://127.0.0.1:8002/", false);

-            configMember.addConfigurationOption("user_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to send to user server", "null", false);

-            configMember.addConfigurationOption("user_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to expect from user server", "null", false);

-

-            configMember.addConfigurationOption("sim_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to send to a simulator", "null", false);

-            configMember.addConfigurationOption("sim_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to expect from a simulator", "null", false);

-            configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false);

-        }

-

-        public bool handleIncomingConfiguration(string configuration_key, object configuration_result)

-        {

-            switch (configuration_key)

-            {

-                case "grid_owner":

-                    this.GridOwner = (string)configuration_result;

-                    break;

-                case "default_asset_server":

-                    this.DefaultAssetServer = (string)configuration_result;

-                    break;

-                case "asset_send_key":

-                    this.AssetSendKey = (string)configuration_result;

-                    break;

-                case "asset_recv_key":

-                    this.AssetRecvKey = (string)configuration_result;

-                    break;

-                case "default_user_server":

-                    this.DefaultUserServer = (string)configuration_result;

-                    break;

-                case "user_send_key":

-                    this.UserSendKey = (string)configuration_result;

-                    break;

-                case "user_recv_key":

-                    this.UserRecvKey = (string)configuration_result;

-                    break;

-                case "sim_send_key":

-                    this.SimSendKey = (string)configuration_result;

-                    break;

-                case "sim_recv_key":

-                    this.SimRecvKey = (string)configuration_result;

-                    break;

-                case "database_provider":

-                    this.DatabaseProvider = (string)configuration_result;

-                    break;

-            }

-

-            return true;

-        }

-    }

-}

+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenSim.Framework.Configuration
+{
+    public class GridConfig
+    {
+        public string GridOwner = "";
+        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 string DatabaseProvider = "";
+        
+        private ConfigurationMember configMember;
+        public GridConfig(string description, string filename)
+        {
+            configMember = new ConfigurationMember(filename, description, this.loadConfigurationOptions, this.handleIncomingConfiguration);
+            configMember.performConfigurationRetrieve();
+        }
+
+        public void loadConfigurationOptions()
+        {
+            configMember.addConfigurationOption("grid_owner", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "OGS Grid Owner", "OGS development team", false);
+            configMember.addConfigurationOption("default_asset_server", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default Asset Server URI", "http://127.0.0.1:8003/", false);
+            configMember.addConfigurationOption("asset_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to send to asset server", "null", false);
+            configMember.addConfigurationOption("asset_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to expect from asset server", "null", false);
+
+            configMember.addConfigurationOption("default_user_server", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default User Server URI", "http://127.0.0.1:8002/", false);
+            configMember.addConfigurationOption("user_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to send to user server", "null", false);
+            configMember.addConfigurationOption("user_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to expect from user server", "null", false);
+
+            configMember.addConfigurationOption("sim_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to send to a simulator", "null", false);
+            configMember.addConfigurationOption("sim_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to expect from a simulator", "null", false);
+            configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false);
+        }
+
+        public bool handleIncomingConfiguration(string configuration_key, object configuration_result)
+        {
+            switch (configuration_key)
+            {
+                case "grid_owner":
+                    this.GridOwner = (string)configuration_result;
+                    break;
+                case "default_asset_server":
+                    this.DefaultAssetServer = (string)configuration_result;
+                    break;
+                case "asset_send_key":
+                    this.AssetSendKey = (string)configuration_result;
+                    break;
+                case "asset_recv_key":
+                    this.AssetRecvKey = (string)configuration_result;
+                    break;
+                case "default_user_server":
+                    this.DefaultUserServer = (string)configuration_result;
+                    break;
+                case "user_send_key":
+                    this.UserSendKey = (string)configuration_result;
+                    break;
+                case "user_recv_key":
+                    this.UserRecvKey = (string)configuration_result;
+                    break;
+                case "sim_send_key":
+                    this.SimSendKey = (string)configuration_result;
+                    break;
+                case "sim_recv_key":
+                    this.SimRecvKey = (string)configuration_result;
+                    break;
+                case "database_provider":
+                    this.DatabaseProvider = (string)configuration_result;
+                    break;
+            }
+
+            return true;
+        }
+    }
+}
diff --git a/OpenSim/Framework/General/Configuration/Interfaces/IGenericConfig.cs b/OpenSim/Framework/General/Configuration/Interfaces/IGenericConfig.cs
index ceccd04..0222745 100644
--- a/OpenSim/Framework/General/Configuration/Interfaces/IGenericConfig.cs
+++ b/OpenSim/Framework/General/Configuration/Interfaces/IGenericConfig.cs
@@ -1,40 +1,40 @@
-/*

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

-{

-    public interface IGenericConfig

-    {

-        void SetFileName(string fileName);

-        void LoadData();

-        void LoadDataFromString(string data);

-        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.Configuration.Interfaces
+{
+    public interface IGenericConfig
+    {
+        void SetFileName(string fileName);
+        void LoadData();
+        void LoadDataFromString(string data);
+        string GetAttribute(string attributeName);
+        bool SetAttribute(string attributeName, string attributeValue);
+        void Commit();
+        void Close();
+    }
+}
diff --git a/OpenSim/Framework/General/Configuration/UserConfig.cs b/OpenSim/Framework/General/Configuration/UserConfig.cs
index 2183491..177506f 100644
--- a/OpenSim/Framework/General/Configuration/UserConfig.cs
+++ b/OpenSim/Framework/General/Configuration/UserConfig.cs
@@ -1,62 +1,62 @@
-using System;

-using System.Collections.Generic;

-using System.Text;

-

-namespace OpenSim.Framework.Configuration

-{

-    /// <summary>

-    /// UserConfig -- For User Server Configuration

-    /// </summary>

-    public class UserConfig

-    {

-        public string DefaultStartupMsg = "";

-        public string GridServerURL = "";

-        public string GridSendKey = "";

-        public string GridRecvKey = "";

-

-        public string DatabaseProvider = "";

-

-        private ConfigurationMember configMember;

-

-        public UserConfig(string description, string filename)

-        {

-            configMember = new ConfigurationMember(filename, description, this.loadConfigurationOptions, this.handleIncomingConfiguration);

-            configMember.performConfigurationRetrieve();

-        }

-

-        public void loadConfigurationOptions()

-        {

-            configMember.addConfigurationOption("default_startup_message", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default Startup Message", "Welcome to OGS",false);

-

-            configMember.addConfigurationOption("default_grid_server", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default Grid Server URI", "http://127.0.0.1:8001/", false);

-            configMember.addConfigurationOption("grid_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to send to grid server", "null", false);

-            configMember.addConfigurationOption("grid_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to expect from grid server", "null", false);

-            configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false);

-

-        }

-

-        public bool handleIncomingConfiguration(string configuration_key, object configuration_result)

-        {

-            switch (configuration_key)

-            {

-                case "default_startup_message":

-                    this.DefaultStartupMsg = (string)configuration_result;

-                    break;

-                case "default_grid_server":

-                    this.GridServerURL = (string)configuration_result;

-                    break;

-                case "grid_send_key":

-                    this.GridSendKey = (string)configuration_result;

-                    break;

-                case "grid_recv_key":

-                    this.GridRecvKey = (string)configuration_result;

-                    break;

-                case "database_provider":

-                    this.DatabaseProvider = (string)configuration_result;

-                    break;

-            }

-

-            return true;

-        }

-    }

-}

+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenSim.Framework.Configuration
+{
+    /// <summary>
+    /// UserConfig -- For User Server Configuration
+    /// </summary>
+    public class UserConfig
+    {
+        public string DefaultStartupMsg = "";
+        public string GridServerURL = "";
+        public string GridSendKey = "";
+        public string GridRecvKey = "";
+
+        public string DatabaseProvider = "";
+
+        private ConfigurationMember configMember;
+
+        public UserConfig(string description, string filename)
+        {
+            configMember = new ConfigurationMember(filename, description, this.loadConfigurationOptions, this.handleIncomingConfiguration);
+            configMember.performConfigurationRetrieve();
+        }
+
+        public void loadConfigurationOptions()
+        {
+            configMember.addConfigurationOption("default_startup_message", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default Startup Message", "Welcome to OGS",false);
+
+            configMember.addConfigurationOption("default_grid_server", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default Grid Server URI", "http://127.0.0.1:8001/", false);
+            configMember.addConfigurationOption("grid_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to send to grid server", "null", false);
+            configMember.addConfigurationOption("grid_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to expect from grid server", "null", false);
+            configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false);
+
+        }
+
+        public bool handleIncomingConfiguration(string configuration_key, object configuration_result)
+        {
+            switch (configuration_key)
+            {
+                case "default_startup_message":
+                    this.DefaultStartupMsg = (string)configuration_result;
+                    break;
+                case "default_grid_server":
+                    this.GridServerURL = (string)configuration_result;
+                    break;
+                case "grid_send_key":
+                    this.GridSendKey = (string)configuration_result;
+                    break;
+                case "grid_recv_key":
+                    this.GridRecvKey = (string)configuration_result;
+                    break;
+                case "database_provider":
+                    this.DatabaseProvider = (string)configuration_result;
+                    break;
+            }
+
+            return true;
+        }
+    }
+}
diff --git a/OpenSim/Framework/General/Types/LandData.cs b/OpenSim/Framework/General/Types/LandData.cs
index 2ae4927..26cb8d5 100644
--- a/OpenSim/Framework/General/Types/LandData.cs
+++ b/OpenSim/Framework/General/Types/LandData.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 LandData

-        {

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

-            public string landName = "Your Parcel";

-            public string landDesc = "";

-            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 landStatus = Parcel.ParcelStatus.Leased;

-            public uint landFlags = (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 LandData()

-            {

-                globalID = LLUUID.Random();

-            }

-

-            public LandData Copy()

-            {

-                LandData landData = new LandData();

-

-                landData.AABBMax = this.AABBMax;

-                landData.AABBMin = this.AABBMin;

-                landData.area = this.area;

-                landData.auctionID = this.auctionID;

-                landData.authBuyerID = this.authBuyerID;

-                landData.category = this.category;

-                landData.claimDate = this.claimDate;

-                landData.claimPrice = this.claimPrice;

-                landData.globalID = this.globalID;

-                landData.groupID = this.groupID;

-                landData.groupPrims = this.groupPrims;

-                landData.otherPrims = this.otherPrims;

-                landData.ownerPrims = this.ownerPrims;

-                landData.selectedPrims = this.selectedPrims;

-                landData.isGroupOwned = this.isGroupOwned;

-                landData.localID = this.localID;

-                landData.landingType = this.landingType;

-                landData.mediaAutoScale = this.mediaAutoScale;

-                landData.mediaID = this.mediaID;

-                landData.mediaURL = this.mediaURL;

-                landData.musicURL = this.musicURL;

-                landData.ownerID = this.ownerID;

-                landData.landBitmapByteArray = (byte[])this.landBitmapByteArray.Clone();

-                landData.landDesc = this.landDesc;

-                landData.landFlags = this.landFlags;

-                landData.landName = this.landName;

-                landData.landStatus = this.landStatus;

-                landData.passHours = this.passHours;

-                landData.passPrice = this.passPrice;

-                landData.salePrice = this.salePrice;

-                landData.snapshotID = this.snapshotID;

-                landData.userLocation = this.userLocation;

-                landData.userLookAt = this.userLookAt;

-

-                return landData;

-           

-            }

-        }

-    

-}

+/*
+* 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 LandData
+        {
+            public byte[] landBitmapByteArray = new byte[512];
+            public string landName = "Your Parcel";
+            public string landDesc = "";
+            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 landStatus = Parcel.ParcelStatus.Leased;
+            public uint landFlags = (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 LandData()
+            {
+                globalID = LLUUID.Random();
+            }
+
+            public LandData Copy()
+            {
+                LandData landData = new LandData();
+
+                landData.AABBMax = this.AABBMax;
+                landData.AABBMin = this.AABBMin;
+                landData.area = this.area;
+                landData.auctionID = this.auctionID;
+                landData.authBuyerID = this.authBuyerID;
+                landData.category = this.category;
+                landData.claimDate = this.claimDate;
+                landData.claimPrice = this.claimPrice;
+                landData.globalID = this.globalID;
+                landData.groupID = this.groupID;
+                landData.groupPrims = this.groupPrims;
+                landData.otherPrims = this.otherPrims;
+                landData.ownerPrims = this.ownerPrims;
+                landData.selectedPrims = this.selectedPrims;
+                landData.isGroupOwned = this.isGroupOwned;
+                landData.localID = this.localID;
+                landData.landingType = this.landingType;
+                landData.mediaAutoScale = this.mediaAutoScale;
+                landData.mediaID = this.mediaID;
+                landData.mediaURL = this.mediaURL;
+                landData.musicURL = this.musicURL;
+                landData.ownerID = this.ownerID;
+                landData.landBitmapByteArray = (byte[])this.landBitmapByteArray.Clone();
+                landData.landDesc = this.landDesc;
+                landData.landFlags = this.landFlags;
+                landData.landName = this.landName;
+                landData.landStatus = this.landStatus;
+                landData.passHours = this.passHours;
+                landData.passPrice = this.passPrice;
+                landData.salePrice = this.salePrice;
+                landData.snapshotID = this.snapshotID;
+                landData.userLocation = this.userLocation;
+                landData.userLookAt = this.userLookAt;
+
+                return landData;
+           
+            }
+        }
+    
+}
diff --git a/OpenSim/Framework/InventoryServiceBase/InventoryServiceBase.cs b/OpenSim/Framework/InventoryServiceBase/InventoryServiceBase.cs
index 49e2e6f..9f681c2 100644
--- a/OpenSim/Framework/InventoryServiceBase/InventoryServiceBase.cs
+++ b/OpenSim/Framework/InventoryServiceBase/InventoryServiceBase.cs
@@ -1,136 +1,136 @@
-using System;

-using System.Collections.Generic;

-using System.Reflection;

-using System.Text;

-using libsecondlife;

-using OpenSim.Framework.Console;

-using OpenSim.Framework.Interfaces;

-using OpenSim.Framework.Data;

-

-namespace OpenSim.Framework.InventoryServiceBase

-{

-    public class InventoryServiceBase

-    {

-        protected Dictionary<string, IInventoryData> m_plugins = new Dictionary<string, IInventoryData>();

-        protected IAssetServer m_assetServer;

-

-        public InventoryServiceBase(IAssetServer assetServer)

-        {

-            m_assetServer = assetServer;

-        }

-

-        /// <summary>

-        /// Adds a new user server plugin - plugins will be requested in the order they were loaded.

-        /// </summary>

-        /// <param name="FileName">The filename to the user server plugin DLL</param>

-        public void AddPlugin(string FileName)

-        {

-            MainLog.Instance.Verbose("Inventorytorage: Attempting to load " + FileName);

-            Assembly pluginAssembly = Assembly.LoadFrom(FileName);

-

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

-            {

-                if (!pluginType.IsAbstract)

-                {

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

-

-                    if (typeInterface != null)

-                    {

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

-                        plug.Initialise();

-                        this.m_plugins.Add(plug.getName(), plug);

-                        MainLog.Instance.Verbose("Inventorystorage: Added IInventoryData Interface");

-                    }

-

-                    typeInterface = null;

-                }

-            }

-

-            pluginAssembly = null;

-        }

-

-        /// <summary>

-        /// Returns the root folder plus any folders in root (so down one level in the Inventory folders tree)

-        /// </summary>

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

-        /// <returns></returns>

-        public List<InventoryFolderBase> RequestFirstLevelFolders(LLUUID userID)

-        {

-            List<InventoryFolderBase> inventoryList = new List<InventoryFolderBase>();

-            foreach (KeyValuePair<string, IInventoryData> plugin in m_plugins)

-            {

-                InventoryFolderBase rootFolder = plugin.Value.getUserRootFolder(userID);

-                if (rootFolder != null)

-                {

-                    inventoryList = plugin.Value.getInventoryFolders(rootFolder.folderID);

-                    inventoryList.Insert(0, rootFolder);

-                    return inventoryList;

-                }

-            }

-            return inventoryList;

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

-        public InventoryFolderBase RequestUsersRoot(LLUUID userID)

-        {

-            foreach (KeyValuePair<string, IInventoryData> plugin in m_plugins)

-            {

-                return plugin.Value.getUserRootFolder(userID);

-            }

-            return null;

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

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

-        /// <returns></returns>

-        public List<InventoryFolderBase> RequestSubFolders(LLUUID parentFolderID)

-        {

-            List<InventoryFolderBase> inventoryList = new List<InventoryFolderBase>();

-            foreach (KeyValuePair<string, IInventoryData> plugin in m_plugins)

-            {

-                return plugin.Value.getInventoryFolders(parentFolderID);

-            }

-            return inventoryList;

-        }

-

-        public List<InventoryItemBase> RequestFolderItems(LLUUID folderID)

-        {

-            List<InventoryItemBase> itemsList = new List<InventoryItemBase>();

-            foreach (KeyValuePair<string, IInventoryData> plugin in m_plugins)

-            {

-                itemsList = plugin.Value.getInventoryInFolder(folderID);

-                return itemsList;

-            }

-            return itemsList;

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

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

-        public void AddNewInventorySet(UsersInventory inventory)

-        {

-

-        }

-

-        public class UsersInventory

-        {

-            public Dictionary<LLUUID, InventoryFolderBase> Folders = new Dictionary<LLUUID, InventoryFolderBase>();

-            public Dictionary<LLUUID, InventoryItemBase> Items = new Dictionary<LLUUID, InventoryItemBase>();

-

-            public UsersInventory()

-            {

-

-            }

-

-            protected virtual void CreateNewInventorySet()

-            {

-

-            }

-        }

-    }

-}

+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Text;
+using libsecondlife;
+using OpenSim.Framework.Console;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Data;
+
+namespace OpenSim.Framework.InventoryServiceBase
+{
+    public class InventoryServiceBase
+    {
+        protected Dictionary<string, IInventoryData> m_plugins = new Dictionary<string, IInventoryData>();
+        protected IAssetServer m_assetServer;
+
+        public InventoryServiceBase(IAssetServer assetServer)
+        {
+            m_assetServer = assetServer;
+        }
+
+        /// <summary>
+        /// Adds a new user server plugin - plugins will be requested in the order they were loaded.
+        /// </summary>
+        /// <param name="FileName">The filename to the user server plugin DLL</param>
+        public void AddPlugin(string FileName)
+        {
+            MainLog.Instance.Verbose("Inventorytorage: Attempting to load " + FileName);
+            Assembly pluginAssembly = Assembly.LoadFrom(FileName);
+
+            foreach (Type pluginType in pluginAssembly.GetTypes())
+            {
+                if (!pluginType.IsAbstract)
+                {
+                    Type typeInterface = pluginType.GetInterface("IInventoryData", true);
+
+                    if (typeInterface != null)
+                    {
+                        IInventoryData plug = (IInventoryData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
+                        plug.Initialise();
+                        this.m_plugins.Add(plug.getName(), plug);
+                        MainLog.Instance.Verbose("Inventorystorage: Added IInventoryData Interface");
+                    }
+
+                    typeInterface = null;
+                }
+            }
+
+            pluginAssembly = null;
+        }
+
+        /// <summary>
+        /// Returns the root folder plus any folders in root (so down one level in the Inventory folders tree)
+        /// </summary>
+        /// <param name="userID"></param>
+        /// <returns></returns>
+        public List<InventoryFolderBase> RequestFirstLevelFolders(LLUUID userID)
+        {
+            List<InventoryFolderBase> inventoryList = new List<InventoryFolderBase>();
+            foreach (KeyValuePair<string, IInventoryData> plugin in m_plugins)
+            {
+                InventoryFolderBase rootFolder = plugin.Value.getUserRootFolder(userID);
+                if (rootFolder != null)
+                {
+                    inventoryList = plugin.Value.getInventoryFolders(rootFolder.folderID);
+                    inventoryList.Insert(0, rootFolder);
+                    return inventoryList;
+                }
+            }
+            return inventoryList;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public InventoryFolderBase RequestUsersRoot(LLUUID userID)
+        {
+            foreach (KeyValuePair<string, IInventoryData> plugin in m_plugins)
+            {
+                return plugin.Value.getUserRootFolder(userID);
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="parentFolderID"></param>
+        /// <returns></returns>
+        public List<InventoryFolderBase> RequestSubFolders(LLUUID parentFolderID)
+        {
+            List<InventoryFolderBase> inventoryList = new List<InventoryFolderBase>();
+            foreach (KeyValuePair<string, IInventoryData> plugin in m_plugins)
+            {
+                return plugin.Value.getInventoryFolders(parentFolderID);
+            }
+            return inventoryList;
+        }
+
+        public List<InventoryItemBase> RequestFolderItems(LLUUID folderID)
+        {
+            List<InventoryItemBase> itemsList = new List<InventoryItemBase>();
+            foreach (KeyValuePair<string, IInventoryData> plugin in m_plugins)
+            {
+                itemsList = plugin.Value.getInventoryInFolder(folderID);
+                return itemsList;
+            }
+            return itemsList;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="inventory"></param>
+        public void AddNewInventorySet(UsersInventory inventory)
+        {
+
+        }
+
+        public class UsersInventory
+        {
+            public Dictionary<LLUUID, InventoryFolderBase> Folders = new Dictionary<LLUUID, InventoryFolderBase>();
+            public Dictionary<LLUUID, InventoryItemBase> Items = new Dictionary<LLUUID, InventoryItemBase>();
+
+            public UsersInventory()
+            {
+
+            }
+
+            protected virtual void CreateNewInventorySet()
+            {
+
+            }
+        }
+    }
+}
diff --git a/OpenSim/Framework/InventoryServiceBase/Properties/AssemblyInfo.cs b/OpenSim/Framework/InventoryServiceBase/Properties/AssemblyInfo.cs
index 35cca07..daf20b2 100644
--- a/OpenSim/Framework/InventoryServiceBase/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/InventoryServiceBase/Properties/AssemblyInfo.cs
@@ -1,35 +1,35 @@
-using System.Reflection;

-using System.Runtime.CompilerServices;

-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("InventoryServiceBase")]

-[assembly: AssemblyDescription("")]

-[assembly: AssemblyConfiguration("")]

-[assembly: AssemblyCompany("")]

-[assembly: AssemblyProduct("InventoryServiceBase")]

-[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("7e1fbd0b-4a25-4804-a01f-89b04eb5b349")]

-

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

-//

-//      Major Version

-//      Minor Version 

-//      Build Number

-//      Revision

-//

-// You can specify all the values or you can default the Revision and Build Numbers 

-// by using the '*' as shown below:

-[assembly: AssemblyVersion("1.0.0.0")]

-[assembly: AssemblyFileVersion("1.0.0.0")]

+using System.Reflection;
+using System.Runtime.CompilerServices;
+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("InventoryServiceBase")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("InventoryServiceBase")]
+[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("7e1fbd0b-4a25-4804-a01f-89b04eb5b349")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Revision and Build Numbers 
+// by using the '*' as shown below:
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/OpenSim/Region/Environment/LandManagement/Land.cs b/OpenSim/Region/Environment/LandManagement/Land.cs
index 625b176..97f8276 100644
--- a/OpenSim/Region/Environment/LandManagement/Land.cs
+++ b/OpenSim/Region/Environment/LandManagement/Land.cs
@@ -1,602 +1,602 @@
-using System;

-using System.Collections.Generic;

-using libsecondlife;

-using libsecondlife.Packets;

-using OpenSim.Framework.Interfaces;

-using OpenSim.Framework.Types;

-using OpenSim.Region.Environment.Scenes;

-

-namespace OpenSim.Region.Environment.LandManagement

-{

-    #region Parcel Class

-    /// <summary>

-    /// Keeps track of a specific piece of land's information

-    /// </summary>

-    public class Land

-    {

-        #region Member Variables

-        public LandData landData = new LandData();

-        public List<SceneObject> primsOverMe = new List<SceneObject>();

-

-        public Scene m_scene;

-

-        private bool[,] landBitmap = new bool[64, 64];

-

-        #endregion

-

-

-        #region Constructors

-        public Land(LLUUID owner_id, bool is_group_owned, Scene scene)

-        {

-            m_scene = scene;

-            landData.ownerID = owner_id;

-            landData.isGroupOwned = is_group_owned;

-

-        }

-        #endregion

-

-

-        #region Member Functions

-

-        #region General Functions

-        /// <summary>

-        /// Checks to see if this land object contains a point

-        /// </summary>

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

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

-        /// <returns>Returns true if the piece of land contains the specified point</returns>

-        public bool containsPoint(int x, int y)

-        {

-            if (x >= 0 && y >= 0 && x <= 256 && x <= 256)

-            {

-                return (landBitmap[x / 4, y / 4] == true);

-            }

-            else

-            {

-                return false;

-            }

-        }

-

-        public Land Copy()

-        {

-            Land newLand = new Land(this.landData.ownerID, this.landData.isGroupOwned, m_scene);

-

-            //Place all new variables here!

-            newLand.landBitmap = (bool[,])(this.landBitmap.Clone());

-            newLand.landData = landData.Copy();

-

-            return newLand;

-        }

-

-        #endregion

-

-

-        #region Packet Request Handling

-        /// <summary>

-        /// Sends land properties as requested

-        /// </summary>

-        /// <param name="sequence_id">ID sent by client for them to keep track of</param>

-        /// <param name="snap_selection">Bool sent by client for them to use</param>

-        /// <param name="remote_client">Object representing the client</param>

-        public void sendLandProperties(int sequence_id, bool snap_selection, int request_result, IClientAPI remote_client)

-        {

-

-            ParcelPropertiesPacket updatePacket = new ParcelPropertiesPacket();

-            updatePacket.ParcelData.AABBMax = landData.AABBMax;

-            updatePacket.ParcelData.AABBMin = landData.AABBMin;

-            updatePacket.ParcelData.Area = landData.area;

-            updatePacket.ParcelData.AuctionID = landData.auctionID;

-            updatePacket.ParcelData.AuthBuyerID = landData.authBuyerID; //unemplemented

-

-            updatePacket.ParcelData.Bitmap = landData.landBitmapByteArray;

-

-            updatePacket.ParcelData.Desc = Helpers.StringToField(landData.landDesc);

-            updatePacket.ParcelData.Category = (byte)landData.category;

-            updatePacket.ParcelData.ClaimDate = landData.claimDate;

-            updatePacket.ParcelData.ClaimPrice = landData.claimPrice;

-            updatePacket.ParcelData.GroupID = landData.groupID;

-            updatePacket.ParcelData.GroupPrims = landData.groupPrims;

-            updatePacket.ParcelData.IsGroupOwned = landData.isGroupOwned;

-            updatePacket.ParcelData.LandingType = (byte)landData.landingType;

-            updatePacket.ParcelData.LocalID = landData.localID;

-            if (landData.area > 0)

-            {

-                updatePacket.ParcelData.MaxPrims = Convert.ToInt32(Math.Round((Convert.ToDecimal(landData.area) / Convert.ToDecimal(65536)) * 15000 * Convert.ToDecimal(m_scene.RegionInfo.estateSettings.objectBonusFactor)));

-            }

-            else

-            {

-                updatePacket.ParcelData.MaxPrims = 0;

-            }

-            updatePacket.ParcelData.MediaAutoScale = landData.mediaAutoScale;

-            updatePacket.ParcelData.MediaID = landData.mediaID;

-            updatePacket.ParcelData.MediaURL = Helpers.StringToField(landData.mediaURL);

-            updatePacket.ParcelData.MusicURL = Helpers.StringToField(landData.musicURL);

-            updatePacket.ParcelData.Name = Helpers.StringToField(landData.landName);

-            updatePacket.ParcelData.OtherCleanTime = 0; //unemplemented

-            updatePacket.ParcelData.OtherCount = 0; //unemplemented

-            updatePacket.ParcelData.OtherPrims = landData.otherPrims;

-            updatePacket.ParcelData.OwnerID = landData.ownerID;

-            updatePacket.ParcelData.OwnerPrims = landData.ownerPrims;

-            updatePacket.ParcelData.ParcelFlags = landData.landFlags;

-            updatePacket.ParcelData.ParcelPrimBonus = m_scene.RegionInfo.estateSettings.objectBonusFactor;

-            updatePacket.ParcelData.PassHours = landData.passHours;

-            updatePacket.ParcelData.PassPrice = landData.passPrice;

-            updatePacket.ParcelData.PublicCount = 0; //unemplemented

-            

-            uint regionFlags = (uint)m_scene.RegionInfo.estateSettings.regionFlags;            

-            updatePacket.ParcelData.RegionDenyAnonymous = ((regionFlags & (uint)Simulator.RegionFlags.DenyAnonymous) > 0);

-            updatePacket.ParcelData.RegionDenyIdentified = ((regionFlags & (uint)Simulator.RegionFlags.DenyIdentified) > 0);

-            updatePacket.ParcelData.RegionDenyTransacted = ((regionFlags & (uint)Simulator.RegionFlags.DenyTransacted) > 0);

-            updatePacket.ParcelData.RegionPushOverride = ((regionFlags & (uint)Simulator.RegionFlags.RestrictPushObject) > 0);

-            

-            updatePacket.ParcelData.RentPrice = 0;

-            updatePacket.ParcelData.RequestResult = request_result;

-            updatePacket.ParcelData.SalePrice = landData.salePrice;

-            updatePacket.ParcelData.SelectedPrims = landData.selectedPrims;

-            updatePacket.ParcelData.SelfCount = 0;//unemplemented

-            updatePacket.ParcelData.SequenceID = sequence_id;

-            if (landData.simwideArea > 0)

-            {

-                updatePacket.ParcelData.SimWideMaxPrims = Convert.ToInt32(Math.Round((Convert.ToDecimal(landData.simwideArea) / Convert.ToDecimal(65536)) * 15000 * Convert.ToDecimal(m_scene.RegionInfo.estateSettings.objectBonusFactor)));

-            }

-            else

-            {

-                updatePacket.ParcelData.SimWideMaxPrims = 0;

-            }

-            updatePacket.ParcelData.SimWideTotalPrims = landData.simwidePrims;

-            updatePacket.ParcelData.SnapSelection = snap_selection;

-            updatePacket.ParcelData.SnapshotID = landData.snapshotID;

-            updatePacket.ParcelData.Status = (byte)landData.landStatus;

-            updatePacket.ParcelData.TotalPrims = landData.ownerPrims + landData.groupPrims + landData.otherPrims + landData.selectedPrims;

-            updatePacket.ParcelData.UserLocation = landData.userLocation;

-            updatePacket.ParcelData.UserLookAt = landData.userLookAt;

-            remote_client.OutPacket((Packet)updatePacket);

-        }

-

-        public void updateLandProperties(ParcelPropertiesUpdatePacket packet, IClientAPI remote_client)

-        {

-            if (remote_client.AgentId == landData.ownerID)

-            {

-                //Needs later group support

-                landData.authBuyerID = packet.ParcelData.AuthBuyerID;

-                landData.category = (libsecondlife.Parcel.ParcelCategory)packet.ParcelData.Category;

-                landData.landDesc = Helpers.FieldToUTF8String(packet.ParcelData.Desc);

-                landData.groupID = packet.ParcelData.GroupID;

-                landData.landingType = packet.ParcelData.LandingType;

-                landData.mediaAutoScale = packet.ParcelData.MediaAutoScale;

-                landData.mediaID = packet.ParcelData.MediaID;

-                landData.mediaURL = Helpers.FieldToUTF8String(packet.ParcelData.MediaURL);

-                landData.musicURL = Helpers.FieldToUTF8String(packet.ParcelData.MusicURL);

-                landData.landName = Helpers.FieldToUTF8String(packet.ParcelData.Name);

-                landData.landFlags = packet.ParcelData.ParcelFlags;

-                landData.passHours = packet.ParcelData.PassHours;

-                landData.passPrice = packet.ParcelData.PassPrice;

-                landData.salePrice = packet.ParcelData.SalePrice;

-                landData.snapshotID = packet.ParcelData.SnapshotID;

-                landData.userLocation = packet.ParcelData.UserLocation;

-                landData.userLookAt = packet.ParcelData.UserLookAt;

-                sendLandUpdateToAvatarsOverMe();

-

-

-            }

-        }

-

-        public void sendLandUpdateToAvatarsOverMe()

-        {

-            List<ScenePresence> avatars = m_scene.RequestAvatarList();

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

-            {

-                Land over = m_scene.LandManager.getLandObject((int)Math.Round(avatars[i].Pos.X), (int)Math.Round(avatars[i].Pos.Y));

-                if (over.landData.localID == this.landData.localID)

-                {

-                    sendLandProperties(0, false, 0, avatars[i].ControllingClient);

-                }

-            }

-        }

-        #endregion

-

-

-        #region Update Functions

-        /// <summary>

-        /// Updates the AABBMin and AABBMax values after area/shape modification of the land object

-        /// </summary>

-        private void updateAABBAndAreaValues()

-        {

-            int min_x = 64;

-            int min_y = 64;

-            int max_x = 0;

-            int max_y = 0;

-            int tempArea = 0;

-            int x, y;

-            for (x = 0; x < 64; x++)

-            {

-                for (y = 0; y < 64; y++)

-                {

-                    if (landBitmap[x, y] == true)

-                    {

-                        if (min_x > x) min_x = x;

-                        if (min_y > y) min_y = y;

-                        if (max_x < x) max_x = x;

-                        if (max_y < y) max_y = y;

-                        tempArea += 16; //16sqm peice of land

-                    }

-                }

-            }

-            landData.AABBMin = new LLVector3((float)(min_x * 4), (float)(min_y * 4), (float)m_scene.Terrain.GetHeight((min_x * 4), (min_y * 4)));

-            landData.AABBMax = new LLVector3((float)(max_x * 4), (float)(max_y * 4), (float)m_scene.Terrain.GetHeight((max_x * 4), (max_y * 4)));

-            landData.area = tempArea;

-        }

-

-        public void updateLandBitmapByteArray()

-        {

-            landData.landBitmapByteArray = convertLandBitmapToBytes();

-        }

-

-        /// <summary>

-        /// Update all settings in land such as area, bitmap byte array, etc

-        /// </summary>

-        public void forceUpdateLandInfo()

-        {

-            this.updateAABBAndAreaValues();

-            this.updateLandBitmapByteArray();

-        }

-

-        public void setLandBitmapFromByteArray()

-        {

-            landBitmap = convertBytesToLandBitmap();

-        }

-        #endregion

-

-

-        #region Land Bitmap Functions

-        /// <summary>

-        /// Sets the land's bitmap manually

-        /// </summary>

-        /// <param name="bitmap">64x64 block representing where this land is on a map</param>

-        public void setLandBitmap(bool[,] bitmap)

-        {

-            if (bitmap.GetLength(0) != 64 || bitmap.GetLength(1) != 64 || bitmap.Rank != 2)

-            {

-                //Throw an exception - The bitmap is not 64x64

-                throw new Exception("Error: Invalid Parcel Bitmap");

-            }

-            else

-            {

-                //Valid: Lets set it

-                landBitmap = bitmap;

-                forceUpdateLandInfo();

-

-            }

-        }

-        /// <summary>

-        /// Gets the land's bitmap manually

-        /// </summary>

-        /// <returns></returns>

-        public bool[,] getLandBitmap()

-        {

-            return landBitmap;

-        }

-        /// <summary>

-        /// Converts the land bitmap to a packet friendly byte array

-        /// </summary>

-        /// <returns></returns>

-        private byte[] convertLandBitmapToBytes()

-        {

-            byte[] tempConvertArr = new byte[512];

-            byte tempByte = 0;

-            int x, y, i, byteNum = 0;

-            i = 0;

-            for (y = 0; y < 64; y++)

-            {

-                for (x = 0; x < 64; x++)

-                {

-                    tempByte = Convert.ToByte(tempByte | Convert.ToByte(landBitmap[x, y]) << (i++ % 8));

-                    if (i % 8 == 0)

-                    {

-                        tempConvertArr[byteNum] = tempByte;

-                        tempByte = (byte)0;

-                        i = 0;

-                        byteNum++;

-                    }

-                }

-            }

-            return tempConvertArr;

-        }

-

-        private bool[,] convertBytesToLandBitmap()

-        {

-            bool[,] tempConvertMap = new bool[64, 64];

-            tempConvertMap.Initialize();

-            byte tempByte = 0;

-            int x = 0, y = 0, i = 0, bitNum = 0;

-            for (i = 0; i < 512; i++)

-            {

-                tempByte = landData.landBitmapByteArray[i];

-                for (bitNum = 0; bitNum < 8; bitNum++)

-                {

-                    bool bit = Convert.ToBoolean(Convert.ToByte(tempByte >> bitNum) & (byte)1);

-                    tempConvertMap[x, y] = bit;

-                    x++;

-                    if (x > 63)

-                    {

-                        x = 0;

-                        y++;

-                    }

-

-                }

-

-            }

-            return tempConvertMap;

-        }

-        /// <summary>

-        /// Full sim land object creation

-        /// </summary>

-        /// <returns></returns>

-        public static bool[,] basicFullRegionLandBitmap()

-        {

-            return getSquareLandBitmap(0, 0, 256, 256);

-        }

-

-        /// <summary>

-        /// Used to modify the bitmap between the x and y points. Points use 64 scale

-        /// </summary>

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

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

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

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

-        /// <returns></returns>

-        public static bool[,] getSquareLandBitmap(int start_x, int start_y, int end_x, int end_y)

-        {

-

-            bool[,] tempBitmap = new bool[64, 64];

-            tempBitmap.Initialize();

-

-            tempBitmap = modifyLandBitmapSquare(tempBitmap, start_x, start_y, end_x, end_y, true);

-            return tempBitmap;

-        }

-

-        /// <summary>

-        /// Change a land bitmap at within a square and set those points to a specific value

-        /// </summary>

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

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

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

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

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

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

-        /// <returns></returns>

-        public static bool[,] modifyLandBitmapSquare(bool[,] land_bitmap, int start_x, int start_y, int end_x, int end_y, bool set_value)

-        {

-            if (land_bitmap.GetLength(0) != 64 || land_bitmap.GetLength(1) != 64 || land_bitmap.Rank != 2)

-            {

-                //Throw an exception - The bitmap is not 64x64

-                throw new Exception("Error: Invalid Parcel Bitmap in modifyLandBitmapSquare()");

-            }

-

-            int x, y;

-            for (y = 0; y < 64; y++)

-            {

-                for (x = 0; x < 64; x++)

-                {

-                    if (x >= start_x / 4 && x < end_x / 4

-                        && y >= start_y / 4 && y < end_y / 4)

-                    {

-                        land_bitmap[x, y] = set_value;

-                    }

-                }

-            }

-            return land_bitmap;

-        }

-        /// <summary>

-        /// Join the true values of 2 bitmaps together

-        /// </summary>

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

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

-        /// <returns></returns>

-        public static bool[,] mergeLandBitmaps(bool[,] bitmap_base, bool[,] bitmap_add)

-        {

-            if (bitmap_base.GetLength(0) != 64 || bitmap_base.GetLength(1) != 64 || bitmap_base.Rank != 2)

-            {

-                //Throw an exception - The bitmap is not 64x64

-                throw new Exception("Error: Invalid Parcel Bitmap - Bitmap_base in mergeLandBitmaps");

-            }

-            if (bitmap_add.GetLength(0) != 64 || bitmap_add.GetLength(1) != 64 || bitmap_add.Rank != 2)

-            {

-                //Throw an exception - The bitmap is not 64x64

-                throw new Exception("Error: Invalid Parcel Bitmap - Bitmap_add in mergeLandBitmaps");

-

-            }

-

-            int x, y;

-            for (y = 0; y < 64; y++)

-            {

-                for (x = 0; x < 64; x++)

-                {

-                    if (bitmap_add[x, y])

-                    {

-                        bitmap_base[x, y] = true;

-                    }

-                }

-            }

-            return bitmap_base;

-        }

-        #endregion

-

-        #region Object Select and Object Owner Listing

-        public void sendForceObjectSelect(int local_id, int request_type, IClientAPI remote_client)

-        {

-            List<uint> resultLocalIDs = new List<uint>();

-            foreach (SceneObject obj in primsOverMe)

-            {

-                if (obj.rootLocalID > 0)

-                {

-                    if (request_type == LandManager.LAND_SELECT_OBJECTS_OWNER && obj.rootPrimitive.OwnerID == this.landData.ownerID)

-                    {

-                        resultLocalIDs.Add(obj.rootLocalID);

-                    }

-                    else if (request_type == LandManager.LAND_SELECT_OBJECTS_GROUP && false) //TODO: change false to group support!

-                    {

-

-                    }

-                    else if (request_type == LandManager.LAND_SELECT_OBJECTS_OTHER && obj.rootPrimitive.OwnerID != remote_client.AgentId)

-                    {

-                        resultLocalIDs.Add(obj.rootLocalID);

-                    }

-                }

-            }

-

-

-            bool firstCall = true;

-            int MAX_OBJECTS_PER_PACKET = 251;

-            ForceObjectSelectPacket pack = new ForceObjectSelectPacket();

-            ForceObjectSelectPacket.DataBlock[] data;

-            while (resultLocalIDs.Count > 0)

-            {

-                if (firstCall)

-                {

-                    pack._Header.ResetList = true;

-                    firstCall = false;

-                }

-                else

-                {

-                    pack._Header.ResetList = false;

-                }

-

-                if (resultLocalIDs.Count > MAX_OBJECTS_PER_PACKET)

-                {

-                    data = new ForceObjectSelectPacket.DataBlock[MAX_OBJECTS_PER_PACKET];

-                }

-                else

-                {

-                    data = new ForceObjectSelectPacket.DataBlock[resultLocalIDs.Count];

-                }

-

-                int i;

-                for (i = 0; i < MAX_OBJECTS_PER_PACKET && resultLocalIDs.Count > 0; i++)

-                {

-                    data[i] = new ForceObjectSelectPacket.DataBlock();

-                    data[i].LocalID = Convert.ToUInt32(resultLocalIDs[0]);

-                    resultLocalIDs.RemoveAt(0);

-                }

-                pack.Data = data;

-                remote_client.OutPacket((Packet)pack);

-            }

-

-        }

-        public void sendLandObjectOwners(IClientAPI remote_client)

-        {

-            Dictionary<LLUUID, int> ownersAndCount = new Dictionary<LLUUID, int>();

-            foreach (SceneObject obj in primsOverMe)

-            {

-                if (!ownersAndCount.ContainsKey(obj.rootPrimitive.OwnerID))

-                {

-                    ownersAndCount.Add(obj.rootPrimitive.OwnerID, 0);

-                }

-                ownersAndCount[obj.rootPrimitive.OwnerID] += obj.primCount;

-            }

-            if (ownersAndCount.Count > 0)

-            {

-

-                ParcelObjectOwnersReplyPacket.DataBlock[] dataBlock = new ParcelObjectOwnersReplyPacket.DataBlock[32];

-

-                if (ownersAndCount.Count < 32)

-                {

-                    dataBlock = new ParcelObjectOwnersReplyPacket.DataBlock[ownersAndCount.Count];

-                }

-

-

-                int num = 0;

-                foreach (LLUUID owner in ownersAndCount.Keys)

-                {

-                    dataBlock[num] = new ParcelObjectOwnersReplyPacket.DataBlock();

-                    dataBlock[num].Count = ownersAndCount[owner];

-                    dataBlock[num].IsGroupOwned = false; //TODO: fix me when group support is added

-                    dataBlock[num].OnlineStatus = true; //TODO: fix me later

-                    dataBlock[num].OwnerID = owner;

-

-                    num++;

-                }

-

-                ParcelObjectOwnersReplyPacket pack = new ParcelObjectOwnersReplyPacket();

-                pack.Data = dataBlock;

-                remote_client.OutPacket(pack);

-            }

-        }

-        #endregion

-

-        #region Object Returning

-        public void returnObject(SceneObject obj)

-        {

-        }

-        public void returnLandObjects(int type, LLUUID owner)

-        {

-

-        }

-        #endregion

-

-        #region Object Adding/Removing from Parcel

-        public void resetLandPrimCounts()

-        {

-            landData.groupPrims = 0;

-            landData.ownerPrims = 0;

-            landData.otherPrims = 0;

-            landData.selectedPrims = 0;

-            primsOverMe.Clear();

-        }

-

-        public void addPrimToCount(SceneObject obj)

-        {

-            LLUUID prim_owner = obj.rootPrimitive.OwnerID;

-            int prim_count = obj.primCount;

-

-            if (obj.isSelected)

-            {

-                landData.selectedPrims += prim_count;

-            }

-            else

-            {

-                if (prim_owner == landData.ownerID)

-                {

-                    landData.ownerPrims += prim_count;

-                }

-                else

-                {

-                    landData.otherPrims += prim_count;

-                }

-            }

-

-            primsOverMe.Add(obj);

-

-        }

-

-        public void removePrimFromCount(SceneObject obj)

-        {

-            if (primsOverMe.Contains(obj))

-            {

-                LLUUID prim_owner = obj.rootPrimitive.OwnerID;

-                int prim_count = obj.primCount;

-

-                if (prim_owner == landData.ownerID)

-                {

-                    landData.ownerPrims -= prim_count;

-                }

-                else if (prim_owner == landData.groupID)

-                {

-                    landData.groupPrims -= prim_count;

-                }

-                else

-                {

-                    landData.otherPrims -= prim_count;

-                }

-

-                primsOverMe.Remove(obj);

-            }

-        }

-        #endregion

-

-        #endregion

-

-

-    }

-    #endregion

-}

+using System;
+using System.Collections.Generic;
+using libsecondlife;
+using libsecondlife.Packets;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+using OpenSim.Region.Environment.Scenes;
+
+namespace OpenSim.Region.Environment.LandManagement
+{
+    #region Parcel Class
+    /// <summary>
+    /// Keeps track of a specific piece of land's information
+    /// </summary>
+    public class Land
+    {
+        #region Member Variables
+        public LandData landData = new LandData();
+        public List<SceneObject> primsOverMe = new List<SceneObject>();
+
+        public Scene m_scene;
+
+        private bool[,] landBitmap = new bool[64, 64];
+
+        #endregion
+
+
+        #region Constructors
+        public Land(LLUUID owner_id, bool is_group_owned, Scene scene)
+        {
+            m_scene = scene;
+            landData.ownerID = owner_id;
+            landData.isGroupOwned = is_group_owned;
+
+        }
+        #endregion
+
+
+        #region Member Functions
+
+        #region General Functions
+        /// <summary>
+        /// Checks to see if this land object contains a point
+        /// </summary>
+        /// <param name="x"></param>
+        /// <param name="y"></param>
+        /// <returns>Returns true if the piece of land contains the specified point</returns>
+        public bool containsPoint(int x, int y)
+        {
+            if (x >= 0 && y >= 0 && x <= 256 && x <= 256)
+            {
+                return (landBitmap[x / 4, y / 4] == true);
+            }
+            else
+            {
+                return false;
+            }
+        }
+
+        public Land Copy()
+        {
+            Land newLand = new Land(this.landData.ownerID, this.landData.isGroupOwned, m_scene);
+
+            //Place all new variables here!
+            newLand.landBitmap = (bool[,])(this.landBitmap.Clone());
+            newLand.landData = landData.Copy();
+
+            return newLand;
+        }
+
+        #endregion
+
+
+        #region Packet Request Handling
+        /// <summary>
+        /// Sends land properties as requested
+        /// </summary>
+        /// <param name="sequence_id">ID sent by client for them to keep track of</param>
+        /// <param name="snap_selection">Bool sent by client for them to use</param>
+        /// <param name="remote_client">Object representing the client</param>
+        public void sendLandProperties(int sequence_id, bool snap_selection, int request_result, IClientAPI remote_client)
+        {
+
+            ParcelPropertiesPacket updatePacket = new ParcelPropertiesPacket();
+            updatePacket.ParcelData.AABBMax = landData.AABBMax;
+            updatePacket.ParcelData.AABBMin = landData.AABBMin;
+            updatePacket.ParcelData.Area = landData.area;
+            updatePacket.ParcelData.AuctionID = landData.auctionID;
+            updatePacket.ParcelData.AuthBuyerID = landData.authBuyerID; //unemplemented
+
+            updatePacket.ParcelData.Bitmap = landData.landBitmapByteArray;
+
+            updatePacket.ParcelData.Desc = Helpers.StringToField(landData.landDesc);
+            updatePacket.ParcelData.Category = (byte)landData.category;
+            updatePacket.ParcelData.ClaimDate = landData.claimDate;
+            updatePacket.ParcelData.ClaimPrice = landData.claimPrice;
+            updatePacket.ParcelData.GroupID = landData.groupID;
+            updatePacket.ParcelData.GroupPrims = landData.groupPrims;
+            updatePacket.ParcelData.IsGroupOwned = landData.isGroupOwned;
+            updatePacket.ParcelData.LandingType = (byte)landData.landingType;
+            updatePacket.ParcelData.LocalID = landData.localID;
+            if (landData.area > 0)
+            {
+                updatePacket.ParcelData.MaxPrims = Convert.ToInt32(Math.Round((Convert.ToDecimal(landData.area) / Convert.ToDecimal(65536)) * 15000 * Convert.ToDecimal(m_scene.RegionInfo.estateSettings.objectBonusFactor)));
+            }
+            else
+            {
+                updatePacket.ParcelData.MaxPrims = 0;
+            }
+            updatePacket.ParcelData.MediaAutoScale = landData.mediaAutoScale;
+            updatePacket.ParcelData.MediaID = landData.mediaID;
+            updatePacket.ParcelData.MediaURL = Helpers.StringToField(landData.mediaURL);
+            updatePacket.ParcelData.MusicURL = Helpers.StringToField(landData.musicURL);
+            updatePacket.ParcelData.Name = Helpers.StringToField(landData.landName);
+            updatePacket.ParcelData.OtherCleanTime = 0; //unemplemented
+            updatePacket.ParcelData.OtherCount = 0; //unemplemented
+            updatePacket.ParcelData.OtherPrims = landData.otherPrims;
+            updatePacket.ParcelData.OwnerID = landData.ownerID;
+            updatePacket.ParcelData.OwnerPrims = landData.ownerPrims;
+            updatePacket.ParcelData.ParcelFlags = landData.landFlags;
+            updatePacket.ParcelData.ParcelPrimBonus = m_scene.RegionInfo.estateSettings.objectBonusFactor;
+            updatePacket.ParcelData.PassHours = landData.passHours;
+            updatePacket.ParcelData.PassPrice = landData.passPrice;
+            updatePacket.ParcelData.PublicCount = 0; //unemplemented
+            
+            uint regionFlags = (uint)m_scene.RegionInfo.estateSettings.regionFlags;            
+            updatePacket.ParcelData.RegionDenyAnonymous = ((regionFlags & (uint)Simulator.RegionFlags.DenyAnonymous) > 0);
+            updatePacket.ParcelData.RegionDenyIdentified = ((regionFlags & (uint)Simulator.RegionFlags.DenyIdentified) > 0);
+            updatePacket.ParcelData.RegionDenyTransacted = ((regionFlags & (uint)Simulator.RegionFlags.DenyTransacted) > 0);
+            updatePacket.ParcelData.RegionPushOverride = ((regionFlags & (uint)Simulator.RegionFlags.RestrictPushObject) > 0);
+            
+            updatePacket.ParcelData.RentPrice = 0;
+            updatePacket.ParcelData.RequestResult = request_result;
+            updatePacket.ParcelData.SalePrice = landData.salePrice;
+            updatePacket.ParcelData.SelectedPrims = landData.selectedPrims;
+            updatePacket.ParcelData.SelfCount = 0;//unemplemented
+            updatePacket.ParcelData.SequenceID = sequence_id;
+            if (landData.simwideArea > 0)
+            {
+                updatePacket.ParcelData.SimWideMaxPrims = Convert.ToInt32(Math.Round((Convert.ToDecimal(landData.simwideArea) / Convert.ToDecimal(65536)) * 15000 * Convert.ToDecimal(m_scene.RegionInfo.estateSettings.objectBonusFactor)));
+            }
+            else
+            {
+                updatePacket.ParcelData.SimWideMaxPrims = 0;
+            }
+            updatePacket.ParcelData.SimWideTotalPrims = landData.simwidePrims;
+            updatePacket.ParcelData.SnapSelection = snap_selection;
+            updatePacket.ParcelData.SnapshotID = landData.snapshotID;
+            updatePacket.ParcelData.Status = (byte)landData.landStatus;
+            updatePacket.ParcelData.TotalPrims = landData.ownerPrims + landData.groupPrims + landData.otherPrims + landData.selectedPrims;
+            updatePacket.ParcelData.UserLocation = landData.userLocation;
+            updatePacket.ParcelData.UserLookAt = landData.userLookAt;
+            remote_client.OutPacket((Packet)updatePacket);
+        }
+
+        public void updateLandProperties(ParcelPropertiesUpdatePacket packet, IClientAPI remote_client)
+        {
+            if (remote_client.AgentId == landData.ownerID)
+            {
+                //Needs later group support
+                landData.authBuyerID = packet.ParcelData.AuthBuyerID;
+                landData.category = (libsecondlife.Parcel.ParcelCategory)packet.ParcelData.Category;
+                landData.landDesc = Helpers.FieldToUTF8String(packet.ParcelData.Desc);
+                landData.groupID = packet.ParcelData.GroupID;
+                landData.landingType = packet.ParcelData.LandingType;
+                landData.mediaAutoScale = packet.ParcelData.MediaAutoScale;
+                landData.mediaID = packet.ParcelData.MediaID;
+                landData.mediaURL = Helpers.FieldToUTF8String(packet.ParcelData.MediaURL);
+                landData.musicURL = Helpers.FieldToUTF8String(packet.ParcelData.MusicURL);
+                landData.landName = Helpers.FieldToUTF8String(packet.ParcelData.Name);
+                landData.landFlags = packet.ParcelData.ParcelFlags;
+                landData.passHours = packet.ParcelData.PassHours;
+                landData.passPrice = packet.ParcelData.PassPrice;
+                landData.salePrice = packet.ParcelData.SalePrice;
+                landData.snapshotID = packet.ParcelData.SnapshotID;
+                landData.userLocation = packet.ParcelData.UserLocation;
+                landData.userLookAt = packet.ParcelData.UserLookAt;
+                sendLandUpdateToAvatarsOverMe();
+
+
+            }
+        }
+
+        public void sendLandUpdateToAvatarsOverMe()
+        {
+            List<ScenePresence> avatars = m_scene.RequestAvatarList();
+            for (int i = 0; i < avatars.Count; i++)
+            {
+                Land over = m_scene.LandManager.getLandObject((int)Math.Round(avatars[i].Pos.X), (int)Math.Round(avatars[i].Pos.Y));
+                if (over.landData.localID == this.landData.localID)
+                {
+                    sendLandProperties(0, false, 0, avatars[i].ControllingClient);
+                }
+            }
+        }
+        #endregion
+
+
+        #region Update Functions
+        /// <summary>
+        /// Updates the AABBMin and AABBMax values after area/shape modification of the land object
+        /// </summary>
+        private void updateAABBAndAreaValues()
+        {
+            int min_x = 64;
+            int min_y = 64;
+            int max_x = 0;
+            int max_y = 0;
+            int tempArea = 0;
+            int x, y;
+            for (x = 0; x < 64; x++)
+            {
+                for (y = 0; y < 64; y++)
+                {
+                    if (landBitmap[x, y] == true)
+                    {
+                        if (min_x > x) min_x = x;
+                        if (min_y > y) min_y = y;
+                        if (max_x < x) max_x = x;
+                        if (max_y < y) max_y = y;
+                        tempArea += 16; //16sqm peice of land
+                    }
+                }
+            }
+            landData.AABBMin = new LLVector3((float)(min_x * 4), (float)(min_y * 4), (float)m_scene.Terrain.GetHeight((min_x * 4), (min_y * 4)));
+            landData.AABBMax = new LLVector3((float)(max_x * 4), (float)(max_y * 4), (float)m_scene.Terrain.GetHeight((max_x * 4), (max_y * 4)));
+            landData.area = tempArea;
+        }
+
+        public void updateLandBitmapByteArray()
+        {
+            landData.landBitmapByteArray = convertLandBitmapToBytes();
+        }
+
+        /// <summary>
+        /// Update all settings in land such as area, bitmap byte array, etc
+        /// </summary>
+        public void forceUpdateLandInfo()
+        {
+            this.updateAABBAndAreaValues();
+            this.updateLandBitmapByteArray();
+        }
+
+        public void setLandBitmapFromByteArray()
+        {
+            landBitmap = convertBytesToLandBitmap();
+        }
+        #endregion
+
+
+        #region Land Bitmap Functions
+        /// <summary>
+        /// Sets the land's bitmap manually
+        /// </summary>
+        /// <param name="bitmap">64x64 block representing where this land is on a map</param>
+        public void setLandBitmap(bool[,] bitmap)
+        {
+            if (bitmap.GetLength(0) != 64 || bitmap.GetLength(1) != 64 || bitmap.Rank != 2)
+            {
+                //Throw an exception - The bitmap is not 64x64
+                throw new Exception("Error: Invalid Parcel Bitmap");
+            }
+            else
+            {
+                //Valid: Lets set it
+                landBitmap = bitmap;
+                forceUpdateLandInfo();
+
+            }
+        }
+        /// <summary>
+        /// Gets the land's bitmap manually
+        /// </summary>
+        /// <returns></returns>
+        public bool[,] getLandBitmap()
+        {
+            return landBitmap;
+        }
+        /// <summary>
+        /// Converts the land bitmap to a packet friendly byte array
+        /// </summary>
+        /// <returns></returns>
+        private byte[] convertLandBitmapToBytes()
+        {
+            byte[] tempConvertArr = new byte[512];
+            byte tempByte = 0;
+            int x, y, i, byteNum = 0;
+            i = 0;
+            for (y = 0; y < 64; y++)
+            {
+                for (x = 0; x < 64; x++)
+                {
+                    tempByte = Convert.ToByte(tempByte | Convert.ToByte(landBitmap[x, y]) << (i++ % 8));
+                    if (i % 8 == 0)
+                    {
+                        tempConvertArr[byteNum] = tempByte;
+                        tempByte = (byte)0;
+                        i = 0;
+                        byteNum++;
+                    }
+                }
+            }
+            return tempConvertArr;
+        }
+
+        private bool[,] convertBytesToLandBitmap()
+        {
+            bool[,] tempConvertMap = new bool[64, 64];
+            tempConvertMap.Initialize();
+            byte tempByte = 0;
+            int x = 0, y = 0, i = 0, bitNum = 0;
+            for (i = 0; i < 512; i++)
+            {
+                tempByte = landData.landBitmapByteArray[i];
+                for (bitNum = 0; bitNum < 8; bitNum++)
+                {
+                    bool bit = Convert.ToBoolean(Convert.ToByte(tempByte >> bitNum) & (byte)1);
+                    tempConvertMap[x, y] = bit;
+                    x++;
+                    if (x > 63)
+                    {
+                        x = 0;
+                        y++;
+                    }
+
+                }
+
+            }
+            return tempConvertMap;
+        }
+        /// <summary>
+        /// Full sim land object creation
+        /// </summary>
+        /// <returns></returns>
+        public static bool[,] basicFullRegionLandBitmap()
+        {
+            return getSquareLandBitmap(0, 0, 256, 256);
+        }
+
+        /// <summary>
+        /// Used to modify the bitmap between the x and y points. Points use 64 scale
+        /// </summary>
+        /// <param name="start_x"></param>
+        /// <param name="start_y"></param>
+        /// <param name="end_x"></param>
+        /// <param name="end_y"></param>
+        /// <returns></returns>
+        public static bool[,] getSquareLandBitmap(int start_x, int start_y, int end_x, int end_y)
+        {
+
+            bool[,] tempBitmap = new bool[64, 64];
+            tempBitmap.Initialize();
+
+            tempBitmap = modifyLandBitmapSquare(tempBitmap, start_x, start_y, end_x, end_y, true);
+            return tempBitmap;
+        }
+
+        /// <summary>
+        /// Change a land bitmap at within a square and set those points to a specific value
+        /// </summary>
+        /// <param name="land_bitmap"></param>
+        /// <param name="start_x"></param>
+        /// <param name="start_y"></param>
+        /// <param name="end_x"></param>
+        /// <param name="end_y"></param>
+        /// <param name="set_value"></param>
+        /// <returns></returns>
+        public static bool[,] modifyLandBitmapSquare(bool[,] land_bitmap, int start_x, int start_y, int end_x, int end_y, bool set_value)
+        {
+            if (land_bitmap.GetLength(0) != 64 || land_bitmap.GetLength(1) != 64 || land_bitmap.Rank != 2)
+            {
+                //Throw an exception - The bitmap is not 64x64
+                throw new Exception("Error: Invalid Parcel Bitmap in modifyLandBitmapSquare()");
+            }
+
+            int x, y;
+            for (y = 0; y < 64; y++)
+            {
+                for (x = 0; x < 64; x++)
+                {
+                    if (x >= start_x / 4 && x < end_x / 4
+                        && y >= start_y / 4 && y < end_y / 4)
+                    {
+                        land_bitmap[x, y] = set_value;
+                    }
+                }
+            }
+            return land_bitmap;
+        }
+        /// <summary>
+        /// Join the true values of 2 bitmaps together
+        /// </summary>
+        /// <param name="bitmap_base"></param>
+        /// <param name="bitmap_add"></param>
+        /// <returns></returns>
+        public static bool[,] mergeLandBitmaps(bool[,] bitmap_base, bool[,] bitmap_add)
+        {
+            if (bitmap_base.GetLength(0) != 64 || bitmap_base.GetLength(1) != 64 || bitmap_base.Rank != 2)
+            {
+                //Throw an exception - The bitmap is not 64x64
+                throw new Exception("Error: Invalid Parcel Bitmap - Bitmap_base in mergeLandBitmaps");
+            }
+            if (bitmap_add.GetLength(0) != 64 || bitmap_add.GetLength(1) != 64 || bitmap_add.Rank != 2)
+            {
+                //Throw an exception - The bitmap is not 64x64
+                throw new Exception("Error: Invalid Parcel Bitmap - Bitmap_add in mergeLandBitmaps");
+
+            }
+
+            int x, y;
+            for (y = 0; y < 64; y++)
+            {
+                for (x = 0; x < 64; x++)
+                {
+                    if (bitmap_add[x, y])
+                    {
+                        bitmap_base[x, y] = true;
+                    }
+                }
+            }
+            return bitmap_base;
+        }
+        #endregion
+
+        #region Object Select and Object Owner Listing
+        public void sendForceObjectSelect(int local_id, int request_type, IClientAPI remote_client)
+        {
+            List<uint> resultLocalIDs = new List<uint>();
+            foreach (SceneObject obj in primsOverMe)
+            {
+                if (obj.rootLocalID > 0)
+                {
+                    if (request_type == LandManager.LAND_SELECT_OBJECTS_OWNER && obj.rootPrimitive.OwnerID == this.landData.ownerID)
+                    {
+                        resultLocalIDs.Add(obj.rootLocalID);
+                    }
+                    else if (request_type == LandManager.LAND_SELECT_OBJECTS_GROUP && false) //TODO: change false to group support!
+                    {
+
+                    }
+                    else if (request_type == LandManager.LAND_SELECT_OBJECTS_OTHER && obj.rootPrimitive.OwnerID != remote_client.AgentId)
+                    {
+                        resultLocalIDs.Add(obj.rootLocalID);
+                    }
+                }
+            }
+
+
+            bool firstCall = true;
+            int MAX_OBJECTS_PER_PACKET = 251;
+            ForceObjectSelectPacket pack = new ForceObjectSelectPacket();
+            ForceObjectSelectPacket.DataBlock[] data;
+            while (resultLocalIDs.Count > 0)
+            {
+                if (firstCall)
+                {
+                    pack._Header.ResetList = true;
+                    firstCall = false;
+                }
+                else
+                {
+                    pack._Header.ResetList = false;
+                }
+
+                if (resultLocalIDs.Count > MAX_OBJECTS_PER_PACKET)
+                {
+                    data = new ForceObjectSelectPacket.DataBlock[MAX_OBJECTS_PER_PACKET];
+                }
+                else
+                {
+                    data = new ForceObjectSelectPacket.DataBlock[resultLocalIDs.Count];
+                }
+
+                int i;
+                for (i = 0; i < MAX_OBJECTS_PER_PACKET && resultLocalIDs.Count > 0; i++)
+                {
+                    data[i] = new ForceObjectSelectPacket.DataBlock();
+                    data[i].LocalID = Convert.ToUInt32(resultLocalIDs[0]);
+                    resultLocalIDs.RemoveAt(0);
+                }
+                pack.Data = data;
+                remote_client.OutPacket((Packet)pack);
+            }
+
+        }
+        public void sendLandObjectOwners(IClientAPI remote_client)
+        {
+            Dictionary<LLUUID, int> ownersAndCount = new Dictionary<LLUUID, int>();
+            foreach (SceneObject obj in primsOverMe)
+            {
+                if (!ownersAndCount.ContainsKey(obj.rootPrimitive.OwnerID))
+                {
+                    ownersAndCount.Add(obj.rootPrimitive.OwnerID, 0);
+                }
+                ownersAndCount[obj.rootPrimitive.OwnerID] += obj.primCount;
+            }
+            if (ownersAndCount.Count > 0)
+            {
+
+                ParcelObjectOwnersReplyPacket.DataBlock[] dataBlock = new ParcelObjectOwnersReplyPacket.DataBlock[32];
+
+                if (ownersAndCount.Count < 32)
+                {
+                    dataBlock = new ParcelObjectOwnersReplyPacket.DataBlock[ownersAndCount.Count];
+                }
+
+
+                int num = 0;
+                foreach (LLUUID owner in ownersAndCount.Keys)
+                {
+                    dataBlock[num] = new ParcelObjectOwnersReplyPacket.DataBlock();
+                    dataBlock[num].Count = ownersAndCount[owner];
+                    dataBlock[num].IsGroupOwned = false; //TODO: fix me when group support is added
+                    dataBlock[num].OnlineStatus = true; //TODO: fix me later
+                    dataBlock[num].OwnerID = owner;
+
+                    num++;
+                }
+
+                ParcelObjectOwnersReplyPacket pack = new ParcelObjectOwnersReplyPacket();
+                pack.Data = dataBlock;
+                remote_client.OutPacket(pack);
+            }
+        }
+        #endregion
+
+        #region Object Returning
+        public void returnObject(SceneObject obj)
+        {
+        }
+        public void returnLandObjects(int type, LLUUID owner)
+        {
+
+        }
+        #endregion
+
+        #region Object Adding/Removing from Parcel
+        public void resetLandPrimCounts()
+        {
+            landData.groupPrims = 0;
+            landData.ownerPrims = 0;
+            landData.otherPrims = 0;
+            landData.selectedPrims = 0;
+            primsOverMe.Clear();
+        }
+
+        public void addPrimToCount(SceneObject obj)
+        {
+            LLUUID prim_owner = obj.rootPrimitive.OwnerID;
+            int prim_count = obj.primCount;
+
+            if (obj.isSelected)
+            {
+                landData.selectedPrims += prim_count;
+            }
+            else
+            {
+                if (prim_owner == landData.ownerID)
+                {
+                    landData.ownerPrims += prim_count;
+                }
+                else
+                {
+                    landData.otherPrims += prim_count;
+                }
+            }
+
+            primsOverMe.Add(obj);
+
+        }
+
+        public void removePrimFromCount(SceneObject obj)
+        {
+            if (primsOverMe.Contains(obj))
+            {
+                LLUUID prim_owner = obj.rootPrimitive.OwnerID;
+                int prim_count = obj.primCount;
+
+                if (prim_owner == landData.ownerID)
+                {
+                    landData.ownerPrims -= prim_count;
+                }
+                else if (prim_owner == landData.groupID)
+                {
+                    landData.groupPrims -= prim_count;
+                }
+                else
+                {
+                    landData.otherPrims -= prim_count;
+                }
+
+                primsOverMe.Remove(obj);
+            }
+        }
+        #endregion
+
+        #endregion
+
+
+    }
+    #endregion
+}
diff --git a/OpenSim/Region/Environment/LandManagement/LandManager.cs b/OpenSim/Region/Environment/LandManagement/LandManager.cs
index 8c359fc..f759934 100644
--- a/OpenSim/Region/Environment/LandManagement/LandManager.cs
+++ b/OpenSim/Region/Environment/LandManagement/LandManager.cs
@@ -1,617 +1,617 @@
-/*

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

-using libsecondlife;

-using libsecondlife.Packets;

-using OpenSim.Framework.Interfaces;

-using OpenSim.Framework.Types;

-using OpenSim.Region.Environment.Scenes;

-

-namespace OpenSim.Region.Environment.LandManagement

-{

-

-

-    #region LandManager Class

-    /// <summary>

-    /// Handles Land objects and operations requiring information from other Land objects (divide, join, etc)

-    /// </summary>

-    public class LandManager : ILocalStorageLandObjectReceiver

-    {

-

-        #region Constants

-        //Land types set with flags in ParcelOverlay.

-        //Only one of these can be used. 

-        public const byte LAND_TYPE_PUBLIC = (byte)0;      //Equals 00000000

-        public const byte LAND_TYPE_OWNED_BY_OTHER = (byte)1;      //Equals 00000001

-        public const byte LAND_TYPE_OWNED_BY_GROUP = (byte)2;      //Equals 00000010

-        public const byte LAND_TYPE_OWNED_BY_REQUESTER = (byte)3;      //Equals 00000011

-        public const byte LAND_TYPE_IS_FOR_SALE = (byte)4;      //Equals 00000100

-        public const byte LAND_TYPE_IS_BEING_AUCTIONED = (byte)5;      //Equals 00000101

-

-

-        //Flags that when set, a border on the given side will be placed

-        //NOTE: North and East is assumable by the west and south sides (if land to east has a west border, then I have an east border; etc)

-        //This took forever to figure out -- jeesh. /blame LL for even having to send these

-        public const byte LAND_FLAG_PROPERTY_BORDER_WEST = (byte)64;     //Equals 01000000

-        public const byte LAND_FLAG_PROPERTY_BORDER_SOUTH = (byte)128;    //Equals 10000000

-

-        //RequestResults (I think these are right, they seem to work):

-        public const int LAND_RESULT_SINGLE = 0;        // The request they made contained only a single piece of land

-        public const int LAND_RESULT_MULTIPLE = 1;      // The request they made contained more than a single peice of land

-

-        //ParcelSelectObjects

-        public const int LAND_SELECT_OBJECTS_OWNER = 2;

-        public const int LAND_SELECT_OBJECTS_GROUP = 4;

-        public const int LAND_SELECT_OBJECTS_OTHER = 8;

-

-

-        //These are other constants. Yay!

-        public const int START_LAND_LOCAL_ID = 1;

-        #endregion

-

-        #region Member Variables

-        public Dictionary<int, Land> landList = new Dictionary<int, Land>();

-        private int lastLandLocalID = START_LAND_LOCAL_ID - 1;

-        private int[,] landIDList = new int[64, 64];

-

-        /// <summary>

-        /// Set to true when a prim is moved, created, added. Performs a prim count update

-        /// </summary>

-        public bool landPrimCountTainted = false;

-

-        private Scene m_scene;

-        private RegionInfo m_regInfo;

-

-        #endregion

-

-        #region Constructors

-        public LandManager(Scene scene, RegionInfo reginfo)

-        {

-

-            m_scene = scene;

-            m_regInfo = reginfo;

-            landIDList.Initialize();

-

-        }

-        #endregion

-

-        #region Member Functions

-

-        #region Parcel From Storage Functions

-        public void LandFromStorage(LandData data)

-        {

-            Land new_land = new Land(data.ownerID, data.isGroupOwned, m_scene);

-            new_land.landData = data.Copy();

-            new_land.setLandBitmapFromByteArray();

-            addLandObject(new_land);

-

-        }

-

-        public void NoLandDataFromStorage()

-        {

-            resetSimLandObjects();

-        }

-        #endregion

-

-        #region Parcel Add/Remove/Get/Create

-        /// <summary>

-        /// Creates a basic Parcel object without an owner (a zeroed key)

-        /// </summary>

-        /// <returns></returns>

-        public Land createBaseLand()

-        {

-            return new Land(new LLUUID(), false, m_scene);

-        }

-

-        /// <summary>

-        /// Adds a land object to the stored list and adds them to the landIDList to what they own

-        /// </summary>

-        /// <param name="new_land">The land object being added</param>

-        public Land addLandObject(Land new_land)

-        {

-            lastLandLocalID++;

-            new_land.landData.localID = lastLandLocalID;

-            landList.Add(lastLandLocalID, new_land.Copy());

-

-

-            bool[,] landBitmap = new_land.getLandBitmap();

-            int x, y;

-            for (x = 0; x < 64; x++)

-            {

-                for (y = 0; y < 64; y++)

-                {

-                    if (landBitmap[x, y])

-                    {

-                        landIDList[x, y] = lastLandLocalID;

-                    }

-                }

-            }

-            landList[lastLandLocalID].forceUpdateLandInfo();

-

-            return new_land;

-

-        }

-        /// <summary>

-        /// Removes a land object from the list. Will not remove if local_id is still owning an area in landIDList

-        /// </summary>

-        /// <param name="local_id">Land.localID of the peice of land to remove.</param>

-        public void removeLandObject(int local_id)

-        {

-            int x, y;

-            for (x = 0; x < 64; x++)

-            {

-                for (y = 0; y < 64; y++)

-                {

-                    if (landIDList[x, y] == local_id)

-                    {

-                        throw new Exception("Could not remove land object. Still being used at " + x + ", " + y);

-                    }

-                }

-            }

-            // TODO: Put event here for storage manager to bind to.

-            landList.Remove(local_id);

-        }

-

-        private void performFinalLandJoin(Land master, Land slave)

-        {

-            int x, y;

-            bool[,] landBitmapSlave = slave.getLandBitmap();

-            for (x = 0; x < 64; x++)

-            {

-                for (y = 0; y < 64; y++)

-                {

-                    if (landBitmapSlave[x, y])

-                    {

-                        landIDList[x, y] = master.landData.localID;

-                    }

-                }

-            }

-            removeLandObject(slave.landData.localID);

-        }

-        /// <summary>

-        /// Get the land object at the specified point

-        /// </summary>

-        /// <param name="x">Value between 0 - 256 on the x axis of the point</param>

-        /// <param name="y">Value between 0 - 256 on the y axis of the point</param>

-        /// <returns>Land object at the point supplied</returns>

-        public Land getLandObject(float x_float, float y_float)

-        {

-            int x = Convert.ToInt32(Math.Floor(Convert.ToDecimal(x_float) / Convert.ToDecimal(4.0)));

-            int y = Convert.ToInt32(Math.Floor(Convert.ToDecimal(y_float) / Convert.ToDecimal(4.0)));

-            

-            if (x > 63 || y > 63 || x < 0 || y < 0)

-            {

-                throw new Exception("Error: Parcel not found at point " + x + ", " + y);

-            }

-            else

-            {

-              // Console.WriteLine("Point (" + x + ", " + y + ") determined from point (" + x_float + ", " + y_float + ")");

-                return landList[landIDList[x, y]];

-            }

-        }

-

-        public Land getLandObject(int x, int y)

-        {

-            if (x > 256 || y > 256 || x < 0 || y < 0)

-            {

-                throw new Exception("Error: Parcel not found at point " + x + ", " + y);

-            }

-            else

-            {

-                return landList[landIDList[x / 4, y / 4]];

-            }

-        }

-        #endregion

-

-        #region Parcel Modification

-        /// <summary>

-        /// Subdivides a piece of land

-        /// </summary>

-        /// <param name="start_x">West Point</param>

-        /// <param name="start_y">South Point</param>

-        /// <param name="end_x">East Point</param>

-        /// <param name="end_y">North Point</param>

-        /// <param name="attempting_user_id">LLUUID of user who is trying to subdivide</param>

-        /// <returns>Returns true if successful</returns>

-        private bool subdivide(int start_x, int start_y, int end_x, int end_y, LLUUID attempting_user_id)

-        {

-           

-            //First, lets loop through the points and make sure they are all in the same peice of land

-            //Get the land object at start

-            Land startLandObject = getLandObject(start_x, start_y);

-            if (startLandObject == null) return false; //No such land object at the beginning

-

-            //Loop through the points

-            try

-            {

-                int totalX = end_x - start_x;

-                int totalY = end_y - start_y;

-                int x, y;

-                for (y = 0; y < totalY; y++)

-                {

-                    for (x = 0; x < totalX; x++)

-                    {

-                        Land tempLandObject = getLandObject(start_x + x, start_y + y);

-                        if (tempLandObject == null) return false; //No such land object at that point

-                        if (tempLandObject != startLandObject) return false; //Subdividing over 2 land objects; no-no

-                    }

-                }

-            }

-            catch (Exception)

-            {

-                return false; //Exception. For now, lets skip subdivision

-            }

-

-            //If we are still here, then they are subdividing within one piece of land

-            //Check owner

-            if (startLandObject.landData.ownerID != attempting_user_id)

-            {

-                return false; //They cant do this!

-            }

-

-            //Lets create a new land object with bitmap activated at that point (keeping the old land objects info)

-            Land newLand = startLandObject.Copy();

-            newLand.landData.landName = "Subdivision of " + newLand.landData.landName;

-            newLand.landData.globalID = LLUUID.Random();

-

-            newLand.setLandBitmap(Land.getSquareLandBitmap(start_x, start_y, end_x, end_y));

-

-            //Now, lets set the subdivision area of the original to false

-            int startLandObjectIndex = startLandObject.landData.localID;

-            landList[startLandObjectIndex].setLandBitmap(Land.modifyLandBitmapSquare(startLandObject.getLandBitmap(), start_x, start_y, end_x, end_y, false));

-            landList[startLandObjectIndex].forceUpdateLandInfo();

-

-

-            this.setPrimsTainted();

-

-            //Now add the new land object

-            Land result = addLandObject(newLand);

-            result.sendLandUpdateToAvatarsOverMe();

-

-

-

-

-            return true;

-        }

-        /// <summary>

-        /// Join 2 land objects together

-        /// </summary>

-        /// <param name="start_x">x value in first piece of land</param>

-        /// <param name="start_y">y value in first piece of land</param>

-        /// <param name="end_x">x value in second peice of land</param>

-        /// <param name="end_y">y value in second peice of land</param>

-        /// <param name="attempting_user_id">LLUUID of the avatar trying to join the land objects</param>

-        /// <returns>Returns true if successful</returns>

-        private bool join(int start_x, int start_y, int end_x, int end_y, LLUUID attempting_user_id)

-        {

-            end_x -= 4;

-            end_y -= 4;

-

-            List<Land> selectedLandObjects = new List<Land>();

-            int stepXSelected = 0;

-            int stepYSelected = 0;

-            for (stepYSelected = start_y; stepYSelected <= end_y; stepYSelected += 4)

-            {

-                for (stepXSelected = start_x; stepXSelected <= end_x; stepXSelected += 4)

-                {

-                    Land p = getLandObject(stepXSelected,stepYSelected);

-                    if (!selectedLandObjects.Contains(p))

-                    {

-                        selectedLandObjects.Add(p);

-                    }

-                }

-            }

-            Land masterLandObject = selectedLandObjects[0];

-            selectedLandObjects.RemoveAt(0);

-

-            

-            if (selectedLandObjects.Count < 1)

-            {

-                return false; //Only one piece of land selected

-            }

-            if (masterLandObject.landData.ownerID != attempting_user_id)

-            {

-                return false; //Not the same owner

-            }

-            foreach (Land p in selectedLandObjects)

-            {

-                if (p.landData.ownerID != masterLandObject.landData.ownerID)

-                {

-                    return false; //Over multiple users. TODO: make this just ignore this piece of land?

-                }

-            }

-            foreach (Land slaveLandObject in selectedLandObjects)

-            {

-                landList[masterLandObject.landData.localID].setLandBitmap(Land.mergeLandBitmaps(masterLandObject.getLandBitmap(), slaveLandObject.getLandBitmap()));

-                performFinalLandJoin(masterLandObject, slaveLandObject);

-            }

-

-

-            this.setPrimsTainted();

-

-            masterLandObject.sendLandUpdateToAvatarsOverMe();

-

-            return true;

-

-

-

-        }

-        #endregion

-

-        #region Parcel Updating

-        /// <summary>

-        /// Where we send the ParcelOverlay packet to the client

-        /// </summary>

-        /// <param name="remote_client">The object representing the client</param>

-        public void sendParcelOverlay(IClientAPI remote_client)

-        {

-            const int LAND_BLOCKS_PER_PACKET = 1024;

-            int x, y = 0;

-            byte[] byteArray = new byte[LAND_BLOCKS_PER_PACKET];

-            int byteArrayCount = 0;

-            int sequenceID = 0;

-            ParcelOverlayPacket packet;

-

-            for (y = 0; y < 64; y++)

-            {

-                for (x = 0; x < 64; x++)

-                {

-                    byte tempByte = (byte)0; //This represents the byte for the current 4x4

-                    Land currentParcelBlock = getLandObject(x * 4, y * 4);

-

-                    if (currentParcelBlock.landData.ownerID == remote_client.AgentId)

-                    {

-                        //Owner Flag

-                        tempByte = Convert.ToByte(tempByte | LAND_TYPE_OWNED_BY_REQUESTER);

-                    }

-                    else if (currentParcelBlock.landData.salePrice > 0 && (currentParcelBlock.landData.authBuyerID == LLUUID.Zero || currentParcelBlock.landData.authBuyerID == remote_client.AgentId))

-                    {

-                        //Sale Flag

-                        tempByte = Convert.ToByte(tempByte | LAND_TYPE_IS_FOR_SALE);

-                    }

-                    else if (currentParcelBlock.landData.ownerID == LLUUID.Zero)

-                    {

-                        //Public Flag

-                        tempByte = Convert.ToByte(tempByte | LAND_TYPE_PUBLIC);

-                    }

-                    else

-                    {

-                        //Other Flag

-                        tempByte = Convert.ToByte(tempByte | LAND_TYPE_OWNED_BY_OTHER);

-                    }

-

-

-                    //Now for border control

-                    if (x == 0)

-                    {

-                        tempByte = Convert.ToByte(tempByte | LAND_FLAG_PROPERTY_BORDER_WEST);

-                    }

-                    else if (getLandObject((x - 1) * 4, y * 4) != currentParcelBlock)

-                    {

-                        tempByte = Convert.ToByte(tempByte | LAND_FLAG_PROPERTY_BORDER_WEST);

-                    }

-

-                    if (y == 0)

-                    {

-                        tempByte = Convert.ToByte(tempByte | LAND_FLAG_PROPERTY_BORDER_SOUTH);

-                    }

-                    else if (getLandObject(x * 4, (y - 1) * 4) != currentParcelBlock)

-                    {

-                        tempByte = Convert.ToByte(tempByte | LAND_FLAG_PROPERTY_BORDER_SOUTH);

-                    }

-

-                    byteArray[byteArrayCount] = tempByte;

-                    byteArrayCount++;

-                    if (byteArrayCount >= LAND_BLOCKS_PER_PACKET)

-                    {

-                        byteArrayCount = 0;

-                        packet = new ParcelOverlayPacket();

-                        packet.ParcelData.Data = byteArray;

-                        packet.ParcelData.SequenceID = sequenceID;

-                        remote_client.OutPacket((Packet)packet);

-                        sequenceID++;

-                        byteArray = new byte[LAND_BLOCKS_PER_PACKET];

-                    }

-                }

-            }

-

-            

-        }

-

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

-        {

-            //Get the land objects within the bounds

-            List<Land> temp = new List<Land>();

-            int x, y, i;

-            int inc_x = end_x - start_x;

-            int inc_y = end_y - start_y;

-            for (x = 0; x < inc_x; x++)

-            {

-                for (y = 0; y < inc_y; y++)

-                {

-                    Land currentParcel = getLandObject(start_x + x, start_y + y);

-                    if (!temp.Contains(currentParcel))

-                    {

-                        currentParcel.forceUpdateLandInfo();

-                        temp.Add(currentParcel);

-                    }

-                }

-            }

-

-            int requestResult = LAND_RESULT_SINGLE;

-            if (temp.Count > 1)

-            {

-                requestResult = LAND_RESULT_MULTIPLE;

-            }

-

-            for (i = 0; i < temp.Count; i++)

-            {

-                temp[i].sendLandProperties(sequence_id, snap_selection, requestResult, remote_client);

-            }

-

-

-            sendParcelOverlay(remote_client);

-        }

-

-        public void handleParcelPropertiesUpdateRequest(ParcelPropertiesUpdatePacket packet, IClientAPI remote_client)

-        {

-            if (landList.ContainsKey(packet.ParcelData.LocalID))

-            {

-                landList[packet.ParcelData.LocalID].updateLandProperties(packet, remote_client);

-            }

-        }

-        public void handleParcelDivideRequest(int west, int south, int east, int north, IClientAPI remote_client)

-        {

-            subdivide(west, south, east, north, remote_client.AgentId);

-        }

-        public void handleParcelJoinRequest(int west, int south, int east, int north, IClientAPI remote_client)

-        {

-            join(west, south, east, north, remote_client.AgentId);

-

-        }

-

-        public void handleParcelSelectObjectsRequest(int local_id, int request_type, IClientAPI remote_client)

-        {

-            landList[local_id].sendForceObjectSelect(local_id, request_type, remote_client);

-        }

-

-        public void handleParcelObjectOwnersRequest(int local_id, IClientAPI remote_client)

-        {

-            landList[local_id].sendLandObjectOwners(remote_client);

-        }

-        #endregion

-

-        /// <summary>

-        /// Resets the sim to the default land object (full sim piece of land owned by the default user)

-        /// </summary>

-        public void resetSimLandObjects()

-        {

-            //Remove all the land objects in the sim and add a blank, full sim land object set to public

-            landList.Clear();

-            lastLandLocalID = START_LAND_LOCAL_ID - 1;

-            landIDList.Initialize();

-

-            Land fullSimParcel = new Land(LLUUID.Zero, false, m_scene);

-

-            fullSimParcel.setLandBitmap(Land.getSquareLandBitmap(0, 0, 256, 256));

-            fullSimParcel.landData.ownerID = m_regInfo.MasterAvatarAssignedUUID;

-

-            addLandObject(fullSimParcel);

-

-        }

-

-

-        public void handleSignificantClientMovement(IClientAPI remote_client)

-        {

-            ScenePresence clientAvatar = m_scene.RequestAvatar(remote_client.AgentId);

-            if (clientAvatar != null)

-            {

-                Land over = getLandObject(clientAvatar.Pos.X,clientAvatar.Pos.Y);

-                if (over != null)

-                {

-                    over.sendLandProperties(0, false, 0, remote_client);

-                }

-            }

-        }

-

-        public void resetAllLandPrimCounts()

-        {

-            foreach (Land p in landList.Values)

-            {

-                p.resetLandPrimCounts();

-            }

-        }

-        public void setPrimsTainted()

-        {

-            this.landPrimCountTainted = true;

-        }

-

-        public void addPrimToLandPrimCounts(SceneObject obj)

-        {

-            LLVector3 position = obj.Pos;

-            Land landUnderPrim = getLandObject(position.X, position.Y);

-            if (landUnderPrim != null)

-            {

-                landUnderPrim.addPrimToCount(obj);

-            }

-        }

-

-        public void removePrimFromLandPrimCounts(SceneObject obj)

-        {

-            foreach (Land p in landList.Values)

-            {

-                p.removePrimFromCount(obj);

-            }

-        }

-

-        public void finalizeLandPrimCountUpdate()

-        {

-            //Get Simwide prim count for owner

-            Dictionary<LLUUID, List<Land>> landOwnersAndParcels = new Dictionary<LLUUID,List<Land>>();

-            foreach (Land p in landList.Values)

-            {

-                if(!landOwnersAndParcels.ContainsKey(p.landData.ownerID))

-                {

-                    List<Land> tempList = new List<Land>();

-                    tempList.Add(p);

-                    landOwnersAndParcels.Add(p.landData.ownerID,tempList);

-                }

-                else

-                {

-                    landOwnersAndParcels[p.landData.ownerID].Add(p);

-                }

-            }

-

-            foreach (LLUUID owner in landOwnersAndParcels.Keys)

-            {

-                int simArea = 0;

-                int simPrims = 0;

-                foreach (Land p in landOwnersAndParcels[owner])

-                {

-                    simArea += p.landData.area;

-                    simPrims += p.landData.ownerPrims + p.landData.otherPrims + p.landData.groupPrims + p.landData.selectedPrims;

-                }

-

-                foreach (Land p in landOwnersAndParcels[owner])

-                {

-                    p.landData.simwideArea = simArea;

-                    p.landData.simwidePrims = simPrims;

-                }

-            }

-

-        }

-        #endregion

-    }

-    #endregion

-

-

-    

-

-

-}

+/*
+* 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.Collections.Generic;
+using libsecondlife;
+using libsecondlife.Packets;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+using OpenSim.Region.Environment.Scenes;
+
+namespace OpenSim.Region.Environment.LandManagement
+{
+
+
+    #region LandManager Class
+    /// <summary>
+    /// Handles Land objects and operations requiring information from other Land objects (divide, join, etc)
+    /// </summary>
+    public class LandManager : ILocalStorageLandObjectReceiver
+    {
+
+        #region Constants
+        //Land types set with flags in ParcelOverlay.
+        //Only one of these can be used. 
+        public const byte LAND_TYPE_PUBLIC = (byte)0;      //Equals 00000000
+        public const byte LAND_TYPE_OWNED_BY_OTHER = (byte)1;      //Equals 00000001
+        public const byte LAND_TYPE_OWNED_BY_GROUP = (byte)2;      //Equals 00000010
+        public const byte LAND_TYPE_OWNED_BY_REQUESTER = (byte)3;      //Equals 00000011
+        public const byte LAND_TYPE_IS_FOR_SALE = (byte)4;      //Equals 00000100
+        public const byte LAND_TYPE_IS_BEING_AUCTIONED = (byte)5;      //Equals 00000101
+
+
+        //Flags that when set, a border on the given side will be placed
+        //NOTE: North and East is assumable by the west and south sides (if land to east has a west border, then I have an east border; etc)
+        //This took forever to figure out -- jeesh. /blame LL for even having to send these
+        public const byte LAND_FLAG_PROPERTY_BORDER_WEST = (byte)64;     //Equals 01000000
+        public const byte LAND_FLAG_PROPERTY_BORDER_SOUTH = (byte)128;    //Equals 10000000
+
+        //RequestResults (I think these are right, they seem to work):
+        public const int LAND_RESULT_SINGLE = 0;        // The request they made contained only a single piece of land
+        public const int LAND_RESULT_MULTIPLE = 1;      // The request they made contained more than a single peice of land
+
+        //ParcelSelectObjects
+        public const int LAND_SELECT_OBJECTS_OWNER = 2;
+        public const int LAND_SELECT_OBJECTS_GROUP = 4;
+        public const int LAND_SELECT_OBJECTS_OTHER = 8;
+
+
+        //These are other constants. Yay!
+        public const int START_LAND_LOCAL_ID = 1;
+        #endregion
+
+        #region Member Variables
+        public Dictionary<int, Land> landList = new Dictionary<int, Land>();
+        private int lastLandLocalID = START_LAND_LOCAL_ID - 1;
+        private int[,] landIDList = new int[64, 64];
+
+        /// <summary>
+        /// Set to true when a prim is moved, created, added. Performs a prim count update
+        /// </summary>
+        public bool landPrimCountTainted = false;
+
+        private Scene m_scene;
+        private RegionInfo m_regInfo;
+
+        #endregion
+
+        #region Constructors
+        public LandManager(Scene scene, RegionInfo reginfo)
+        {
+
+            m_scene = scene;
+            m_regInfo = reginfo;
+            landIDList.Initialize();
+
+        }
+        #endregion
+
+        #region Member Functions
+
+        #region Parcel From Storage Functions
+        public void LandFromStorage(LandData data)
+        {
+            Land new_land = new Land(data.ownerID, data.isGroupOwned, m_scene);
+            new_land.landData = data.Copy();
+            new_land.setLandBitmapFromByteArray();
+            addLandObject(new_land);
+
+        }
+
+        public void NoLandDataFromStorage()
+        {
+            resetSimLandObjects();
+        }
+        #endregion
+
+        #region Parcel Add/Remove/Get/Create
+        /// <summary>
+        /// Creates a basic Parcel object without an owner (a zeroed key)
+        /// </summary>
+        /// <returns></returns>
+        public Land createBaseLand()
+        {
+            return new Land(new LLUUID(), false, m_scene);
+        }
+
+        /// <summary>
+        /// Adds a land object to the stored list and adds them to the landIDList to what they own
+        /// </summary>
+        /// <param name="new_land">The land object being added</param>
+        public Land addLandObject(Land new_land)
+        {
+            lastLandLocalID++;
+            new_land.landData.localID = lastLandLocalID;
+            landList.Add(lastLandLocalID, new_land.Copy());
+
+
+            bool[,] landBitmap = new_land.getLandBitmap();
+            int x, y;
+            for (x = 0; x < 64; x++)
+            {
+                for (y = 0; y < 64; y++)
+                {
+                    if (landBitmap[x, y])
+                    {
+                        landIDList[x, y] = lastLandLocalID;
+                    }
+                }
+            }
+            landList[lastLandLocalID].forceUpdateLandInfo();
+
+            return new_land;
+
+        }
+        /// <summary>
+        /// Removes a land object from the list. Will not remove if local_id is still owning an area in landIDList
+        /// </summary>
+        /// <param name="local_id">Land.localID of the peice of land to remove.</param>
+        public void removeLandObject(int local_id)
+        {
+            int x, y;
+            for (x = 0; x < 64; x++)
+            {
+                for (y = 0; y < 64; y++)
+                {
+                    if (landIDList[x, y] == local_id)
+                    {
+                        throw new Exception("Could not remove land object. Still being used at " + x + ", " + y);
+                    }
+                }
+            }
+            // TODO: Put event here for storage manager to bind to.
+            landList.Remove(local_id);
+        }
+
+        private void performFinalLandJoin(Land master, Land slave)
+        {
+            int x, y;
+            bool[,] landBitmapSlave = slave.getLandBitmap();
+            for (x = 0; x < 64; x++)
+            {
+                for (y = 0; y < 64; y++)
+                {
+                    if (landBitmapSlave[x, y])
+                    {
+                        landIDList[x, y] = master.landData.localID;
+                    }
+                }
+            }
+            removeLandObject(slave.landData.localID);
+        }
+        /// <summary>
+        /// Get the land object at the specified point
+        /// </summary>
+        /// <param name="x">Value between 0 - 256 on the x axis of the point</param>
+        /// <param name="y">Value between 0 - 256 on the y axis of the point</param>
+        /// <returns>Land object at the point supplied</returns>
+        public Land getLandObject(float x_float, float y_float)
+        {
+            int x = Convert.ToInt32(Math.Floor(Convert.ToDecimal(x_float) / Convert.ToDecimal(4.0)));
+            int y = Convert.ToInt32(Math.Floor(Convert.ToDecimal(y_float) / Convert.ToDecimal(4.0)));
+            
+            if (x > 63 || y > 63 || x < 0 || y < 0)
+            {
+                throw new Exception("Error: Parcel not found at point " + x + ", " + y);
+            }
+            else
+            {
+              // Console.WriteLine("Point (" + x + ", " + y + ") determined from point (" + x_float + ", " + y_float + ")");
+                return landList[landIDList[x, y]];
+            }
+        }
+
+        public Land getLandObject(int x, int y)
+        {
+            if (x > 256 || y > 256 || x < 0 || y < 0)
+            {
+                throw new Exception("Error: Parcel not found at point " + x + ", " + y);
+            }
+            else
+            {
+                return landList[landIDList[x / 4, y / 4]];
+            }
+        }
+        #endregion
+
+        #region Parcel Modification
+        /// <summary>
+        /// Subdivides a piece of land
+        /// </summary>
+        /// <param name="start_x">West Point</param>
+        /// <param name="start_y">South Point</param>
+        /// <param name="end_x">East Point</param>
+        /// <param name="end_y">North Point</param>
+        /// <param name="attempting_user_id">LLUUID of user who is trying to subdivide</param>
+        /// <returns>Returns true if successful</returns>
+        private bool subdivide(int start_x, int start_y, int end_x, int end_y, LLUUID attempting_user_id)
+        {
+           
+            //First, lets loop through the points and make sure they are all in the same peice of land
+            //Get the land object at start
+            Land startLandObject = getLandObject(start_x, start_y);
+            if (startLandObject == null) return false; //No such land object at the beginning
+
+            //Loop through the points
+            try
+            {
+                int totalX = end_x - start_x;
+                int totalY = end_y - start_y;
+                int x, y;
+                for (y = 0; y < totalY; y++)
+                {
+                    for (x = 0; x < totalX; x++)
+                    {
+                        Land tempLandObject = getLandObject(start_x + x, start_y + y);
+                        if (tempLandObject == null) return false; //No such land object at that point
+                        if (tempLandObject != startLandObject) return false; //Subdividing over 2 land objects; no-no
+                    }
+                }
+            }
+            catch (Exception)
+            {
+                return false; //Exception. For now, lets skip subdivision
+            }
+
+            //If we are still here, then they are subdividing within one piece of land
+            //Check owner
+            if (startLandObject.landData.ownerID != attempting_user_id)
+            {
+                return false; //They cant do this!
+            }
+
+            //Lets create a new land object with bitmap activated at that point (keeping the old land objects info)
+            Land newLand = startLandObject.Copy();
+            newLand.landData.landName = "Subdivision of " + newLand.landData.landName;
+            newLand.landData.globalID = LLUUID.Random();
+
+            newLand.setLandBitmap(Land.getSquareLandBitmap(start_x, start_y, end_x, end_y));
+
+            //Now, lets set the subdivision area of the original to false
+            int startLandObjectIndex = startLandObject.landData.localID;
+            landList[startLandObjectIndex].setLandBitmap(Land.modifyLandBitmapSquare(startLandObject.getLandBitmap(), start_x, start_y, end_x, end_y, false));
+            landList[startLandObjectIndex].forceUpdateLandInfo();
+
+
+            this.setPrimsTainted();
+
+            //Now add the new land object
+            Land result = addLandObject(newLand);
+            result.sendLandUpdateToAvatarsOverMe();
+
+
+
+
+            return true;
+        }
+        /// <summary>
+        /// Join 2 land objects together
+        /// </summary>
+        /// <param name="start_x">x value in first piece of land</param>
+        /// <param name="start_y">y value in first piece of land</param>
+        /// <param name="end_x">x value in second peice of land</param>
+        /// <param name="end_y">y value in second peice of land</param>
+        /// <param name="attempting_user_id">LLUUID of the avatar trying to join the land objects</param>
+        /// <returns>Returns true if successful</returns>
+        private bool join(int start_x, int start_y, int end_x, int end_y, LLUUID attempting_user_id)
+        {
+            end_x -= 4;
+            end_y -= 4;
+
+            List<Land> selectedLandObjects = new List<Land>();
+            int stepXSelected = 0;
+            int stepYSelected = 0;
+            for (stepYSelected = start_y; stepYSelected <= end_y; stepYSelected += 4)
+            {
+                for (stepXSelected = start_x; stepXSelected <= end_x; stepXSelected += 4)
+                {
+                    Land p = getLandObject(stepXSelected,stepYSelected);
+                    if (!selectedLandObjects.Contains(p))
+                    {
+                        selectedLandObjects.Add(p);
+                    }
+                }
+            }
+            Land masterLandObject = selectedLandObjects[0];
+            selectedLandObjects.RemoveAt(0);
+
+            
+            if (selectedLandObjects.Count < 1)
+            {
+                return false; //Only one piece of land selected
+            }
+            if (masterLandObject.landData.ownerID != attempting_user_id)
+            {
+                return false; //Not the same owner
+            }
+            foreach (Land p in selectedLandObjects)
+            {
+                if (p.landData.ownerID != masterLandObject.landData.ownerID)
+                {
+                    return false; //Over multiple users. TODO: make this just ignore this piece of land?
+                }
+            }
+            foreach (Land slaveLandObject in selectedLandObjects)
+            {
+                landList[masterLandObject.landData.localID].setLandBitmap(Land.mergeLandBitmaps(masterLandObject.getLandBitmap(), slaveLandObject.getLandBitmap()));
+                performFinalLandJoin(masterLandObject, slaveLandObject);
+            }
+
+
+            this.setPrimsTainted();
+
+            masterLandObject.sendLandUpdateToAvatarsOverMe();
+
+            return true;
+
+
+
+        }
+        #endregion
+
+        #region Parcel Updating
+        /// <summary>
+        /// Where we send the ParcelOverlay packet to the client
+        /// </summary>
+        /// <param name="remote_client">The object representing the client</param>
+        public void sendParcelOverlay(IClientAPI remote_client)
+        {
+            const int LAND_BLOCKS_PER_PACKET = 1024;
+            int x, y = 0;
+            byte[] byteArray = new byte[LAND_BLOCKS_PER_PACKET];
+            int byteArrayCount = 0;
+            int sequenceID = 0;
+            ParcelOverlayPacket packet;
+
+            for (y = 0; y < 64; y++)
+            {
+                for (x = 0; x < 64; x++)
+                {
+                    byte tempByte = (byte)0; //This represents the byte for the current 4x4
+                    Land currentParcelBlock = getLandObject(x * 4, y * 4);
+
+                    if (currentParcelBlock.landData.ownerID == remote_client.AgentId)
+                    {
+                        //Owner Flag
+                        tempByte = Convert.ToByte(tempByte | LAND_TYPE_OWNED_BY_REQUESTER);
+                    }
+                    else if (currentParcelBlock.landData.salePrice > 0 && (currentParcelBlock.landData.authBuyerID == LLUUID.Zero || currentParcelBlock.landData.authBuyerID == remote_client.AgentId))
+                    {
+                        //Sale Flag
+                        tempByte = Convert.ToByte(tempByte | LAND_TYPE_IS_FOR_SALE);
+                    }
+                    else if (currentParcelBlock.landData.ownerID == LLUUID.Zero)
+                    {
+                        //Public Flag
+                        tempByte = Convert.ToByte(tempByte | LAND_TYPE_PUBLIC);
+                    }
+                    else
+                    {
+                        //Other Flag
+                        tempByte = Convert.ToByte(tempByte | LAND_TYPE_OWNED_BY_OTHER);
+                    }
+
+
+                    //Now for border control
+                    if (x == 0)
+                    {
+                        tempByte = Convert.ToByte(tempByte | LAND_FLAG_PROPERTY_BORDER_WEST);
+                    }
+                    else if (getLandObject((x - 1) * 4, y * 4) != currentParcelBlock)
+                    {
+                        tempByte = Convert.ToByte(tempByte | LAND_FLAG_PROPERTY_BORDER_WEST);
+                    }
+
+                    if (y == 0)
+                    {
+                        tempByte = Convert.ToByte(tempByte | LAND_FLAG_PROPERTY_BORDER_SOUTH);
+                    }
+                    else if (getLandObject(x * 4, (y - 1) * 4) != currentParcelBlock)
+                    {
+                        tempByte = Convert.ToByte(tempByte | LAND_FLAG_PROPERTY_BORDER_SOUTH);
+                    }
+
+                    byteArray[byteArrayCount] = tempByte;
+                    byteArrayCount++;
+                    if (byteArrayCount >= LAND_BLOCKS_PER_PACKET)
+                    {
+                        byteArrayCount = 0;
+                        packet = new ParcelOverlayPacket();
+                        packet.ParcelData.Data = byteArray;
+                        packet.ParcelData.SequenceID = sequenceID;
+                        remote_client.OutPacket((Packet)packet);
+                        sequenceID++;
+                        byteArray = new byte[LAND_BLOCKS_PER_PACKET];
+                    }
+                }
+            }
+
+            
+        }
+
+        public void handleParcelPropertiesRequest(int start_x, int start_y, int end_x, int end_y, int sequence_id, bool snap_selection, IClientAPI remote_client)
+        {
+            //Get the land objects within the bounds
+            List<Land> temp = new List<Land>();
+            int x, y, i;
+            int inc_x = end_x - start_x;
+            int inc_y = end_y - start_y;
+            for (x = 0; x < inc_x; x++)
+            {
+                for (y = 0; y < inc_y; y++)
+                {
+                    Land currentParcel = getLandObject(start_x + x, start_y + y);
+                    if (!temp.Contains(currentParcel))
+                    {
+                        currentParcel.forceUpdateLandInfo();
+                        temp.Add(currentParcel);
+                    }
+                }
+            }
+
+            int requestResult = LAND_RESULT_SINGLE;
+            if (temp.Count > 1)
+            {
+                requestResult = LAND_RESULT_MULTIPLE;
+            }
+
+            for (i = 0; i < temp.Count; i++)
+            {
+                temp[i].sendLandProperties(sequence_id, snap_selection, requestResult, remote_client);
+            }
+
+
+            sendParcelOverlay(remote_client);
+        }
+
+        public void handleParcelPropertiesUpdateRequest(ParcelPropertiesUpdatePacket packet, IClientAPI remote_client)
+        {
+            if (landList.ContainsKey(packet.ParcelData.LocalID))
+            {
+                landList[packet.ParcelData.LocalID].updateLandProperties(packet, remote_client);
+            }
+        }
+        public void handleParcelDivideRequest(int west, int south, int east, int north, IClientAPI remote_client)
+        {
+            subdivide(west, south, east, north, remote_client.AgentId);
+        }
+        public void handleParcelJoinRequest(int west, int south, int east, int north, IClientAPI remote_client)
+        {
+            join(west, south, east, north, remote_client.AgentId);
+
+        }
+
+        public void handleParcelSelectObjectsRequest(int local_id, int request_type, IClientAPI remote_client)
+        {
+            landList[local_id].sendForceObjectSelect(local_id, request_type, remote_client);
+        }
+
+        public void handleParcelObjectOwnersRequest(int local_id, IClientAPI remote_client)
+        {
+            landList[local_id].sendLandObjectOwners(remote_client);
+        }
+        #endregion
+
+        /// <summary>
+        /// Resets the sim to the default land object (full sim piece of land owned by the default user)
+        /// </summary>
+        public void resetSimLandObjects()
+        {
+            //Remove all the land objects in the sim and add a blank, full sim land object set to public
+            landList.Clear();
+            lastLandLocalID = START_LAND_LOCAL_ID - 1;
+            landIDList.Initialize();
+
+            Land fullSimParcel = new Land(LLUUID.Zero, false, m_scene);
+
+            fullSimParcel.setLandBitmap(Land.getSquareLandBitmap(0, 0, 256, 256));
+            fullSimParcel.landData.ownerID = m_regInfo.MasterAvatarAssignedUUID;
+
+            addLandObject(fullSimParcel);
+
+        }
+
+
+        public void handleSignificantClientMovement(IClientAPI remote_client)
+        {
+            ScenePresence clientAvatar = m_scene.RequestAvatar(remote_client.AgentId);
+            if (clientAvatar != null)
+            {
+                Land over = getLandObject(clientAvatar.Pos.X,clientAvatar.Pos.Y);
+                if (over != null)
+                {
+                    over.sendLandProperties(0, false, 0, remote_client);
+                }
+            }
+        }
+
+        public void resetAllLandPrimCounts()
+        {
+            foreach (Land p in landList.Values)
+            {
+                p.resetLandPrimCounts();
+            }
+        }
+        public void setPrimsTainted()
+        {
+            this.landPrimCountTainted = true;
+        }
+
+        public void addPrimToLandPrimCounts(SceneObject obj)
+        {
+            LLVector3 position = obj.Pos;
+            Land landUnderPrim = getLandObject(position.X, position.Y);
+            if (landUnderPrim != null)
+            {
+                landUnderPrim.addPrimToCount(obj);
+            }
+        }
+
+        public void removePrimFromLandPrimCounts(SceneObject obj)
+        {
+            foreach (Land p in landList.Values)
+            {
+                p.removePrimFromCount(obj);
+            }
+        }
+
+        public void finalizeLandPrimCountUpdate()
+        {
+            //Get Simwide prim count for owner
+            Dictionary<LLUUID, List<Land>> landOwnersAndParcels = new Dictionary<LLUUID,List<Land>>();
+            foreach (Land p in landList.Values)
+            {
+                if(!landOwnersAndParcels.ContainsKey(p.landData.ownerID))
+                {
+                    List<Land> tempList = new List<Land>();
+                    tempList.Add(p);
+                    landOwnersAndParcels.Add(p.landData.ownerID,tempList);
+                }
+                else
+                {
+                    landOwnersAndParcels[p.landData.ownerID].Add(p);
+                }
+            }
+
+            foreach (LLUUID owner in landOwnersAndParcels.Keys)
+            {
+                int simArea = 0;
+                int simPrims = 0;
+                foreach (Land p in landOwnersAndParcels[owner])
+                {
+                    simArea += p.landData.area;
+                    simPrims += p.landData.ownerPrims + p.landData.otherPrims + p.landData.groupPrims + p.landData.selectedPrims;
+                }
+
+                foreach (Land p in landOwnersAndParcels[owner])
+                {
+                    p.landData.simwideArea = simArea;
+                    p.landData.simwidePrims = simPrims;
+                }
+            }
+
+        }
+        #endregion
+    }
+    #endregion
+
+
+    
+
+
+}
diff --git a/OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup2.cs b/OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup2.cs
index 4f48217..a4b3852 100644
--- a/OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup2.cs
+++ b/OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup2.cs
@@ -1,299 +1,299 @@
-using System.Collections.Generic;

-using System.Text;

-using Axiom.Math;

-using libsecondlife;

-using libsecondlife.Packets;

-using OpenSim.Framework.Interfaces;

-using OpenSim.Framework.Types;

-using OpenSim.Physics.Manager;

-

-namespace OpenSim.Region.Environment.Scenes

-{

-    // public delegate void PrimCountTaintedDelegate();

-

-    public class AllNewSceneObjectGroup2 : EntityBase

-    {

-        private Encoding enc = Encoding.ASCII;

-

-        protected AllNewSceneObjectPart2 m_rootPart;

-        protected Dictionary<LLUUID, AllNewSceneObjectPart2> m_parts = new Dictionary<LLUUID, AllNewSceneObjectPart2>();

-

-        public event PrimCountTaintedDelegate OnPrimCountTainted;

-

-        /// <summary>

-        /// 

-        /// </summary>

-        public int primCount

-        {

-            get

-            {

-                return 1;

-            }

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

-        public LLVector3 GroupCentrePoint

-        {

-            get

-            {

-                return new LLVector3(0, 0, 0);

-            }

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

-        public AllNewSceneObjectGroup2()

-        {

-

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

-        public void FlagGroupForFullUpdate()

-        {

-

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

-        public void FlagGroupForTerseUpdate()

-        {

-

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

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

-        public void LinkToGroup(AllNewSceneObjectGroup2 objectGroup)

-        {

-

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

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

-        /// <returns></returns>

-        private AllNewSceneObjectPart2 GetChildPrim(LLUUID primID)

-        {

-            AllNewSceneObjectPart2 childPart = null;

-            if (this.m_parts.ContainsKey(primID))

-            {

-                childPart = this.m_parts[primID];

-            }

-            return childPart;

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

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

-        /// <returns></returns>

-        private AllNewSceneObjectPart2 GetChildPrim(uint localID)

-        {

-            foreach (AllNewSceneObjectPart2 part in this.m_parts.Values)

-            {

-                if (part.m_localID == localID)

-                {

-                    return part;

-                }

-            }

-            return null;

-        }

-

-        public void TriggerTainted()

-        {

-            if (OnPrimCountTainted != null)

-            {

-                this.OnPrimCountTainted();

-            }

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

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

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

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

-        public void GrapMovement(LLVector3 offset, LLVector3 pos, IClientAPI remoteClient)

-        {

-            this.Pos = pos;

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

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

-        public void GetProperites(IClientAPI client)

-        {

-            ObjectPropertiesPacket proper = new ObjectPropertiesPacket();

-            proper.ObjectData = new ObjectPropertiesPacket.ObjectDataBlock[1];

-            proper.ObjectData[0] = new ObjectPropertiesPacket.ObjectDataBlock();

-            proper.ObjectData[0].ItemID = LLUUID.Zero;

-            proper.ObjectData[0].CreationDate = (ulong)this.m_rootPart.CreationDate;

-            proper.ObjectData[0].CreatorID = this.m_rootPart.CreatorID;

-            proper.ObjectData[0].FolderID = LLUUID.Zero;

-            proper.ObjectData[0].FromTaskID = LLUUID.Zero;

-            proper.ObjectData[0].GroupID = LLUUID.Zero;

-            proper.ObjectData[0].InventorySerial = 0;

-            proper.ObjectData[0].LastOwnerID = this.m_rootPart.LastOwnerID;

-            proper.ObjectData[0].ObjectID = this.m_uuid;

-            proper.ObjectData[0].OwnerID = this.m_rootPart.OwnerID;

-            proper.ObjectData[0].TouchName = enc.GetBytes(this.m_rootPart.TouchName + "\0");

-            proper.ObjectData[0].TextureID = new byte[0];

-            proper.ObjectData[0].SitName = enc.GetBytes(this.m_rootPart.SitName + "\0");

-            proper.ObjectData[0].Name = enc.GetBytes(this.m_rootPart.Name + "\0");

-            proper.ObjectData[0].Description = enc.GetBytes(this.m_rootPart.Description + "\0");

-            proper.ObjectData[0].OwnerMask = this.m_rootPart.OwnerMask;

-            proper.ObjectData[0].NextOwnerMask = this.m_rootPart.NextOwnerMask;

-            proper.ObjectData[0].GroupMask = this.m_rootPart.GroupMask;

-            proper.ObjectData[0].EveryoneMask = this.m_rootPart.EveryoneMask;

-            proper.ObjectData[0].BaseMask = this.m_rootPart.BaseMask;

-

-            client.OutPacket(proper);

-        }

-

-        #region Shape

-        /// <summary>

-        /// 

-        /// </summary>

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

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

-        {

-            AllNewSceneObjectPart2 part = this.GetChildPrim(localID);

-            if (part != null)

-            {

-                part.UpdateShape(shapeBlock);

-            }

-        }

-        #endregion

-

-        #region Position

-        public void UpdateGroupPosition(LLVector3 pos)

-        {

-            this.m_pos = pos;

-        }

-

-        public void UpdateSinglePosition(LLVector3 pos, uint localID)

-        {

-            AllNewSceneObjectPart2 part = this.GetChildPrim(localID);

-            if (part != null)

-            {

-                if (part.uuid == this.m_rootPart.uuid)

-                {

-                    this.UpdateRootPosition(pos);

-                }

-                else

-                {

-                    part.UpdateOffSet(pos);

-                }

-            }

-        }

-

-        private void UpdateRootPosition(LLVector3 pos)

-        {

-            LLVector3 newPos = new LLVector3(pos.X, pos.Y, pos.Z);

-            LLVector3 oldPos = new LLVector3(this.Pos.X + this.m_rootPart.OffsetPosition.X, this.Pos.Y + this.m_rootPart.OffsetPosition.Y, this.Pos.Z + this.m_rootPart.OffsetPosition.Z);

-            LLVector3 diff = oldPos - newPos;

-            Axiom.Math.Vector3 axDiff = new Vector3(diff.X, diff.Y, diff.Z);

-            Axiom.Math.Quaternion partRotation = new Quaternion(this.m_rootPart.RotationOffset.W, this.m_rootPart.RotationOffset.X, this.m_rootPart.RotationOffset.Y, this.m_rootPart.RotationOffset.Z);

-            axDiff = partRotation.Inverse() * axDiff;

-            diff.X = axDiff.x;

-            diff.Y = axDiff.y;

-            diff.Z = axDiff.z;

-

-            foreach (AllNewSceneObjectPart2 obPart in this.m_parts.Values)

-            {

-                if (obPart.uuid != this.m_rootPart.uuid)

-                {

-                    obPart.OffsetPosition = obPart.OffsetPosition + diff;

-                }

-            }

-            this.Pos = newPos;

-            pos.X = newPos.X;

-            pos.Y = newPos.Y;

-            pos.Z = newPos.Z;

-        }

-        #endregion

-

-        #region Roation

-        public void UpdateGroupRotation(LLQuaternion rot)

-        {

-            this.m_rootPart.UpdateRotation(rot);

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

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

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

-        public void UpdateGroupRotation(LLVector3 pos, LLQuaternion rot)

-        {

-            this.m_rootPart.UpdateRotation(rot);

-            this.m_pos = pos;

-        }

-

-        public void UpdateSingleRotation(LLQuaternion rot, uint localID)

-        {

-            AllNewSceneObjectPart2 part = this.GetChildPrim(localID);

-            if (part != null)

-            {

-                if (part.uuid == this.m_rootPart.uuid)

-                {

-                    this.UpdateRootRotation(rot);

-                }

-                else

-                {

-                    part.UpdateRotation(rot);

-                }

-            }

-        }

-        private void UpdateRootRotation(LLQuaternion rot)

-        {

-            this.m_rootPart.UpdateRotation(rot);

-            Axiom.Math.Quaternion axRot = new Quaternion(rot.W, rot.X, rot.Y, rot.Z);

-            Axiom.Math.Quaternion oldParentRot = new Quaternion(this.m_rootPart.RotationOffset.W, this.m_rootPart.RotationOffset.X, this.m_rootPart.RotationOffset.Y, this.m_rootPart.RotationOffset.Z);

-

-            foreach (AllNewSceneObjectPart2 prim in this.m_parts.Values)

-            {

-                if (prim.uuid != this.m_rootPart.uuid)

-                {

-                    Vector3 axPos = new Vector3(prim.OffsetPosition.X, prim.OffsetPosition.Y, prim.OffsetPosition.Z);

-                    axPos = oldParentRot * axPos;

-                    axPos = axRot.Inverse() * axPos;

-                    prim.OffsetPosition = new LLVector3(axPos.x, axPos.y, axPos.z);

-                    Axiom.Math.Quaternion primsRot = new Quaternion(prim.RotationOffset.W, prim.RotationOffset.X, prim.RotationOffset.Y, prim.RotationOffset.Z);

-                    Axiom.Math.Quaternion newRot = oldParentRot * primsRot;

-                    newRot = axRot.Inverse() * newRot;

-                    prim.RotationOffset = new LLQuaternion(newRot.w, newRot.x, newRot.y, newRot.z);

-                }

-            }

-        }

-        #endregion

-        /// <summary>

-        /// 

-        /// </summary>

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

-        private void SetPartAsRoot(AllNewSceneObjectPart2 part)

-        {

-            this.m_rootPart = part;

-            this.m_uuid = part.uuid;

-            this.m_localId = part.m_localID;

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

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

-        private void SetPartAsNonRoot(AllNewSceneObjectPart2 part)

-        {

-

-        }

-    }

-}

+using System.Collections.Generic;
+using System.Text;
+using Axiom.Math;
+using libsecondlife;
+using libsecondlife.Packets;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+using OpenSim.Physics.Manager;
+
+namespace OpenSim.Region.Environment.Scenes
+{
+    // public delegate void PrimCountTaintedDelegate();
+
+    public class AllNewSceneObjectGroup2 : EntityBase
+    {
+        private Encoding enc = Encoding.ASCII;
+
+        protected AllNewSceneObjectPart2 m_rootPart;
+        protected Dictionary<LLUUID, AllNewSceneObjectPart2> m_parts = new Dictionary<LLUUID, AllNewSceneObjectPart2>();
+
+        public event PrimCountTaintedDelegate OnPrimCountTainted;
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public int primCount
+        {
+            get
+            {
+                return 1;
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public LLVector3 GroupCentrePoint
+        {
+            get
+            {
+                return new LLVector3(0, 0, 0);
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public AllNewSceneObjectGroup2()
+        {
+
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public void FlagGroupForFullUpdate()
+        {
+
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public void FlagGroupForTerseUpdate()
+        {
+
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="objectGroup"></param>
+        public void LinkToGroup(AllNewSceneObjectGroup2 objectGroup)
+        {
+
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="primID"></param>
+        /// <returns></returns>
+        private AllNewSceneObjectPart2 GetChildPrim(LLUUID primID)
+        {
+            AllNewSceneObjectPart2 childPart = null;
+            if (this.m_parts.ContainsKey(primID))
+            {
+                childPart = this.m_parts[primID];
+            }
+            return childPart;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="localID"></param>
+        /// <returns></returns>
+        private AllNewSceneObjectPart2 GetChildPrim(uint localID)
+        {
+            foreach (AllNewSceneObjectPart2 part in this.m_parts.Values)
+            {
+                if (part.m_localID == localID)
+                {
+                    return part;
+                }
+            }
+            return null;
+        }
+
+        public void TriggerTainted()
+        {
+            if (OnPrimCountTainted != null)
+            {
+                this.OnPrimCountTainted();
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="offset"></param>
+        /// <param name="pos"></param>
+        /// <param name="remoteClient"></param>
+        public void GrapMovement(LLVector3 offset, LLVector3 pos, IClientAPI remoteClient)
+        {
+            this.Pos = pos;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="client"></param>
+        public void GetProperites(IClientAPI client)
+        {
+            ObjectPropertiesPacket proper = new ObjectPropertiesPacket();
+            proper.ObjectData = new ObjectPropertiesPacket.ObjectDataBlock[1];
+            proper.ObjectData[0] = new ObjectPropertiesPacket.ObjectDataBlock();
+            proper.ObjectData[0].ItemID = LLUUID.Zero;
+            proper.ObjectData[0].CreationDate = (ulong)this.m_rootPart.CreationDate;
+            proper.ObjectData[0].CreatorID = this.m_rootPart.CreatorID;
+            proper.ObjectData[0].FolderID = LLUUID.Zero;
+            proper.ObjectData[0].FromTaskID = LLUUID.Zero;
+            proper.ObjectData[0].GroupID = LLUUID.Zero;
+            proper.ObjectData[0].InventorySerial = 0;
+            proper.ObjectData[0].LastOwnerID = this.m_rootPart.LastOwnerID;
+            proper.ObjectData[0].ObjectID = this.m_uuid;
+            proper.ObjectData[0].OwnerID = this.m_rootPart.OwnerID;
+            proper.ObjectData[0].TouchName = enc.GetBytes(this.m_rootPart.TouchName + "\0");
+            proper.ObjectData[0].TextureID = new byte[0];
+            proper.ObjectData[0].SitName = enc.GetBytes(this.m_rootPart.SitName + "\0");
+            proper.ObjectData[0].Name = enc.GetBytes(this.m_rootPart.Name + "\0");
+            proper.ObjectData[0].Description = enc.GetBytes(this.m_rootPart.Description + "\0");
+            proper.ObjectData[0].OwnerMask = this.m_rootPart.OwnerMask;
+            proper.ObjectData[0].NextOwnerMask = this.m_rootPart.NextOwnerMask;
+            proper.ObjectData[0].GroupMask = this.m_rootPart.GroupMask;
+            proper.ObjectData[0].EveryoneMask = this.m_rootPart.EveryoneMask;
+            proper.ObjectData[0].BaseMask = this.m_rootPart.BaseMask;
+
+            client.OutPacket(proper);
+        }
+
+        #region Shape
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="shapeBlock"></param>
+        public void UpdateShape(ObjectShapePacket.ObjectDataBlock shapeBlock, uint localID)
+        {
+            AllNewSceneObjectPart2 part = this.GetChildPrim(localID);
+            if (part != null)
+            {
+                part.UpdateShape(shapeBlock);
+            }
+        }
+        #endregion
+
+        #region Position
+        public void UpdateGroupPosition(LLVector3 pos)
+        {
+            this.m_pos = pos;
+        }
+
+        public void UpdateSinglePosition(LLVector3 pos, uint localID)
+        {
+            AllNewSceneObjectPart2 part = this.GetChildPrim(localID);
+            if (part != null)
+            {
+                if (part.uuid == this.m_rootPart.uuid)
+                {
+                    this.UpdateRootPosition(pos);
+                }
+                else
+                {
+                    part.UpdateOffSet(pos);
+                }
+            }
+        }
+
+        private void UpdateRootPosition(LLVector3 pos)
+        {
+            LLVector3 newPos = new LLVector3(pos.X, pos.Y, pos.Z);
+            LLVector3 oldPos = new LLVector3(this.Pos.X + this.m_rootPart.OffsetPosition.X, this.Pos.Y + this.m_rootPart.OffsetPosition.Y, this.Pos.Z + this.m_rootPart.OffsetPosition.Z);
+            LLVector3 diff = oldPos - newPos;
+            Axiom.Math.Vector3 axDiff = new Vector3(diff.X, diff.Y, diff.Z);
+            Axiom.Math.Quaternion partRotation = new Quaternion(this.m_rootPart.RotationOffset.W, this.m_rootPart.RotationOffset.X, this.m_rootPart.RotationOffset.Y, this.m_rootPart.RotationOffset.Z);
+            axDiff = partRotation.Inverse() * axDiff;
+            diff.X = axDiff.x;
+            diff.Y = axDiff.y;
+            diff.Z = axDiff.z;
+
+            foreach (AllNewSceneObjectPart2 obPart in this.m_parts.Values)
+            {
+                if (obPart.uuid != this.m_rootPart.uuid)
+                {
+                    obPart.OffsetPosition = obPart.OffsetPosition + diff;
+                }
+            }
+            this.Pos = newPos;
+            pos.X = newPos.X;
+            pos.Y = newPos.Y;
+            pos.Z = newPos.Z;
+        }
+        #endregion
+
+        #region Roation
+        public void UpdateGroupRotation(LLQuaternion rot)
+        {
+            this.m_rootPart.UpdateRotation(rot);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="pos"></param>
+        /// <param name="rot"></param>
+        public void UpdateGroupRotation(LLVector3 pos, LLQuaternion rot)
+        {
+            this.m_rootPart.UpdateRotation(rot);
+            this.m_pos = pos;
+        }
+
+        public void UpdateSingleRotation(LLQuaternion rot, uint localID)
+        {
+            AllNewSceneObjectPart2 part = this.GetChildPrim(localID);
+            if (part != null)
+            {
+                if (part.uuid == this.m_rootPart.uuid)
+                {
+                    this.UpdateRootRotation(rot);
+                }
+                else
+                {
+                    part.UpdateRotation(rot);
+                }
+            }
+        }
+        private void UpdateRootRotation(LLQuaternion rot)
+        {
+            this.m_rootPart.UpdateRotation(rot);
+            Axiom.Math.Quaternion axRot = new Quaternion(rot.W, rot.X, rot.Y, rot.Z);
+            Axiom.Math.Quaternion oldParentRot = new Quaternion(this.m_rootPart.RotationOffset.W, this.m_rootPart.RotationOffset.X, this.m_rootPart.RotationOffset.Y, this.m_rootPart.RotationOffset.Z);
+
+            foreach (AllNewSceneObjectPart2 prim in this.m_parts.Values)
+            {
+                if (prim.uuid != this.m_rootPart.uuid)
+                {
+                    Vector3 axPos = new Vector3(prim.OffsetPosition.X, prim.OffsetPosition.Y, prim.OffsetPosition.Z);
+                    axPos = oldParentRot * axPos;
+                    axPos = axRot.Inverse() * axPos;
+                    prim.OffsetPosition = new LLVector3(axPos.x, axPos.y, axPos.z);
+                    Axiom.Math.Quaternion primsRot = new Quaternion(prim.RotationOffset.W, prim.RotationOffset.X, prim.RotationOffset.Y, prim.RotationOffset.Z);
+                    Axiom.Math.Quaternion newRot = oldParentRot * primsRot;
+                    newRot = axRot.Inverse() * newRot;
+                    prim.RotationOffset = new LLQuaternion(newRot.w, newRot.x, newRot.y, newRot.z);
+                }
+            }
+        }
+        #endregion
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="part"></param>
+        private void SetPartAsRoot(AllNewSceneObjectPart2 part)
+        {
+            this.m_rootPart = part;
+            this.m_uuid = part.uuid;
+            this.m_localId = part.m_localID;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="part"></param>
+        private void SetPartAsNonRoot(AllNewSceneObjectPart2 part)
+        {
+
+        }
+    }
+}
diff --git a/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs b/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs
index 82d4cd0..07d1357 100644
--- a/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs
+++ b/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs
@@ -1,216 +1,216 @@
-using System.Collections.Generic;

-using System.Text;

-using System;

-using Axiom.Math;

-using libsecondlife;

-using libsecondlife.Packets;

-using OpenSim.Framework.Interfaces;

-using OpenSim.Framework.Types;

-

-namespace OpenSim.Region.Environment.Scenes

-{

-

-    public class AllNewSceneObjectPart2

-    {

-        private const uint FULL_MASK_PERMISSIONS = 2147483647;

-

-        private uint m_flags = 32 + 65536 + 131072 + 256 + 4 + 8 + 2048 + 524288 + 268435456 + 128;

-        private ulong m_regionHandle;

-

-        public string SitName = "";

-        public string TouchName = "";

-        public string Text = "";

-

-        public LLUUID CreatorID;

-        public LLUUID OwnerID;

-        public LLUUID LastOwnerID;

-        public Int32 CreationDate;

-

-        public LLUUID uuid;

-        public uint m_localID;

-

-        public uint ParentID = 0;

-

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

-

-        protected PrimitiveBaseShape m_Shape;

-

-        protected AllNewSceneObjectGroup2 m_parentGroup;

-

-

-        #region Properties

-        protected string m_name;

-        /// <summary>

-        /// 

-        /// </summary>

-        public virtual string Name

-        {

-            get { return m_name; }

-            set { m_name = value; }

-        }

-

-        protected LLVector3 m_offset;

-        public LLVector3 OffsetPosition

-        {

-            get

-            {

-                return m_offset;

-            }

-            set

-            {

-                m_offset = value;

-            }

-        }

-

-        protected LLQuaternion m_rotationOffset;

-        public LLQuaternion RotationOffset

-        {

-            get

-            {

-                return m_rotationOffset;

-            }

-            set

-            {

-                m_rotationOffset = value;

-            }

-        }

-

-        private string m_description = "";

-        public string Description

-        {

-            get

-            {

-                return this.m_description;

-            }

-            set

-            {

-                this.m_description = value;

-            }

-        }

-

-        public PrimitiveBaseShape Shape

-        {

-            get

-            {

-                return this.m_Shape;

-            }

-        }

-

-        public LLVector3 Scale

-        {

-            set

-            {

-                this.m_Shape.Scale = value;

-            }

-            get

-            {

-                return this.m_Shape.Scale;

-            }

-        }

-        #endregion

-

-        #region Constructors

-        public AllNewSceneObjectPart2(ulong regionHandle, AllNewSceneObjectGroup2 parent, LLUUID ownerID, uint localID, PrimitiveBaseShape shape, LLVector3 position)

-        {

-            this.m_regionHandle = regionHandle;

-            this.m_parentGroup = parent;

-

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

-            this.OwnerID = ownerID;

-            this.CreatorID = this.OwnerID;

-            this.LastOwnerID = LLUUID.Zero;

-            this.uuid = LLUUID.Random();

-            this.m_localID = (uint)(localID);

-            this.m_Shape = shape;

-

-            this.OffsetPosition = position;

-

-            //temporary code just so the m_flags field doesn't give a compiler warning

-            if (m_flags == 1)

-            {

-

-            }

-        }

-        #endregion

-

-        #region Shape

-        /// <summary>

-        /// 

-        /// </summary>

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

-        public void UpdateShape(ObjectShapePacket.ObjectDataBlock shapeBlock)

-        {

-            this.m_Shape.PathBegin = shapeBlock.PathBegin;

-            this.m_Shape.PathEnd = shapeBlock.PathEnd;

-            this.m_Shape.PathScaleX = shapeBlock.PathScaleX;

-            this.m_Shape.PathScaleY = shapeBlock.PathScaleY;

-            this.m_Shape.PathShearX = shapeBlock.PathShearX;

-            this.m_Shape.PathShearY = shapeBlock.PathShearY;

-            this.m_Shape.PathSkew = shapeBlock.PathSkew;

-            this.m_Shape.ProfileBegin = shapeBlock.ProfileBegin;

-            this.m_Shape.ProfileEnd = shapeBlock.ProfileEnd;

-            this.m_Shape.PathCurve = shapeBlock.PathCurve;

-            this.m_Shape.ProfileCurve = shapeBlock.ProfileCurve;

-            this.m_Shape.ProfileHollow = shapeBlock.ProfileHollow;

-            this.m_Shape.PathRadiusOffset = shapeBlock.PathRadiusOffset;

-            this.m_Shape.PathRevolutions = shapeBlock.PathRevolutions;

-            this.m_Shape.PathTaperX = shapeBlock.PathTaperX;

-            this.m_Shape.PathTaperY = shapeBlock.PathTaperY;

-            this.m_Shape.PathTwist = shapeBlock.PathTwist;

-            this.m_Shape.PathTwistBegin = shapeBlock.PathTwistBegin;

-        }

-        #endregion

-

-        #region Texture

-        /// <summary>

-        /// 

-        /// </summary>

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

-        public void UpdateTextureEntry(byte[] textureEntry)

-        {

-            this.m_Shape.TextureEntry = textureEntry;

-        }

-        #endregion

-

-        #region Position

-        /// <summary>

-        /// 

-        /// </summary>

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

-        public void UpdateOffSet(LLVector3 pos)

-        {

-            LLVector3 newPos = new LLVector3(pos.X, pos.Y, pos.Z);

-            this.OffsetPosition = newPos;

-        }

-        #endregion

-

-        #region rotation

-        public void UpdateRotation(LLQuaternion rot)

-        {

-            this.RotationOffset = new LLQuaternion(rot.X, rot.Y, rot.Z, rot.W);

-        }

-        #endregion

-

-        #region Resizing/Scale

-        /// <summary>

-        /// 

-        /// </summary>

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

-        public void Resize(LLVector3 scale)

-        {

-            LLVector3 offset = (scale - this.m_Shape.Scale);

-            offset.X /= 2;

-            offset.Y /= 2;

-            offset.Z /= 2;

-

-            this.OffsetPosition += offset;

-            this.m_Shape.Scale = scale;

-        }

-        #endregion

-    }

-}

-

+using System.Collections.Generic;
+using System.Text;
+using System;
+using Axiom.Math;
+using libsecondlife;
+using libsecondlife.Packets;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+
+namespace OpenSim.Region.Environment.Scenes
+{
+
+    public class AllNewSceneObjectPart2
+    {
+        private const uint FULL_MASK_PERMISSIONS = 2147483647;
+
+        private uint m_flags = 32 + 65536 + 131072 + 256 + 4 + 8 + 2048 + 524288 + 268435456 + 128;
+        private ulong m_regionHandle;
+
+        public string SitName = "";
+        public string TouchName = "";
+        public string Text = "";
+
+        public LLUUID CreatorID;
+        public LLUUID OwnerID;
+        public LLUUID LastOwnerID;
+        public Int32 CreationDate;
+
+        public LLUUID uuid;
+        public uint m_localID;
+
+        public uint ParentID = 0;
+
+        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;
+
+        protected PrimitiveBaseShape m_Shape;
+
+        protected AllNewSceneObjectGroup2 m_parentGroup;
+
+
+        #region Properties
+        protected string m_name;
+        /// <summary>
+        /// 
+        /// </summary>
+        public virtual string Name
+        {
+            get { return m_name; }
+            set { m_name = value; }
+        }
+
+        protected LLVector3 m_offset;
+        public LLVector3 OffsetPosition
+        {
+            get
+            {
+                return m_offset;
+            }
+            set
+            {
+                m_offset = value;
+            }
+        }
+
+        protected LLQuaternion m_rotationOffset;
+        public LLQuaternion RotationOffset
+        {
+            get
+            {
+                return m_rotationOffset;
+            }
+            set
+            {
+                m_rotationOffset = value;
+            }
+        }
+
+        private string m_description = "";
+        public string Description
+        {
+            get
+            {
+                return this.m_description;
+            }
+            set
+            {
+                this.m_description = value;
+            }
+        }
+
+        public PrimitiveBaseShape Shape
+        {
+            get
+            {
+                return this.m_Shape;
+            }
+        }
+
+        public LLVector3 Scale
+        {
+            set
+            {
+                this.m_Shape.Scale = value;
+            }
+            get
+            {
+                return this.m_Shape.Scale;
+            }
+        }
+        #endregion
+
+        #region Constructors
+        public AllNewSceneObjectPart2(ulong regionHandle, AllNewSceneObjectGroup2 parent, LLUUID ownerID, uint localID, PrimitiveBaseShape shape, LLVector3 position)
+        {
+            this.m_regionHandle = regionHandle;
+            this.m_parentGroup = parent;
+
+            this.CreationDate = (Int32)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;
+            this.OwnerID = ownerID;
+            this.CreatorID = this.OwnerID;
+            this.LastOwnerID = LLUUID.Zero;
+            this.uuid = LLUUID.Random();
+            this.m_localID = (uint)(localID);
+            this.m_Shape = shape;
+
+            this.OffsetPosition = position;
+
+            //temporary code just so the m_flags field doesn't give a compiler warning
+            if (m_flags == 1)
+            {
+
+            }
+        }
+        #endregion
+
+        #region Shape
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="shapeBlock"></param>
+        public void UpdateShape(ObjectShapePacket.ObjectDataBlock shapeBlock)
+        {
+            this.m_Shape.PathBegin = shapeBlock.PathBegin;
+            this.m_Shape.PathEnd = shapeBlock.PathEnd;
+            this.m_Shape.PathScaleX = shapeBlock.PathScaleX;
+            this.m_Shape.PathScaleY = shapeBlock.PathScaleY;
+            this.m_Shape.PathShearX = shapeBlock.PathShearX;
+            this.m_Shape.PathShearY = shapeBlock.PathShearY;
+            this.m_Shape.PathSkew = shapeBlock.PathSkew;
+            this.m_Shape.ProfileBegin = shapeBlock.ProfileBegin;
+            this.m_Shape.ProfileEnd = shapeBlock.ProfileEnd;
+            this.m_Shape.PathCurve = shapeBlock.PathCurve;
+            this.m_Shape.ProfileCurve = shapeBlock.ProfileCurve;
+            this.m_Shape.ProfileHollow = shapeBlock.ProfileHollow;
+            this.m_Shape.PathRadiusOffset = shapeBlock.PathRadiusOffset;
+            this.m_Shape.PathRevolutions = shapeBlock.PathRevolutions;
+            this.m_Shape.PathTaperX = shapeBlock.PathTaperX;
+            this.m_Shape.PathTaperY = shapeBlock.PathTaperY;
+            this.m_Shape.PathTwist = shapeBlock.PathTwist;
+            this.m_Shape.PathTwistBegin = shapeBlock.PathTwistBegin;
+        }
+        #endregion
+
+        #region Texture
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="textureEntry"></param>
+        public void UpdateTextureEntry(byte[] textureEntry)
+        {
+            this.m_Shape.TextureEntry = textureEntry;
+        }
+        #endregion
+
+        #region Position
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="pos"></param>
+        public void UpdateOffSet(LLVector3 pos)
+        {
+            LLVector3 newPos = new LLVector3(pos.X, pos.Y, pos.Z);
+            this.OffsetPosition = newPos;
+        }
+        #endregion
+
+        #region rotation
+        public void UpdateRotation(LLQuaternion rot)
+        {
+            this.RotationOffset = new LLQuaternion(rot.X, rot.Y, rot.Z, rot.W);
+        }
+        #endregion
+
+        #region Resizing/Scale
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="scale"></param>
+        public void Resize(LLVector3 scale)
+        {
+            LLVector3 offset = (scale - this.m_Shape.Scale);
+            offset.X /= 2;
+            offset.Y /= 2;
+            offset.Z /= 2;
+
+            this.OffsetPosition += offset;
+            this.m_Shape.Scale = scale;
+        }
+        #endregion
+    }
+}
+
diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/LSLEngine/LSLHandler/Common.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/LSLEngine/LSLHandler/Common.cs
index 790871b..554ba1a 100644
--- a/OpenSim/Region/Environment/Scenes/scripting/Engines/LSLEngine/LSLHandler/Common.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/Engines/LSLEngine/LSLHandler/Common.cs
@@ -1,84 +1,84 @@
-/*

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

-* 

-*/

-/* Original code: Tedd Hansen */

-using System;

-using System.Collections.Generic;

-using System.Text;

-

-namespace OpenSim.Region.Scripting.LSL

-{

-    public static class Common

-    {

-        static public bool Debug = true;

-        static public bool IL_UseTryCatch = true;

-        static public bool IL_CreateConstructor = true;

-        static public bool IL_CreateFunctionList = true;

-        static public bool IL_ProcessCodeChunks = true;

-

-        public delegate void SendToDebugEventDelegate(string Message);

-        public delegate void SendToLogEventDelegate(string Message);

-        static public event SendToDebugEventDelegate SendToDebugEvent;

-        static public event SendToLogEventDelegate SendToLogEvent;

-

-        static public void SendToDebug(string Message)

-        {

-            //if (Debug == true)

-                Console.WriteLine("Debug: " + Message);

-            SendToDebugEvent(DateTime.Now.ToString("[HH:mm:ss] ") + Message + "\r\n");

-        }

-        static public void SendToLog(string Message)

-        {

-            //if (Debug == true)

-                Console.WriteLine("LOG: " + Message);

-                SendToLogEvent(DateTime.Now.ToString("[HH:mm:ss] ") + Message + "\r\n");

-        }

-    }

-

-    // TEMPORARY TEST THINGIES

-    public static class IL_Helper

-    {

-        public static string ReverseFormatString(string text1, string format)

-        {

-            Common.SendToDebug("ReverseFormatString text1: " + text1);

-            Common.SendToDebug("ReverseFormatString format: " + format);

-            return string.Format(format, text1);

-        }

-        public static string ReverseFormatString(string text1, UInt32 text2, string format)

-        {

-            Common.SendToDebug("ReverseFormatString text1: " + text1);

-            Common.SendToDebug("ReverseFormatString text2: " + text2.ToString());

-            Common.SendToDebug("ReverseFormatString format: " + format);

-            return string.Format(format, text1, text2.ToString());

-        }

-        public static string Cast_ToString(object obj)

-        {

-            Common.SendToDebug("OBJECT TO BE CASTED: " + obj.GetType().ToString());

-            return "ABCDEFGIHJKLMNOPQ123";

-        }

-    }

-}

+/*
+* 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.
+* 
+*/
+/* Original code: Tedd Hansen */
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenSim.Region.Scripting.LSL
+{
+    public static class Common
+    {
+        static public bool Debug = true;
+        static public bool IL_UseTryCatch = true;
+        static public bool IL_CreateConstructor = true;
+        static public bool IL_CreateFunctionList = true;
+        static public bool IL_ProcessCodeChunks = true;
+
+        public delegate void SendToDebugEventDelegate(string Message);
+        public delegate void SendToLogEventDelegate(string Message);
+        static public event SendToDebugEventDelegate SendToDebugEvent;
+        static public event SendToLogEventDelegate SendToLogEvent;
+
+        static public void SendToDebug(string Message)
+        {
+            //if (Debug == true)
+                Console.WriteLine("Debug: " + Message);
+            SendToDebugEvent(DateTime.Now.ToString("[HH:mm:ss] ") + Message + "\r\n");
+        }
+        static public void SendToLog(string Message)
+        {
+            //if (Debug == true)
+                Console.WriteLine("LOG: " + Message);
+                SendToLogEvent(DateTime.Now.ToString("[HH:mm:ss] ") + Message + "\r\n");
+        }
+    }
+
+    // TEMPORARY TEST THINGIES
+    public static class IL_Helper
+    {
+        public static string ReverseFormatString(string text1, string format)
+        {
+            Common.SendToDebug("ReverseFormatString text1: " + text1);
+            Common.SendToDebug("ReverseFormatString format: " + format);
+            return string.Format(format, text1);
+        }
+        public static string ReverseFormatString(string text1, UInt32 text2, string format)
+        {
+            Common.SendToDebug("ReverseFormatString text1: " + text1);
+            Common.SendToDebug("ReverseFormatString text2: " + text2.ToString());
+            Common.SendToDebug("ReverseFormatString format: " + format);
+            return string.Format(format, text1, text2.ToString());
+        }
+        public static string Cast_ToString(object obj)
+        {
+            Common.SendToDebug("OBJECT TO BE CASTED: " + obj.GetType().ToString());
+            return "ABCDEFGIHJKLMNOPQ123";
+        }
+    }
+}
diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/LSLEngine/LSLHandler/IL_common_functions.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/LSLEngine/LSLHandler/IL_common_functions.cs
index cae78b7..2f23a91 100644
--- a/OpenSim/Region/Environment/Scenes/scripting/Engines/LSLEngine/LSLHandler/IL_common_functions.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/Engines/LSLEngine/LSLHandler/IL_common_functions.cs
@@ -1,56 +1,56 @@
-/*

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

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

-*

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

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

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

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

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

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

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

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

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

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

-*

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

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

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

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

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

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

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

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

-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-* 

-*/

-/* Original code: Tedd Hansen */

-using System;

-using System.Collections.Generic;

-using System.Text;

-using System.Reflection;

-using System.Reflection.Emit;

-

-namespace OpenSim.Region.Scripting.LSL

-{

-    partial class LSO_Parser

-    {

-        private static TypeBuilder CreateType(ModuleBuilder modBuilder, string typeName)

-        {

-            TypeBuilder typeBuilder = modBuilder.DefineType(typeName,

-                        TypeAttributes.Public |

-                        TypeAttributes.Class |

-                        TypeAttributes.AutoClass |

-                        TypeAttributes.AnsiClass |

-                        TypeAttributes.BeforeFieldInit |

-                        TypeAttributes.AutoLayout,

-                        typeof(object),

-                        new Type[] { typeof(object) });

-            return typeBuilder;

-

-        }

-

-

-    }

-}

+/*
+* 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.
+* 
+*/
+/* Original code: Tedd Hansen */
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Reflection;
+using System.Reflection.Emit;
+
+namespace OpenSim.Region.Scripting.LSL
+{
+    partial class LSO_Parser
+    {
+        private static TypeBuilder CreateType(ModuleBuilder modBuilder, string typeName)
+        {
+            TypeBuilder typeBuilder = modBuilder.DefineType(typeName,
+                        TypeAttributes.Public |
+                        TypeAttributes.Class |
+                        TypeAttributes.AutoClass |
+                        TypeAttributes.AnsiClass |
+                        TypeAttributes.BeforeFieldInit |
+                        TypeAttributes.AutoLayout,
+                        typeof(object),
+                        new Type[] { typeof(object) });
+            return typeBuilder;
+
+        }
+
+
+    }
+}
diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/LSLEngine/LSLHandler/LSL_BuiltIn_Commands_Interface.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/LSLEngine/LSLHandler/LSL_BuiltIn_Commands_Interface.cs
index cf603b0..d8a0ce3 100644
--- a/OpenSim/Region/Environment/Scenes/scripting/Engines/LSLEngine/LSLHandler/LSL_BuiltIn_Commands_Interface.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/Engines/LSLEngine/LSLHandler/LSL_BuiltIn_Commands_Interface.cs
@@ -1,366 +1,366 @@
-/*

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

-* 

-*/

-/* Original code: Tedd Hansen */

-using System;

-    using System.Collections.Generic;

-    using System.Text;

-

-    namespace OpenSim.Region.Scripting.LSL

-    {

-        public interface LSL_BuiltIn_Commands_Interface

-        {

-            void llSin();

-            void llCos();

-            void llTan();

-            void llAtan2();

-            void llSqrt();

-            void llPow();

-            void llAbs();

-            void llFabs();

-            void llFrand();

-            void llFloor();

-            void llCeil();

-            void llRound();

-            void llVecMag();

-            void llVecNorm();

-            void llVecDist();

-            void llRot2Euler();

-            void llEuler2Rot();

-            void llAxes2Rot();

-            void llRot2Fwd();

-            void llRot2Left();

-            void llRot2Up();

-            void llRotBetween();

-            void llWhisper();

-            void llSay(UInt32 channelID, string text);

-            void llShout();

-            void llListen();

-            void llListenControl();

-            void llListenRemove();

-            void llSensor();

-            void llSensorRepeat();

-            void llSensorRemove();

-            void llDetectedName();

-            void llDetectedKey();

-            void llDetectedOwner();

-            void llDetectedType();

-            void llDetectedPos();

-            void llDetectedVel();

-            void llDetectedGrab();

-            void llDetectedRot();

-            void llDetectedGroup();

-            void llDetectedLinkNumber();

-            void llDie();

-            void llGround();

-            void llCloud();

-            void llWind();

-            void llSetStatus();

-            void llGetStatus();

-            void llSetScale();

-            void llGetScale();

-            void llSetColor();

-            void llGetAlpha();

-            void llSetAlpha();

-            void llGetColor();

-            void llSetTexture();

-            void llScaleTexture();

-            void llOffsetTexture();

-            void llRotateTexture();

-            void llGetTexture();

-            void llSetPos();

-            void llGetPos();

-            void llGetLocalPos();

-            void llSetRot();

-            void llGetRot();

-            void llGetLocalRot();

-            void llSetForce();

-            void llGetForce();

-            void llTarget();

-            void llTargetRemove();

-            void llRotTarget();

-            void llRotTargetRemove();

-            void llMoveToTarget();

-            void llStopMoveToTarget();

-            void llApplyImpulse();

-            void llApplyRotationalImpulse();

-            void llSetTorque();

-            void llGetTorque();

-            void llSetForceAndTorque();

-            void llGetVel();

-            void llGetAccel();

-            void llGetOmega();

-            void llGetTimeOfDay();

-            void llGetWallclock();

-            void llGetTime();

-            void llResetTime();

-            void llGetAndResetTime();

-            void llSound();

-            void llPlaySound();

-            void llLoopSound();

-            void llLoopSoundMaster();

-            void llLoopSoundSlave();

-            void llPlaySoundSlave();

-            void llTriggerSound();

-            void llStopSound();

-            void llPreloadSound();

-            void llGetSubString();

-            void llDeleteSubString();

-            void llInsertString();

-            void llToUpper();

-            void llToLower();

-            void llGiveMoney();

-            void llMakeExplosion();

-            void llMakeFountain();

-            void llMakeSmoke();

-            void llMakeFire();

-            void llRezObject();

-            void llLookAt();

-            void llStopLookAt();

-            void llSetTimerEvent();

-            void llSleep();

-            void llGetMass();

-            void llCollisionFilter();

-            void llTakeControls();

-            void llReleaseControls();

-            void llAttachToAvatar();

-            void llDetachFromAvatar();

-            void llTakeCamera();

-            void llReleaseCamera();

-            void llGetOwner();

-            void llInstantMessage();

-            void llEmail();

-            void llGetNextEmail();

-            void llGetKey();

-            void llSetBuoyancy();

-            void llSetHoverHeight();

-            void llStopHover();

-            void llMinEventDelay();

-            void llSoundPreload();

-            void llRotLookAt();

-            void llStringLength();

-            void llStartAnimation();

-            void llStopAnimation();

-            void llPointAt();

-            void llStopPointAt();

-            void llTargetOmega();

-            void llGetStartParameter();

-            void llGodLikeRezObject();

-            void llRequestPermissions();

-            void llGetPermissionsKey();

-            void llGetPermissions();

-            void llGetLinkNumber();

-            void llSetLinkColor();

-            void llCreateLink();

-            void llBreakLink();

-            void llBreakAllLinks();

-            void llGetLinkKey();

-            void llGetLinkName();

-            void llGetInventoryNumber();

-            void llGetInventoryName();

-            void llSetScriptState();

-            void llGetEnergy();

-            void llGiveInventory();

-            void llRemoveInventory();

-            void llSetText();

-            void llWater();

-            void llPassTouches();

-            void llRequestAgentData();

-            void llRequestInventoryData();

-            void llSetDamage();

-            void llTeleportAgentHome();

-            void llModifyLand();

-            void llCollisionSound();

-            void llCollisionSprite();

-            void llGetAnimation();

-            void llResetScript();

-            void llMessageLinked();

-            void llPushObject();

-            void llPassCollisions();

-            void llGetScriptName();

-            void llGetNumberOfSides();

-            void llAxisAngle2Rot();

-            void llRot2Axis();

-            void llRot2Angle();

-            void llAcos();

-            void llAsin();

-            void llAngleBetween();

-            void llGetInventoryKey();

-            void llAllowInventoryDrop();

-            void llGetSunDirection();

-            void llGetTextureOffset();

-            void llGetTextureScale();

-            void llGetTextureRot();

-            void llSubStringIndex();

-            void llGetOwnerKey();

-            void llGetCenterOfMass();

-            void llListSort();

-            void llGetListLength();

-            void llList2Integer();

-            void llList2Float();

-            void llList2String();

-            void llList2Key();

-            void llList2Vector();

-            void llList2Rot();

-            void llList2List();

-            void llDeleteSubList();

-            void llGetListEntryType();

-            void llList2CSV();

-            void llCSV2List();

-            void llListRandomize();

-            void llList2ListStrided();

-            void llGetRegionCorner();

-            void llListInsertList();

-            void llListFindList();

-            void llGetObjectName();

-            void llSetObjectName();

-            void llGetDate();

-            void llEdgeOfWorld();

-            void llGetAgentInfo();

-            void llAdjustSoundVolume();

-            void llSetSoundQueueing();

-            void llSetSoundRadius();

-            void llKey2Name();

-            void llSetTextureAnim();

-            void llTriggerSoundLimited();

-            void llEjectFromLand();

-            void llParseString2List();

-            void llOverMyLand();

-            void llGetLandOwnerAt();

-            void llGetNotecardLine();

-            void llGetAgentSize();

-            void llSameGroup();

-            void llUnSit();

-            void llGroundSlope();

-            void llGroundNormal();

-            void llGroundContour();

-            void llGetAttached();

-            void llGetFreeMemory();

-            void llGetRegionName();

-            void llGetRegionTimeDilation();

-            void llGetRegionFPS();

-            void llParticleSystem();

-            void llGroundRepel();

-            void llGiveInventoryList();

-            void llSetVehicleType();

-            void llSetVehicleFloatParam();

-            void llSetVehicleVectorParam();

-            void llSetVehicleRotationParam();

-            void llSetVehicleFlags();

-            void llRemoveVehicleFlags();

-            void llSitTarget();

-            void llAvatarOnSitTarget();

-            void llAddToLandPassList();

-            void llSetTouchText();

-            void llSetSitText();

-            void llSetCameraEyeOffset();

-            void llSetCameraAtOffset();

-            void llDumpList2String();

-            void llScriptDanger();

-            void llDialog();

-            void llVolumeDetect();

-            void llResetOtherScript();

-            void llGetScriptState();

-            void llRemoteLoadScript();

-            void llSetRemoteScriptAccessPin();

-            void llRemoteLoadScriptPin();

-            void llOpenRemoteDataChannel();

-            void llSendRemoteData();

-            void llRemoteDataReply();

-            void llCloseRemoteDataChannel();

-            void llMD5String();

-            void llSetPrimitiveParams();

-            void llStringToBase64();

-            void llBase64ToString();

-            void llXorBase64Strings();

-            void llRemoteDataSetRegion();

-            void llLog10();

-            void llLog();

-            void llGetAnimationList();

-            void llSetParcelMusicURL();

-            void llGetRootPosition();

-            void llGetRootRotation();

-            void llGetObjectDesc();

-            void llSetObjectDesc();

-            void llGetCreator();

-            void llGetTimestamp();

-            void llSetLinkAlpha();

-            void llGetNumberOfPrims();

-            void llGetNumberOfNotecardLines();

-            void llGetBoundingBox();

-            void llGetGeometricCenter();

-            void llGetPrimitiveParams();

-            void llIntegerToBase64();

-            void llBase64ToInteger();

-            void llGetGMTclock();

-            void llGetSimulatorHostname();

-            void llSetLocalRot();

-            void llParseStringKeepNulls();

-            void llRezAtRoot();

-            void llGetObjectPermMask();

-            void llSetObjectPermMask();

-            void llGetInventoryPermMask();

-            void llSetInventoryPermMask();

-            void llGetInventoryCreator();

-            void llOwnerSay();

-            void llRequestSimulatorData();

-            void llForceMouselook();

-            void llGetObjectMass();

-            void llListReplaceList();

-            void llLoadURL();

-            void llParcelMediaCommandList();

-            void llParcelMediaQuery();

-            void llModPow();

-            void llGetInventoryType();

-            void llSetPayPrice();

-            void llGetCameraPos();

-            void llGetCameraRot();

-            void llSetPrimURL();

-            void llRefreshPrimURL();

-            void llEscapeURL();

-            void llUnescapeURL();

-            void llMapDestination();

-            void llAddToLandBanList();

-            void llRemoveFromLandPassList();

-            void llRemoveFromLandBanList();

-            void llSetCameraParams();

-            void llClearCameraParams();

-            void llListStatistics();

-            void llGetUnixTime();

-            void llGetParcelFlags();

-            void llGetRegionFlags();

-            void llXorBase64StringsCorrect();

-            void llHTTPRequest();

-            void llResetLandBanList();

-            void llResetLandPassList();

-            void llGetParcelPrimCount();

-            void llGetParcelPrimOwners();

-            void llGetObjectPrimCount();

-            void llGetParcelMaxPrims();

-            void llGetParcelDetails();

-        }

-    }

+/*
+* 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.
+* 
+*/
+/* Original code: Tedd Hansen */
+using System;
+    using System.Collections.Generic;
+    using System.Text;
+
+    namespace OpenSim.Region.Scripting.LSL
+    {
+        public interface LSL_BuiltIn_Commands_Interface
+        {
+            void llSin();
+            void llCos();
+            void llTan();
+            void llAtan2();
+            void llSqrt();
+            void llPow();
+            void llAbs();
+            void llFabs();
+            void llFrand();
+            void llFloor();
+            void llCeil();
+            void llRound();
+            void llVecMag();
+            void llVecNorm();
+            void llVecDist();
+            void llRot2Euler();
+            void llEuler2Rot();
+            void llAxes2Rot();
+            void llRot2Fwd();
+            void llRot2Left();
+            void llRot2Up();
+            void llRotBetween();
+            void llWhisper();
+            void llSay(UInt32 channelID, string text);
+            void llShout();
+            void llListen();
+            void llListenControl();
+            void llListenRemove();
+            void llSensor();
+            void llSensorRepeat();
+            void llSensorRemove();
+            void llDetectedName();
+            void llDetectedKey();
+            void llDetectedOwner();
+            void llDetectedType();
+            void llDetectedPos();
+            void llDetectedVel();
+            void llDetectedGrab();
+            void llDetectedRot();
+            void llDetectedGroup();
+            void llDetectedLinkNumber();
+            void llDie();
+            void llGround();
+            void llCloud();
+            void llWind();
+            void llSetStatus();
+            void llGetStatus();
+            void llSetScale();
+            void llGetScale();
+            void llSetColor();
+            void llGetAlpha();
+            void llSetAlpha();
+            void llGetColor();
+            void llSetTexture();
+            void llScaleTexture();
+            void llOffsetTexture();
+            void llRotateTexture();
+            void llGetTexture();
+            void llSetPos();
+            void llGetPos();
+            void llGetLocalPos();
+            void llSetRot();
+            void llGetRot();
+            void llGetLocalRot();
+            void llSetForce();
+            void llGetForce();
+            void llTarget();
+            void llTargetRemove();
+            void llRotTarget();
+            void llRotTargetRemove();
+            void llMoveToTarget();
+            void llStopMoveToTarget();
+            void llApplyImpulse();
+            void llApplyRotationalImpulse();
+            void llSetTorque();
+            void llGetTorque();
+            void llSetForceAndTorque();
+            void llGetVel();
+            void llGetAccel();
+            void llGetOmega();
+            void llGetTimeOfDay();
+            void llGetWallclock();
+            void llGetTime();
+            void llResetTime();
+            void llGetAndResetTime();
+            void llSound();
+            void llPlaySound();
+            void llLoopSound();
+            void llLoopSoundMaster();
+            void llLoopSoundSlave();
+            void llPlaySoundSlave();
+            void llTriggerSound();
+            void llStopSound();
+            void llPreloadSound();
+            void llGetSubString();
+            void llDeleteSubString();
+            void llInsertString();
+            void llToUpper();
+            void llToLower();
+            void llGiveMoney();
+            void llMakeExplosion();
+            void llMakeFountain();
+            void llMakeSmoke();
+            void llMakeFire();
+            void llRezObject();
+            void llLookAt();
+            void llStopLookAt();
+            void llSetTimerEvent();
+            void llSleep();
+            void llGetMass();
+            void llCollisionFilter();
+            void llTakeControls();
+            void llReleaseControls();
+            void llAttachToAvatar();
+            void llDetachFromAvatar();
+            void llTakeCamera();
+            void llReleaseCamera();
+            void llGetOwner();
+            void llInstantMessage();
+            void llEmail();
+            void llGetNextEmail();
+            void llGetKey();
+            void llSetBuoyancy();
+            void llSetHoverHeight();
+            void llStopHover();
+            void llMinEventDelay();
+            void llSoundPreload();
+            void llRotLookAt();
+            void llStringLength();
+            void llStartAnimation();
+            void llStopAnimation();
+            void llPointAt();
+            void llStopPointAt();
+            void llTargetOmega();
+            void llGetStartParameter();
+            void llGodLikeRezObject();
+            void llRequestPermissions();
+            void llGetPermissionsKey();
+            void llGetPermissions();
+            void llGetLinkNumber();
+            void llSetLinkColor();
+            void llCreateLink();
+            void llBreakLink();
+            void llBreakAllLinks();
+            void llGetLinkKey();
+            void llGetLinkName();
+            void llGetInventoryNumber();
+            void llGetInventoryName();
+            void llSetScriptState();
+            void llGetEnergy();
+            void llGiveInventory();
+            void llRemoveInventory();
+            void llSetText();
+            void llWater();
+            void llPassTouches();
+            void llRequestAgentData();
+            void llRequestInventoryData();
+            void llSetDamage();
+            void llTeleportAgentHome();
+            void llModifyLand();
+            void llCollisionSound();
+            void llCollisionSprite();
+            void llGetAnimation();
+            void llResetScript();
+            void llMessageLinked();
+            void llPushObject();
+            void llPassCollisions();
+            void llGetScriptName();
+            void llGetNumberOfSides();
+            void llAxisAngle2Rot();
+            void llRot2Axis();
+            void llRot2Angle();
+            void llAcos();
+            void llAsin();
+            void llAngleBetween();
+            void llGetInventoryKey();
+            void llAllowInventoryDrop();
+            void llGetSunDirection();
+            void llGetTextureOffset();
+            void llGetTextureScale();
+            void llGetTextureRot();
+            void llSubStringIndex();
+            void llGetOwnerKey();
+            void llGetCenterOfMass();
+            void llListSort();
+            void llGetListLength();
+            void llList2Integer();
+            void llList2Float();
+            void llList2String();
+            void llList2Key();
+            void llList2Vector();
+            void llList2Rot();
+            void llList2List();
+            void llDeleteSubList();
+            void llGetListEntryType();
+            void llList2CSV();
+            void llCSV2List();
+            void llListRandomize();
+            void llList2ListStrided();
+            void llGetRegionCorner();
+            void llListInsertList();
+            void llListFindList();
+            void llGetObjectName();
+            void llSetObjectName();
+            void llGetDate();
+            void llEdgeOfWorld();
+            void llGetAgentInfo();
+            void llAdjustSoundVolume();
+            void llSetSoundQueueing();
+            void llSetSoundRadius();
+            void llKey2Name();
+            void llSetTextureAnim();
+            void llTriggerSoundLimited();
+            void llEjectFromLand();
+            void llParseString2List();
+            void llOverMyLand();
+            void llGetLandOwnerAt();
+            void llGetNotecardLine();
+            void llGetAgentSize();
+            void llSameGroup();
+            void llUnSit();
+            void llGroundSlope();
+            void llGroundNormal();
+            void llGroundContour();
+            void llGetAttached();
+            void llGetFreeMemory();
+            void llGetRegionName();
+            void llGetRegionTimeDilation();
+            void llGetRegionFPS();
+            void llParticleSystem();
+            void llGroundRepel();
+            void llGiveInventoryList();
+            void llSetVehicleType();
+            void llSetVehicleFloatParam();
+            void llSetVehicleVectorParam();
+            void llSetVehicleRotationParam();
+            void llSetVehicleFlags();
+            void llRemoveVehicleFlags();
+            void llSitTarget();
+            void llAvatarOnSitTarget();
+            void llAddToLandPassList();
+            void llSetTouchText();
+            void llSetSitText();
+            void llSetCameraEyeOffset();
+            void llSetCameraAtOffset();
+            void llDumpList2String();
+            void llScriptDanger();
+            void llDialog();
+            void llVolumeDetect();
+            void llResetOtherScript();
+            void llGetScriptState();
+            void llRemoteLoadScript();
+            void llSetRemoteScriptAccessPin();
+            void llRemoteLoadScriptPin();
+            void llOpenRemoteDataChannel();
+            void llSendRemoteData();
+            void llRemoteDataReply();
+            void llCloseRemoteDataChannel();
+            void llMD5String();
+            void llSetPrimitiveParams();
+            void llStringToBase64();
+            void llBase64ToString();
+            void llXorBase64Strings();
+            void llRemoteDataSetRegion();
+            void llLog10();
+            void llLog();
+            void llGetAnimationList();
+            void llSetParcelMusicURL();
+            void llGetRootPosition();
+            void llGetRootRotation();
+            void llGetObjectDesc();
+            void llSetObjectDesc();
+            void llGetCreator();
+            void llGetTimestamp();
+            void llSetLinkAlpha();
+            void llGetNumberOfPrims();
+            void llGetNumberOfNotecardLines();
+            void llGetBoundingBox();
+            void llGetGeometricCenter();
+            void llGetPrimitiveParams();
+            void llIntegerToBase64();
+            void llBase64ToInteger();
+            void llGetGMTclock();
+            void llGetSimulatorHostname();
+            void llSetLocalRot();
+            void llParseStringKeepNulls();
+            void llRezAtRoot();
+            void llGetObjectPermMask();
+            void llSetObjectPermMask();
+            void llGetInventoryPermMask();
+            void llSetInventoryPermMask();
+            void llGetInventoryCreator();
+            void llOwnerSay();
+            void llRequestSimulatorData();
+            void llForceMouselook();
+            void llGetObjectMass();
+            void llListReplaceList();
+            void llLoadURL();
+            void llParcelMediaCommandList();
+            void llParcelMediaQuery();
+            void llModPow();
+            void llGetInventoryType();
+            void llSetPayPrice();
+            void llGetCameraPos();
+            void llGetCameraRot();
+            void llSetPrimURL();
+            void llRefreshPrimURL();
+            void llEscapeURL();
+            void llUnescapeURL();
+            void llMapDestination();
+            void llAddToLandBanList();
+            void llRemoveFromLandPassList();
+            void llRemoveFromLandBanList();
+            void llSetCameraParams();
+            void llClearCameraParams();
+            void llListStatistics();
+            void llGetUnixTime();
+            void llGetParcelFlags();
+            void llGetRegionFlags();
+            void llXorBase64StringsCorrect();
+            void llHTTPRequest();
+            void llResetLandBanList();
+            void llResetLandPassList();
+            void llGetParcelPrimCount();
+            void llGetParcelPrimOwners();
+            void llGetObjectPrimCount();
+            void llGetParcelMaxPrims();
+            void llGetParcelDetails();
+        }
+    }
diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/LSLEngine/LSLHandler/LSL_BuiltIn_Commands_TestImplementation.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/LSLEngine/LSLHandler/LSL_BuiltIn_Commands_TestImplementation.cs
index 08e7f95..4b0fa7e 100644
--- a/OpenSim/Region/Environment/Scenes/scripting/Engines/LSLEngine/LSLHandler/LSL_BuiltIn_Commands_TestImplementation.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/Engines/LSLEngine/LSLHandler/LSL_BuiltIn_Commands_TestImplementation.cs
@@ -1,377 +1,377 @@
-/*

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

-* 

-*/

-/* Original code: Tedd Hansen */

-using System;

-using System.Collections.Generic;

-using System.Text;

-

-namespace OpenSim.Region.Scripting.LSL

-{

-    public class LSL_BuiltIn_Commands_TestImplementation: LSL_BuiltIn_Commands_Interface

-    {

-        public LSL_BuiltIn_Commands_TestImplementation()

-        {

-            Common.SendToDebug("LSL_BuiltIn_Commands_TestImplementation: Creating object");

-        }

-

-        public void llSin() { }

-        public void llCos() { }

-        public void llTan() { }

-        public void llAtan2() { }

-        public void llSqrt() { }

-        public void llPow() { }

-        public void llAbs() { }

-        public void llFabs() { }

-        public void llFrand() { }

-        public void llFloor() { }

-        public void llCeil() { }

-        public void llRound() { }

-        public void llVecMag() { }

-        public void llVecNorm() { }

-        public void llVecDist() { }

-        public void llRot2Euler() { }

-        public void llEuler2Rot() { }

-        public void llAxes2Rot() { }

-        public void llRot2Fwd() { }

-        public void llRot2Left() { }

-        public void llRot2Up() { }

-        public void llRotBetween() { }

-        public void llWhisper() { }

-        public void llSay(UInt32 channelID, string text)

-        {

-            Common.SendToDebug("INTERNAL FUNCTION llSay(" + channelID + ", \"" + text + "\");");

-        }

-        public void llShout() { }

-        public void llListen() { }

-        public void llListenControl() { }

-        public void llListenRemove() { }

-        public void llSensor() { }

-        public void llSensorRepeat() { }

-        public void llSensorRemove() { }

-        public void llDetectedName() { }

-        public void llDetectedKey() { }

-        public void llDetectedOwner() { }

-        public void llDetectedType() { }

-        public void llDetectedPos() { }

-        public void llDetectedVel() { }

-        public void llDetectedGrab() { }

-        public void llDetectedRot() { }

-        public void llDetectedGroup() { }

-        public void llDetectedLinkNumber() { }

-        public void llDie() { }

-        public void llGround() { }

-        public void llCloud() { }

-        public void llWind() { }

-        public void llSetStatus() { }

-        public void llGetStatus() { }

-        public void llSetScale() { }

-        public void llGetScale() { }

-        public void llSetColor() { }

-        public void llGetAlpha() { }

-        public void llSetAlpha() { }

-        public void llGetColor() { }

-        public void llSetTexture() { }

-        public void llScaleTexture() { }

-        public void llOffsetTexture() { }

-        public void llRotateTexture() { }

-        public void llGetTexture() { }

-        public void llSetPos() { }

-        public void llGetPos() { }

-        public void llGetLocalPos() { }

-        public void llSetRot() { }

-        public void llGetRot() { }

-        public void llGetLocalRot() { }

-        public void llSetForce() { }

-        public void llGetForce() { }

-        public void llTarget() { }

-        public void llTargetRemove() { }

-        public void llRotTarget() { }

-        public void llRotTargetRemove() { }

-        public void llMoveToTarget() { }

-        public void llStopMoveToTarget() { }

-        public void llApplyImpulse() { }

-        public void llApplyRotationalImpulse() { }

-        public void llSetTorque() { }

-        public void llGetTorque() { }

-        public void llSetForceAndTorque() { }

-        public void llGetVel() { }

-        public void llGetAccel() { }

-        public void llGetOmega() { }

-        public void llGetTimeOfDay() { }

-        public void llGetWallclock() { }

-        public void llGetTime() { }

-        public void llResetTime() { }

-        public void llGetAndResetTime() { }

-        public void llSound() { }

-        public void llPlaySound() { }

-        public void llLoopSound() { }

-        public void llLoopSoundMaster() { }

-        public void llLoopSoundSlave() { }

-        public void llPlaySoundSlave() { }

-        public void llTriggerSound() { }

-        public void llStopSound() { }

-        public void llPreloadSound() { }

-        public void llGetSubString() { }

-        public void llDeleteSubString() { }

-        public void llInsertString() { }

-        public void llToUpper() { }

-        public void llToLower() { }

-        public void llGiveMoney() { }

-        public void llMakeExplosion() { }

-        public void llMakeFountain() { }

-        public void llMakeSmoke() { }

-        public void llMakeFire() { }

-        public void llRezObject() { }

-        public void llLookAt() { }

-        public void llStopLookAt() { }

-        public void llSetTimerEvent() { }

-        public void llSleep() { }

-        public void llGetMass() { }

-        public void llCollisionFilter() { }

-        public void llTakeControls() { }

-        public void llReleaseControls() { }

-        public void llAttachToAvatar() { }

-        public void llDetachFromAvatar() { }

-        public void llTakeCamera() { }

-        public void llReleaseCamera() { }

-        public void llGetOwner() { }

-        public void llInstantMessage() { }

-        public void llEmail() { }

-        public void llGetNextEmail() { }

-        public void llGetKey() { }

-        public void llSetBuoyancy() { }

-        public void llSetHoverHeight() { }

-        public void llStopHover() { }

-        public void llMinEventDelay() { }

-        public void llSoundPreload() { }

-        public void llRotLookAt() { }

-        public void llStringLength() { }

-        public void llStartAnimation() { }

-        public void llStopAnimation() { }

-        public void llPointAt() { }

-        public void llStopPointAt() { }

-        public void llTargetOmega() { }

-        public void llGetStartParameter() { }

-        public void llGodLikeRezObject() { }

-        public void llRequestPermissions() { }

-        public void llGetPermissionsKey() { }

-        public void llGetPermissions() { }

-        public void llGetLinkNumber() { }

-        public void llSetLinkColor() { }

-        public void llCreateLink() { }

-        public void llBreakLink() { }

-        public void llBreakAllLinks() { }

-        public void llGetLinkKey() { }

-        public void llGetLinkName() { }

-        public void llGetInventoryNumber() { }

-        public void llGetInventoryName() { }

-        public void llSetScriptState() { }

-        public void llGetEnergy() { }

-        public void llGiveInventory() { }

-        public void llRemoveInventory() { }

-        public void llSetText() { }

-        public void llWater() { }

-        public void llPassTouches() { }

-        public void llRequestAgentData() { }

-        public void llRequestInventoryData() { }

-        public void llSetDamage() { }

-        public void llTeleportAgentHome() { }

-        public void llModifyLand() { }

-        public void llCollisionSound() { }

-        public void llCollisionSprite() { }

-        public void llGetAnimation() { }

-        public void llResetScript() { }

-        public void llMessageLinked() { }

-        public void llPushObject() { }

-        public void llPassCollisions() { }

-        public void llGetScriptName() { }

-        public void llGetNumberOfSides() { }

-        public void llAxisAngle2Rot() { }

-        public void llRot2Axis() { }

-        public void llRot2Angle() { }

-        public void llAcos() { }

-        public void llAsin() { }

-        public void llAngleBetween() { }

-        public void llGetInventoryKey() { }

-        public void llAllowInventoryDrop() { }

-        public void llGetSunDirection() { }

-        public void llGetTextureOffset() { }

-        public void llGetTextureScale() { }

-        public void llGetTextureRot() { }

-        public void llSubStringIndex() { }

-        public void llGetOwnerKey() { }

-        public void llGetCenterOfMass() { }

-        public void llListSort() { }

-        public void llGetListLength() { }

-        public void llList2Integer() { }

-        public void llList2Float() { }

-        public void llList2String() { }

-        public void llList2Key() { }

-        public void llList2Vector() { }

-        public void llList2Rot() { }

-        public void llList2List() { }

-        public void llDeleteSubList() { }

-        public void llGetListEntryType() { }

-        public void llList2CSV() { }

-        public void llCSV2List() { }

-        public void llListRandomize() { }

-        public void llList2ListStrided() { }

-        public void llGetRegionCorner() { }

-        public void llListInsertList() { }

-        public void llListFindList() { }

-        public void llGetObjectName() { }

-        public void llSetObjectName() { }

-        public void llGetDate() { }

-        public void llEdgeOfWorld() { }

-        public void llGetAgentInfo() { }

-        public void llAdjustSoundVolume() { }

-        public void llSetSoundQueueing() { }

-        public void llSetSoundRadius() { }

-        public void llKey2Name() { }

-        public void llSetTextureAnim() { }

-        public void llTriggerSoundLimited() { }

-        public void llEjectFromLand() { }

-        public void llParseString2List() { }

-        public void llOverMyLand() { }

-        public void llGetLandOwnerAt() { }

-        public void llGetNotecardLine() { }

-        public void llGetAgentSize() { }

-        public void llSameGroup() { }

-        public void llUnSit() { }

-        public void llGroundSlope() { }

-        public void llGroundNormal() { }

-        public void llGroundContour() { }

-        public void llGetAttached() { }

-        public void llGetFreeMemory() { }

-        public void llGetRegionName() { }

-        public void llGetRegionTimeDilation() { }

-        public void llGetRegionFPS() { }

-        public void llParticleSystem() { }

-        public void llGroundRepel() { }

-        public void llGiveInventoryList() { }

-        public void llSetVehicleType() { }

-        public void llSetVehicleFloatParam() { }

-        public void llSetVehicleVectorParam() { }

-        public void llSetVehicleRotationParam() { }

-        public void llSetVehicleFlags() { }

-        public void llRemoveVehicleFlags() { }

-        public void llSitTarget() { }

-        public void llAvatarOnSitTarget() { }

-        public void llAddToLandPassList() { }

-        public void llSetTouchText() { }

-        public void llSetSitText() { }

-        public void llSetCameraEyeOffset() { }

-        public void llSetCameraAtOffset() { }

-        public void llDumpList2String() { }

-        public void llScriptDanger() { }

-        public void llDialog() { }

-        public void llVolumeDetect() { }

-        public void llResetOtherScript() { }

-        public void llGetScriptState() { }

-        public void llRemoteLoadScript() { }

-        public void llSetRemoteScriptAccessPin() { }

-        public void llRemoteLoadScriptPin() { }

-        public void llOpenRemoteDataChannel() { }

-        public void llSendRemoteData() { }

-        public void llRemoteDataReply() { }

-        public void llCloseRemoteDataChannel() { }

-        public void llMD5String() { }

-        public void llSetPrimitiveParams() { }

-        public void llStringToBase64() { }

-        public void llBase64ToString() { }

-        public void llXorBase64Strings() { }

-        public void llRemoteDataSetRegion() { }

-        public void llLog10() { }

-        public void llLog() { }

-        public void llGetAnimationList() { }

-        public void llSetParcelMusicURL() { }

-        public void llGetRootPosition() { }

-        public void llGetRootRotation() { }

-        public void llGetObjectDesc() { }

-        public void llSetObjectDesc() { }

-        public void llGetCreator() { }

-        public void llGetTimestamp() { }

-        public void llSetLinkAlpha() { }

-        public void llGetNumberOfPrims() { }

-        public void llGetNumberOfNotecardLines() { }

-        public void llGetBoundingBox() { }

-        public void llGetGeometricCenter() { }

-        public void llGetPrimitiveParams() { }

-        public void llIntegerToBase64() { }

-        public void llBase64ToInteger() { }

-        public void llGetGMTclock() { }

-        public void llGetSimulatorHostname() { }

-        public void llSetLocalRot() { }

-        public void llParseStringKeepNulls() { }

-        public void llRezAtRoot() { }

-        public void llGetObjectPermMask() { }

-        public void llSetObjectPermMask() { }

-        public void llGetInventoryPermMask() { }

-        public void llSetInventoryPermMask() { }

-        public void llGetInventoryCreator() { }

-        public void llOwnerSay() { }

-        public void llRequestSimulatorData() { }

-        public void llForceMouselook() { }

-        public void llGetObjectMass() { }

-        public void llListReplaceList() { }

-        public void llLoadURL() { }

-        public void llParcelMediaCommandList() { }

-        public void llParcelMediaQuery() { }

-        public void llModPow() { }

-        public void llGetInventoryType() { }

-        public void llSetPayPrice() { }

-        public void llGetCameraPos() { }

-        public void llGetCameraRot() { }

-        public void llSetPrimURL() { }

-        public void llRefreshPrimURL() { }

-        public void llEscapeURL() { }

-        public void llUnescapeURL() { }

-        public void llMapDestination() { }

-        public void llAddToLandBanList() { }

-        public void llRemoveFromLandPassList() { }

-        public void llRemoveFromLandBanList() { }

-        public void llSetCameraParams() { }

-        public void llClearCameraParams() { }

-        public void llListStatistics() { }

-        public void llGetUnixTime() { }

-        public void llGetParcelFlags() { }

-        public void llGetRegionFlags() { }

-        public void llXorBase64StringsCorrect() { }

-        public void llHTTPRequest() { }

-        public void llResetLandBanList() { }

-        public void llResetLandPassList() { }

-        public void llGetParcelPrimCount() { }

-        public void llGetParcelPrimOwners() { }

-        public void llGetObjectPrimCount() { }

-        public void llGetParcelMaxPrims() { }

-        public void llGetParcelDetails() { }

-

-

-

-    }

-}

+/*
+* 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.
+* 
+*/
+/* Original code: Tedd Hansen */
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenSim.Region.Scripting.LSL
+{
+    public class LSL_BuiltIn_Commands_TestImplementation: LSL_BuiltIn_Commands_Interface
+    {
+        public LSL_BuiltIn_Commands_TestImplementation()
+        {
+            Common.SendToDebug("LSL_BuiltIn_Commands_TestImplementation: Creating object");
+        }
+
+        public void llSin() { }
+        public void llCos() { }
+        public void llTan() { }
+        public void llAtan2() { }
+        public void llSqrt() { }
+        public void llPow() { }
+        public void llAbs() { }
+        public void llFabs() { }
+        public void llFrand() { }
+        public void llFloor() { }
+        public void llCeil() { }
+        public void llRound() { }
+        public void llVecMag() { }
+        public void llVecNorm() { }
+        public void llVecDist() { }
+        public void llRot2Euler() { }
+        public void llEuler2Rot() { }
+        public void llAxes2Rot() { }
+        public void llRot2Fwd() { }
+        public void llRot2Left() { }
+        public void llRot2Up() { }
+        public void llRotBetween() { }
+        public void llWhisper() { }
+        public void llSay(UInt32 channelID, string text)
+        {
+            Common.SendToDebug("INTERNAL FUNCTION llSay(" + channelID + ", \"" + text + "\");");
+        }
+        public void llShout() { }
+        public void llListen() { }
+        public void llListenControl() { }
+        public void llListenRemove() { }
+        public void llSensor() { }
+        public void llSensorRepeat() { }
+        public void llSensorRemove() { }
+        public void llDetectedName() { }
+        public void llDetectedKey() { }
+        public void llDetectedOwner() { }
+        public void llDetectedType() { }
+        public void llDetectedPos() { }
+        public void llDetectedVel() { }
+        public void llDetectedGrab() { }
+        public void llDetectedRot() { }
+        public void llDetectedGroup() { }
+        public void llDetectedLinkNumber() { }
+        public void llDie() { }
+        public void llGround() { }
+        public void llCloud() { }
+        public void llWind() { }
+        public void llSetStatus() { }
+        public void llGetStatus() { }
+        public void llSetScale() { }
+        public void llGetScale() { }
+        public void llSetColor() { }
+        public void llGetAlpha() { }
+        public void llSetAlpha() { }
+        public void llGetColor() { }
+        public void llSetTexture() { }
+        public void llScaleTexture() { }
+        public void llOffsetTexture() { }
+        public void llRotateTexture() { }
+        public void llGetTexture() { }
+        public void llSetPos() { }
+        public void llGetPos() { }
+        public void llGetLocalPos() { }
+        public void llSetRot() { }
+        public void llGetRot() { }
+        public void llGetLocalRot() { }
+        public void llSetForce() { }
+        public void llGetForce() { }
+        public void llTarget() { }
+        public void llTargetRemove() { }
+        public void llRotTarget() { }
+        public void llRotTargetRemove() { }
+        public void llMoveToTarget() { }
+        public void llStopMoveToTarget() { }
+        public void llApplyImpulse() { }
+        public void llApplyRotationalImpulse() { }
+        public void llSetTorque() { }
+        public void llGetTorque() { }
+        public void llSetForceAndTorque() { }
+        public void llGetVel() { }
+        public void llGetAccel() { }
+        public void llGetOmega() { }
+        public void llGetTimeOfDay() { }
+        public void llGetWallclock() { }
+        public void llGetTime() { }
+        public void llResetTime() { }
+        public void llGetAndResetTime() { }
+        public void llSound() { }
+        public void llPlaySound() { }
+        public void llLoopSound() { }
+        public void llLoopSoundMaster() { }
+        public void llLoopSoundSlave() { }
+        public void llPlaySoundSlave() { }
+        public void llTriggerSound() { }
+        public void llStopSound() { }
+        public void llPreloadSound() { }
+        public void llGetSubString() { }
+        public void llDeleteSubString() { }
+        public void llInsertString() { }
+        public void llToUpper() { }
+        public void llToLower() { }
+        public void llGiveMoney() { }
+        public void llMakeExplosion() { }
+        public void llMakeFountain() { }
+        public void llMakeSmoke() { }
+        public void llMakeFire() { }
+        public void llRezObject() { }
+        public void llLookAt() { }
+        public void llStopLookAt() { }
+        public void llSetTimerEvent() { }
+        public void llSleep() { }
+        public void llGetMass() { }
+        public void llCollisionFilter() { }
+        public void llTakeControls() { }
+        public void llReleaseControls() { }
+        public void llAttachToAvatar() { }
+        public void llDetachFromAvatar() { }
+        public void llTakeCamera() { }
+        public void llReleaseCamera() { }
+        public void llGetOwner() { }
+        public void llInstantMessage() { }
+        public void llEmail() { }
+        public void llGetNextEmail() { }
+        public void llGetKey() { }
+        public void llSetBuoyancy() { }
+        public void llSetHoverHeight() { }
+        public void llStopHover() { }
+        public void llMinEventDelay() { }
+        public void llSoundPreload() { }
+        public void llRotLookAt() { }
+        public void llStringLength() { }
+        public void llStartAnimation() { }
+        public void llStopAnimation() { }
+        public void llPointAt() { }
+        public void llStopPointAt() { }
+        public void llTargetOmega() { }
+        public void llGetStartParameter() { }
+        public void llGodLikeRezObject() { }
+        public void llRequestPermissions() { }
+        public void llGetPermissionsKey() { }
+        public void llGetPermissions() { }
+        public void llGetLinkNumber() { }
+        public void llSetLinkColor() { }
+        public void llCreateLink() { }
+        public void llBreakLink() { }
+        public void llBreakAllLinks() { }
+        public void llGetLinkKey() { }
+        public void llGetLinkName() { }
+        public void llGetInventoryNumber() { }
+        public void llGetInventoryName() { }
+        public void llSetScriptState() { }
+        public void llGetEnergy() { }
+        public void llGiveInventory() { }
+        public void llRemoveInventory() { }
+        public void llSetText() { }
+        public void llWater() { }
+        public void llPassTouches() { }
+        public void llRequestAgentData() { }
+        public void llRequestInventoryData() { }
+        public void llSetDamage() { }
+        public void llTeleportAgentHome() { }
+        public void llModifyLand() { }
+        public void llCollisionSound() { }
+        public void llCollisionSprite() { }
+        public void llGetAnimation() { }
+        public void llResetScript() { }
+        public void llMessageLinked() { }
+        public void llPushObject() { }
+        public void llPassCollisions() { }
+        public void llGetScriptName() { }
+        public void llGetNumberOfSides() { }
+        public void llAxisAngle2Rot() { }
+        public void llRot2Axis() { }
+        public void llRot2Angle() { }
+        public void llAcos() { }
+        public void llAsin() { }
+        public void llAngleBetween() { }
+        public void llGetInventoryKey() { }
+        public void llAllowInventoryDrop() { }
+        public void llGetSunDirection() { }
+        public void llGetTextureOffset() { }
+        public void llGetTextureScale() { }
+        public void llGetTextureRot() { }
+        public void llSubStringIndex() { }
+        public void llGetOwnerKey() { }
+        public void llGetCenterOfMass() { }
+        public void llListSort() { }
+        public void llGetListLength() { }
+        public void llList2Integer() { }
+        public void llList2Float() { }
+        public void llList2String() { }
+        public void llList2Key() { }
+        public void llList2Vector() { }
+        public void llList2Rot() { }
+        public void llList2List() { }
+        public void llDeleteSubList() { }
+        public void llGetListEntryType() { }
+        public void llList2CSV() { }
+        public void llCSV2List() { }
+        public void llListRandomize() { }
+        public void llList2ListStrided() { }
+        public void llGetRegionCorner() { }
+        public void llListInsertList() { }
+        public void llListFindList() { }
+        public void llGetObjectName() { }
+        public void llSetObjectName() { }
+        public void llGetDate() { }
+        public void llEdgeOfWorld() { }
+        public void llGetAgentInfo() { }
+        public void llAdjustSoundVolume() { }
+        public void llSetSoundQueueing() { }
+        public void llSetSoundRadius() { }
+        public void llKey2Name() { }
+        public void llSetTextureAnim() { }
+        public void llTriggerSoundLimited() { }
+        public void llEjectFromLand() { }
+        public void llParseString2List() { }
+        public void llOverMyLand() { }
+        public void llGetLandOwnerAt() { }
+        public void llGetNotecardLine() { }
+        public void llGetAgentSize() { }
+        public void llSameGroup() { }
+        public void llUnSit() { }
+        public void llGroundSlope() { }
+        public void llGroundNormal() { }
+        public void llGroundContour() { }
+        public void llGetAttached() { }
+        public void llGetFreeMemory() { }
+        public void llGetRegionName() { }
+        public void llGetRegionTimeDilation() { }
+        public void llGetRegionFPS() { }
+        public void llParticleSystem() { }
+        public void llGroundRepel() { }
+        public void llGiveInventoryList() { }
+        public void llSetVehicleType() { }
+        public void llSetVehicleFloatParam() { }
+        public void llSetVehicleVectorParam() { }
+        public void llSetVehicleRotationParam() { }
+        public void llSetVehicleFlags() { }
+        public void llRemoveVehicleFlags() { }
+        public void llSitTarget() { }
+        public void llAvatarOnSitTarget() { }
+        public void llAddToLandPassList() { }
+        public void llSetTouchText() { }
+        public void llSetSitText() { }
+        public void llSetCameraEyeOffset() { }
+        public void llSetCameraAtOffset() { }
+        public void llDumpList2String() { }
+        public void llScriptDanger() { }
+        public void llDialog() { }
+        public void llVolumeDetect() { }
+        public void llResetOtherScript() { }
+        public void llGetScriptState() { }
+        public void llRemoteLoadScript() { }
+        public void llSetRemoteScriptAccessPin() { }
+        public void llRemoteLoadScriptPin() { }
+        public void llOpenRemoteDataChannel() { }
+        public void llSendRemoteData() { }
+        public void llRemoteDataReply() { }
+        public void llCloseRemoteDataChannel() { }
+        public void llMD5String() { }
+        public void llSetPrimitiveParams() { }
+        public void llStringToBase64() { }
+        public void llBase64ToString() { }
+        public void llXorBase64Strings() { }
+        public void llRemoteDataSetRegion() { }
+        public void llLog10() { }
+        public void llLog() { }
+        public void llGetAnimationList() { }
+        public void llSetParcelMusicURL() { }
+        public void llGetRootPosition() { }
+        public void llGetRootRotation() { }
+        public void llGetObjectDesc() { }
+        public void llSetObjectDesc() { }
+        public void llGetCreator() { }
+        public void llGetTimestamp() { }
+        public void llSetLinkAlpha() { }
+        public void llGetNumberOfPrims() { }
+        public void llGetNumberOfNotecardLines() { }
+        public void llGetBoundingBox() { }
+        public void llGetGeometricCenter() { }
+        public void llGetPrimitiveParams() { }
+        public void llIntegerToBase64() { }
+        public void llBase64ToInteger() { }
+        public void llGetGMTclock() { }
+        public void llGetSimulatorHostname() { }
+        public void llSetLocalRot() { }
+        public void llParseStringKeepNulls() { }
+        public void llRezAtRoot() { }
+        public void llGetObjectPermMask() { }
+        public void llSetObjectPermMask() { }
+        public void llGetInventoryPermMask() { }
+        public void llSetInventoryPermMask() { }
+        public void llGetInventoryCreator() { }
+        public void llOwnerSay() { }
+        public void llRequestSimulatorData() { }
+        public void llForceMouselook() { }
+        public void llGetObjectMass() { }
+        public void llListReplaceList() { }
+        public void llLoadURL() { }
+        public void llParcelMediaCommandList() { }
+        public void llParcelMediaQuery() { }
+        public void llModPow() { }
+        public void llGetInventoryType() { }
+        public void llSetPayPrice() { }
+        public void llGetCameraPos() { }
+        public void llGetCameraRot() { }
+        public void llSetPrimURL() { }
+        public void llRefreshPrimURL() { }
+        public void llEscapeURL() { }
+        public void llUnescapeURL() { }
+        public void llMapDestination() { }
+        public void llAddToLandBanList() { }
+        public void llRemoveFromLandPassList() { }
+        public void llRemoveFromLandBanList() { }
+        public void llSetCameraParams() { }
+        public void llClearCameraParams() { }
+        public void llListStatistics() { }
+        public void llGetUnixTime() { }
+        public void llGetParcelFlags() { }
+        public void llGetRegionFlags() { }
+        public void llXorBase64StringsCorrect() { }
+        public void llHTTPRequest() { }
+        public void llResetLandBanList() { }
+        public void llResetLandPassList() { }
+        public void llGetParcelPrimCount() { }
+        public void llGetParcelPrimOwners() { }
+        public void llGetObjectPrimCount() { }
+        public void llGetParcelMaxPrims() { }
+        public void llGetParcelDetails() { }
+
+
+
+    }
+}
diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/LSLEngine/LSLHandler/LSL_OPCODE_IL_processor.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/LSLEngine/LSLHandler/LSL_OPCODE_IL_processor.cs
index 4b8f8d7..46f6845 100644
--- a/OpenSim/Region/Environment/Scenes/scripting/Engines/LSLEngine/LSLHandler/LSL_OPCODE_IL_processor.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/Engines/LSLEngine/LSLHandler/LSL_OPCODE_IL_processor.cs
@@ -1,351 +1,351 @@
-/*

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

-* 

-*/

-/* Original code: Tedd Hansen */

-using System;

-        using System.Collections.Generic;

-        using System.Text;

-        using System.Reflection;

-        using System.Reflection.Emit;

-

-        namespace OpenSim.Region.Scripting.LSL

-        {

-            partial class LSO_Parser

-            {

-                //LSO_Enums MyLSO_Enums = new LSO_Enums();

-

-                internal bool LSL_PROCESS_OPCODE(ILGenerator il)

-                {

-                    

-                    byte bp1;

-                    UInt32 u32p1;

-                    UInt16 opcode = br_read(1)[0];

-                    Common.SendToDebug("OPCODE: " + ((LSO_Enums.Operation_Table)opcode).ToString());

-                    string idesc = ((LSO_Enums.Operation_Table)opcode).ToString();

-                    switch ((LSO_Enums.Operation_Table)opcode)

-                    {

-

-                        case LSO_Enums.Operation_Table.POP:

-                        case LSO_Enums.Operation_Table.POPL:

-                        case LSO_Enums.Operation_Table.POPV:

-                        case LSO_Enums.Operation_Table.POPQ:

-                        case LSO_Enums.Operation_Table.POPIP:

-                        case LSO_Enums.Operation_Table.POPBP:

-                        case LSO_Enums.Operation_Table.POPSP:

-                        case LSO_Enums.Operation_Table.POPSLR:

-                            // ignore -- builds callframe

-                            Common.SendToDebug("Instruction " + idesc + ": il.Emit(OpCodes.Pop);");

-                            il.Emit(OpCodes.Pop);

-                            break;

-                        case LSO_Enums.Operation_Table.POPARG:

-                            Common.SendToDebug("Instruction " + idesc + ": Ignored");

-                            Common.SendToDebug("Instruction " + idesc + ": Description: Drop x bytes from the stack ");

-                            Common.SendToDebug("Param1: " + BitConverter.ToUInt32(br_read(4), 0));

-                            break;

-

-                        // LONG

-                        case LSO_Enums.Operation_Table.STORE:

-                        case LSO_Enums.Operation_Table.STORES:

-                        case LSO_Enums.Operation_Table.STOREL:

-                        case LSO_Enums.Operation_Table.STOREV:

-                        case LSO_Enums.Operation_Table.STOREQ:

-                        case LSO_Enums.Operation_Table.STOREG:

-                        case LSO_Enums.Operation_Table.STOREGS:

-                        case LSO_Enums.Operation_Table.STOREGL:

-                        case LSO_Enums.Operation_Table.STOREGV:

-                        case LSO_Enums.Operation_Table.STOREGQ:

-                        case LSO_Enums.Operation_Table.LOADP:

-                        case LSO_Enums.Operation_Table.LOADSP:

-                        case LSO_Enums.Operation_Table.LOADLP:

-                        case LSO_Enums.Operation_Table.LOADVP:

-                        case LSO_Enums.Operation_Table.LOADQP:

-                        case LSO_Enums.Operation_Table.PUSH:

-                        case LSO_Enums.Operation_Table.PUSHS:

-                        case LSO_Enums.Operation_Table.PUSHL:

-                        case LSO_Enums.Operation_Table.PUSHV:

-                        case LSO_Enums.Operation_Table.PUSHQ:

-                        case LSO_Enums.Operation_Table.PUSHG:

-                        case LSO_Enums.Operation_Table.PUSHGS:

-                        case LSO_Enums.Operation_Table.PUSHGL:

-                        case LSO_Enums.Operation_Table.PUSHGV:

-                        case LSO_Enums.Operation_Table.PUSHGQ:

-                            Common.SendToDebug("Param1: " + BitConverter.ToUInt32(br_read(4), 0));

-                            break;

-                            // None

-                        case LSO_Enums.Operation_Table.PUSHIP:

-                        case LSO_Enums.Operation_Table.PUSHBP:

-                        case LSO_Enums.Operation_Table.PUSHSP:

-                            // Push Stack Top (Memory Address) to stack

-                            Common.SendToDebug("Instruction " + idesc + ": il.Emit(OpCodes.Ldc_I4, " + myHeader.SP + ");");

-                            Common.SendToDebug("Instruction " + idesc + ": Description: Pushing Stack Top (Memory Address from header) to stack");

-                            il.Emit(OpCodes.Ldc_I4, myHeader.SP);

-                            break;

-                        // BYTE

-                        case LSO_Enums.Operation_Table.PUSHARGB:

-                            Common.SendToDebug("Param1: " + br_read(1)[0]);

-                            break;

-                        // INTEGER

-                        case LSO_Enums.Operation_Table.PUSHARGI:

-                            // TODO: What is size of integer?

-                            u32p1 = BitConverter.ToUInt32(br_read(4), 0);

-                            Common.SendToDebug("Instruction PUSHSP: il.Emit(OpCodes.Ldc_I4, " + u32p1 + ");");

-                            Common.SendToDebug("Param1: " + u32p1);

-                            il.Emit(OpCodes.Ldc_I4, u32p1);

-                            break;

-                        // FLOAT

-                        case LSO_Enums.Operation_Table.PUSHARGF:

-                            // TODO: What is size of float?

-                            Common.SendToDebug("Param1: " + BitConverter.ToUInt32(br_read(4), 0));

-                            break;

-                        // STRING

-                        case LSO_Enums.Operation_Table.PUSHARGS:

-                            string s = Read_String();

-                            Common.SendToDebug("Instruction " + idesc + ": il.Emit(OpCodes.Ldstr, \"" + s + "\");");

-                            Common.SendToDebug("Param1: " + s);

-                            il.Emit(OpCodes.Ldstr, s);

-                            break;

-                        // VECTOR z,y,x

-                        case LSO_Enums.Operation_Table.PUSHARGV:

-                            Common.SendToDebug("Param1 Z: " + BitConverter.ToUInt32(br_read(4), 0));

-                            Common.SendToDebug("Param1 Y: " + BitConverter.ToUInt32(br_read(4), 0));

-                            Common.SendToDebug("Param1 X: " + BitConverter.ToUInt32(br_read(4), 0));

-                            break;

-                        // ROTATION s,z,y,x

-                        case LSO_Enums.Operation_Table.PUSHARGQ:

-                            Common.SendToDebug("Param1 S: " + BitConverter.ToUInt32(br_read(4), 0));

-                            Common.SendToDebug("Param1 Z: " + BitConverter.ToUInt32(br_read(4), 0));

-                            Common.SendToDebug("Param1 Y: " + BitConverter.ToUInt32(br_read(4), 0));

-                            Common.SendToDebug("Param1 X: " + BitConverter.ToUInt32(br_read(4), 0));

-                            break;

-                        // LONG

-                        case LSO_Enums.Operation_Table.PUSHARGE:

-                            u32p1 = BitConverter.ToUInt32(br_read(4), 0);

-                            //Common.SendToDebug("Instruction PUSHSP: il.Emit(OpCodes., " + u32p1 + ");");

-                            Common.SendToDebug("Instruction " + idesc + ": Ignoring (not in use according to doc)");

-                            //Common.SendToDebug("Instruction " + idesc + ": Description: Pushes X bytes of $00 onto the stack (used to put space for local variable memory for a call)");

-                            Common.SendToDebug("Param1: " + u32p1);

-                            //il.Emit(OpCodes.ldc_i4, u32p1);

-                            //if (u32p1 > 0) {

-                                //for (int _ic=0; _ic < u32p1; _ic++)

-                                //{

-                                //    Common.SendToDebug("Instruction " + idesc + ": il.Emit(OpCodes.Ldnull);");

-                                //    il.Emit(OpCodes.Ldnull);

-                                //}

-                            break;

-                        // BYTE

-                        case LSO_Enums.Operation_Table.ADD:

-                            bp1 = br_read(1)[0];

-                            Common.SendToDebug("Instruction " + idesc + ": Add type: " + ((LSO_Enums.OpCode_Add_TypeDefs)bp1).ToString());

-                            Common.SendToDebug("Param1: " + bp1);

-                            switch ((LSO_Enums.OpCode_Add_TypeDefs)bp1)

-                            {

-                                case LSO_Enums.OpCode_Add_TypeDefs.String:

-                                    Common.SendToDebug("Instruction " + idesc

-                                        + ": il.Emit(OpCodes.Call, typeof(System.String).GetMethod(\"Concat\", new Type[] { typeof(object), typeof(object) }));");

-                                    il.Emit(OpCodes.Call, typeof(System.String).GetMethod

-                                            ("Concat", new Type[] { typeof(object), typeof(object) }));

-

-                                    break;

-                                case LSO_Enums.OpCode_Add_TypeDefs.UInt32:

-                                default:

-                                    Common.SendToDebug("Instruction " + idesc + ": il.Emit(OpCodes.Add);");

-                                    il.Emit(OpCodes.Add);

-                                    break;

-                            }

-

-                                

-                                //il.Emit(OpCodes.Add, p1);

-                            break;

-                        case LSO_Enums.Operation_Table.SUB:

-                            Common.SendToDebug("Instruction " + idesc + ": il.Emit(OpCodes.Sub);");

-                            bp1 = br_read(1)[0];

-                            Common.SendToDebug("Param1: " + bp1);

-                                il.Emit(OpCodes.Sub);

-                                //il.Emit(OpCodes.Sub, p1);

-                            break;

-                        case LSO_Enums.Operation_Table.MUL:

-                            Common.SendToDebug("Instruction " + idesc + ": il.Emit(OpCodes.Mul);");

-                    bp1 = br_read(1)[0];

-        Common.SendToDebug("Param1: " + bp1);

-                                il.Emit(OpCodes.Mul);

-                                //il.Emit(OpCodes.Mul, p1);

-                            break;

-                        case LSO_Enums.Operation_Table.DIV:

-                            Common.SendToDebug("Instruction " + idesc + ": il.Emit(OpCodes.Div);");

-        bp1 = br_read(1)[0];

-        Common.SendToDebug("Param1: " + bp1);

-                                il.Emit(OpCodes.Div);

-                                //il.Emit(OpCodes.Div, p1);

-                            break;

-                        case LSO_Enums.Operation_Table.EQ:

-                            Common.SendToDebug("Instruction " + idesc + ": il.Emit(OpCodes.Ceq);");

-        bp1 = br_read(1)[0];

-        Common.SendToDebug("Param1: " + bp1);

-                                il.Emit(OpCodes.Ceq);

-                                //il.Emit(OpCodes.Ceq, p1);

-                            break;

-                        case LSO_Enums.Operation_Table.NEQ:

-                        case LSO_Enums.Operation_Table.LEQ:

-                        case LSO_Enums.Operation_Table.GEQ:

-                        case LSO_Enums.Operation_Table.LESS:

-                            Common.SendToDebug("Instruction " + idesc + ": il.Emit(OpCodes.Clt_Un);");

-        bp1 = br_read(1)[0];

-        Common.SendToDebug("Param1: " + bp1);

-                                il.Emit(OpCodes.Clt_Un);

-                                //il.Emit(OpCodes.Clt, p1);

-                            break;

-                        case LSO_Enums.Operation_Table.GREATER:

-                            Common.SendToDebug("Instruction " + idesc + ": il.Emit(OpCodes.Cgt_Un);");

-        bp1 = br_read(1)[0];

-        Common.SendToDebug("Param1: " + bp1);

-                                il.Emit(OpCodes.Cgt_Un);

-                                //il.Emit(OpCodes.Cgt, p1);

-                            break;

-                        case LSO_Enums.Operation_Table.MOD:

-                        case LSO_Enums.Operation_Table.BOOLOR:

-        bp1 = br_read(1)[0];

-        Common.SendToDebug("Param1: " + bp1);

-                            break;

-                        // LONG

-                        case LSO_Enums.Operation_Table.JUMP:

-                            Common.SendToDebug("Param1: " + BitConverter.ToUInt32(br_read(4), 0));

-                            break;

-                        // BYTE, LONG

-                        case LSO_Enums.Operation_Table.JUMPIF:

-                        case LSO_Enums.Operation_Table.JUMPNIF:

-                            Common.SendToDebug("Param1: " + br_read(1)[0]);

-                            Common.SendToDebug("Param2: " + BitConverter.ToUInt32(br_read(4), 0));

-                            break;

-                        // LONG

-                        case LSO_Enums.Operation_Table.STATE:

-                            bp1 = br_read(1)[0];

-                                //il.Emit(OpCodes.Ld);                            // Load local variable 0 onto stack

-                                //il.Emit(OpCodes.Ldc_I4, 0);                    // Push index position

-                                //il.Emit(OpCodes.Ldstr, EventList[p1]);          // Push value

-                                //il.Emit(OpCodes.Stelem_Ref);                    // Perform array[index] = value

-                            break;

-                        case LSO_Enums.Operation_Table.CALL:

-                            Common.SendToDebug("Param1: " + BitConverter.ToUInt32(br_read(4), 0));

-                            break;

-                        // BYTE

-                        case LSO_Enums.Operation_Table.CAST:

-                            bp1 = br_read(1)[0];

-                            Common.SendToDebug("Instruction " + idesc + ": Cast to type: " + ((LSO_Enums.OpCode_Cast_TypeDefs)bp1));

-                            Common.SendToDebug("Param1: " + bp1);

-                            switch ((LSO_Enums.OpCode_Cast_TypeDefs)bp1)

-                            {

-                                case LSO_Enums.OpCode_Cast_TypeDefs.String:

-                                    Common.SendToDebug("Instruction " + idesc + ": il.Emit(OpCodes.Calli, typeof(System.Convert).GetMethod(\"ToString\", new Type[] { typeof(object) }));");

-                                    //il.Emit(OpCodes.Box, typeof (UInt32));

-                                    il.Emit(OpCodes.Calli, typeof(Common).GetMethod

-                                            ("Cast_ToString", new Type[] { typeof(object) }));

-                                    

-                                    //il.Emit(OpCodes.Box, typeof(System.UInt32) );

-                                    //il.Emit(OpCodes.Box, typeof(string));

-

-                                    //il.Emit(OpCodes.Conv_R8);

-                                    //il.Emit(OpCodes.Call, typeof(System.Convert).GetMethod

-                                    //        ("ToString", new Type[] { typeof(float) }));

-                                    

-                                    break;

-                                default:

-                                    Common.SendToDebug("Instruction " + idesc + ": Unknown cast type!");

-                                    break;

-                            }

-                            break;

-                        // LONG

-                        case LSO_Enums.Operation_Table.STACKTOS:

-                        case LSO_Enums.Operation_Table.STACKTOL:

-                            Common.SendToDebug("Param1: " + BitConverter.ToUInt32(br_read(4), 0));

-                            break;

-                        // BYTE

-                        case LSO_Enums.Operation_Table.PRINT:

-                        case LSO_Enums.Operation_Table.CALLLIB:

-                            Common.SendToDebug("Param1: " + br_read(1)[0]);

-                            break;

-                        // SHORT

-                        case LSO_Enums.Operation_Table.CALLLIB_TWO_BYTE:

-                            // TODO: What is size of short?

-                            UInt16 U16p1 = BitConverter.ToUInt16(br_read(2), 0);

-                            Common.SendToDebug("Instruction " + idesc + ": Builtin Command: " + ((LSO_Enums.BuiltIn_Functions)U16p1).ToString());

-                            Common.SendToDebug("Param1: " + U16p1);

-                            switch ((LSO_Enums.BuiltIn_Functions)U16p1)

-                                {

-                                    case LSO_Enums.BuiltIn_Functions.llSay:

-                                        Common.SendToDebug("Instruction " + idesc + " " + ((LSO_Enums.BuiltIn_Functions)U16p1).ToString() 

-                                            + ": Mapped to internal function");

-

-                                        //il.Emit(OpCodes.Ldstr, "INTERNAL COMMAND: llSay({0}, \"{1}\"");

-                                        //il.Emit(OpCodes.Call, typeof(IL_Helper).GetMethod("ReverseFormatString",

-                                        //    new Type[] { typeof(string), typeof(UInt32), typeof(string) }

-                                        //));

-

-

-                                        //il.Emit(OpCodes.Pop);

-                                        //il.Emit(OpCodes.Call,

-                                        //    typeof(Console).GetMethod("WriteLine",

-                                        //    new Type[] { typeof(string) }

-                                        //));

-

-

-                                        il.Emit(OpCodes.Call,

-                                            typeof(Common).GetMethod("SendToLog",

-                                            new Type[] { typeof(string) }

-                                        ));

-

-

-                                        

-                                        //il.Emit(OpCodes.Pop);

-

-                                       //il.Emit(OpCodes.Ldind_I2, 0);

-

-                                        //il.Emit(OpCodes.Call, typeof(string).GetMethod("Format", new Type[] { typeof(string), typeof(object) }));

-                                        //il.EmitCalli(OpCodes.Calli, 

-                                        //il.Emit(OpCodes.Call, typeof().GetMethod

-                                         //   ("llSay", new Type[] { typeof(UInt32), typeof(string) }));

-                                        break;

-                                default:

-                                    Common.SendToDebug("Instruction " + idesc + ": " + ((LSO_Enums.BuiltIn_Functions)U16p1).ToString() + ": INTERNAL COMMAND NOT IMPLEMENTED");

-                                    break;

-                                }

-                            

-                                //Common.SendToDebug("Instruction " + idesc + ": DEBUG: Faking return code:");

-                                //Common.SendToDebug("Instruction " + idesc + ": il.Emit(OpCodes.Ldc_I4, 0);");

-                                //il.Emit(OpCodes.Ldc_I4, 0);

-                                break;

-

-                        // RETURN

-                        case LSO_Enums.Operation_Table.RETURN:

-

-                            Common.SendToDebug("Last OPCODE was return command. Code chunk execution complete.");

-                            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.
+* 
+*/
+/* Original code: Tedd Hansen */
+using System;
+        using System.Collections.Generic;
+        using System.Text;
+        using System.Reflection;
+        using System.Reflection.Emit;
+
+        namespace OpenSim.Region.Scripting.LSL
+        {
+            partial class LSO_Parser
+            {
+                //LSO_Enums MyLSO_Enums = new LSO_Enums();
+
+                internal bool LSL_PROCESS_OPCODE(ILGenerator il)
+                {
+                    
+                    byte bp1;
+                    UInt32 u32p1;
+                    UInt16 opcode = br_read(1)[0];
+                    Common.SendToDebug("OPCODE: " + ((LSO_Enums.Operation_Table)opcode).ToString());
+                    string idesc = ((LSO_Enums.Operation_Table)opcode).ToString();
+                    switch ((LSO_Enums.Operation_Table)opcode)
+                    {
+
+                        case LSO_Enums.Operation_Table.POP:
+                        case LSO_Enums.Operation_Table.POPL:
+                        case LSO_Enums.Operation_Table.POPV:
+                        case LSO_Enums.Operation_Table.POPQ:
+                        case LSO_Enums.Operation_Table.POPIP:
+                        case LSO_Enums.Operation_Table.POPBP:
+                        case LSO_Enums.Operation_Table.POPSP:
+                        case LSO_Enums.Operation_Table.POPSLR:
+                            // ignore -- builds callframe
+                            Common.SendToDebug("Instruction " + idesc + ": il.Emit(OpCodes.Pop);");
+                            il.Emit(OpCodes.Pop);
+                            break;
+                        case LSO_Enums.Operation_Table.POPARG:
+                            Common.SendToDebug("Instruction " + idesc + ": Ignored");
+                            Common.SendToDebug("Instruction " + idesc + ": Description: Drop x bytes from the stack ");
+                            Common.SendToDebug("Param1: " + BitConverter.ToUInt32(br_read(4), 0));
+                            break;
+
+                        // LONG
+                        case LSO_Enums.Operation_Table.STORE:
+                        case LSO_Enums.Operation_Table.STORES:
+                        case LSO_Enums.Operation_Table.STOREL:
+                        case LSO_Enums.Operation_Table.STOREV:
+                        case LSO_Enums.Operation_Table.STOREQ:
+                        case LSO_Enums.Operation_Table.STOREG:
+                        case LSO_Enums.Operation_Table.STOREGS:
+                        case LSO_Enums.Operation_Table.STOREGL:
+                        case LSO_Enums.Operation_Table.STOREGV:
+                        case LSO_Enums.Operation_Table.STOREGQ:
+                        case LSO_Enums.Operation_Table.LOADP:
+                        case LSO_Enums.Operation_Table.LOADSP:
+                        case LSO_Enums.Operation_Table.LOADLP:
+                        case LSO_Enums.Operation_Table.LOADVP:
+                        case LSO_Enums.Operation_Table.LOADQP:
+                        case LSO_Enums.Operation_Table.PUSH:
+                        case LSO_Enums.Operation_Table.PUSHS:
+                        case LSO_Enums.Operation_Table.PUSHL:
+                        case LSO_Enums.Operation_Table.PUSHV:
+                        case LSO_Enums.Operation_Table.PUSHQ:
+                        case LSO_Enums.Operation_Table.PUSHG:
+                        case LSO_Enums.Operation_Table.PUSHGS:
+                        case LSO_Enums.Operation_Table.PUSHGL:
+                        case LSO_Enums.Operation_Table.PUSHGV:
+                        case LSO_Enums.Operation_Table.PUSHGQ:
+                            Common.SendToDebug("Param1: " + BitConverter.ToUInt32(br_read(4), 0));
+                            break;
+                            // None
+                        case LSO_Enums.Operation_Table.PUSHIP:
+                        case LSO_Enums.Operation_Table.PUSHBP:
+                        case LSO_Enums.Operation_Table.PUSHSP:
+                            // Push Stack Top (Memory Address) to stack
+                            Common.SendToDebug("Instruction " + idesc + ": il.Emit(OpCodes.Ldc_I4, " + myHeader.SP + ");");
+                            Common.SendToDebug("Instruction " + idesc + ": Description: Pushing Stack Top (Memory Address from header) to stack");
+                            il.Emit(OpCodes.Ldc_I4, myHeader.SP);
+                            break;
+                        // BYTE
+                        case LSO_Enums.Operation_Table.PUSHARGB:
+                            Common.SendToDebug("Param1: " + br_read(1)[0]);
+                            break;
+                        // INTEGER
+                        case LSO_Enums.Operation_Table.PUSHARGI:
+                            // TODO: What is size of integer?
+                            u32p1 = BitConverter.ToUInt32(br_read(4), 0);
+                            Common.SendToDebug("Instruction PUSHSP: il.Emit(OpCodes.Ldc_I4, " + u32p1 + ");");
+                            Common.SendToDebug("Param1: " + u32p1);
+                            il.Emit(OpCodes.Ldc_I4, u32p1);
+                            break;
+                        // FLOAT
+                        case LSO_Enums.Operation_Table.PUSHARGF:
+                            // TODO: What is size of float?
+                            Common.SendToDebug("Param1: " + BitConverter.ToUInt32(br_read(4), 0));
+                            break;
+                        // STRING
+                        case LSO_Enums.Operation_Table.PUSHARGS:
+                            string s = Read_String();
+                            Common.SendToDebug("Instruction " + idesc + ": il.Emit(OpCodes.Ldstr, \"" + s + "\");");
+                            Common.SendToDebug("Param1: " + s);
+                            il.Emit(OpCodes.Ldstr, s);
+                            break;
+                        // VECTOR z,y,x
+                        case LSO_Enums.Operation_Table.PUSHARGV:
+                            Common.SendToDebug("Param1 Z: " + BitConverter.ToUInt32(br_read(4), 0));
+                            Common.SendToDebug("Param1 Y: " + BitConverter.ToUInt32(br_read(4), 0));
+                            Common.SendToDebug("Param1 X: " + BitConverter.ToUInt32(br_read(4), 0));
+                            break;
+                        // ROTATION s,z,y,x
+                        case LSO_Enums.Operation_Table.PUSHARGQ:
+                            Common.SendToDebug("Param1 S: " + BitConverter.ToUInt32(br_read(4), 0));
+                            Common.SendToDebug("Param1 Z: " + BitConverter.ToUInt32(br_read(4), 0));
+                            Common.SendToDebug("Param1 Y: " + BitConverter.ToUInt32(br_read(4), 0));
+                            Common.SendToDebug("Param1 X: " + BitConverter.ToUInt32(br_read(4), 0));
+                            break;
+                        // LONG
+                        case LSO_Enums.Operation_Table.PUSHARGE:
+                            u32p1 = BitConverter.ToUInt32(br_read(4), 0);
+                            //Common.SendToDebug("Instruction PUSHSP: il.Emit(OpCodes., " + u32p1 + ");");
+                            Common.SendToDebug("Instruction " + idesc + ": Ignoring (not in use according to doc)");
+                            //Common.SendToDebug("Instruction " + idesc + ": Description: Pushes X bytes of $00 onto the stack (used to put space for local variable memory for a call)");
+                            Common.SendToDebug("Param1: " + u32p1);
+                            //il.Emit(OpCodes.ldc_i4, u32p1);
+                            //if (u32p1 > 0) {
+                                //for (int _ic=0; _ic < u32p1; _ic++)
+                                //{
+                                //    Common.SendToDebug("Instruction " + idesc + ": il.Emit(OpCodes.Ldnull);");
+                                //    il.Emit(OpCodes.Ldnull);
+                                //}
+                            break;
+                        // BYTE
+                        case LSO_Enums.Operation_Table.ADD:
+                            bp1 = br_read(1)[0];
+                            Common.SendToDebug("Instruction " + idesc + ": Add type: " + ((LSO_Enums.OpCode_Add_TypeDefs)bp1).ToString());
+                            Common.SendToDebug("Param1: " + bp1);
+                            switch ((LSO_Enums.OpCode_Add_TypeDefs)bp1)
+                            {
+                                case LSO_Enums.OpCode_Add_TypeDefs.String:
+                                    Common.SendToDebug("Instruction " + idesc
+                                        + ": il.Emit(OpCodes.Call, typeof(System.String).GetMethod(\"Concat\", new Type[] { typeof(object), typeof(object) }));");
+                                    il.Emit(OpCodes.Call, typeof(System.String).GetMethod
+                                            ("Concat", new Type[] { typeof(object), typeof(object) }));
+
+                                    break;
+                                case LSO_Enums.OpCode_Add_TypeDefs.UInt32:
+                                default:
+                                    Common.SendToDebug("Instruction " + idesc + ": il.Emit(OpCodes.Add);");
+                                    il.Emit(OpCodes.Add);
+                                    break;
+                            }
+
+                                
+                                //il.Emit(OpCodes.Add, p1);
+                            break;
+                        case LSO_Enums.Operation_Table.SUB:
+                            Common.SendToDebug("Instruction " + idesc + ": il.Emit(OpCodes.Sub);");
+                            bp1 = br_read(1)[0];
+                            Common.SendToDebug("Param1: " + bp1);
+                                il.Emit(OpCodes.Sub);
+                                //il.Emit(OpCodes.Sub, p1);
+                            break;
+                        case LSO_Enums.Operation_Table.MUL:
+                            Common.SendToDebug("Instruction " + idesc + ": il.Emit(OpCodes.Mul);");
+                    bp1 = br_read(1)[0];
+        Common.SendToDebug("Param1: " + bp1);
+                                il.Emit(OpCodes.Mul);
+                                //il.Emit(OpCodes.Mul, p1);
+                            break;
+                        case LSO_Enums.Operation_Table.DIV:
+                            Common.SendToDebug("Instruction " + idesc + ": il.Emit(OpCodes.Div);");
+        bp1 = br_read(1)[0];
+        Common.SendToDebug("Param1: " + bp1);
+                                il.Emit(OpCodes.Div);
+                                //il.Emit(OpCodes.Div, p1);
+                            break;
+                        case LSO_Enums.Operation_Table.EQ:
+                            Common.SendToDebug("Instruction " + idesc + ": il.Emit(OpCodes.Ceq);");
+        bp1 = br_read(1)[0];
+        Common.SendToDebug("Param1: " + bp1);
+                                il.Emit(OpCodes.Ceq);
+                                //il.Emit(OpCodes.Ceq, p1);
+                            break;
+                        case LSO_Enums.Operation_Table.NEQ:
+                        case LSO_Enums.Operation_Table.LEQ:
+                        case LSO_Enums.Operation_Table.GEQ:
+                        case LSO_Enums.Operation_Table.LESS:
+                            Common.SendToDebug("Instruction " + idesc + ": il.Emit(OpCodes.Clt_Un);");
+        bp1 = br_read(1)[0];
+        Common.SendToDebug("Param1: " + bp1);
+                                il.Emit(OpCodes.Clt_Un);
+                                //il.Emit(OpCodes.Clt, p1);
+                            break;
+                        case LSO_Enums.Operation_Table.GREATER:
+                            Common.SendToDebug("Instruction " + idesc + ": il.Emit(OpCodes.Cgt_Un);");
+        bp1 = br_read(1)[0];
+        Common.SendToDebug("Param1: " + bp1);
+                                il.Emit(OpCodes.Cgt_Un);
+                                //il.Emit(OpCodes.Cgt, p1);
+                            break;
+                        case LSO_Enums.Operation_Table.MOD:
+                        case LSO_Enums.Operation_Table.BOOLOR:
+        bp1 = br_read(1)[0];
+        Common.SendToDebug("Param1: " + bp1);
+                            break;
+                        // LONG
+                        case LSO_Enums.Operation_Table.JUMP:
+                            Common.SendToDebug("Param1: " + BitConverter.ToUInt32(br_read(4), 0));
+                            break;
+                        // BYTE, LONG
+                        case LSO_Enums.Operation_Table.JUMPIF:
+                        case LSO_Enums.Operation_Table.JUMPNIF:
+                            Common.SendToDebug("Param1: " + br_read(1)[0]);
+                            Common.SendToDebug("Param2: " + BitConverter.ToUInt32(br_read(4), 0));
+                            break;
+                        // LONG
+                        case LSO_Enums.Operation_Table.STATE:
+                            bp1 = br_read(1)[0];
+                                //il.Emit(OpCodes.Ld);                            // Load local variable 0 onto stack
+                                //il.Emit(OpCodes.Ldc_I4, 0);                    // Push index position
+                                //il.Emit(OpCodes.Ldstr, EventList[p1]);          // Push value
+                                //il.Emit(OpCodes.Stelem_Ref);                    // Perform array[index] = value
+                            break;
+                        case LSO_Enums.Operation_Table.CALL:
+                            Common.SendToDebug("Param1: " + BitConverter.ToUInt32(br_read(4), 0));
+                            break;
+                        // BYTE
+                        case LSO_Enums.Operation_Table.CAST:
+                            bp1 = br_read(1)[0];
+                            Common.SendToDebug("Instruction " + idesc + ": Cast to type: " + ((LSO_Enums.OpCode_Cast_TypeDefs)bp1));
+                            Common.SendToDebug("Param1: " + bp1);
+                            switch ((LSO_Enums.OpCode_Cast_TypeDefs)bp1)
+                            {
+                                case LSO_Enums.OpCode_Cast_TypeDefs.String:
+                                    Common.SendToDebug("Instruction " + idesc + ": il.Emit(OpCodes.Calli, typeof(System.Convert).GetMethod(\"ToString\", new Type[] { typeof(object) }));");
+                                    //il.Emit(OpCodes.Box, typeof (UInt32));
+                                    il.Emit(OpCodes.Calli, typeof(Common).GetMethod
+                                            ("Cast_ToString", new Type[] { typeof(object) }));
+                                    
+                                    //il.Emit(OpCodes.Box, typeof(System.UInt32) );
+                                    //il.Emit(OpCodes.Box, typeof(string));
+
+                                    //il.Emit(OpCodes.Conv_R8);
+                                    //il.Emit(OpCodes.Call, typeof(System.Convert).GetMethod
+                                    //        ("ToString", new Type[] { typeof(float) }));
+                                    
+                                    break;
+                                default:
+                                    Common.SendToDebug("Instruction " + idesc + ": Unknown cast type!");
+                                    break;
+                            }
+                            break;
+                        // LONG
+                        case LSO_Enums.Operation_Table.STACKTOS:
+                        case LSO_Enums.Operation_Table.STACKTOL:
+                            Common.SendToDebug("Param1: " + BitConverter.ToUInt32(br_read(4), 0));
+                            break;
+                        // BYTE
+                        case LSO_Enums.Operation_Table.PRINT:
+                        case LSO_Enums.Operation_Table.CALLLIB:
+                            Common.SendToDebug("Param1: " + br_read(1)[0]);
+                            break;
+                        // SHORT
+                        case LSO_Enums.Operation_Table.CALLLIB_TWO_BYTE:
+                            // TODO: What is size of short?
+                            UInt16 U16p1 = BitConverter.ToUInt16(br_read(2), 0);
+                            Common.SendToDebug("Instruction " + idesc + ": Builtin Command: " + ((LSO_Enums.BuiltIn_Functions)U16p1).ToString());
+                            Common.SendToDebug("Param1: " + U16p1);
+                            switch ((LSO_Enums.BuiltIn_Functions)U16p1)
+                                {
+                                    case LSO_Enums.BuiltIn_Functions.llSay:
+                                        Common.SendToDebug("Instruction " + idesc + " " + ((LSO_Enums.BuiltIn_Functions)U16p1).ToString() 
+                                            + ": Mapped to internal function");
+
+                                        //il.Emit(OpCodes.Ldstr, "INTERNAL COMMAND: llSay({0}, \"{1}\"");
+                                        //il.Emit(OpCodes.Call, typeof(IL_Helper).GetMethod("ReverseFormatString",
+                                        //    new Type[] { typeof(string), typeof(UInt32), typeof(string) }
+                                        //));
+
+
+                                        //il.Emit(OpCodes.Pop);
+                                        //il.Emit(OpCodes.Call,
+                                        //    typeof(Console).GetMethod("WriteLine",
+                                        //    new Type[] { typeof(string) }
+                                        //));
+
+
+                                        il.Emit(OpCodes.Call,
+                                            typeof(Common).GetMethod("SendToLog",
+                                            new Type[] { typeof(string) }
+                                        ));
+
+
+                                        
+                                        //il.Emit(OpCodes.Pop);
+
+                                       //il.Emit(OpCodes.Ldind_I2, 0);
+
+                                        //il.Emit(OpCodes.Call, typeof(string).GetMethod("Format", new Type[] { typeof(string), typeof(object) }));
+                                        //il.EmitCalli(OpCodes.Calli, 
+                                        //il.Emit(OpCodes.Call, typeof().GetMethod
+                                         //   ("llSay", new Type[] { typeof(UInt32), typeof(string) }));
+                                        break;
+                                default:
+                                    Common.SendToDebug("Instruction " + idesc + ": " + ((LSO_Enums.BuiltIn_Functions)U16p1).ToString() + ": INTERNAL COMMAND NOT IMPLEMENTED");
+                                    break;
+                                }
+                            
+                                //Common.SendToDebug("Instruction " + idesc + ": DEBUG: Faking return code:");
+                                //Common.SendToDebug("Instruction " + idesc + ": il.Emit(OpCodes.Ldc_I4, 0);");
+                                //il.Emit(OpCodes.Ldc_I4, 0);
+                                break;
+
+                        // RETURN
+                        case LSO_Enums.Operation_Table.RETURN:
+
+                            Common.SendToDebug("Last OPCODE was return command. Code chunk execution complete.");
+                            return true;
+                    }
+                    return false;
+                }
+
+            }
+        }
diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/LSLEngine/LSLScript.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/LSLEngine/LSLScript.cs
index 4ee4d37..49357f5 100644
--- a/OpenSim/Region/Environment/Scenes/scripting/Engines/LSLEngine/LSLScript.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/Engines/LSLEngine/LSLScript.cs
@@ -1,33 +1,33 @@
-using System;

-using System.Collections.Generic;

-using System.Text;

-

-using OpenSim.Region.Scripting;

-using OpenSim.Region.Scripting.LSL;

-

-namespace OpenSim.Region.Scripting.LSL

-{

-    class LSLScript : IScript

-    {

-        ScriptInfo scriptInfo;

-        LSL.Engine lindenScriptEngine;

-

-        public LSLScript(string filename, libsecondlife.LLUUID taskObject)

-        {

-            scriptInfo.CreateTaskAPI(taskObject);

-

-            lindenScriptEngine = new Engine();

-            lindenScriptEngine.Start(filename);

-        }

-

-        public void Initialise(ScriptInfo info)

-        {

-            scriptInfo = info;

-        }

-

-        public string getName()

-        {

-            return "LSL Script";

-        }

-    }

-}

+using System;
+using System.Collections.Generic;
+using System.Text;
+
+using OpenSim.Region.Scripting;
+using OpenSim.Region.Scripting.LSL;
+
+namespace OpenSim.Region.Scripting.LSL
+{
+    class LSLScript : IScript
+    {
+        ScriptInfo scriptInfo;
+        LSL.Engine lindenScriptEngine;
+
+        public LSLScript(string filename, libsecondlife.LLUUID taskObject)
+        {
+            scriptInfo.CreateTaskAPI(taskObject);
+
+            lindenScriptEngine = new Engine();
+            lindenScriptEngine.Start(filename);
+        }
+
+        public void Initialise(ScriptInfo info)
+        {
+            scriptInfo = info;
+        }
+
+        public string getName()
+        {
+            return "LSL Script";
+        }
+    }
+}
diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/LSLEngine/LSLScriptEngine.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/LSLEngine/LSLScriptEngine.cs
index 10706ad..c232c2f 100644
--- a/OpenSim/Region/Environment/Scenes/scripting/Engines/LSLEngine/LSLScriptEngine.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/Engines/LSLEngine/LSLScriptEngine.cs
@@ -1,27 +1,27 @@
-using System;

-using System.Collections.Generic;

-using System.Text;

-

-using OpenSim.Region.Scripting;

-using OpenSim.Region.Scripting.LSL;

-

-namespace OpenSim.Region.Scripting

-{

-    public class LSLEngine : IScriptCompiler

-    {

-        public string FileExt()

-        {

-            return ".lso";

-        }

-

-        public Dictionary<string, IScript> compile(string filename)

-        {

-            LSLScript script = new LSLScript(filename, libsecondlife.LLUUID.Zero);

-            Dictionary<string, IScript> returns = new Dictionary<string, IScript>();

-

-            returns.Add(filename, script);

-

-            return returns;

-        }

-    }

+using System;
+using System.Collections.Generic;
+using System.Text;
+
+using OpenSim.Region.Scripting;
+using OpenSim.Region.Scripting.LSL;
+
+namespace OpenSim.Region.Scripting
+{
+    public class LSLEngine : IScriptCompiler
+    {
+        public string FileExt()
+        {
+            return ".lso";
+        }
+
+        public Dictionary<string, IScript> compile(string filename)
+        {
+            LSLScript script = new LSLScript(filename, libsecondlife.LLUUID.Zero);
+            Dictionary<string, IScript> returns = new Dictionary<string, IScript>();
+
+            returns.Add(filename, script);
+
+            return returns;
+        }
+    }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/Examples/SimpleApp/FileSystemObject.cs b/OpenSim/Region/Examples/SimpleApp/FileSystemObject.cs
index 2e43fe6..83a76e3 100644
--- a/OpenSim/Region/Examples/SimpleApp/FileSystemObject.cs
+++ b/OpenSim/Region/Examples/SimpleApp/FileSystemObject.cs
@@ -1,31 +1,31 @@
-using System;

-using System.Collections.Generic;

-using System.Text;

-using OpenSim.Region.Environment.Scenes;

-using libsecondlife;

-using OpenSim.Framework.Types;

-using System.Timers;

-using System.Diagnostics;

-using System.IO;

-using Primitive=OpenSim.Region.Environment.Scenes.Primitive;

-

-namespace SimpleApp

-{

-    public class FileSystemObject : SceneObject

-    {

-        public FileSystemObject(Scene world, FileInfo fileInfo, LLVector3 pos)

-            : base( world, world.EventManager, LLUUID.Zero, world.NextLocalId, pos, BoxShape.Default )

-        {

-            

-            

-            float size = (float)Math.Pow((double)fileInfo.Length, (double) 1 / 3) / 5;

-            rootPrimitive.ResizeGoup(new LLVector3(size, size, size));

-            rootPrimitive.Text = fileInfo.Name;

-        }

-

-        public override void Update()

-        {

-            base.Update();

-        }

-    }

-}

+using System;
+using System.Collections.Generic;
+using System.Text;
+using OpenSim.Region.Environment.Scenes;
+using libsecondlife;
+using OpenSim.Framework.Types;
+using System.Timers;
+using System.Diagnostics;
+using System.IO;
+using Primitive=OpenSim.Region.Environment.Scenes.Primitive;
+
+namespace SimpleApp
+{
+    public class FileSystemObject : SceneObject
+    {
+        public FileSystemObject(Scene world, FileInfo fileInfo, LLVector3 pos)
+            : base( world, world.EventManager, LLUUID.Zero, world.NextLocalId, pos, BoxShape.Default )
+        {
+            
+            
+            float size = (float)Math.Pow((double)fileInfo.Length, (double) 1 / 3) / 5;
+            rootPrimitive.ResizeGoup(new LLVector3(size, size, size));
+            rootPrimitive.Text = fileInfo.Name;
+        }
+
+        public override void Update()
+        {
+            base.Update();
+        }
+    }
+}
diff --git a/OpenSim/Region/Physics/BulletXPlugin/OpenSim.Region.Physics.BulletXPlugin.csproj b/OpenSim/Region/Physics/BulletXPlugin/OpenSim.Region.Physics.BulletXPlugin.csproj
index fdb1d38..7519d74 100644
--- a/OpenSim/Region/Physics/BulletXPlugin/OpenSim.Region.Physics.BulletXPlugin.csproj
+++ b/OpenSim/Region/Physics/BulletXPlugin/OpenSim.Region.Physics.BulletXPlugin.csproj
@@ -1,66 +1,66 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ProductVersion>8.0.50727</ProductVersion>

-    <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{2D3DE8E4-9202-46A4-857B-3579B70E8356}</ProjectGuid>

-    <OutputType>Library</OutputType>

-    <AppDesignerFolder>Properties</AppDesignerFolder>

-    <RootNamespace>OpenSim.Region.Physics.BulletXPlugin</RootNamespace>

-    <AssemblyName>OpenSim.Region.Physics.BulletXPlugin</AssemblyName>

-    <StartupObject>

-    </StartupObject>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

-    <DebugSymbols>true</DebugSymbols>

-    <DebugType>full</DebugType>

-    <Optimize>false</Optimize>

-    <OutputPath>bin\Debug\</OutputPath>

-    <DefineConstants>DEBUG;TRACE</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

-    <DebugType>pdbonly</DebugType>

-    <Optimize>true</Optimize>

-    <OutputPath>..\..\..\..\bin\Physics\</OutputPath>

-    <DefineConstants>TRACE</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

-  </PropertyGroup>

-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

-       Other similar extension points exist, see Microsoft.Common.targets.

-  <Target Name="BeforeBuild">

-  </Target>

-  <Target Name="AfterBuild">

-  </Target>

-  -->

-  <ItemGroup>

-    <Compile Include="AssemblyInfo.cs" />

-    <Compile Include="BulletXPlugin.cs" />

-  </ItemGroup>

-  <ItemGroup>

-    <Reference Include="Axiom.MathLib.dll">

-      <HintPath>..\..\..\..\bin\Axiom.MathLib.dll</HintPath>

-      <Private>False</Private>

-    </Reference>

-    <Reference Include="Modified.XnaDevRu.BulletX, Version=2.50.149.21894, Culture=neutral, processorArchitecture=x86">

-      <SpecificVersion>False</SpecificVersion>

-      <HintPath>..\..\..\..\bin\Modified.XnaDevRu.BulletX.dll</HintPath>

-    </Reference>

-    <Reference Include="MonoXnaCompactMaths, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">

-      <SpecificVersion>False</SpecificVersion>

-      <HintPath>..\..\..\..\bin\MonoXnaCompactMaths.dll</HintPath>

-    </Reference>

-    <Reference Include="OpenSim.Region.Physics.Manager, Version=1.0.2741.37128, Culture=neutral, processorArchitecture=MSIL">

-      <SpecificVersion>False</SpecificVersion>

-      <HintPath>..\..\..\..\bin\OpenSim.Region.Physics.Manager.dll</HintPath>

-    </Reference>

-    <Reference Include="System" />

-    <Reference Include="System.Data" />

-    <Reference Include="System.Xml" />

-  </ItemGroup>

+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{2D3DE8E4-9202-46A4-857B-3579B70E8356}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>OpenSim.Region.Physics.BulletXPlugin</RootNamespace>
+    <AssemblyName>OpenSim.Region.Physics.BulletXPlugin</AssemblyName>
+    <StartupObject>
+    </StartupObject>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\..\..\bin\Physics\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+  <ItemGroup>
+    <Compile Include="AssemblyInfo.cs" />
+    <Compile Include="BulletXPlugin.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Axiom.MathLib.dll">
+      <HintPath>..\..\..\..\bin\Axiom.MathLib.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Modified.XnaDevRu.BulletX, Version=2.50.149.21894, Culture=neutral, processorArchitecture=x86">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\bin\Modified.XnaDevRu.BulletX.dll</HintPath>
+    </Reference>
+    <Reference Include="MonoXnaCompactMaths, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\bin\MonoXnaCompactMaths.dll</HintPath>
+    </Reference>
+    <Reference Include="OpenSim.Region.Physics.Manager, Version=1.0.2741.37128, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\bin\OpenSim.Region.Physics.Manager.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/OpenSim/Region/Storage/OpenSim.DataStore.DB4o/DB4oDataStore.cs b/OpenSim/Region/Storage/OpenSim.DataStore.DB4o/DB4oDataStore.cs
index 91dab04..06c9069 100644
--- a/OpenSim/Region/Storage/OpenSim.DataStore.DB4o/DB4oDataStore.cs
+++ b/OpenSim/Region/Storage/OpenSim.DataStore.DB4o/DB4oDataStore.cs
@@ -1,110 +1,110 @@
-using System;

-using System.Collections.Generic;

-using System.Text;

-

-using OpenSim.Region.Environment.Scenes;

-using OpenSim.Region.Environment.LandManagement;

-using OpenSim.Region.Environment;

-using OpenSim.Region.Interfaces;

-using OpenSim.Framework.Console;

-using libsecondlife;

-

-using Db4objects.Db4o;

-using Db4objects.Db4o.Query;

-

-namespace OpenSim.DataStore.DB4oStorage

-{

-

-    public class SceneObjectQuery : Predicate

-    {

-        private LLUUID globalIDSearch;

-

-        public SceneObjectQuery(LLUUID find)

-        {

-            globalIDSearch = find;

-        }

-

-        public bool Match(SceneObject obj)

-        {

-            return obj.rootUUID == globalIDSearch;

-        }

-    }

-

-

-    public class DB4oDataStore : IRegionDataStore

-    {

-        private IObjectContainer db;

-

-        public void Initialise(string dbfile, string dbname)

-        {

-            MainLog.Instance.Verbose("DATASTORE", "DB4O - Opening " + dbfile);

-            db = Db4oFactory.OpenFile(dbfile);

-

-            return;

-        }

-

-        public void StoreObject(SceneObject obj)

-        {

-            db.Set(obj);

-        }

-

-        public void RemoveObject(LLUUID obj)

-        {

-            IObjectSet result = db.Query(new SceneObjectQuery(obj));

-            if (result.Count > 0)

-            {

-                SceneObject item = (SceneObject)result.Next();

-                db.Delete(item);

-            }

-        }

-

-        public List<SceneObject> LoadObjects()

-        {

-            IObjectSet result = db.Get(typeof(SceneObject));

-            List<SceneObject> retvals = new List<SceneObject>();

-

-            MainLog.Instance.Verbose("DATASTORE", "DB4O - LoadObjects found " + result.Count.ToString() + " objects");

-

-            foreach (Object obj in result)

-            {

-                retvals.Add((SceneObject)obj);

-            }

-

-            return retvals;

-        }

-

-        public void StoreTerrain(double[,] ter)

-        {

-

-        }

-

-        public double[,] LoadTerrain()

-        {

-            return null;

-        }

-

-        public void RemoveLandObject(uint id)

-        {

-

-        }

-

-        public void StoreParcel(Land parcel)

-        {

-

-        }

-

-        public List<Land> LoadLandObjects()

-        {

-            return new List<Land>();

-        }

-

-        public void Shutdown()

-        {

-            if (db != null)

-            {

-                db.Commit();

-                db.Close();

-            }

-        }

-    }

-}

+using System;
+using System.Collections.Generic;
+using System.Text;
+
+using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Environment.LandManagement;
+using OpenSim.Region.Environment;
+using OpenSim.Region.Interfaces;
+using OpenSim.Framework.Console;
+using libsecondlife;
+
+using Db4objects.Db4o;
+using Db4objects.Db4o.Query;
+
+namespace OpenSim.DataStore.DB4oStorage
+{
+
+    public class SceneObjectQuery : Predicate
+    {
+        private LLUUID globalIDSearch;
+
+        public SceneObjectQuery(LLUUID find)
+        {
+            globalIDSearch = find;
+        }
+
+        public bool Match(SceneObject obj)
+        {
+            return obj.rootUUID == globalIDSearch;
+        }
+    }
+
+
+    public class DB4oDataStore : IRegionDataStore
+    {
+        private IObjectContainer db;
+
+        public void Initialise(string dbfile, string dbname)
+        {
+            MainLog.Instance.Verbose("DATASTORE", "DB4O - Opening " + dbfile);
+            db = Db4oFactory.OpenFile(dbfile);
+
+            return;
+        }
+
+        public void StoreObject(SceneObject obj)
+        {
+            db.Set(obj);
+        }
+
+        public void RemoveObject(LLUUID obj)
+        {
+            IObjectSet result = db.Query(new SceneObjectQuery(obj));
+            if (result.Count > 0)
+            {
+                SceneObject item = (SceneObject)result.Next();
+                db.Delete(item);
+            }
+        }
+
+        public List<SceneObject> LoadObjects()
+        {
+            IObjectSet result = db.Get(typeof(SceneObject));
+            List<SceneObject> retvals = new List<SceneObject>();
+
+            MainLog.Instance.Verbose("DATASTORE", "DB4O - LoadObjects found " + result.Count.ToString() + " objects");
+
+            foreach (Object obj in result)
+            {
+                retvals.Add((SceneObject)obj);
+            }
+
+            return retvals;
+        }
+
+        public void StoreTerrain(double[,] ter)
+        {
+
+        }
+
+        public double[,] LoadTerrain()
+        {
+            return null;
+        }
+
+        public void RemoveLandObject(uint id)
+        {
+
+        }
+
+        public void StoreParcel(Land parcel)
+        {
+
+        }
+
+        public List<Land> LoadLandObjects()
+        {
+            return new List<Land>();
+        }
+
+        public void Shutdown()
+        {
+            if (db != null)
+            {
+                db.Commit();
+                db.Close();
+            }
+        }
+    }
+}
diff --git a/OpenSim/Region/Storage/OpenSim.DataStore.DB4o/Properties/AssemblyInfo.cs b/OpenSim/Region/Storage/OpenSim.DataStore.DB4o/Properties/AssemblyInfo.cs
index 0d6788b..6985947 100644
--- a/OpenSim/Region/Storage/OpenSim.DataStore.DB4o/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Storage/OpenSim.DataStore.DB4o/Properties/AssemblyInfo.cs
@@ -1,35 +1,35 @@
-using System.Reflection;

-using System.Runtime.CompilerServices;

-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.DataStore.DB4o")]

-[assembly: AssemblyDescription("")]

-[assembly: AssemblyConfiguration("")]

-[assembly: AssemblyCompany("")]

-[assembly: AssemblyProduct("OpenSim.DataStore.DB4o")]

-[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("7a12de8b-fdd1-48f5-89a9-8dc2dafbeebc")]

-

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

-//

-//      Major Version

-//      Minor Version 

-//      Build Number

-//      Revision

-//

-// You can specify all the values or you can default the Revision and Build Numbers 

-// by using the '*' as shown below:

-[assembly: AssemblyVersion("1.0.0.0")]

-[assembly: AssemblyFileVersion("1.0.0.0")]

+using System.Reflection;
+using System.Runtime.CompilerServices;
+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.DataStore.DB4o")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("OpenSim.DataStore.DB4o")]
+[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("7a12de8b-fdd1-48f5-89a9-8dc2dafbeebc")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Revision and Build Numbers 
+// by using the '*' as shown below:
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Form1.Designer.cs b/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Form1.Designer.cs
index f6e52cf..0601e51 100644
--- a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Form1.Designer.cs
+++ b/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Form1.Designer.cs
@@ -1,83 +1,83 @@
-namespace LaunchSLClient

-{

-    partial class Form1

-    {

-        /// <summary>

-        /// Required designer variable.

-        /// </summary>

-        private System.ComponentModel.IContainer components = null;

-

-        /// <summary>

-        /// Clean up any resources being used.

-        /// </summary>

-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>

-        protected override void Dispose(bool disposing)

-        {

-            if (disposing && (components != null))

-            {

-                components.Dispose();

-            }

-            base.Dispose(disposing);

-        }

-

-        #region Windows Form Designer generated code

-

-        /// <summary>

-        /// Required method for Designer support - do not modify

-        /// the contents of this method with the code editor.

-        /// </summary>

-        private void InitializeComponent()

-        {

-            this.comboBox1 = new System.Windows.Forms.ComboBox();

-            this.textBox1 = new System.Windows.Forms.TextBox();

-            this.SuspendLayout();

-            // 

-            // comboBox1

-            // 

-            this.comboBox1.FormattingEnabled = true;

-            this.comboBox1.Items.AddRange(new object[] {

-            "Local Sandbox",

-            "Local Grid Server",

-            "DeepGrid - www.deepgrid.com",

-            "OSGrid - www.osgrid.org",

-            "Linden Labs - www.secondlife.com"});

-            this.comboBox1.Location = new System.Drawing.Point(37, 83);

-            this.comboBox1.Name = "comboBox1";

-            this.comboBox1.Size = new System.Drawing.Size(348, 21);

-            this.comboBox1.TabIndex = 0;

-            this.comboBox1.Text = "Choose from list";

-            this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged);

-            // 

-            // textBox1

-            // 

-            this.textBox1.BorderStyle = System.Windows.Forms.BorderStyle.None;

-            this.textBox1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.textBox1.Location = new System.Drawing.Point(37, 32);

-            this.textBox1.Name = "textBox1";

-            this.textBox1.ReadOnly = true;

-            this.textBox1.Size = new System.Drawing.Size(292, 19);

-            this.textBox1.TabIndex = 1;

-            this.textBox1.Text = "Choose from one of the following:";

-            // 

-            // Form1

-            // 

-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);

-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;

-            this.ClientSize = new System.Drawing.Size(501, 339);

-            this.Controls.Add(this.textBox1);

-            this.Controls.Add(this.comboBox1);

-            this.Name = "Form1";

-            this.Text = "OpenSim Client Launcher";

-            this.ResumeLayout(false);

-            this.PerformLayout();

-

-        }

-

-        #endregion

-

-        private System.Windows.Forms.ComboBox comboBox1;

-        private System.Windows.Forms.TextBox textBox1;

-

-    }

-}

-

+namespace LaunchSLClient
+{
+    partial class Form1
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.comboBox1 = new System.Windows.Forms.ComboBox();
+            this.textBox1 = new System.Windows.Forms.TextBox();
+            this.SuspendLayout();
+            // 
+            // comboBox1
+            // 
+            this.comboBox1.FormattingEnabled = true;
+            this.comboBox1.Items.AddRange(new object[] {
+            "Local Sandbox",
+            "Local Grid Server",
+            "DeepGrid - www.deepgrid.com",
+            "OSGrid - www.osgrid.org",
+            "Linden Labs - www.secondlife.com"});
+            this.comboBox1.Location = new System.Drawing.Point(37, 83);
+            this.comboBox1.Name = "comboBox1";
+            this.comboBox1.Size = new System.Drawing.Size(348, 21);
+            this.comboBox1.TabIndex = 0;
+            this.comboBox1.Text = "Choose from list";
+            this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged);
+            // 
+            // textBox1
+            // 
+            this.textBox1.BorderStyle = System.Windows.Forms.BorderStyle.None;
+            this.textBox1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.textBox1.Location = new System.Drawing.Point(37, 32);
+            this.textBox1.Name = "textBox1";
+            this.textBox1.ReadOnly = true;
+            this.textBox1.Size = new System.Drawing.Size(292, 19);
+            this.textBox1.TabIndex = 1;
+            this.textBox1.Text = "Choose from one of the following:";
+            // 
+            // Form1
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(501, 339);
+            this.Controls.Add(this.textBox1);
+            this.Controls.Add(this.comboBox1);
+            this.Name = "Form1";
+            this.Text = "OpenSim Client Launcher";
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.ComboBox comboBox1;
+        private System.Windows.Forms.TextBox textBox1;
+
+    }
+}
+
diff --git a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Form1.cs b/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Form1.cs
index 497661d..8fd9b27 100644
--- a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Form1.cs
+++ b/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Form1.cs
@@ -1,194 +1,194 @@
-/*

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

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

-*

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

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

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

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

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

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

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

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

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

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

-*

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

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

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

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

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

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

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

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

-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-* 

-*/

-using System;

-using System.IO;

-using System.Collections;

-using System.Collections.Generic;

-using System.ComponentModel;

-using System.Data;

-using System.Diagnostics;

-using System.Drawing;

-using System.Text;

-using System.Text.RegularExpressions;

-using System.Windows.Forms;

-using Microsoft.Win32;

-

-namespace LaunchSLClient

-{

-    public partial class Form1 : Form

-    {

-        string gridUrl = "";

-        string sandboxUrl = "";

-        string deepGridUrl = "http://user.deepgrid.com:8002/";

-        string osGridUrl = "http://www.osgrid.org:8002/";

-        string runUrl = "";

-        string runLine = "";

-        Object exeFlags;

-        Object exePath;

-

-

-        public Form1()

-        {

-            InitializeComponent();

-            ArrayList menuItems=new ArrayList();

-            menuItems.Add("Please select one:");

-            string sandboxHostName = "";

-            string sandboxPort = "";

-            Object simPath = null;

-            FileInfo defaultFile;

-            StreamReader stream;

-

-

-            // get executable path from registry

-            //

-            RegistryKey regKey;

-            RegistryKey exeKey;

-            regKey = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Linden Research, Inc.\SecondLife");

-            if (regKey == null)

-            {

-                throw new LauncherException("Can't find Second Life. Are you sure it is installed?", "LauncherException.Form1");

-            }

-            Object exe = regKey.GetValue("Exe");

-            exeFlags = regKey.GetValue("Flags");

-            exePath = regKey.GetValue("");

-            runLine = exePath.ToString() + "\\" + exe.ToString();

-            Registry.LocalMachine.Flush();

-            Registry.LocalMachine.Close();

-

-            // find opensim directory

-            //

-            exeKey = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\OpenSim\OpenSim");

-            if (exeKey != null)

-            {

-

-                simPath = exeKey.GetValue("Path");

-

-                // build sandbox URL from Regions\default.xml

-                // this is highly dependant on a standard default.xml

-                //

-                Directory.SetCurrentDirectory(simPath.ToString());  //this should be set to wherever we decide to put the binaries

-                string text;

-                Regex myRegex = new Regex(".*internal_ip_port=\\\"(?<port>.*?)\\\".*external_host_name=\\\"(?<name>.*?)\\\".*");

-                if (File.Exists(@"Regions\default.xml"))

-                {

-                    defaultFile = new FileInfo(@"Regions\default.xml");

-                    stream = defaultFile.OpenText();

-                    do

-                    {

-                        text = stream.ReadLine();

-                        if (text == null)

-                        {

-                            break;

-                        }

-                        MatchCollection theMatches = myRegex.Matches(text);

-                        foreach (Match theMatch in theMatches)

-                        {

-                            if (theMatch.Length != 0)

-                            {

-                                sandboxHostName = theMatch.Groups["name"].ToString();

-                                sandboxPort = theMatch.Groups["port"].ToString();

-                            }

-                        }

-                    } while (text != null);

-                    stream.Close();

-                    sandboxUrl = "http:\\" + sandboxHostName + ":" + sandboxPort;

-                    menuItems.Add("Local Sandbox");

-                }

-                else

-                {

-                    MessageBox.Show("No OpenSim config files found. Please run OpenSim and finish configuration to run a local sim. Showing public grids only", "No OpenSim");

-                }

-

-

-                //build local grid URL from network_servers_information.xml

-                // this is highly dependant on a standard default.xml

-                //

-                myRegex = new Regex(".*UserServerURL=\\\"(?<url>.*?)\\\".*");

-                if (File.Exists(@"network_servers_information.xml"))

-                {

-                    defaultFile = new FileInfo(@"network_servers_information.xml");

-

-

-                    stream = defaultFile.OpenText();

-                    do

-                    {

-                        text = stream.ReadLine();

-                        if (text == null)

-                        {

-                            break;

-                        }

-                        MatchCollection theMatches = myRegex.Matches(text);

-                        foreach (Match theMatch in theMatches)

-                        {

-                            if (theMatch.Length != 0)

-                            {

-                                gridUrl = theMatch.Groups["url"].ToString();

-                            }

-                        }

-                    } while (text != null);

-                    stream.Close();

-                    if (gridUrl != null)

-                    {

-                        menuItems.Add("Local Grid Server");

-                    }

-                }

-            }

-            else

-            {

-                MessageBox.Show("No OpenSim installed. Showing public grids only", "No OpenSim");

-            }

-            menuItems.Add("DeepGrid - www.deepgrid.com");

-            menuItems.Add("OSGrid - www.osgrid.org");

-            menuItems.Add("Linden Labs - www.secondlife.com");

-            comboBox1.DataSource=menuItems;

-        }

-

-        private void radioButton1_CheckedChanged(object sender, EventArgs e)

-        {

-

-        }

-

-        private void comboBox1_SelectedIndexChanged(object sender, EventArgs e)

-        {

-            if (comboBox1.Text == "Please select one:") { return; }

-            if (comboBox1.Text == "Local Sandbox") { runUrl=" - loginuri " + sandboxUrl;}

-            if (comboBox1.Text == "Local Grid Server") { runUrl = " - loginuri " + gridUrl; }

-            if (comboBox1.Text == "DeepGrid - www.deepgrid.com") { runUrl = " - loginuri " + deepGridUrl; }

-            if (comboBox1.Text == "OSGrid - www.osgrid.org") { runUrl = " - loginuri " + osGridUrl; }

-            if (comboBox1.Text == "Linden Labs - www.secondlife.com") { runUrl = ""; }

-            System.Diagnostics.Process proc = new System.Diagnostics.Process();

-            proc.StartInfo.FileName = runLine;

-            proc.StartInfo.Arguments = exeFlags.ToString() + " " + runUrl;

-            proc.StartInfo.UseShellExecute = false;

-            proc.StartInfo.RedirectStandardOutput = false;

-            proc.StartInfo.WorkingDirectory = exePath.ToString();

-            proc.Start();

-            proc.WaitForExit();

-        }

-    }

+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.IO;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Diagnostics;
+using System.Drawing;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Windows.Forms;
+using Microsoft.Win32;
+
+namespace LaunchSLClient
+{
+    public partial class Form1 : Form
+    {
+        string gridUrl = "";
+        string sandboxUrl = "";
+        string deepGridUrl = "http://user.deepgrid.com:8002/";
+        string osGridUrl = "http://www.osgrid.org:8002/";
+        string runUrl = "";
+        string runLine = "";
+        Object exeFlags;
+        Object exePath;
+
+
+        public Form1()
+        {
+            InitializeComponent();
+            ArrayList menuItems=new ArrayList();
+            menuItems.Add("Please select one:");
+            string sandboxHostName = "";
+            string sandboxPort = "";
+            Object simPath = null;
+            FileInfo defaultFile;
+            StreamReader stream;
+
+
+            // get executable path from registry
+            //
+            RegistryKey regKey;
+            RegistryKey exeKey;
+            regKey = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Linden Research, Inc.\SecondLife");
+            if (regKey == null)
+            {
+                throw new LauncherException("Can't find Second Life. Are you sure it is installed?", "LauncherException.Form1");
+            }
+            Object exe = regKey.GetValue("Exe");
+            exeFlags = regKey.GetValue("Flags");
+            exePath = regKey.GetValue("");
+            runLine = exePath.ToString() + "\\" + exe.ToString();
+            Registry.LocalMachine.Flush();
+            Registry.LocalMachine.Close();
+
+            // find opensim directory
+            //
+            exeKey = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\OpenSim\OpenSim");
+            if (exeKey != null)
+            {
+
+                simPath = exeKey.GetValue("Path");
+
+                // build sandbox URL from Regions\default.xml
+                // this is highly dependant on a standard default.xml
+                //
+                Directory.SetCurrentDirectory(simPath.ToString());  //this should be set to wherever we decide to put the binaries
+                string text;
+                Regex myRegex = new Regex(".*internal_ip_port=\\\"(?<port>.*?)\\\".*external_host_name=\\\"(?<name>.*?)\\\".*");
+                if (File.Exists(@"Regions\default.xml"))
+                {
+                    defaultFile = new FileInfo(@"Regions\default.xml");
+                    stream = defaultFile.OpenText();
+                    do
+                    {
+                        text = stream.ReadLine();
+                        if (text == null)
+                        {
+                            break;
+                        }
+                        MatchCollection theMatches = myRegex.Matches(text);
+                        foreach (Match theMatch in theMatches)
+                        {
+                            if (theMatch.Length != 0)
+                            {
+                                sandboxHostName = theMatch.Groups["name"].ToString();
+                                sandboxPort = theMatch.Groups["port"].ToString();
+                            }
+                        }
+                    } while (text != null);
+                    stream.Close();
+                    sandboxUrl = "http:\\" + sandboxHostName + ":" + sandboxPort;
+                    menuItems.Add("Local Sandbox");
+                }
+                else
+                {
+                    MessageBox.Show("No OpenSim config files found. Please run OpenSim and finish configuration to run a local sim. Showing public grids only", "No OpenSim");
+                }
+
+
+                //build local grid URL from network_servers_information.xml
+                // this is highly dependant on a standard default.xml
+                //
+                myRegex = new Regex(".*UserServerURL=\\\"(?<url>.*?)\\\".*");
+                if (File.Exists(@"network_servers_information.xml"))
+                {
+                    defaultFile = new FileInfo(@"network_servers_information.xml");
+
+
+                    stream = defaultFile.OpenText();
+                    do
+                    {
+                        text = stream.ReadLine();
+                        if (text == null)
+                        {
+                            break;
+                        }
+                        MatchCollection theMatches = myRegex.Matches(text);
+                        foreach (Match theMatch in theMatches)
+                        {
+                            if (theMatch.Length != 0)
+                            {
+                                gridUrl = theMatch.Groups["url"].ToString();
+                            }
+                        }
+                    } while (text != null);
+                    stream.Close();
+                    if (gridUrl != null)
+                    {
+                        menuItems.Add("Local Grid Server");
+                    }
+                }
+            }
+            else
+            {
+                MessageBox.Show("No OpenSim installed. Showing public grids only", "No OpenSim");
+            }
+            menuItems.Add("DeepGrid - www.deepgrid.com");
+            menuItems.Add("OSGrid - www.osgrid.org");
+            menuItems.Add("Linden Labs - www.secondlife.com");
+            comboBox1.DataSource=menuItems;
+        }
+
+        private void radioButton1_CheckedChanged(object sender, EventArgs e)
+        {
+
+        }
+
+        private void comboBox1_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if (comboBox1.Text == "Please select one:") { return; }
+            if (comboBox1.Text == "Local Sandbox") { runUrl=" - loginuri " + sandboxUrl;}
+            if (comboBox1.Text == "Local Grid Server") { runUrl = " - loginuri " + gridUrl; }
+            if (comboBox1.Text == "DeepGrid - www.deepgrid.com") { runUrl = " - loginuri " + deepGridUrl; }
+            if (comboBox1.Text == "OSGrid - www.osgrid.org") { runUrl = " - loginuri " + osGridUrl; }
+            if (comboBox1.Text == "Linden Labs - www.secondlife.com") { runUrl = ""; }
+            System.Diagnostics.Process proc = new System.Diagnostics.Process();
+            proc.StartInfo.FileName = runLine;
+            proc.StartInfo.Arguments = exeFlags.ToString() + " " + runUrl;
+            proc.StartInfo.UseShellExecute = false;
+            proc.StartInfo.RedirectStandardOutput = false;
+            proc.StartInfo.WorkingDirectory = exePath.ToString();
+            proc.Start();
+            proc.WaitForExit();
+        }
+    }
 }
\ No newline at end of file
diff --git a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Form1.resx b/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Form1.resx
index ff31a6d..19dc0dd 100644
--- a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Form1.resx
+++ b/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Form1.resx
@@ -1,120 +1,120 @@
-<?xml version="1.0" encoding="utf-8"?>

-<root>

-  <!-- 

-    Microsoft ResX Schema 

-    

-    Version 2.0

-    

-    The primary goals of this format is to allow a simple XML format 

-    that is mostly human readable. The generation and parsing of the 

-    various data types are done through the TypeConverter classes 

-    associated with the data types.

-    

-    Example:

-    

-    ... ado.net/XML headers & schema ...

-    <resheader name="resmimetype">text/microsoft-resx</resheader>

-    <resheader name="version">2.0</resheader>

-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>

-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>

-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>

-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>

-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">

-        <value>[base64 mime encoded serialized .NET Framework object]</value>

-    </data>

-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>

-        <comment>This is a comment</comment>

-    </data>

-                

-    There are any number of "resheader" rows that contain simple 

-    name/value pairs.

-    

-    Each data row contains a name, and value. The row also contains a 

-    type or mimetype. Type corresponds to a .NET class that support 

-    text/value conversion through the TypeConverter architecture. 

-    Classes that don't support this are serialized and stored with the 

-    mimetype set.

-    

-    The mimetype is used for serialized objects, and tells the 

-    ResXResourceReader how to depersist the object. This is currently not 

-    extensible. For a given mimetype the value must be set accordingly:

-    

-    Note - application/x-microsoft.net.object.binary.base64 is the format 

-    that the ResXResourceWriter will generate, however the reader can 

-    read any of the formats listed below.

-    

-    mimetype: application/x-microsoft.net.object.binary.base64

-    value   : The object must be serialized with 

-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter

-            : and then encoded with base64 encoding.

-    

-    mimetype: application/x-microsoft.net.object.soap.base64

-    value   : The object must be serialized with 

-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter

-            : and then encoded with base64 encoding.

-

-    mimetype: application/x-microsoft.net.object.bytearray.base64

-    value   : The object must be serialized into a byte array 

-            : using a System.ComponentModel.TypeConverter

-            : and then encoded with base64 encoding.

-    -->

-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">

-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />

-    <xsd:element name="root" msdata:IsDataSet="true">

-      <xsd:complexType>

-        <xsd:choice maxOccurs="unbounded">

-          <xsd:element name="metadata">

-            <xsd:complexType>

-              <xsd:sequence>

-                <xsd:element name="value" type="xsd:string" minOccurs="0" />

-              </xsd:sequence>

-              <xsd:attribute name="name" use="required" type="xsd:string" />

-              <xsd:attribute name="type" type="xsd:string" />

-              <xsd:attribute name="mimetype" type="xsd:string" />

-              <xsd:attribute ref="xml:space" />

-            </xsd:complexType>

-          </xsd:element>

-          <xsd:element name="assembly">

-            <xsd:complexType>

-              <xsd:attribute name="alias" type="xsd:string" />

-              <xsd:attribute name="name" type="xsd:string" />

-            </xsd:complexType>

-          </xsd:element>

-          <xsd:element name="data">

-            <xsd:complexType>

-              <xsd:sequence>

-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />

-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />

-              </xsd:sequence>

-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />

-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />

-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />

-              <xsd:attribute ref="xml:space" />

-            </xsd:complexType>

-          </xsd:element>

-          <xsd:element name="resheader">

-            <xsd:complexType>

-              <xsd:sequence>

-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />

-              </xsd:sequence>

-              <xsd:attribute name="name" type="xsd:string" use="required" />

-            </xsd:complexType>

-          </xsd:element>

-        </xsd:choice>

-      </xsd:complexType>

-    </xsd:element>

-  </xsd:schema>

-  <resheader name="resmimetype">

-    <value>text/microsoft-resx</value>

-  </resheader>

-  <resheader name="version">

-    <value>2.0</value>

-  </resheader>

-  <resheader name="reader">

-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

-  </resheader>

-  <resheader name="writer">

-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

-  </resheader>

+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
 </root>
\ No newline at end of file
diff --git a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/LaunchSLClient.csproj b/OpenSim/Tools/LaunchSLClient/LaunchSLClient/LaunchSLClient.csproj
index bc70f11..2589ec7 100644
--- a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/LaunchSLClient.csproj
+++ b/OpenSim/Tools/LaunchSLClient/LaunchSLClient/LaunchSLClient.csproj
@@ -1,79 +1,79 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ProductVersion>8.0.50727</ProductVersion>

-    <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{50FD2DCD-2E2D-413C-8260-D9CD22405895}</ProjectGuid>

-    <OutputType>WinExe</OutputType>

-    <AppDesignerFolder>Properties</AppDesignerFolder>

-    <RootNamespace>LaunchSLClient</RootNamespace>

-    <AssemblyName>LaunchSLClient</AssemblyName>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

-    <DebugSymbols>true</DebugSymbols>

-    <DebugType>full</DebugType>

-    <Optimize>false</Optimize>

-    <OutputPath>bin\Debug\</OutputPath>

-    <DefineConstants>DEBUG;TRACE</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

-    <DebugType>pdbonly</DebugType>

-    <Optimize>true</Optimize>

-    <OutputPath>bin\Release\</OutputPath>

-    <DefineConstants>TRACE</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

-  </PropertyGroup>

-  <ItemGroup>

-    <Reference Include="System" />

-    <Reference Include="System.Data" />

-    <Reference Include="System.Deployment" />

-    <Reference Include="System.Drawing" />

-    <Reference Include="System.Windows.Forms" />

-    <Reference Include="System.Xml" />

-  </ItemGroup>

-  <ItemGroup>

-    <Compile Include="Form1.cs">

-      <SubType>Form</SubType>

-    </Compile>

-    <Compile Include="Form1.Designer.cs">

-      <DependentUpon>Form1.cs</DependentUpon>

-    </Compile>

-    <Compile Include="LauncherException.cs" />

-    <Compile Include="Program.cs" />

-    <Compile Include="Properties\AssemblyInfo.cs" />

-    <EmbeddedResource Include="Form1.resx">

-      <SubType>Designer</SubType>

-      <DependentUpon>Form1.cs</DependentUpon>

-    </EmbeddedResource>

-    <EmbeddedResource Include="Properties\Resources.resx">

-      <Generator>ResXFileCodeGenerator</Generator>

-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>

-      <SubType>Designer</SubType>

-    </EmbeddedResource>

-    <Compile Include="Properties\Resources.Designer.cs">

-      <AutoGen>True</AutoGen>

-      <DependentUpon>Resources.resx</DependentUpon>

-    </Compile>

-    <None Include="Properties\Settings.settings">

-      <Generator>SettingsSingleFileGenerator</Generator>

-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>

-    </None>

-    <Compile Include="Properties\Settings.Designer.cs">

-      <AutoGen>True</AutoGen>

-      <DependentUpon>Settings.settings</DependentUpon>

-      <DesignTimeSharedInput>True</DesignTimeSharedInput>

-    </Compile>

-  </ItemGroup>

-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

-       Other similar extension points exist, see Microsoft.Common.targets.

-  <Target Name="BeforeBuild">

-  </Target>

-  <Target Name="AfterBuild">

-  </Target>

-  -->

+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{50FD2DCD-2E2D-413C-8260-D9CD22405895}</ProjectGuid>
+    <OutputType>WinExe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>LaunchSLClient</RootNamespace>
+    <AssemblyName>LaunchSLClient</AssemblyName>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Deployment" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Form1.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Form1.Designer.cs">
+      <DependentUpon>Form1.cs</DependentUpon>
+    </Compile>
+    <Compile Include="LauncherException.cs" />
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <EmbeddedResource Include="Form1.resx">
+      <SubType>Designer</SubType>
+      <DependentUpon>Form1.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
 </Project>
\ No newline at end of file
diff --git a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/LauncherException.cs b/OpenSim/Tools/LaunchSLClient/LaunchSLClient/LauncherException.cs
index 7a2e861..a0b4612 100644
--- a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/LauncherException.cs
+++ b/OpenSim/Tools/LaunchSLClient/LaunchSLClient/LauncherException.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 System;

-using System.Collections.Generic;

-using System.Text;

-

-namespace LaunchSLClient

-{

-    class LauncherException : ApplicationException

-    {

-

-        private const string CUSTOMMESSAGE = "The SL Client Launcher has failed with the following error: ";

-

-        private LauncherException() { }

-

-        public LauncherException(string errorMesssage, string source)

-            : base (CUSTOMMESSAGE + errorMesssage)

-        {

-            base.Source = source;

-        }

-

-        public LauncherException(string errorMessage, string source, Exception innerException)

-            : base(CUSTOMMESSAGE + errorMessage, innerException)

-        {

-            base.Source = source;

-        }

-    }

-}

+/*
+* 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.Collections.Generic;
+using System.Text;
+
+namespace LaunchSLClient
+{
+    class LauncherException : ApplicationException
+    {
+
+        private const string CUSTOMMESSAGE = "The SL Client Launcher has failed with the following error: ";
+
+        private LauncherException() { }
+
+        public LauncherException(string errorMesssage, string source)
+            : base (CUSTOMMESSAGE + errorMesssage)
+        {
+            base.Source = source;
+        }
+
+        public LauncherException(string errorMessage, string source, Exception innerException)
+            : base(CUSTOMMESSAGE + errorMessage, innerException)
+        {
+            base.Source = source;
+        }
+    }
+}
diff --git a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Program.cs b/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Program.cs
index ba652a9..efcfd46 100644
--- a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Program.cs
+++ b/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Program.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 System;

-using System.Collections.Generic;

-using System.Windows.Forms;

-

-

-namespace LaunchSLClient

-{

-    static class Program

-    {

-        /// <summary>

-        /// The main entry point for the application.

-        /// </summary>

-        [STAThread]

-        static void Main()

-        {

-

-            try

-            {

-                Application.EnableVisualStyles();

-                Application.SetCompatibleTextRenderingDefault(false);

-                Application.Run(new Form1());

-            }

-            catch (Exception ex)

-            {

-                // Handles all unhandled errors

-                MessageBox.Show(ex.Message,"Unhandled Error");

-            }

-        }

-    }

+/*
+* 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.Collections.Generic;
+using System.Windows.Forms;
+
+
+namespace LaunchSLClient
+{
+    static class Program
+    {
+        /// <summary>
+        /// The main entry point for the application.
+        /// </summary>
+        [STAThread]
+        static void Main()
+        {
+
+            try
+            {
+                Application.EnableVisualStyles();
+                Application.SetCompatibleTextRenderingDefault(false);
+                Application.Run(new Form1());
+            }
+            catch (Exception ex)
+            {
+                // Handles all unhandled errors
+                MessageBox.Show(ex.Message,"Unhandled Error");
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Properties/AssemblyInfo.cs b/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Properties/AssemblyInfo.cs
index 4bd2cea..0c3e72e 100644
--- a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Properties/AssemblyInfo.cs
+++ b/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Properties/AssemblyInfo.cs
@@ -1,33 +1,33 @@
-using System.Reflection;

-using System.Runtime.CompilerServices;

-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("LaunchSLClient")]

-[assembly: AssemblyDescription("")]

-[assembly: AssemblyConfiguration("")]

-[assembly: AssemblyCompany("Home")]

-[assembly: AssemblyProduct("LaunchSLClient")]

-[assembly: AssemblyCopyright("Copyright © Home 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("b08c6904-e6cc-4d9c-8d24-feb0464b1648")]

-

-// 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.CompilerServices;
+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("LaunchSLClient")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Home")]
+[assembly: AssemblyProduct("LaunchSLClient")]
+[assembly: AssemblyCopyright("Copyright © Home 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("b08c6904-e6cc-4d9c-8d24-feb0464b1648")]
+
+// 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/Tools/LaunchSLClient/LaunchSLClient/Properties/Resources.Designer.cs b/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Properties/Resources.Designer.cs
index f9dfcc0..4e9188d 100644
--- a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Properties/Resources.Designer.cs
+++ b/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Properties/Resources.Designer.cs
@@ -1,71 +1,71 @@
-//------------------------------------------------------------------------------

-// <auto-generated>

-//     This code was generated by a tool.

-//     Runtime Version:2.0.50727.832

-//

-//     Changes to this file may cause incorrect behavior and will be lost if

-//     the code is regenerated.

-// </auto-generated>

-//------------------------------------------------------------------------------

-

-namespace LaunchSLClient.Properties

-{

-

-

-    /// <summary>

-    ///   A strongly-typed resource class, for looking up localized strings, etc.

-    /// </summary>

-    // This class was auto-generated by the StronglyTypedResourceBuilder

-    // class via a tool like ResGen or Visual Studio.

-    // To add or remove a member, edit your .ResX file then rerun ResGen

-    // with the /str option, or rebuild your VS project.

-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]

-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-    internal class Resources

-    {

-

-        private static global::System.Resources.ResourceManager resourceMan;

-

-        private static global::System.Globalization.CultureInfo resourceCulture;

-

-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]

-        internal Resources()

-        {

-        }

-

-        /// <summary>

-        ///   Returns the cached ResourceManager instance used by this class.

-        /// </summary>

-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]

-        internal static global::System.Resources.ResourceManager ResourceManager

-        {

-            get

-            {

-                if ((resourceMan == null))

-                {

-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("LaunchSLClient.Properties.Resources", typeof(Resources).Assembly);

-                    resourceMan = temp;

-                }

-                return resourceMan;

-            }

-        }

-

-        /// <summary>

-        ///   Overrides the current thread's CurrentUICulture property for all

-        ///   resource lookups using this strongly typed resource class.

-        /// </summary>

-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]

-        internal static global::System.Globalization.CultureInfo Culture

-        {

-            get

-            {

-                return resourceCulture;

-            }

-            set

-            {

-                resourceCulture = value;

-            }

-        }

-    }

-}

+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:2.0.50727.832
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace LaunchSLClient.Properties
+{
+
+
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources
+    {
+
+        private static global::System.Resources.ResourceManager resourceMan;
+
+        private static global::System.Globalization.CultureInfo resourceCulture;
+
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources()
+        {
+        }
+
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager
+        {
+            get
+            {
+                if ((resourceMan == null))
+                {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("LaunchSLClient.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture
+        {
+            get
+            {
+                return resourceCulture;
+            }
+            set
+            {
+                resourceCulture = value;
+            }
+        }
+    }
+}
diff --git a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Properties/Resources.resx b/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Properties/Resources.resx
index ffecec8..af7dbeb 100644
--- a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Properties/Resources.resx
+++ b/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Properties/Resources.resx
@@ -1,117 +1,117 @@
-<?xml version="1.0" encoding="utf-8"?>

-<root>

-  <!-- 

-    Microsoft ResX Schema 

-    

-    Version 2.0

-    

-    The primary goals of this format is to allow a simple XML format 

-    that is mostly human readable. The generation and parsing of the 

-    various data types are done through the TypeConverter classes 

-    associated with the data types.

-    

-    Example:

-    

-    ... ado.net/XML headers & schema ...

-    <resheader name="resmimetype">text/microsoft-resx</resheader>

-    <resheader name="version">2.0</resheader>

-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>

-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>

-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>

-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>

-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">

-        <value>[base64 mime encoded serialized .NET Framework object]</value>

-    </data>

-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>

-        <comment>This is a comment</comment>

-    </data>

-                

-    There are any number of "resheader" rows that contain simple 

-    name/value pairs.

-    

-    Each data row contains a name, and value. The row also contains a 

-    type or mimetype. Type corresponds to a .NET class that support 

-    text/value conversion through the TypeConverter architecture. 

-    Classes that don't support this are serialized and stored with the 

-    mimetype set.

-    

-    The mimetype is used for serialized objects, and tells the 

-    ResXResourceReader how to depersist the object. This is currently not 

-    extensible. For a given mimetype the value must be set accordingly:

-    

-    Note - application/x-microsoft.net.object.binary.base64 is the format 

-    that the ResXResourceWriter will generate, however the reader can 

-    read any of the formats listed below.

-    

-    mimetype: application/x-microsoft.net.object.binary.base64

-    value   : The object must be serialized with 

-            : System.Serialization.Formatters.Binary.BinaryFormatter

-            : and then encoded with base64 encoding.

-    

-    mimetype: application/x-microsoft.net.object.soap.base64

-    value   : The object must be serialized with 

-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter

-            : and then encoded with base64 encoding.

-

-    mimetype: application/x-microsoft.net.object.bytearray.base64

-    value   : The object must be serialized into a byte array 

-            : using a System.ComponentModel.TypeConverter

-            : and then encoded with base64 encoding.

-    -->

-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">

-    <xsd:element name="root" msdata:IsDataSet="true">

-      <xsd:complexType>

-        <xsd:choice maxOccurs="unbounded">

-          <xsd:element name="metadata">

-            <xsd:complexType>

-              <xsd:sequence>

-                <xsd:element name="value" type="xsd:string" minOccurs="0" />

-              </xsd:sequence>

-              <xsd:attribute name="name" type="xsd:string" />

-              <xsd:attribute name="type" type="xsd:string" />

-              <xsd:attribute name="mimetype" type="xsd:string" />

-            </xsd:complexType>

-          </xsd:element>

-          <xsd:element name="assembly">

-            <xsd:complexType>

-              <xsd:attribute name="alias" type="xsd:string" />

-              <xsd:attribute name="name" type="xsd:string" />

-            </xsd:complexType>

-          </xsd:element>

-          <xsd:element name="data">

-            <xsd:complexType>

-              <xsd:sequence>

-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />

-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />

-              </xsd:sequence>

-              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />

-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />

-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />

-            </xsd:complexType>

-          </xsd:element>

-          <xsd:element name="resheader">

-            <xsd:complexType>

-              <xsd:sequence>

-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />

-              </xsd:sequence>

-              <xsd:attribute name="name" type="xsd:string" use="required" />

-            </xsd:complexType>

-          </xsd:element>

-        </xsd:choice>

-      </xsd:complexType>

-    </xsd:element>

-  </xsd:schema>

-  <resheader name="resmimetype">

-    <value>text/microsoft-resx</value>

-  </resheader>

-  <resheader name="version">

-    <value>2.0</value>

-  </resheader>

-  <resheader name="reader">

-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

-  </resheader>

-  <resheader name="writer">

-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

-  </resheader>

+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
 </root>
\ No newline at end of file
diff --git a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Properties/Settings.Designer.cs b/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Properties/Settings.Designer.cs
index 72c3ced..3dcc200 100644
--- a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Properties/Settings.Designer.cs
+++ b/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Properties/Settings.Designer.cs
@@ -1,30 +1,30 @@
-//------------------------------------------------------------------------------

-// <auto-generated>

-//     This code was generated by a tool.

-//     Runtime Version:2.0.50727.832

-//

-//     Changes to this file may cause incorrect behavior and will be lost if

-//     the code is regenerated.

-// </auto-generated>

-//------------------------------------------------------------------------------

-

-namespace LaunchSLClient.Properties

-{

-

-

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "8.0.0.0")]

-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase

-    {

-

-        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));

-

-        public static Settings Default

-        {

-            get

-            {

-                return defaultInstance;

-            }

-        }

-    }

-}

+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:2.0.50727.832
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace LaunchSLClient.Properties
+{
+
+
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "8.0.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
+    {
+
+        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+
+        public static Settings Default
+        {
+            get
+            {
+                return defaultInstance;
+            }
+        }
+    }
+}
diff --git a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Properties/Settings.settings b/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Properties/Settings.settings
index abf36c5..3964565 100644
--- a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Properties/Settings.settings
+++ b/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Properties/Settings.settings
@@ -1,7 +1,7 @@
-<?xml version='1.0' encoding='utf-8'?>

-<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">

-  <Profiles>

-    <Profile Name="(Default)" />

-  </Profiles>

-  <Settings />

-</SettingsFile>

+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
+  <Profiles>
+    <Profile Name="(Default)" />
+  </Profiles>
+  <Settings />
+</SettingsFile>