* Some work in progress code: Inventory cache, start of inventory server/service, userprofile cache, inventory handling. (non of it is enabled yet (or at least it shouldn't be).

* Fixed some of the problems with crossing regions when flying: you should no longer sink to ground level when crossing (should keep roughly your right height). Should no longer sometimes get sent back to the centre of the current region when attempting to border cross. But instead sometimes you will find you avatar stop at the edge of region and you will need to start moving again to retry the crossing (which should then work). This code is partly based on Babblefrog's issue #212 patch. [I think I have some ideas of how to solve the stopping at edges problem, just want to get the inventory code done first] * Capabilities code has now been moved to the OpenSim.Framework.Communications project as some of the caps code will be tightly tied to inventory/asset handling and it was causing a two way reference problem when it was in its own project/dll. This is a Big commit as I was going to keep my inventory work local until I had it in a working state, in case it brakes anything, but its getting harder to keep in sync with svn.
author: MW 2007-07-22 11:44:36 +0000
committer: MW 2007-07-22 11:44:36 +0000
commit: 70fa30204272e874b8e3acccdc2e22cd4e42b2b2 (patch)
tree: 2f6c3c0f3b3bd60d5972f8dea6b3abeae4dc9065 /OpenSim/Region/Capabilities
parent: * Aerobic erosion now uses Navier Stokes algorithms for wind calculations. (diff)
download: opensim-SC-70fa30204272e874b8e3acccdc2e22cd4e42b2b2.zip
opensim-SC-70fa30204272e874b8e3acccdc2e22cd4e42b2b2.tar.gz
opensim-SC-70fa30204272e874b8e3acccdc2e22cd4e42b2b2.tar.bz2
opensim-SC-70fa30204272e874b8e3acccdc2e22cd4e42b2b2.tar.xz
16 files changed, 996 insertions, 965 deletions
diff --git a/OpenSim/Region/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index 06a4bd5..3b1cc6a 100644
--- a/OpenSim/Region/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -1,330 +1,359 @@
-/*
+/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
+* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
+*
-* Redistribution and use in source and binary forms, with or without
+* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
+* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
+*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
+*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
+*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
+*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
+*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
+*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
+*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
+*       derived from this software without specific prior written permission.
-*
+*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* 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
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
+* 
-*/
+*/
-using System;
+using System;
-using System.Collections;
+using System.Collections;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.Text;
+using System.Text;
-using System.IO;
+using System.IO;
-using libsecondlife;
+using libsecondlife;
-using OpenSim.Framework.Servers;
+using OpenSim.Framework.Servers;
-using OpenSim.Framework.Types;
+using OpenSim.Framework.Types;
-using OpenSim.Framework.Utilities;
+using OpenSim.Framework.Utilities;
-using OpenSim.Region.Caches;
+using OpenSim.Framework.Communications.Caches;
-namespace OpenSim.Region.Capabilities
+namespace OpenSim.Region.Capabilities
-{
+{
-    public delegate void UpLoadedTexture(string assetName, LLUUID assetID, LLUUID inventoryItem, byte[] data);
+    public delegate void UpLoadedTexture(string assetName, LLUUID assetID, LLUUID inventoryItem, byte[] data);
-    public class Caps
+    public class Caps
-    {
+    {
-        private string m_httpListenerHostName;
+        private string m_httpListenerHostName;
-        private int m_httpListenPort;
+        private int m_httpListenPort;
-        private string m_capsObjectPath = "00001-";
+        private string m_capsObjectPath = "00001-";
-        private string m_requestPath = "0000/";
+        private string m_requestPath = "0000/";
-        private string m_mapLayerPath = "0001/";
+        private string m_mapLayerPath = "0001/";
-        private string m_newInventory = "0002/";
+        private string m_newInventory = "0002/";
-       // private string m_requestTexture = "0003/";
+       // private string m_requestTexture = "0003/";
-        //private string eventQueue = "0100/";
+        private string m_notecardUpdatePath = "0004/";
-        private BaseHttpServer httpListener;
+        //private string eventQueue = "0100/";
-        private LLUUID agentID;
+        private BaseHttpServer httpListener;
-        private AssetCache assetCache;
+        private LLUUID agentID;
-        private int eventQueueCount = 1;
+        private AssetCache assetCache;
-        private Queue<string> CapsEventQueue = new Queue<string>();
+        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)
-        {
+        public Caps(AssetCache assetCach, BaseHttpServer httpServer, string httpListen, int httpPort, string capsPath, LLUUID agent)
-            assetCache = assetCach;
+        {
-            m_capsObjectPath = capsPath;
+            assetCache = assetCach;
-            httpListener = httpServer;
+            m_capsObjectPath = capsPath;
-            m_httpListenerHostName = httpListen;
+            httpListener = httpServer;
-            m_httpListenPort = httpPort;
+            m_httpListenerHostName = httpListen;
-            agentID = agent;
+            m_httpListenPort = httpPort;
-        }
+            agentID = agent;
+        }
-        /// <summary>
-        /// 
+        /// <summary>
-        /// </summary>
+        /// 
-        public void RegisterHandlers()
+        /// </summary>
-        {
+        public void RegisterHandlers()
-            Console.WriteLine("registering CAPS handlers");
+        {
-            string capsBase = "/CAPS/" + m_capsObjectPath;
+            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));
+            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_requestPath, CapsRequest);
+            AddLegacyCapsHandler(httpListener, m_notecardUpdatePath, NoteCardAgentInventory);
-        [Obsolete("Use BaseHttpServer.AddStreamHandler(new LLSDStreamHandler( LLSDMethod delegate )) instead.")]
+        }
-        private void AddLegacyCapsHandler(BaseHttpServer httpListener, string path, RestMethod restMethod)
-        {
+        [Obsolete("Use BaseHttpServer.AddStreamHandler(new LLSDStreamHandler( LLSDMethod delegate )) instead.")]
-            string capsBase = "/CAPS/" + m_capsObjectPath;
+        private void AddLegacyCapsHandler(BaseHttpServer httpListener, string path, RestMethod restMethod)
-            httpListener.AddStreamHandler(new RestStreamHandler("POST", capsBase + path, restMethod));
+        {
-        }
+            string capsBase = "/CAPS/" + m_capsObjectPath;
+            httpListener.AddStreamHandler(new RestStreamHandler("POST", capsBase + path, restMethod));
-        /// <summary>
+        }
-        /// 
-        /// </summary>
+        /// <summary>
-        /// <param name="request"></param>
+        /// 
-        /// <param name="path"></param>
+        /// </summary>
-        /// <param name="param"></param>
+        /// <param name="request"></param>
-        /// <returns></returns>
+        /// <param name="path"></param>
-        public string CapsRequest(string request, string path, string param)
+        /// <param name="param"></param>
-        {
+        /// <returns></returns>
-           // Console.WriteLine("caps request " + request);
+        public string CapsRequest(string request, string path, string param)
-            string result = LLSDHelpers.SerialiseLLSDReply(this.GetCapabilities());
+        {
-            return result;
+            //Console.WriteLine("caps request " + request);
-        }
+            string result = LLSDHelpers.SerialiseLLSDReply(this.GetCapabilities());
+            return result;
-        /// <summary>
+        }
-        /// 
-        /// </summary>
+        /// <summary>
-        /// <returns></returns>
+        /// 
-        protected LLSDCapsDetails GetCapabilities()
+        /// </summary>
-        {
+        /// <returns></returns>
-            LLSDCapsDetails caps = new LLSDCapsDetails();
+        protected LLSDCapsDetails GetCapabilities()
-            string capsBaseUrl = "http://" + m_httpListenerHostName + ":" + m_httpListenPort.ToString() + "/CAPS/" + m_capsObjectPath;
+        {
-            caps.MapLayer = capsBaseUrl + m_mapLayerPath;
+            LLSDCapsDetails caps = new LLSDCapsDetails();
-            caps.NewFileAgentInventory = capsBaseUrl + m_newInventory;
+            string capsBaseUrl = "http://" + m_httpListenerHostName + ":" + m_httpListenPort.ToString() + "/CAPS/" + m_capsObjectPath;
-            //caps.RequestTextureDownload = capsBaseUrl + m_requestTexture;
+            caps.MapLayer = capsBaseUrl + m_mapLayerPath;
-           // caps.ChatSessionRequest = capsBaseUrl + m_requestTexture;
+            caps.NewFileAgentInventory = capsBaseUrl + m_newInventory;
-            return caps;
+            //caps.RequestTextureDownload = capsBaseUrl + m_requestTexture;
-        }
+            caps.UpdateNotecardAgentInventory = capsBaseUrl + m_notecardUpdatePath;
+            return caps;
-        /// <summary>
+        }
-        /// 
-        /// </summary>
+        /// <summary>
-        /// <param name="mapReq"></param>
+        /// 
-        /// <returns></returns>
+        /// </summary>
-        public LLSDMapLayerResponse GetMapLayer(LLSDMapRequest mapReq)
+        /// <param name="mapReq"></param>
-        {
+        /// <returns></returns>
-            LLSDMapLayerResponse mapResponse = new LLSDMapLayerResponse();
+        public LLSDMapLayerResponse GetMapLayer(LLSDMapRequest mapReq)
-            mapResponse.LayerData.Array.Add(this.GetLLSDMapLayerResponse());
+        {
-            return mapResponse;
+            LLSDMapLayerResponse mapResponse = new LLSDMapLayerResponse();
-        }
+            mapResponse.LayerData.Array.Add(this.GetLLSDMapLayerResponse());
+            return mapResponse;
-        /// <summary>
+        }
-        /// 
-        /// </summary>
+        /// <summary>
-        /// <returns></returns>
+        /// 
-        protected LLSDMapLayer GetLLSDMapLayerResponse()
+        /// </summary>
-        {
+        /// <returns></returns>
-            LLSDMapLayer mapLayer = new LLSDMapLayer();
+        protected LLSDMapLayer GetLLSDMapLayerResponse()
-            mapLayer.Right = 5000;
+        {
-            mapLayer.Top = 5000;
+            LLSDMapLayer mapLayer = new LLSDMapLayer();
-            mapLayer.ImageID = new LLUUID("00000000-0000-0000-9999-000000000006");
+            mapLayer.Right = 5000;
-            return mapLayer;
+            mapLayer.Top = 5000;
-        }
+            mapLayer.ImageID = new LLUUID("00000000-0000-0000-9999-000000000006");
+            return mapLayer;
-        /// <summary>
+        }
-        /// 
-        /// </summary>
+        /// <summary>
-        /// <param name="request"></param>
+        /// 
-        /// <param name="path"></param>
+        /// </summary>
-        /// <param name="param"></param>
+        /// <param name="request"></param>
-        /// <returns></returns>
+        /// <param name="path"></param>
-        public string RequestTexture(string request, string path, string param)
+        /// <param name="param"></param>
-        {
+        /// <returns></returns>
-            Console.WriteLine("texture request " + request);
+        public string RequestTexture(string request, string path, string param)
-            // Needs implementing (added to remove compiler warning)
+        {
-            return "";
+            Console.WriteLine("texture request " + request);
-        }
+            // Needs implementing (added to remove compiler warning)
+            return "";
-        #region EventQueue (Currently not enabled)
+        }
-        /// <summary>
-        /// 
+        #region EventQueue (Currently not enabled)
-        /// </summary>
+        /// <summary>
-        /// <param name="request"></param>
+        /// 
-        /// <param name="path"></param>
+        /// </summary>
-        /// <param name="param"></param>
+        /// <param name="request"></param>
-        /// <returns></returns>
+        /// <param name="path"></param>
-        public string ProcessEventQueue(string request, string path, string param)
+        /// <param name="param"></param>
-        {
+        /// <returns></returns>
-            string res = "";
+        public string ProcessEventQueue(string request, string path, string param)
-            
+        {
-            if (this.CapsEventQueue.Count > 0)
+            string res = "";
-            {
+            
-                lock (this.CapsEventQueue)
+            if (this.CapsEventQueue.Count > 0)
-                {
+            {
-                    string item = CapsEventQueue.Dequeue();
+                lock (this.CapsEventQueue)
-                    res = item;
+                {
-                }
+                    string item = CapsEventQueue.Dequeue();
-            }
+                    res = item;
-            else
+                }
-            {
+            }
-                res = this.CreateEmptyEventResponse();
+            else
-            }
+            {
-            return res;
+                res = this.CreateEmptyEventResponse();
-        }
+            }
+            return res;
-        /// <summary>
+        }
-        /// 
-        /// </summary>
+        /// <summary>
-        /// <param name="caps"></param>
+        /// 
-        /// <param name="ipAddressPort"></param>
+        /// </summary>
-        /// <returns></returns>
+        /// <param name="caps"></param>
-        public string CreateEstablishAgentComms(string caps, string ipAddressPort)
+        /// <param name="ipAddressPort"></param>
-        {
+        /// <returns></returns>
-            LLSDCapEvent eventItem = new LLSDCapEvent();
+        public string CreateEstablishAgentComms(string caps, string ipAddressPort)
-            eventItem.id = eventQueueCount;
+        {
-            //should be creating a EstablishAgentComms item, but there isn't a class for it yet
+            LLSDCapEvent eventItem = new LLSDCapEvent();
-            eventItem.events.Array.Add(new LLSDEmpty());
+            eventItem.id = eventQueueCount;
-            string res = LLSDHelpers.SerialiseLLSDReply(eventItem);
+            //should be creating a EstablishAgentComms item, but there isn't a class for it yet
-            eventQueueCount++;
+            eventItem.events.Array.Add(new LLSDEmpty());
-            
+            string res = LLSDHelpers.SerialiseLLSDReply(eventItem);
-            this.CapsEventQueue.Enqueue(res);
+            eventQueueCount++;
-            return res;
+            
-        }
+            this.CapsEventQueue.Enqueue(res);
+            return res;
-        /// <summary>
+        }
-        /// 
-        /// </summary>
+        /// <summary>
-        /// <returns></returns>
+        /// 
-        public string CreateEmptyEventResponse()
+        /// </summary>
-        {
+        /// <returns></returns>
-            LLSDCapEvent eventItem = new LLSDCapEvent();
+        public string CreateEmptyEventResponse()
-            eventItem.id = eventQueueCount;
+        {
-            eventItem.events.Array.Add(new LLSDEmpty());
+            LLSDCapEvent eventItem = new LLSDCapEvent();
-            string res = LLSDHelpers.SerialiseLLSDReply(eventItem);
+            eventItem.id = eventQueueCount;
-            eventQueueCount++;
+            eventItem.events.Array.Add(new LLSDEmpty());
-            return res;
+            string res = LLSDHelpers.SerialiseLLSDReply(eventItem);
-        }
+            eventQueueCount++;
-        #endregion
+            return res;
-        
+        }
-        /// <summary>
+        #endregion
-        /// 
-        /// </summary>
+        /// <summary>
-        /// <param name="llsdRequest"></param>
+        /// 
-        /// <returns></returns>
+        /// </summary>
-        public LLSDAssetUploadResponse NewAgentInventoryRequest(LLSDAssetUploadRequest llsdRequest)
+        /// <param name="request"></param>
-        {
+        /// <param name="path"></param>
-          //  Console.WriteLine("asset upload request via CAPS");
+        /// <param name="param"></param>
-            string assetName = llsdRequest.name;
+        /// <returns></returns>
-            string capsBase = "/CAPS/" + m_capsObjectPath;
+        public string NoteCardAgentInventory(string request, string path, string param)
-            LLUUID newAsset = LLUUID.Random();
+        {
-            LLUUID newInvItem = LLUUID.Random();
+            Console.WriteLine("notecard update request " + request);
-            string uploaderPath = Util.RandomClass.Next(5000, 8000).ToString("0000");
+            string assetName = "notecardupdate";
+            string capsBase = "/CAPS/" + m_capsObjectPath;
-            AssetUploader uploader = new AssetUploader(assetName, newAsset, newInvItem, capsBase + uploaderPath, this.httpListener);
+            LLUUID newAsset = LLUUID.Random();
-            httpListener.AddStreamHandler(new BinaryStreamHandler("POST", capsBase + uploaderPath, uploader.uploaderCaps));
+            LLUUID newInvItem = LLUUID.Random();
-            string uploaderURL = "http://" + m_httpListenerHostName + ":" + m_httpListenPort.ToString() + capsBase + uploaderPath;
+            string uploaderPath = Util.RandomClass.Next(5000, 8000).ToString("0000");
-            LLSDAssetUploadResponse uploadResponse = new LLSDAssetUploadResponse();
+            AssetUploader uploader = new AssetUploader(assetName, newAsset, newInvItem, capsBase + uploaderPath, this.httpListener);
-            uploadResponse.uploader = uploaderURL;
+            httpListener.AddStreamHandler(new BinaryStreamHandler("POST", capsBase + uploaderPath, uploader.uploaderCaps));
-            uploadResponse.state = "upload";
+            string uploaderURL = "http://" + m_httpListenerHostName + ":" + m_httpListenPort.ToString() + capsBase + uploaderPath;
-            uploader.OnUpLoad += this.UploadCompleteHandler;
-            return uploadResponse;
+            LLSDAssetUploadResponse uploadResponse = new LLSDAssetUploadResponse();
-        }
+            uploadResponse.uploader = uploaderURL;
+            uploadResponse.state = "upload";
-        /// <summary>
+            //   uploader.OnUpLoad += this.UploadCompleteHandler;
-        /// 
+            return LLSDHelpers.SerialiseLLSDReply(uploadResponse);
-        /// </summary>
+        }
-        /// <param name="assetID"></param>
-        /// <param name="inventoryItem"></param>
+        /// <summary>
-        /// <param name="data"></param>
+        /// 
-        public void UploadCompleteHandler(string assetName, LLUUID assetID, LLUUID inventoryItem, byte[] data)
+        /// </summary>
-        {
+        /// <param name="llsdRequest"></param>
-            AssetBase asset;
+        /// <returns></returns>
-            asset = new AssetBase();
+        public LLSDAssetUploadResponse NewAgentInventoryRequest(LLSDAssetUploadRequest llsdRequest)
-            asset.FullID = assetID;
+        {
-            asset.Type = 0;
+          //  Console.WriteLine("asset upload request via CAPS");
-            asset.InvType = 0;
+            string assetName = llsdRequest.name;
-            asset.Name = assetName; 
+            string capsBase = "/CAPS/" + m_capsObjectPath;
-            asset.Data = data;
+            LLUUID newAsset = LLUUID.Random();
-            this.assetCache.AddAsset(asset);
+            LLUUID newInvItem = LLUUID.Random();
-        }
+            string uploaderPath = Util.RandomClass.Next(5000, 8000).ToString("0000");
-        public class AssetUploader
+            AssetUploader uploader = new AssetUploader(assetName, newAsset, newInvItem, capsBase + uploaderPath, this.httpListener);
-        {
+            httpListener.AddStreamHandler(new BinaryStreamHandler("POST", capsBase + uploaderPath, uploader.uploaderCaps));
-            public event UpLoadedTexture OnUpLoad;
+            string uploaderURL = "http://" + m_httpListenerHostName + ":" + m_httpListenPort.ToString() + capsBase + uploaderPath;
-            private string uploaderPath = "";
+            LLSDAssetUploadResponse uploadResponse = new LLSDAssetUploadResponse();
-            private LLUUID newAssetID;
+            uploadResponse.uploader = uploaderURL;
-            private LLUUID inventoryItemID;
+            uploadResponse.state = "upload";
-            private BaseHttpServer httpListener;
+            uploader.OnUpLoad += this.UploadCompleteHandler;
-            private bool SaveImages = false;
+            return uploadResponse;
-            private string m_assetName = "";
+        }
-            /// <summary>
+        /// <summary>
-            /// 
+        /// 
-            /// </summary>
+        /// </summary>
-            /// <param name="assetID"></param>
+        /// <param name="assetID"></param>
-            /// <param name="inventoryItem"></param>
+        /// <param name="inventoryItem"></param>
-            /// <param name="path"></param>
+        /// <param name="data"></param>
-            /// <param name="httpServer"></param>
+        public void UploadCompleteHandler(string assetName, LLUUID assetID, LLUUID inventoryItem, byte[] data)
-            public AssetUploader(string assetName, LLUUID assetID, LLUUID inventoryItem, string path, BaseHttpServer httpServer)
+        {
-            {
+            AssetBase asset;
-                m_assetName = assetName;
+            asset = new AssetBase();
-                newAssetID = assetID;
+            asset.FullID = assetID;
-                inventoryItemID = inventoryItem;
+            asset.Type = 0;
-                uploaderPath = path;
+            asset.InvType = 0;
-                httpListener = httpServer;
+            asset.Name = assetName; 
-            }
+            asset.Data = data;
+            this.assetCache.AddAsset(asset);
-            /// <summary>
+        }
-            /// 
-            /// </summary>
+        public class AssetUploader
-            /// <param name="data"></param>
+        {
-            /// <param name="path"></param>
+            public event UpLoadedTexture OnUpLoad;
-            /// <param name="param"></param>
-            /// <returns></returns>
+            private string uploaderPath = "";
-            public string uploaderCaps(byte[] data, string path, string param)
+            private LLUUID newAssetID;
-            {
+            private LLUUID inventoryItemID;
-                LLUUID inv = this.inventoryItemID;
+            private BaseHttpServer httpListener;
-                string res = "";
+            private bool SaveImages = true;
-                LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete();
+            private string m_assetName = "";
-                uploadComplete.new_asset = newAssetID.ToStringHyphenated();
-                uploadComplete.new_inventory_item = inv;
+            /// <summary>
-                uploadComplete.state = "complete";
+            /// 
-                res = LLSDHelpers.SerialiseLLSDReply(uploadComplete);
+            /// </summary>
-             
+            /// <param name="assetID"></param>
-                httpListener.RemoveStreamHandler("POST", uploaderPath);
+            /// <param name="inventoryItem"></param>
+            /// <param name="path"></param>
-                if(this.SaveImages)
+            /// <param name="httpServer"></param>
-                    this.SaveImageToFile(m_assetName + ".jp2", data);
+            public AssetUploader(string assetName, LLUUID assetID, LLUUID inventoryItem, string path, BaseHttpServer httpServer)
+            {
-                if (OnUpLoad != null)
+                m_assetName = assetName;
-                {
+                newAssetID = assetID;
-                    OnUpLoad(m_assetName, newAssetID, inv, data);
+                inventoryItemID = inventoryItem;
-                }
+                uploaderPath = path;
-                
+                httpListener = httpServer;
-                return res;
+            }
-            }
+            /// <summary>
-            private void SaveImageToFile(string filename, byte[] data)
+            /// 
-            {
+            /// </summary>
-               
+            /// <param name="data"></param>
-               FileStream fs = File.Create(filename);
+            /// <param name="path"></param>
-               BinaryWriter bw = new BinaryWriter(fs);
+            /// <param name="param"></param>
-               bw.Write(data);
+            /// <returns></returns>
-               bw.Close();
+            public string uploaderCaps(byte[] data, string path, string param)
-               fs.Close();
+            {
-            }
+                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/Region/Capabilities/LLSDArray.cs b/OpenSim/Framework/Communications/Capabilities/LLSDArray.cs
index d3e1979..e04849f 100644
--- a/OpenSim/Region/Capabilities/LLSDArray.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDArray.cs
@@ -1,42 +1,42 @@
-/*
+/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
+* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
+*
-* Redistribution and use in source and binary forms, with or without
+* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
+* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
+*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
+*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
+*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
+*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
+*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
+*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
+*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
+*       derived from this software without specific prior written permission.
-*
+*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* 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
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
+* 
-*/
+*/
-using System.Collections;
+using System.Collections;
-namespace OpenSim.Region.Capabilities
+namespace OpenSim.Region.Capabilities
-{
+{
-    [LLSDType("ARRAY")]
+    [LLSDType("ARRAY")]
-    public class LLSDArray
+    public class LLSDArray
-    {
+    {
-        public ArrayList Array = new ArrayList();
+        public ArrayList Array = new ArrayList();
-        public LLSDArray()
+        public LLSDArray()
-        {
+        {
-        }
+        }
-    }
+    }
-}
+}
diff --git a/OpenSim/Region/Capabilities/LLSDAssetUploadComplete.cs b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadComplete.cs
index 5718b8f..ce373c0 100644
--- a/OpenSim/Region/Capabilities/LLSDAssetUploadComplete.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadComplete.cs
@@ -1,44 +1,45 @@
-/*
+/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
+* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
+*
-* Redistribution and use in source and binary forms, with or without
+* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
+* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
+*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
+*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
+*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
+*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
+*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
+*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
+*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
+*       derived from this software without specific prior written permission.
-*
+*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* 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
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
+* 
-*/
+*/
-using libsecondlife;
+using libsecondlife;
-namespace OpenSim.Region.Capabilities
+namespace OpenSim.Region.Capabilities
-{
+{
-    [LLSDType("MAP")]
+    [LLSDType("MAP")]
-    public class LLSDAssetUploadComplete
+    public class LLSDAssetUploadComplete
-    {
+    {
-        public string new_asset = "";
+        public string new_asset = "";
-        public LLUUID new_inventory_item = LLUUID.Zero;
+        public LLUUID new_inventory_item = LLUUID.Zero;
-        public string state = "";
+        public string state = "";
+        //public bool success = false;
-        public LLSDAssetUploadComplete()
-        {
+        public LLSDAssetUploadComplete()
+        {
-        }
-    }
+        }
-}
+    }
+}
diff --git a/OpenSim/Region/Capabilities/LLSDAssetUploadRequest.cs b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs
index 0096fb1..7ef77cb 100644
--- a/OpenSim/Region/Capabilities/LLSDAssetUploadRequest.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs
@@ -1,21 +1,21 @@
-using System;
+using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.Text;
+using System.Text;
-using libsecondlife;
+using libsecondlife;
-namespace OpenSim.Region.Capabilities
+namespace OpenSim.Region.Capabilities
-{
+{
-    [LLSDMap]
+    [LLSDMap]
-    public class LLSDAssetUploadRequest
+    public class LLSDAssetUploadRequest
-    {
+    {
-        public string asset_type = "";
+        public string asset_type = "";
-        public string description = "";
+        public string description = "";
-        public LLUUID folder_id = LLUUID.Zero;
+        public LLUUID folder_id = LLUUID.Zero;
-        public string inventory_type = "";
+        public string inventory_type = "";
-        public string name = "";
+        public string name = "";
-        public LLSDAssetUploadRequest()
+        public LLSDAssetUploadRequest()
-        {
+        {
-        }
+        }
-    }
+    }
-}
+}
diff --git a/OpenSim/Region/Capabilities/LLSDAssetUploadResponse.cs b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs
index 2a2a5d1..1a620ae 100644
--- a/OpenSim/Region/Capabilities/LLSDAssetUploadResponse.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs
@@ -1,18 +1,18 @@
-using System;
+using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.Text;
+using System.Text;
-namespace OpenSim.Region.Capabilities
+namespace OpenSim.Region.Capabilities
-{
+{
-    [LLSDMap]
+    [LLSDMap]
-    public class LLSDAssetUploadResponse
+    public class LLSDAssetUploadResponse
-    {
+    {
-        public string uploader = "";
+        public string uploader = "";
-        public string state = "";
+        public string state = "";
-        public LLSDAssetUploadResponse()
+        public LLSDAssetUploadResponse()
-        {
+        {
-        }
+        }
-    }
+    }
-}
+}
diff --git a/OpenSim/Region/Capabilities/LLSDCapEvent.cs b/OpenSim/Framework/Communications/Capabilities/LLSDCapEvent.cs
index 2c2689b..51b4fe0 100644
--- a/OpenSim/Region/Capabilities/LLSDCapEvent.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDCapEvent.cs
@@ -1,41 +1,41 @@
-/*
+/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
+* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
+*
-* Redistribution and use in source and binary forms, with or without
+* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
+* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
+*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
+*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
+*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
+*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
+*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
+*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
+*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
+*       derived from this software without specific prior written permission.
-*
+*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* 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
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
+* 
-*/
+*/
-namespace OpenSim.Region.Capabilities
+namespace OpenSim.Region.Capabilities
-{
+{
-    [LLSDType("MAP")]
+    [LLSDType("MAP")]
-    public class LLSDCapEvent
+    public class LLSDCapEvent
-    {
+    {
-        public int id = 0;
+        public int id = 0;
-        public LLSDArray events = new LLSDArray();
+        public LLSDArray events = new LLSDArray();
-        public LLSDCapEvent()
+        public LLSDCapEvent()
-        {
+        {
-        }
+        }
-    }
+    }
-}
+}
diff --git a/OpenSim/Region/Capabilities/LLSDCapsDetails.cs b/OpenSim/Framework/Communications/Capabilities/LLSDCapsDetails.cs
index 132b8f7..3b6a629 100644
--- a/OpenSim/Region/Capabilities/LLSDCapsDetails.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDCapsDetails.cs
@@ -1,17 +1,18 @@
-namespace OpenSim.Region.Capabilities
+namespace OpenSim.Region.Capabilities
-{
+{
-    [LLSDType("MAP")]
+    [LLSDType("MAP")]
-    public class LLSDCapsDetails
+    public class LLSDCapsDetails
-    {
+    {
-        public string MapLayer = "";
+        public string MapLayer = "";
-        public string NewFileAgentInventory = "";
+        public string NewFileAgentInventory = "";
-        //public string EventQueueGet = "";
+        //public string EventQueueGet = "";
-        //public string RequestTextureDownload = "";
+        //public string RequestTextureDownload = "";
-        //public string ChatSessionRequest = "";
+        //public string ChatSessionRequest = "";
+        public string UpdateNotecardAgentInventory = "";
-        public LLSDCapsDetails()
-        {
+        public LLSDCapsDetails()
+        {
-        }
-    }
+        }
-}
+    }
+}
diff --git a/OpenSim/Region/Capabilities/LLSDEmpty.cs b/OpenSim/Framework/Communications/Capabilities/LLSDEmpty.cs
index ca27c9d..d79c09e 100644
--- a/OpenSim/Region/Capabilities/LLSDEmpty.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDEmpty.cs
@@ -1,38 +1,38 @@
-/*
+/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
+* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
+*
-* Redistribution and use in source and binary forms, with or without
+* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
+* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
+*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
+*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
+*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
+*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
+*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
+*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
+*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
+*       derived from this software without specific prior written permission.
-*
+*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* 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
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
+* 
-*/
+*/
-namespace OpenSim.Region.Capabilities
+namespace OpenSim.Region.Capabilities
-{
+{
-    [LLSDType("MAP")]
+    [LLSDType("MAP")]
-    public class LLSDEmpty
+    public class LLSDEmpty
-    {
+    {
-        public LLSDEmpty()
+        public LLSDEmpty()
-        {
+        {
-        }
+        }
-    }
+    }
-}
+}
diff --git a/OpenSim/Region/Capabilities/LLSDHelpers.cs b/OpenSim/Framework/Communications/Capabilities/LLSDHelpers.cs
index efeb9b1..19ef0c9 100644
--- a/OpenSim/Region/Capabilities/LLSDHelpers.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDHelpers.cs
@@ -1,164 +1,164 @@
-/*
+/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
+* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
+*
-* Redistribution and use in source and binary forms, with or without
+* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
+* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
+*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
+*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
+*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
+*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
+*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
+*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
+*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
+*       derived from this software without specific prior written permission.
-*
+*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* 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
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
+* 
-*/
+*/
-using System;
+using System;
-using System.Collections;
+using System.Collections;
-using System.IO;
+using System.IO;
-using System.Reflection;
+using System.Reflection;
-using System.Xml;
+using System.Xml;
-using libsecondlife;
+using libsecondlife;
-namespace OpenSim.Region.Capabilities
+namespace OpenSim.Region.Capabilities
-{
+{
-    public class LLSDHelpers
+    public class LLSDHelpers
-    {
+    {
-        public static string SerialiseLLSDReply(object obj)
+        public static string SerialiseLLSDReply(object obj)
-        {
+        {
-            StringWriter sw = new StringWriter();
+            StringWriter sw = new StringWriter();
-            XmlTextWriter writer = new XmlTextWriter(sw);
+            XmlTextWriter writer = new XmlTextWriter(sw);
-            writer.Formatting = Formatting.None;
+            writer.Formatting = Formatting.None;
-            writer.WriteStartElement(String.Empty, "llsd", String.Empty);
+            writer.WriteStartElement(String.Empty, "llsd", String.Empty);
-            SerializeLLSDType(writer, obj);
+            SerializeLLSDType(writer, obj);
-            writer.WriteEndElement();
+            writer.WriteEndElement();
-            writer.Close();
+            writer.Close();
-            return sw.ToString();
+            return sw.ToString();
-        }
+        }
-        public static void SerializeLLSDType(XmlTextWriter writer, object obj)
+        public static void SerializeLLSDType(XmlTextWriter writer, object obj)
-        {
+        {
-            Type myType = obj.GetType();
+            Type myType = obj.GetType();
-            LLSDType[] llsdattributes = (LLSDType[])myType.GetCustomAttributes(typeof(LLSDType), false);
+            LLSDType[] llsdattributes = (LLSDType[])myType.GetCustomAttributes(typeof(LLSDType), false);
-            if (llsdattributes.Length > 0)
+            if (llsdattributes.Length > 0)
-            {
+            {
-                switch (llsdattributes[0].ObjectType)
+                switch (llsdattributes[0].ObjectType)
-                {
+                {
-                    case "MAP":
+                    case "MAP":
-                        writer.WriteStartElement(String.Empty, "map", String.Empty);
+                        writer.WriteStartElement(String.Empty, "map", String.Empty);
-                        FieldInfo[] fields = myType.GetFields();
+                        FieldInfo[] fields = myType.GetFields();
-                        for (int i = 0; i < fields.Length; i++)
+                        for (int i = 0; i < fields.Length; i++)
-                        {
+                        {
-                            object fieldValue = fields[i].GetValue(obj);
+                            object fieldValue = fields[i].GetValue(obj);
-                            LLSDType[] fieldAttributes = (LLSDType[])fieldValue.GetType().GetCustomAttributes(typeof(LLSDType), false);
+                            LLSDType[] fieldAttributes = (LLSDType[])fieldValue.GetType().GetCustomAttributes(typeof(LLSDType), false);
-                            if (fieldAttributes.Length > 0)
+                            if (fieldAttributes.Length > 0)
-                            {
+                            {
-                                writer.WriteStartElement(String.Empty, "key", String.Empty);
+                                writer.WriteStartElement(String.Empty, "key", String.Empty);
-                                writer.WriteString(fields[i].Name);
+                                writer.WriteString(fields[i].Name);
-                                writer.WriteEndElement();
+                                writer.WriteEndElement();
-                                SerializeLLSDType(writer, fieldValue);
+                                SerializeLLSDType(writer, fieldValue);
-                            }
+                            }
-                            else
+                            else
-                            {
+                            {
-                                writer.WriteStartElement(String.Empty, "key", String.Empty);
+                                writer.WriteStartElement(String.Empty, "key", String.Empty);
-                                writer.WriteString(fields[i].Name);
+                                writer.WriteString(fields[i].Name);
-                                writer.WriteEndElement();
+                                writer.WriteEndElement();
-                                LLSD.LLSDWriteOne(writer, fieldValue);
+                                LLSD.LLSDWriteOne(writer, fieldValue);
-                            }
+                            }
-                        }
+                        }
-                        writer.WriteEndElement();
+                        writer.WriteEndElement();
-                        break;
+                        break;
-                    case "ARRAY":
+                    case "ARRAY":
-                        // LLSDArray arrayObject = obj as LLSDArray;
+                        // LLSDArray arrayObject = obj as LLSDArray;
-                        // ArrayList a = arrayObject.Array;
+                        // ArrayList a = arrayObject.Array;
-                        ArrayList a = (ArrayList)obj.GetType().GetField("Array").GetValue(obj);
+                        ArrayList a = (ArrayList)obj.GetType().GetField("Array").GetValue(obj);
-                        if (a != null)
+                        if (a != null)
-                        {
+                        {
-                            writer.WriteStartElement(String.Empty, "array", String.Empty);
+                            writer.WriteStartElement(String.Empty, "array", String.Empty);
-                            foreach (object item in a)
+                            foreach (object item in a)
-                            {
+                            {
-                                SerializeLLSDType(writer, item);
+                                SerializeLLSDType(writer, item);
-                            }
+                            }
-                            writer.WriteEndElement();
+                            writer.WriteEndElement();
-                        }
+                        }
-                        break;
+                        break;
-                }
+                }
-            }
+            }
-            else
+            else
-            {
+            {
-                LLSD.LLSDWriteOne(writer, obj);
+                LLSD.LLSDWriteOne(writer, obj);
-            }
+            }
-        }
+        }
-        public static object DeserialiseLLSDMap(Hashtable llsd, object obj)
+        public static object DeserialiseLLSDMap(Hashtable llsd, object obj)
-        {
+        {
-            Type myType = obj.GetType();
+            Type myType = obj.GetType();
-            LLSDType[] llsdattributes = (LLSDType[])myType.GetCustomAttributes(typeof(LLSDType), false);
+            LLSDType[] llsdattributes = (LLSDType[])myType.GetCustomAttributes(typeof(LLSDType), false);
-            if (llsdattributes.Length > 0)
+            if (llsdattributes.Length > 0)
-            {
+            {
-                switch (llsdattributes[0].ObjectType)
+                switch (llsdattributes[0].ObjectType)
-                {
+                {
-                    case "MAP":
+                    case "MAP":
-                        IDictionaryEnumerator enumerator = llsd.GetEnumerator();
+                        IDictionaryEnumerator enumerator = llsd.GetEnumerator();
-                        while (enumerator.MoveNext())
+                        while (enumerator.MoveNext())
-                        {
+                        {
-                            FieldInfo field = myType.GetField((string)enumerator.Key);
+                            FieldInfo field = myType.GetField((string)enumerator.Key);
-                            if (field != null)
+                            if (field != null)
-                            {
+                            {
-                                if (enumerator.Value is Hashtable)
+                                if (enumerator.Value is Hashtable)
-                                {
+                                {
-                                    object fieldValue = field.GetValue(obj);
+                                    object fieldValue = field.GetValue(obj);
-                                    DeserialiseLLSDMap((Hashtable) enumerator.Value, fieldValue);
+                                    DeserialiseLLSDMap((Hashtable) enumerator.Value, fieldValue);
-                                }
+                                }
-                                else if (enumerator.Value is ArrayList)
+                                else if (enumerator.Value is ArrayList)
-                                {
+                                {
-                                    object fieldValue = field.GetValue(obj);
+                                    object fieldValue = field.GetValue(obj);
-                                    fieldValue.GetType().GetField("Array").SetValue(fieldValue, enumerator.Value);
+                                    fieldValue.GetType().GetField("Array").SetValue(fieldValue, enumerator.Value);
-                                    //TODO
+                                    //TODO
-                                    // the LLSD map/array types in the array need to be deserialised
+                                    // 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. 
+                                    // but first we need to know the right class to deserialise them into. 
-                                }
+                                }
-                                else
+                                else
-                                {
+                                {
-                                    field.SetValue(obj, enumerator.Value);
+                                    field.SetValue(obj, enumerator.Value);
-                                }
+                                }
-                            }
+                            }
-                        }
+                        }
-                        break;
+                        break;
-                }
+                }
-            }
+            }
-            return obj;
+            return obj;
-        }
+        }
-    }
+    }
-    
+    
-    
+    
-   
+   
-    
+    
-    
+    
-    
+    
-    
+    
-    
+    
-    
+    
-}
+}
diff --git a/OpenSim/Region/Capabilities/LLSDMapLayer.cs b/OpenSim/Framework/Communications/Capabilities/LLSDMapLayer.cs
index e0c006c..566d0e9 100644
--- a/OpenSim/Region/Capabilities/LLSDMapLayer.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDMapLayer.cs
@@ -1,46 +1,46 @@
-/*
+/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
+* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
+*
-* Redistribution and use in source and binary forms, with or without
+* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
+* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
+*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
+*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
+*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
+*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
+*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
+*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
+*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
+*       derived from this software without specific prior written permission.
-*
+*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* 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
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
+* 
-*/
+*/
-using libsecondlife;
+using libsecondlife;
-namespace OpenSim.Region.Capabilities
+namespace OpenSim.Region.Capabilities
-{
+{
-    [LLSDType("MAP")]
+    [LLSDType("MAP")]
-    public class LLSDMapLayer
+    public class LLSDMapLayer
-    {
+    {
-        public int Left = 0;
+        public int Left = 0;
-        public int Right = 0;
+        public int Right = 0;
-        public int Top = 0;
+        public int Top = 0;
-        public int Bottom = 0;
+        public int Bottom = 0;
-        public LLUUID ImageID = LLUUID.Zero;
+        public LLUUID ImageID = LLUUID.Zero;
-        public LLSDMapLayer()
+        public LLSDMapLayer()
-        {
+        {
-        }
+        }
-    }
+    }
-}
+}
diff --git a/OpenSim/Region/Capabilities/LLSDMapLayerResponse.cs b/OpenSim/Framework/Communications/Capabilities/LLSDMapLayerResponse.cs
index 8b9837b..ce746ae 100644
--- a/OpenSim/Region/Capabilities/LLSDMapLayerResponse.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDMapLayerResponse.cs
@@ -1,41 +1,41 @@
-/*
+/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
+* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
+*
-* Redistribution and use in source and binary forms, with or without
+* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
+* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
+*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
+*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
+*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
+*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
+*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
+*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
+*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
+*       derived from this software without specific prior written permission.
-*
+*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* 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
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
+* 
-*/
+*/
-namespace OpenSim.Region.Capabilities
+namespace OpenSim.Region.Capabilities
-{
+{
-    [LLSDType("MAP")]
+    [LLSDType("MAP")]
-    public class LLSDMapLayerResponse
+    public class LLSDMapLayerResponse
-    {
+    {
-        public LLSDMapRequest AgentData = new LLSDMapRequest();
+        public LLSDMapRequest AgentData = new LLSDMapRequest();
-        public LLSDArray LayerData = new LLSDArray();
+        public LLSDArray LayerData = new LLSDArray();
-        public LLSDMapLayerResponse()
+        public LLSDMapLayerResponse()
-        {
+        {
-        }
+        }
-    }
+    }
-}
+}
diff --git a/OpenSim/Region/Capabilities/LLSDMapRequest.cs b/OpenSim/Framework/Communications/Capabilities/LLSDMapRequest.cs
index 8ac7943..fb739cd 100644
--- a/OpenSim/Region/Capabilities/LLSDMapRequest.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDMapRequest.cs
@@ -1,13 +1,13 @@
-namespace OpenSim.Region.Capabilities
+namespace OpenSim.Region.Capabilities
-{
+{
-    [LLSDType("MAP")]
+    [LLSDType("MAP")]
-    public class LLSDMapRequest
+    public class LLSDMapRequest
-    {
+    {
-        public int Flags = 0;
+        public int Flags = 0;
-        public LLSDMapRequest()
+        public LLSDMapRequest()
-        {
+        {
-        }
+        }
-    }
+    }
-}
+}
diff --git a/OpenSim/Region/Capabilities/LLSDMethod.cs b/OpenSim/Framework/Communications/Capabilities/LLSDMethod.cs
index 068d539..5f42f44 100644
--- a/OpenSim/Region/Capabilities/LLSDMethod.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDMethod.cs
@@ -1,8 +1,8 @@
-using System;
+using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.Text;
+using System.Text;
-namespace OpenSim.Region.Capabilities
+namespace OpenSim.Region.Capabilities
-{
+{
-    public delegate TResponse LLSDMethod<TRequest, TResponse>(TRequest request);
+    public delegate TResponse LLSDMethod<TRequest, TResponse>(TRequest request);
-}
+}
diff --git a/OpenSim/Region/Capabilities/LLSDStreamHandler.cs b/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs
index d98e23f..7d99b6e 100644
--- a/OpenSim/Region/Capabilities/LLSDStreamHandler.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs
@@ -1,42 +1,42 @@
-using System;
+using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.Text;
+using System.Text;
-using OpenSim.Framework.Servers;
+using OpenSim.Framework.Servers;
-using System.IO;
+using System.IO;
-using System.Collections;
+using System.Collections;
-using libsecondlife;
+using libsecondlife;
-namespace OpenSim.Region.Capabilities
+namespace OpenSim.Region.Capabilities
-{
+{
-    public class LLSDStreamhandler<TRequest, TResponse> : BaseStreamHandler
+    public class LLSDStreamhandler<TRequest, TResponse> : BaseStreamHandler
-        where TRequest : new()
+        where TRequest : new()
-    {
+    {
-        private LLSDMethod<TRequest, TResponse> m_method;
+        private LLSDMethod<TRequest, TResponse> m_method;
-        public LLSDStreamhandler(string httpMethod, string path, LLSDMethod<TRequest, TResponse> method)
+        public LLSDStreamhandler(string httpMethod, string path, LLSDMethod<TRequest, TResponse> method)
-            : base(httpMethod, path )
+            : base(httpMethod, path )
-        {
+        {
-            m_method = method;
+            m_method = method;
-        }
+        }
-        
+        
-        public override byte[] Handle(string path, Stream request)
+        public override byte[] Handle(string path, Stream request)
-        {
+        {
-            //Encoding encoding = Encoding.UTF8;
+            //Encoding encoding = Encoding.UTF8;
-            //StreamReader streamReader = new StreamReader(request, false);
+            //StreamReader streamReader = new StreamReader(request, false);
-            //string requestBody = streamReader.ReadToEnd();
+            //string requestBody = streamReader.ReadToEnd();
-            //streamReader.Close();
+            //streamReader.Close();
-            Hashtable hash = (Hashtable)LLSD.LLSDDeserialize( request );
+            Hashtable hash = (Hashtable)LLSD.LLSDDeserialize( request );
-            TRequest llsdRequest = new TRequest();
+            TRequest llsdRequest = new TRequest();
-            LLSDHelpers.DeserialiseLLSDMap(hash, llsdRequest);
+            LLSDHelpers.DeserialiseLLSDMap(hash, llsdRequest);
-            TResponse response = m_method(llsdRequest);
+            TResponse response = m_method(llsdRequest);
-            Encoding encoding = new UTF8Encoding(false);
+            Encoding encoding = new UTF8Encoding(false);
-            
+            
-            return encoding.GetBytes( LLSDHelpers.SerialiseLLSDReply(response) );
+            return encoding.GetBytes( LLSDHelpers.SerialiseLLSDReply(response) );
-        }
+        }
-    }
+    }
-}
+}
diff --git a/OpenSim/Region/Capabilities/LLSDTest.cs b/OpenSim/Framework/Communications/Capabilities/LLSDTest.cs
index 78ccf67..f23e327 100644
--- a/OpenSim/Region/Capabilities/LLSDTest.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDTest.cs
@@ -1,41 +1,41 @@
-/*
+/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
+* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
+*
-* Redistribution and use in source and binary forms, with or without
+* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
+* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
+*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
+*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
+*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
+*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
+*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
+*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
+*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
+*       derived from this software without specific prior written permission.
-*
+*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* 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
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
+* 
-*/
+*/
-namespace OpenSim.Region.Capabilities
+namespace OpenSim.Region.Capabilities
-{
+{
-    [LLSDType("MAP")]
+    [LLSDType("MAP")]
-    public class LLSDTest
+    public class LLSDTest
-    {
+    {
-        public int Test1 = 20;
+        public int Test1 = 20;
-        public int Test2 = 10;
+        public int Test2 = 10;
-        public LLSDTest()
+        public LLSDTest()
-        {
+        {
-        }
+        }
-    }
+    }
-}
+}
diff --git a/OpenSim/Region/Capabilities/LLSDType.cs b/OpenSim/Framework/Communications/Capabilities/LLSDType.cs
index 04f4d9a..c58a937 100644
--- a/OpenSim/Region/Capabilities/LLSDType.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDType.cs
@@ -1,59 +1,59 @@
-/*
+/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
+* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
+*
-* Redistribution and use in source and binary forms, with or without
+* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
+* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
+*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
+*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
+*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
+*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
+*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
+*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
+*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
+*       derived from this software without specific prior written permission.
-*
+*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* 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
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
+* 
-*/
+*/
-using System;
+using System;
-namespace OpenSim.Region.Capabilities
+namespace OpenSim.Region.Capabilities
-{
+{
-    [AttributeUsage(AttributeTargets.Class)]
+    [AttributeUsage(AttributeTargets.Class)]
-    public class LLSDType : Attribute
+    public class LLSDType : Attribute
-    {
+    {
-        protected string myType;
+        protected string myType;
-        public LLSDType(string type)
+        public LLSDType(string type)
-        {
+        {
-            myType = type;
+            myType = type;
-        }
+        }
-        public string ObjectType
+        public string ObjectType
-        {
+        {
-            get
+            get
-            {
+            {
-                return myType;
+                return myType;
-            }
+            }
-        }
+        }
-    }
+    }
-    [AttributeUsage(AttributeTargets.Class)]
+    [AttributeUsage(AttributeTargets.Class)]
-    public class LLSDMap : LLSDType
+    public class LLSDMap : LLSDType
-    {
+    {
-        public LLSDMap() : base( "MAP" )
+        public LLSDMap() : base( "MAP" )
-        {
+        {
-        }
+        }
-    }
+    }
-}
+}
author	MW	2007-07-22 11:44:36 +0000
committer	MW	2007-07-22 11:44:36 +0000
commit	70fa30204272e874b8e3acccdc2e22cd4e42b2b2 (patch)
tree	2f6c3c0f3b3bd60d5972f8dea6b3abeae4dc9065 /OpenSim/Region/Capabilities
parent	* Aerobic erosion now uses Navier Stokes algorithms for wind calculations. (diff)
download	opensim-SC-70fa30204272e874b8e3acccdc2e22cd4e42b2b2.zip opensim-SC-70fa30204272e874b8e3acccdc2e22cd4e42b2b2.tar.gz opensim-SC-70fa30204272e874b8e3acccdc2e22cd4e42b2b2.tar.bz2 opensim-SC-70fa30204272e874b8e3acccdc2e22cd4e42b2b2.tar.xz