Update svn properties.

26 files changed, 3275 insertions, 3275 deletions

diff --git a/OpenSim/Framework/Capabilities/Caps.cs b/OpenSim/Framework/Capabilities/Caps.cs
index 12bf04d..df29c4e 100644
--- a/OpenSim/Framework/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Capabilities/Caps.cs
@@ -1,1212 +1,1212 @@
-/*

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

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

- *

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

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

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

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

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

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

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

- *     * Neither the name of the OpenSimulator 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.IO;

-using System.Reflection;

-using log4net;

-using OpenMetaverse;

-using OpenSim.Framework.Servers;

-using OpenSim.Framework.Servers.HttpServer;

-using OpenSim.Services.Interfaces;

-

-// using OpenSim.Region.Framework.Interfaces;

-

-namespace OpenSim.Framework.Capabilities

-{

-    public delegate void UpLoadedAsset(

-        string assetName, string description, UUID assetID, UUID inventoryItem, UUID parentFolder,

-        byte[] data, string inventoryType, string assetType);

-

-    public delegate UUID UpdateItem(UUID itemID, byte[] data);

-

-    public delegate void UpdateTaskScript(UUID itemID, UUID primID, bool isScriptRunning, byte[] data);

-

-    public delegate void NewInventoryItem(UUID userID, InventoryItemBase item);

-

-    public delegate void NewAsset(AssetBase asset);

-

-    public delegate UUID ItemUpdatedCallback(UUID userID, UUID itemID, byte[] data);

-

-    public delegate void TaskScriptUpdatedCallback(UUID userID, UUID itemID, UUID primID,

-                                                   bool isScriptRunning, byte[] data);

-

-    public delegate List<InventoryItemBase> FetchInventoryDescendentsCAPS(UUID agentID, UUID folderID, UUID ownerID,

-                                                                          bool fetchFolders, bool fetchItems, int sortOrder);

-

-    /// <summary>

-    /// XXX Probably not a particularly nice way of allow us to get the scene presence from the scene (chiefly so that

-    /// we can popup a message on the user's client if the inventory service has permanently failed).  But I didn't want

-    /// to just pass the whole Scene into CAPS.

-    /// </summary>

-    public delegate IClientAPI GetClientDelegate(UUID agentID);

-

-    public class Caps

-    {

-        private static readonly ILog m_log =

-            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);

-

-        private string m_httpListenerHostName;

-        private uint m_httpListenPort;

-

-        /// <summary>

-        /// This is the uuid portion of every CAPS path.  It is used to make capability urls private to the requester.

-        /// </summary>

-        private string m_capsObjectPath;

-        public string CapsObjectPath { get { return m_capsObjectPath; } }

-

-        private CapsHandlers m_capsHandlers;

-

-        private static readonly string m_requestPath = "0000/";

-        // private static readonly string m_mapLayerPath = "0001/";

-        private static readonly string m_newInventory = "0002/";

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

-        private static readonly string m_notecardUpdatePath = "0004/";

-        private static readonly string m_notecardTaskUpdatePath = "0005/";

-        // private static readonly string m_fetchInventoryPath = "0006/";

-

-        // The following entries are in a module, however, they are also here so that we don't re-assign

-        // the path to another cap by mistake.

-        // private static readonly string m_parcelVoiceInfoRequestPath = "0007/"; // This is in a module.

-        // private static readonly string m_provisionVoiceAccountRequestPath = "0008/";// This is in a module.

-

-        // private static readonly string m_remoteParcelRequestPath = "0009/";// This is in the LandManagementModule.

-

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

-        private IHttpServer m_httpListener;

-        private UUID m_agentID;

-        private IAssetService m_assetCache;

-        private int m_eventQueueCount = 1;

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

-        private bool m_dumpAssetsToFile;

-        private string m_regionName;

-

-        public bool SSLCaps

-        {

-            get { return m_httpListener.UseSSL; }

-        }

-        public string SSLCommonName

-        {

-            get { return m_httpListener.SSLCommonName; }

-        }

-        public CapsHandlers CapsHandlers

-        {

-            get { return m_capsHandlers; }

-        }

-

-        // These are callbacks which will be setup by the scene so that we can update scene data when we

-        // receive capability calls

-        public NewInventoryItem AddNewInventoryItem = null;

-        public NewAsset AddNewAsset = null;

-        public ItemUpdatedCallback ItemUpdatedCall = null;

-        public TaskScriptUpdatedCallback TaskScriptUpdatedCall = null;

-        public FetchInventoryDescendentsCAPS CAPSFetchInventoryDescendents = null;

-        public GetClientDelegate GetClient = null;

-

-        public Caps(IAssetService assetCache, IHttpServer httpServer, string httpListen, uint httpPort, string capsPath,

-                    UUID agent, bool dumpAssetsToFile, string regionName)

-        {

-            m_assetCache = assetCache;

-            m_capsObjectPath = capsPath;

-            m_httpListener = httpServer;

-            m_httpListenerHostName = httpListen;

-

-            m_httpListenPort = httpPort;

-

-            if (httpServer.UseSSL)

-            {

-                m_httpListenPort = httpServer.SSLPort;

-                httpListen = httpServer.SSLCommonName;

-                httpPort = httpServer.SSLPort;

-            }

-

-            m_agentID = agent;

-            m_dumpAssetsToFile = dumpAssetsToFile;

-            m_capsHandlers = new CapsHandlers(httpServer, httpListen, httpPort, httpServer.UseSSL);

-            m_regionName = regionName;

-        }

-

-        /// <summary>

-        /// Register all CAPS http service handlers

-        /// </summary>

-        public void RegisterHandlers()

-        {

-            DeregisterHandlers();

-

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

-

-            RegisterRegionServiceHandlers(capsBase);

-            RegisterInventoryServiceHandlers(capsBase);

-

-        }

-

-        public void RegisterRegionServiceHandlers(string capsBase)

-        {

-            try

-            {

-                // the root of all evil

-                m_capsHandlers["SEED"] = new RestStreamHandler("POST", capsBase + m_requestPath, CapsRequest);

-                m_log.DebugFormat(

-                    "[CAPS]: Registered seed capability {0} for {1}", capsBase + m_requestPath, m_agentID);

-

-                //m_capsHandlers["MapLayer"] =

-                //    new LLSDStreamhandler<OSDMapRequest, OSDMapLayerResponse>("POST",

-                //                                                                capsBase + m_mapLayerPath,

-                //                                                                GetMapLayer);

-                m_capsHandlers["UpdateScriptTaskInventory"] =

-                    new RestStreamHandler("POST", capsBase + m_notecardTaskUpdatePath, ScriptTaskInventory);

-                m_capsHandlers["UpdateScriptTask"] = m_capsHandlers["UpdateScriptTaskInventory"];

-

-            }

-            catch (Exception e)

-            {

-                m_log.Error("[CAPS]: " + e.ToString());

-            }

-        }

-

-        public void RegisterInventoryServiceHandlers(string capsBase)

-        {

-            try

-            {

-                // I don't think this one works...

-                m_capsHandlers["NewFileAgentInventory"] =

-                    new LLSDStreamhandler<LLSDAssetUploadRequest, LLSDAssetUploadResponse>("POST",

-                                                                                           capsBase + m_newInventory,

-                                                                                           NewAgentInventoryRequest);

-                m_capsHandlers["UpdateNotecardAgentInventory"] =

-                    new RestStreamHandler("POST", capsBase + m_notecardUpdatePath, NoteCardAgentInventory);

-                m_capsHandlers["UpdateScriptAgentInventory"] = m_capsHandlers["UpdateNotecardAgentInventory"];

-                m_capsHandlers["UpdateScriptAgent"] = m_capsHandlers["UpdateScriptAgentInventory"];

-                

-                // As of RC 1.22.9 of the Linden client this is

-                // supported

-

-                // m_capsHandlers["WebFetchInventoryDescendents"] =new RestStreamHandler("POST", capsBase + m_fetchInventoryPath, FetchInventoryDescendentsRequest);

-

-                // justincc: I've disabled the CAPS service for now to fix problems with selecting textures, and

-                // subsequent inventory breakage, in the edit object pane (such as mantis 1085).  This requires

-                // enhancements (probably filling out the folder part of the LLSD reply) to our CAPS service,

-                // but when I went on the Linden grid, the

-                // simulators I visited (version 1.21) were, surprisingly, no longer supplying this capability.  Instead,

-                // the 1.19.1.4 client appeared to be happily flowing inventory data over UDP

-                //

-                // This is very probably just a temporary measure - once the CAPS service appears again on the Linden grid

-                // we will be

-                // able to get the data we need to implement the necessary part of the protocol to fix the issue above.

-                //                m_capsHandlers["FetchInventoryDescendents"] =

-                //                    new RestStreamHandler("POST", capsBase + m_fetchInventoryPath, FetchInventoryRequest);

-

-                // m_capsHandlers["FetchInventoryDescendents"] =

-                //     new LLSDStreamhandler<LLSDFetchInventoryDescendents, LLSDInventoryDescendents>("POST",

-                //                                                                                    capsBase + m_fetchInventory,

-                //                                                                                    FetchInventory));

-                // m_capsHandlers["RequestTextureDownload"] = new RestStreamHandler("POST",

-                //                                                                  capsBase + m_requestTexture,

-                //                                                                  RequestTexture);

-            }

-            catch (Exception e)

-            {

-                m_log.Error("[CAPS]: " + e.ToString());

-            }

-        }

-

-        /// <summary>

-        /// Register a handler.  This allows modules to register handlers.

-        /// </summary>

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

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

-        public void RegisterHandler(string capName, IRequestHandler handler)

-        {

-            m_capsHandlers[capName] = handler;

-            //m_log.DebugFormat("[CAPS]: Registering handler for \"{0}\": path {1}", capName, handler.Path);

-        }

-

-        /// <summary>

-        /// Remove all CAPS service handlers.

-        ///

-        /// </summary>

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

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

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

-        public void DeregisterHandlers()

-        {

-            if (m_capsHandlers != null)

-            {

-                foreach (string capsName in m_capsHandlers.Caps)

-                {

-                    m_capsHandlers.Remove(capsName);

-                }

-            }

-        }

-

-        /// <summary>

-        /// Construct a client response detailing all the capabilities this server can provide.

-        /// </summary>

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

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

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

-        /// <param name="httpRequest">HTTP request header object</param>

-        /// <param name="httpResponse">HTTP response header object</param>

-        /// <returns></returns>

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

-                                  OSHttpRequest httpRequest, OSHttpResponse httpResponse)

-        {

-            //m_log.Debug("[CAPS]: Seed Caps Request in region: " + m_regionName);

-

-            string result = LLSDHelpers.SerialiseLLSDReply(m_capsHandlers.CapsDetails);

-

-            //m_log.DebugFormat("[CAPS] CapsRequest {0}", result);

-

-            return result;

-        }

-

-        // FIXME: these all should probably go into the respective region

-        // modules

-

-        /// <summary>

-        /// Processes a fetch inventory request and sends the reply

-

-        /// </summary>

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

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

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

-        /// <returns></returns>

-        // Request is like:

-        //<llsd>

-        //   <map><key>folders</key>

-        //       <array>

-        //            <map>

-        //                <key>fetch-folders</key><boolean>1</boolean><key>fetch-items</key><boolean>1</boolean><key>folder-id</key><uuid>8e1e3a30-b9bf-11dc-95ff-0800200c9a66</uuid><key>owner-id</key><uuid>11111111-1111-0000-0000-000100bba000</uuid><key>sort-order</key><integer>1</integer>

-        //            </map>

-        //       </array>

-        //   </map>

-        //</llsd>

-        //

-        // multiple fetch-folder maps are allowed within the larger folders map.

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

-        {

-            // string unmodifiedRequest = request.ToString();

-

-            //m_log.DebugFormat("[AGENT INVENTORY]: Received CAPS fetch inventory request {0}", unmodifiedRequest);

-            m_log.Debug("[CAPS]: Inventory Request in region: " + m_regionName);

-

-            Hashtable hash = new Hashtable();

-            try

-            {

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

-            }

-            catch (LLSD.LLSDParseException pe)

-            {

-                m_log.Error("[AGENT INVENTORY]: Fetch error: " + pe.Message);

-                m_log.Error("Request: " + request.ToString());

-            }

-

-            ArrayList foldersrequested = (ArrayList)hash["folders"];

-

-            string response = "";

-

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

-            {

-                string inventoryitemstr = "";

-                Hashtable inventoryhash = (Hashtable)foldersrequested[i];

-

-                LLSDFetchInventoryDescendents llsdRequest = new LLSDFetchInventoryDescendents();

-                LLSDHelpers.DeserialiseOSDMap(inventoryhash, llsdRequest);

-                LLSDInventoryDescendents reply = FetchInventoryReply(llsdRequest);

-

-                inventoryitemstr = LLSDHelpers.SerialiseLLSDReply(reply);

-                inventoryitemstr = inventoryitemstr.Replace("<llsd><map><key>folders</key><array>", "");

-                inventoryitemstr = inventoryitemstr.Replace("</array></map></llsd>", "");

-

-                response += inventoryitemstr;

-            }

-

-            if (response.Length == 0)

-            {

-                // Ter-guess: If requests fail a lot, the client seems to stop requesting descendants.

-                // Therefore, I'm concluding that the client only has so many threads available to do requests

-                // and when a thread stalls..   is stays stalled.

-                // Therefore we need to return something valid

-                response = "<llsd><map><key>folders</key><array /></map></llsd>";

-            }

-            else

-            {

-                response = "<llsd><map><key>folders</key><array>" + response + "</array></map></llsd>";

-            }

-

-            //m_log.DebugFormat("[AGENT INVENTORY]: Replying to CAPS fetch inventory request with following xml");

-            //m_log.Debug(Util.GetFormattedXml(response));

-

-            return response;

-        }

-

-        public string FetchInventoryDescendentsRequest(string request, string path, string param,OSHttpRequest httpRequest, OSHttpResponse httpResponse)

-        {

-            // m_log.Debug("[CAPS]: FetchInventoryDescendentsRequest in region: " + m_regionName + "request is "+request);

-

-            // nasty temporary hack here, the linden client falsely identifies the uuid 00000000-0000-0000-0000-000000000000 as a string which breaks us

-            // correctly mark it as a uuid

-            request = request.Replace("<string>00000000-0000-0000-0000-000000000000</string>", "<uuid>00000000-0000-0000-0000-000000000000</uuid>");

-            

-            // another hack <integer>1</integer> results in a System.ArgumentException: Object type System.Int32 cannot be converted to target type: System.Boolean

-            request = request.Replace("<key>fetch_folders</key><integer>0</integer>", "<key>fetch_folders</key><boolean>0</boolean>");

-            request = request.Replace("<key>fetch_folders</key><integer>1</integer>", "<key>fetch_folders</key><boolean>1</boolean>");

-            Hashtable hash = new Hashtable();

-            try

-            {

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

-            }

-            catch (LLSD.LLSDParseException pe)

-            {

-                m_log.Error("[AGENT INVENTORY]: Fetch error: " + pe.Message);

-                m_log.Error("Request: " + request.ToString());

-            }

-

-            ArrayList foldersrequested = (ArrayList)hash["folders"];

-

-            string response = "";

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

-            {

-                string inventoryitemstr = "";

-                Hashtable inventoryhash = (Hashtable)foldersrequested[i];

-

-                LLSDFetchInventoryDescendents llsdRequest = new LLSDFetchInventoryDescendents();

-                

-                try{

-                LLSDHelpers.DeserialiseOSDMap(inventoryhash, llsdRequest);

-                }

-                catch(Exception e)

-                {

-                    m_log.Debug("[CAPS]: caught exception doing OSD deserialize" + e);

-                }

-                LLSDInventoryDescendents reply = FetchInventoryReply(llsdRequest);

-

-                inventoryitemstr = LLSDHelpers.SerialiseLLSDReply(reply);

-                inventoryitemstr = inventoryitemstr.Replace("<llsd><map><key>folders</key><array>", "");

-                inventoryitemstr = inventoryitemstr.Replace("</array></map></llsd>", "");

-

-                response += inventoryitemstr;

-            }

-            

-            

-            if (response.Length == 0)

-            {

-                // Ter-guess: If requests fail a lot, the client seems to stop requesting descendants.

-                // Therefore, I'm concluding that the client only has so many threads available to do requests

-                // and when a thread stalls..   is stays stalled.

-                // Therefore we need to return something valid

-                response = "<llsd><map><key>folders</key><array /></map></llsd>";

-            }

-            else

-            {

-                response = "<llsd><map><key>folders</key><array>" + response + "</array></map></llsd>";

-            }

-

-            //m_log.DebugFormat("[CAPS]: Replying to CAPS fetch inventory request with following xml");

-            //m_log.Debug("[CAPS] "+response);

-

-            return response;

-        }

-        

-

-

-        /// <summary>

-        /// Construct an LLSD reply packet to a CAPS inventory request

-        /// </summary>

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

-        /// <returns></returns>

-        private LLSDInventoryDescendents FetchInventoryReply(LLSDFetchInventoryDescendents invFetch)

-        {

-            LLSDInventoryDescendents reply = new LLSDInventoryDescendents();

-            LLSDInventoryFolderContents contents = new LLSDInventoryFolderContents();

-            contents.agent_id = m_agentID;

-            contents.owner_id =  invFetch.owner_id;

-            contents.folder_id = invFetch.folder_id;

-

-            // The version number being sent back was originally 1.

-            // Unfortunately, on 1.19.1.4, this means that we see a problem where on subsequent logins

-            // without clearing client cache, objects in the root folder disappear until the cache is cleared,

-            // at which point they reappear.

-            //

-            // Seeing the version to something other than 0 may be the right thing to do, but there is

-            // a greater subtlety of the second life protocol that needs to be understood first.

-            contents.version = 0;

-

-            contents.descendents = 0;

-            reply.folders.Array.Add(contents);

-            List<InventoryItemBase> itemList = null;

-            if (CAPSFetchInventoryDescendents != null)

-            {

-                itemList = CAPSFetchInventoryDescendents(m_agentID, invFetch.folder_id, invFetch.owner_id, invFetch.fetch_folders, invFetch.fetch_items, invFetch.sort_order);

-            }

-

-            if (itemList != null)

-            {

-                foreach (InventoryItemBase invItem in itemList)

-                {

-                    contents.items.Array.Add(ConvertInventoryItem(invItem));

-                }

-            }

-            /* The following block is removed as it ALWAYS sends the error to the client because the RC 1.22.9 client tries to 

-                find items that have become dissasociated with a paret folder and have parent of 00000000-0000-00000....

-            else

-            {

-                IClientAPI client = GetClient(m_agentID);

-

-                // We're going to both notify the client of inventory service failure and send back a 'no folder contents' response.

-                // If we don't send back the response,

-                // the client becomes unhappy (see Teravus' comment in FetchInventoryRequest())

-                if (client != null)

-                {

-                    client.SendAgentAlertMessage(

-                        "AGIN0001E: The inventory service has either failed or is not responding.  Your inventory will not function properly for the rest of this session.  Please clear your cache and relog.",

-                        true);

-                }

-                else

-                {

-                    m_log.ErrorFormat(

-                        "[AGENT INVENTORY]: Could not lookup controlling client for {0} in order to notify them of the inventory service failure",

-                        m_agentID);

-                }

-            }*/

-

-            contents.descendents = contents.items.Array.Count;

-            return reply;

-        }

-

-        /// <summary>

-        /// Convert an internal inventory item object into an LLSD object.

-        /// </summary>

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

-        /// <returns></returns>

-        private LLSDInventoryItem ConvertInventoryItem(InventoryItemBase invItem)

-        {

-            LLSDInventoryItem llsdItem = new LLSDInventoryItem();

-            llsdItem.asset_id = invItem.AssetID;

-            llsdItem.created_at = invItem.CreationDate;

-            llsdItem.desc = invItem.Description;

-            llsdItem.flags = 0;

-            llsdItem.item_id = invItem.ID;

-            llsdItem.name = invItem.Name;

-            llsdItem.parent_id = invItem.Folder;

-            try

-            {

-                // TODO reevaluate after upgrade to libomv >= r2566. Probably should use UtilsConversions.

-                llsdItem.type = TaskInventoryItem.Types[invItem.AssetType];

-                llsdItem.inv_type = TaskInventoryItem.InvTypes[invItem.InvType];

-            }

-            catch (Exception e)

-            {

-                m_log.Error("[CAPS]: Problem setting asset/inventory type while converting inventory item " + invItem.Name + " to LLSD:", e);

-            }

-            llsdItem.permissions = new LLSDPermissions();

-            llsdItem.permissions.creator_id = invItem.CreatorIdAsUuid;

-            llsdItem.permissions.base_mask = (int)invItem.CurrentPermissions;

-            llsdItem.permissions.everyone_mask = (int)invItem.EveryOnePermissions;

-            llsdItem.permissions.group_id = UUID.Zero;

-            llsdItem.permissions.group_mask = 0;

-            llsdItem.permissions.is_owner_group = false;

-            llsdItem.permissions.next_owner_mask = (int)invItem.NextPermissions;

-            llsdItem.permissions.owner_id = m_agentID; // FixMe

-            llsdItem.permissions.owner_mask = (int)invItem.CurrentPermissions;

-            llsdItem.sale_info = new LLSDSaleInfo();

-            llsdItem.sale_info.sale_price = 10;

-            llsdItem.sale_info.sale_type = "not";

-

-            return llsdItem;

-        }

-

-        /// <summary>

-        ///

-        /// </summary>

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

-        /// <returns></returns>

-        public LLSDMapLayerResponse GetMapLayer(LLSDMapRequest mapReq)

-        {

-            m_log.Debug("[CAPS]: MapLayer Request in region: " + m_regionName);

-            LLSDMapLayerResponse mapResponse = new LLSDMapLayerResponse();

-            mapResponse.LayerData.Array.Add(GetOSDMapLayerResponse());

-            return mapResponse;

-        }

-

-        /// <summary>

-        ///

-        /// </summary>

-        /// <returns></returns>

-        protected static OSDMapLayer GetOSDMapLayerResponse()

-        {

-            OSDMapLayer mapLayer = new OSDMapLayer();

-            mapLayer.Right = 5000;

-            mapLayer.Top = 5000;

-            mapLayer.ImageID = new UUID("00000000-0000-1111-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)

-        {

-            m_log.Debug("texture request " + request);

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

-            return String.Empty;

-        }

-

-        #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 = String.Empty;

-

-            if (m_capsEventQueue.Count > 0)

-            {

-                lock (m_capsEventQueue)

-                {

-                    string item = m_capsEventQueue.Dequeue();

-                    res = item;

-                }

-            }

-            else

-            {

-                res = 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 = m_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);

-            m_eventQueueCount++;

-

-            m_capsEventQueue.Enqueue(res);

-            return res;

-        }

-

-        /// <summary>

-        ///

-        /// </summary>

-        /// <returns></returns>

-        public string CreateEmptyEventResponse()

-        {

-            LLSDCapEvent eventItem = new LLSDCapEvent();

-            eventItem.id = m_eventQueueCount;

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

-            string res = LLSDHelpers.SerialiseLLSDReply(eventItem);

-            m_eventQueueCount++;

-            return res;

-        }

-

-        #endregion

-

-        /// <summary>

-        /// Called by the script task update handler.  Provides a URL to which the client can upload a new asset.

-        /// </summary>

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

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

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

-        /// <param name="httpRequest">HTTP request header object</param>

-        /// <param name="httpResponse">HTTP response header object</param>

-        /// <returns></returns>

-        public string ScriptTaskInventory(string request, string path, string param,

-                                          OSHttpRequest httpRequest, OSHttpResponse httpResponse)

-        {

-            try

-            {

-                m_log.Debug("[CAPS]: ScriptTaskInventory Request in region: " + m_regionName);

-                //m_log.DebugFormat("[CAPS]: request: {0}, path: {1}, param: {2}", request, path, param);

-

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

-                LLSDTaskScriptUpdate llsdUpdateRequest = new LLSDTaskScriptUpdate();

-                LLSDHelpers.DeserialiseOSDMap(hash, llsdUpdateRequest);

-

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

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

-

-                TaskInventoryScriptUpdater uploader =

-                    new TaskInventoryScriptUpdater(

-                        llsdUpdateRequest.item_id,

-                        llsdUpdateRequest.task_id,

-                        llsdUpdateRequest.is_script_running,

-                        capsBase + uploaderPath,

-                        m_httpListener,

-                        m_dumpAssetsToFile);

-                uploader.OnUpLoad += TaskScriptUpdated;

-

-                m_httpListener.AddStreamHandler(

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

-

-                string protocol = "http://";

-

-                if (m_httpListener.UseSSL)

-                    protocol = "https://";

-

-                string uploaderURL = protocol + m_httpListenerHostName + ":" + m_httpListenPort.ToString() + capsBase +

-                                     uploaderPath;

-

-                LLSDAssetUploadResponse uploadResponse = new LLSDAssetUploadResponse();

-                uploadResponse.uploader = uploaderURL;

-                uploadResponse.state = "upload";

-

-//                m_log.InfoFormat("[CAPS]: " +

-//                                 "ScriptTaskInventory response: {0}",

-//                                 LLSDHelpers.SerialiseLLSDReply(uploadResponse)));

-

-                return LLSDHelpers.SerialiseLLSDReply(uploadResponse);

-            }

-            catch (Exception e)

-            {

-                m_log.Error("[CAPS]: " + e.ToString());

-            }

-

-            return null;

-        }

-

-        /// <summary>

-        /// Called by the notecard update handler.  Provides a URL to which the client can upload a new asset.

-        /// </summary>

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

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

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

-        /// <returns></returns>

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

-                                             OSHttpRequest httpRequest, OSHttpResponse httpResponse)

-        {

-            //m_log.Debug("[CAPS]: NoteCardAgentInventory Request in region: " + m_regionName + "\n" + request);

-            //m_log.Debug("[CAPS]: NoteCardAgentInventory Request is: " + request);

-            

-            //OpenMetaverse.StructuredData.OSDMap hash = (OpenMetaverse.StructuredData.OSDMap)OpenMetaverse.StructuredData.LLSDParser.DeserializeBinary(Utils.StringToBytes(request));

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

-            LLSDItemUpdate llsdRequest = new LLSDItemUpdate();

-            LLSDHelpers.DeserialiseOSDMap(hash, llsdRequest);

-

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

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

-

-            ItemUpdater uploader =

-                new ItemUpdater(llsdRequest.item_id, capsBase + uploaderPath, m_httpListener, m_dumpAssetsToFile);

-            uploader.OnUpLoad += ItemUpdated;

-

-            m_httpListener.AddStreamHandler(

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

-

-            string protocol = "http://";

-

-            if (m_httpListener.UseSSL)

-                protocol = "https://";

-

-            string uploaderURL = protocol + m_httpListenerHostName + ":" + m_httpListenPort.ToString() + capsBase +

-                                 uploaderPath;

-

-            LLSDAssetUploadResponse uploadResponse = new LLSDAssetUploadResponse();

-            uploadResponse.uploader = uploaderURL;

-            uploadResponse.state = "upload";

-

-//            m_log.InfoFormat("[CAPS]: " +

-//                             "NoteCardAgentInventory response: {0}",

-//                             LLSDHelpers.SerialiseLLSDReply(uploadResponse)));

-

-            return LLSDHelpers.SerialiseLLSDReply(uploadResponse);

-        }

-

-        /// <summary>

-        ///

-        /// </summary>

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

-        /// <returns></returns>

-        public LLSDAssetUploadResponse NewAgentInventoryRequest(LLSDAssetUploadRequest llsdRequest)

-        {

-            //m_log.Debug("[CAPS]: NewAgentInventoryRequest Request is: " + llsdRequest.ToString());

-            //m_log.Debug("asset upload request via CAPS" + llsdRequest.inventory_type + " , " + llsdRequest.asset_type);

-

-            if (llsdRequest.asset_type == "texture" ||

-                llsdRequest.asset_type == "animation" ||

-                llsdRequest.asset_type == "sound")

-            {

-                IClientAPI client = null;

-                IScene scene = null;

-                if (GetClient != null)

-                {

-                    client = GetClient(m_agentID);

-                    scene = client.Scene;

-

-                    IMoneyModule mm = scene.RequestModuleInterface<IMoneyModule>();

-

-                    if (mm != null)

-                    {

-                        if (!mm.UploadCovered(client))

-                        {

-                            if (client != null)

-                                client.SendAgentAlertMessage("Unable to upload asset. Insufficient funds.", false);

-

-                            LLSDAssetUploadResponse errorResponse = new LLSDAssetUploadResponse();

-                            errorResponse.uploader = "";

-                            errorResponse.state = "error";

-                            return errorResponse;

-                        }

-                    }

-                }

-            }

-

-

-            string assetName = llsdRequest.name;

-            string assetDes = llsdRequest.description;

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

-            UUID newAsset = UUID.Random();

-            UUID newInvItem = UUID.Random();

-            UUID parentFolder = llsdRequest.folder_id;

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

-

-            AssetUploader uploader =

-                new AssetUploader(assetName, assetDes, newAsset, newInvItem, parentFolder, llsdRequest.inventory_type,

-                                  llsdRequest.asset_type, capsBase + uploaderPath, m_httpListener, m_dumpAssetsToFile);

-            m_httpListener.AddStreamHandler(

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

-

-            string protocol = "http://";

-

-            if (m_httpListener.UseSSL)

-                protocol = "https://";

-

-            string uploaderURL = protocol + m_httpListenerHostName + ":" + m_httpListenPort.ToString() + capsBase +

-                                 uploaderPath;

-

-            LLSDAssetUploadResponse uploadResponse = new LLSDAssetUploadResponse();

-            uploadResponse.uploader = uploaderURL;

-            uploadResponse.state = "upload";

-            uploader.OnUpLoad += UploadCompleteHandler;

-            return uploadResponse;

-        }

-

-        /// <summary>

-        ///

-        /// </summary>

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

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

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

-        public void UploadCompleteHandler(string assetName, string assetDescription, UUID assetID,

-                                          UUID inventoryItem, UUID parentFolder, byte[] data, string inventoryType,

-                                          string assetType)

-        {

-            sbyte assType = 0;

-            sbyte inType = 0;

-

-            if (inventoryType == "sound")

-            {

-                inType = 1;

-                assType = 1;

-            }

-            else if (inventoryType == "animation")

-            {

-                inType = 19;

-                assType = 20;

-            }

-            else if (inventoryType == "wearable")

-            {

-                inType = 18;

-                switch (assetType)

-                {

-                    case "bodypart":

-                        assType = 13;

-                        break;

-                    case "clothing":

-                        assType = 5;

-                        break;

-                }

-            }

-

-            AssetBase asset;

-            asset = new AssetBase();

-            asset.FullID = assetID;

-            asset.Type = assType;

-            asset.Name = assetName;

-            asset.Data = data;

-            if (AddNewAsset != null)

-                AddNewAsset(asset);

-            else if (m_assetCache != null)

-                m_assetCache.Store(asset);

-

-            InventoryItemBase item = new InventoryItemBase();

-            item.Owner = m_agentID;

-            item.CreatorId = m_agentID.ToString();

-            item.ID = inventoryItem;

-            item.AssetID = asset.FullID;

-            item.Description = assetDescription;

-            item.Name = assetName;

-            item.AssetType = assType;

-            item.InvType = inType;

-            item.Folder = parentFolder;

-            item.CurrentPermissions = 2147483647;

-            item.BasePermissions = 2147483647;

-            item.EveryOnePermissions = 0;

-            item.NextPermissions = 2147483647;

-            item.CreationDate = Util.UnixTimeSinceEpoch();

-

-            if (AddNewInventoryItem != null)

-            {

-                AddNewInventoryItem(m_agentID, item);

-            }

-        }

-

-        /// <summary>

-        /// Called when new asset data for an agent inventory item update has been uploaded.

-        /// </summary>

-        /// <param name="itemID">Item to update</param>

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

-        /// <returns></returns>

-        public UUID ItemUpdated(UUID itemID, byte[] data)

-        {

-            if (ItemUpdatedCall != null)

-            {

-                return ItemUpdatedCall(m_agentID, itemID, data);

-            }

-

-            return UUID.Zero;

-        }

-

-        /// <summary>

-        /// Called when new asset data for an agent inventory item update has been uploaded.

-        /// </summary>

-        /// <param name="itemID">Item to update</param>

-        /// <param name="primID">Prim containing item to update</param>

-        /// <param name="isScriptRunning">Signals whether the script to update is currently running</param>

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

-        public void TaskScriptUpdated(UUID itemID, UUID primID, bool isScriptRunning, byte[] data)

-        {

-            if (TaskScriptUpdatedCall != null)

-            {

-                TaskScriptUpdatedCall(m_agentID, itemID, primID, isScriptRunning, data);

-            }

-        }

-

-        public class AssetUploader

-        {

-            public event UpLoadedAsset OnUpLoad;

-            private UpLoadedAsset handlerUpLoad = null;

-

-            private string uploaderPath = String.Empty;

-            private UUID newAssetID;

-            private UUID inventoryItemID;

-            private UUID parentFolder;

-            private IHttpServer httpListener;

-            private bool m_dumpAssetsToFile;

-            private string m_assetName = String.Empty;

-            private string m_assetDes = String.Empty;

-

-            private string m_invType = String.Empty;

-            private string m_assetType = String.Empty;

-

-            public AssetUploader(string assetName, string description, UUID assetID, UUID inventoryItem,

-                                 UUID parentFolderID, string invType, string assetType, string path,

-                                 IHttpServer httpServer, bool dumpAssetsToFile)

-            {

-                m_assetName = assetName;

-                m_assetDes = description;

-                newAssetID = assetID;

-                inventoryItemID = inventoryItem;

-                uploaderPath = path;

-                httpListener = httpServer;

-                parentFolder = parentFolderID;

-                m_assetType = assetType;

-                m_invType = invType;

-                m_dumpAssetsToFile = dumpAssetsToFile;

-            }

-

-            /// <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)

-            {

-                UUID inv = inventoryItemID;

-                string res = String.Empty;

-                LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete();

-                uploadComplete.new_asset = newAssetID.ToString();

-                uploadComplete.new_inventory_item = inv;

-                uploadComplete.state = "complete";

-

-                res = LLSDHelpers.SerialiseLLSDReply(uploadComplete);

-

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

-

-                // TODO: probably make this a better set of extensions here

-                string extension = ".jp2";

-                if (m_invType != "image")

-                {

-                    extension = ".dat";

-                }

-

-                if (m_dumpAssetsToFile)

-                {

-                    SaveAssetToFile(m_assetName + extension, data);

-                }

-                handlerUpLoad = OnUpLoad;

-                if (handlerUpLoad != null)

-                {

-                    handlerUpLoad(m_assetName, m_assetDes, newAssetID, inv, parentFolder, data, m_invType, m_assetType);

-                }

-

-                return res;

-            }

-            ///Left this in and commented in case there are unforseen issues

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

-            //{

-            //    FileStream fs = File.Create(filename);

-            //    BinaryWriter bw = new BinaryWriter(fs);

-            //    bw.Write(data);

-            //    bw.Close();

-            //    fs.Close();

-            //}

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

-            {

-                string assetPath = "UserAssets";

-                if (!Directory.Exists(assetPath))

-                {

-                    Directory.CreateDirectory(assetPath);

-                }

-                FileStream fs = File.Create(Path.Combine(assetPath, Util.safeFileName(filename)));

-                BinaryWriter bw = new BinaryWriter(fs);

-                bw.Write(data);

-                bw.Close();

-                fs.Close();

-            }

-        }

-

-        /// <summary>

-        /// This class is a callback invoked when a client sends asset data to

-        /// an agent inventory notecard update url

-        /// </summary>

-        public class ItemUpdater

-        {

-            public event UpdateItem OnUpLoad;

-

-            private UpdateItem handlerUpdateItem = null;

-

-            private string uploaderPath = String.Empty;

-            private UUID inventoryItemID;

-            private IHttpServer httpListener;

-            private bool m_dumpAssetToFile;

-

-            public ItemUpdater(UUID inventoryItem, string path, IHttpServer httpServer, bool dumpAssetToFile)

-            {

-                m_dumpAssetToFile = dumpAssetToFile;

-

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

-            {

-                UUID inv = inventoryItemID;

-                string res = String.Empty;

-                LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete();

-                UUID assetID = UUID.Zero;

-                handlerUpdateItem = OnUpLoad;

-                if (handlerUpdateItem != null)

-                {

-                    assetID = handlerUpdateItem(inv, data);

-                }

-

-                uploadComplete.new_asset = assetID.ToString();

-                uploadComplete.new_inventory_item = inv;

-                uploadComplete.state = "complete";

-

-                res = LLSDHelpers.SerialiseLLSDReply(uploadComplete);

-

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

-

-                if (m_dumpAssetToFile)

-                {

-                    SaveAssetToFile("updateditem" + Util.RandomClass.Next(1, 1000) + ".dat", data);

-                }

-

-                return res;

-            }

-            ///Left this in and commented in case there are unforseen issues

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

-            //{

-            //    FileStream fs = File.Create(filename);

-            //    BinaryWriter bw = new BinaryWriter(fs);

-            //    bw.Write(data);

-            //    bw.Close();

-            //    fs.Close();

-            //}

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

-            {

-                string assetPath = "UserAssets";

-                if (!Directory.Exists(assetPath))

-                {

-                    Directory.CreateDirectory(assetPath);

-                }

-                FileStream fs = File.Create(Path.Combine(assetPath, filename));

-                BinaryWriter bw = new BinaryWriter(fs);

-                bw.Write(data);

-                bw.Close();

-                fs.Close();

-            }

-        }

-

-        /// <summary>

-        /// This class is a callback invoked when a client sends asset data to

-        /// a task inventory script update url

-        /// </summary>

-        public class TaskInventoryScriptUpdater

-        {

-            public event UpdateTaskScript OnUpLoad;

-

-            private UpdateTaskScript handlerUpdateTaskScript = null;

-

-            private string uploaderPath = String.Empty;

-            private UUID inventoryItemID;

-            private UUID primID;

-            private bool isScriptRunning;

-            private IHttpServer httpListener;

-            private bool m_dumpAssetToFile;

-

-            public TaskInventoryScriptUpdater(UUID inventoryItemID, UUID primID, int isScriptRunning,

-                                              string path, IHttpServer httpServer, bool dumpAssetToFile)

-            {

-                m_dumpAssetToFile = dumpAssetToFile;

-

-                this.inventoryItemID = inventoryItemID;

-                this.primID = primID;

-

-                // This comes in over the packet as an integer, but actually appears to be treated as a bool

-                this.isScriptRunning = (0 == isScriptRunning ? false : true);

-

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

-            {

-                try

-                {

-//                    m_log.InfoFormat("[CAPS]: " +

-//                                     "TaskInventoryScriptUpdater received data: {0}, path: {1}, param: {2}",

-//                                     data, path, param));

-

-                    string res = String.Empty;

-                    LLSDTaskInventoryUploadComplete uploadComplete = new LLSDTaskInventoryUploadComplete();

-

-                    handlerUpdateTaskScript = OnUpLoad;

-                    if (handlerUpdateTaskScript != null)

-                    {

-                        handlerUpdateTaskScript(inventoryItemID, primID, isScriptRunning, data);

-                    }

-

-                    uploadComplete.item_id = inventoryItemID;

-                    uploadComplete.task_id = primID;

-                    uploadComplete.state = "complete";

-

-                    res = LLSDHelpers.SerialiseLLSDReply(uploadComplete);

-

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

-

-                    if (m_dumpAssetToFile)

-                    {

-                        SaveAssetToFile("updatedtaskscript" + Util.RandomClass.Next(1, 1000) + ".dat", data);

-                    }

-

-//                    m_log.InfoFormat("[CAPS]: TaskInventoryScriptUpdater.uploaderCaps res: {0}", res);

-

-                    return res;

-                }

-                catch (Exception e)

-                {

-                    m_log.Error("[CAPS]: " + e.ToString());

-                }

-

-                // XXX Maybe this should be some meaningful error packet

-                return null;

-            }

-            ///Left this in and commented in case there are unforseen issues

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

-            //{

-            //    FileStream fs = File.Create(filename);

-            //    BinaryWriter bw = new BinaryWriter(fs);

-            //    bw.Write(data);

-            //    bw.Close();

-            //    fs.Close();

-            //}

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

-            {

-                string assetPath = "UserAssets";

-                if (!Directory.Exists(assetPath))

-                {

-                    Directory.CreateDirectory(assetPath);

-                }

-                FileStream fs = File.Create(Path.Combine(assetPath, filename));

-                BinaryWriter bw = new BinaryWriter(fs);

-                bw.Write(data);

-                bw.Close();

-                fs.Close();

-            }

-        }

-    }

-}

+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator 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.IO;
+using System.Reflection;
+using log4net;
+using OpenMetaverse;
+using OpenSim.Framework.Servers;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Services.Interfaces;
+
+// using OpenSim.Region.Framework.Interfaces;
+
+namespace OpenSim.Framework.Capabilities
+{
+    public delegate void UpLoadedAsset(
+        string assetName, string description, UUID assetID, UUID inventoryItem, UUID parentFolder,
+        byte[] data, string inventoryType, string assetType);
+
+    public delegate UUID UpdateItem(UUID itemID, byte[] data);
+
+    public delegate void UpdateTaskScript(UUID itemID, UUID primID, bool isScriptRunning, byte[] data);
+
+    public delegate void NewInventoryItem(UUID userID, InventoryItemBase item);
+
+    public delegate void NewAsset(AssetBase asset);
+
+    public delegate UUID ItemUpdatedCallback(UUID userID, UUID itemID, byte[] data);
+
+    public delegate void TaskScriptUpdatedCallback(UUID userID, UUID itemID, UUID primID,
+                                                   bool isScriptRunning, byte[] data);
+
+    public delegate List<InventoryItemBase> FetchInventoryDescendentsCAPS(UUID agentID, UUID folderID, UUID ownerID,
+                                                                          bool fetchFolders, bool fetchItems, int sortOrder);
+
+    /// <summary>
+    /// XXX Probably not a particularly nice way of allow us to get the scene presence from the scene (chiefly so that
+    /// we can popup a message on the user's client if the inventory service has permanently failed).  But I didn't want
+    /// to just pass the whole Scene into CAPS.
+    /// </summary>
+    public delegate IClientAPI GetClientDelegate(UUID agentID);
+
+    public class Caps
+    {
+        private static readonly ILog m_log =
+            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        private string m_httpListenerHostName;
+        private uint m_httpListenPort;
+
+        /// <summary>
+        /// This is the uuid portion of every CAPS path.  It is used to make capability urls private to the requester.
+        /// </summary>
+        private string m_capsObjectPath;
+        public string CapsObjectPath { get { return m_capsObjectPath; } }
+
+        private CapsHandlers m_capsHandlers;
+
+        private static readonly string m_requestPath = "0000/";
+        // private static readonly string m_mapLayerPath = "0001/";
+        private static readonly string m_newInventory = "0002/";
+        //private static readonly string m_requestTexture = "0003/";
+        private static readonly string m_notecardUpdatePath = "0004/";
+        private static readonly string m_notecardTaskUpdatePath = "0005/";
+        // private static readonly string m_fetchInventoryPath = "0006/";
+
+        // The following entries are in a module, however, they are also here so that we don't re-assign
+        // the path to another cap by mistake.
+        // private static readonly string m_parcelVoiceInfoRequestPath = "0007/"; // This is in a module.
+        // private static readonly string m_provisionVoiceAccountRequestPath = "0008/";// This is in a module.
+
+        // private static readonly string m_remoteParcelRequestPath = "0009/";// This is in the LandManagementModule.
+
+        //private string eventQueue = "0100/";
+        private IHttpServer m_httpListener;
+        private UUID m_agentID;
+        private IAssetService m_assetCache;
+        private int m_eventQueueCount = 1;
+        private Queue<string> m_capsEventQueue = new Queue<string>();
+        private bool m_dumpAssetsToFile;
+        private string m_regionName;
+
+        public bool SSLCaps
+        {
+            get { return m_httpListener.UseSSL; }
+        }
+        public string SSLCommonName
+        {
+            get { return m_httpListener.SSLCommonName; }
+        }
+        public CapsHandlers CapsHandlers
+        {
+            get { return m_capsHandlers; }
+        }
+
+        // These are callbacks which will be setup by the scene so that we can update scene data when we
+        // receive capability calls
+        public NewInventoryItem AddNewInventoryItem = null;
+        public NewAsset AddNewAsset = null;
+        public ItemUpdatedCallback ItemUpdatedCall = null;
+        public TaskScriptUpdatedCallback TaskScriptUpdatedCall = null;
+        public FetchInventoryDescendentsCAPS CAPSFetchInventoryDescendents = null;
+        public GetClientDelegate GetClient = null;
+
+        public Caps(IAssetService assetCache, IHttpServer httpServer, string httpListen, uint httpPort, string capsPath,
+                    UUID agent, bool dumpAssetsToFile, string regionName)
+        {
+            m_assetCache = assetCache;
+            m_capsObjectPath = capsPath;
+            m_httpListener = httpServer;
+            m_httpListenerHostName = httpListen;
+
+            m_httpListenPort = httpPort;
+
+            if (httpServer.UseSSL)
+            {
+                m_httpListenPort = httpServer.SSLPort;
+                httpListen = httpServer.SSLCommonName;
+                httpPort = httpServer.SSLPort;
+            }
+
+            m_agentID = agent;
+            m_dumpAssetsToFile = dumpAssetsToFile;
+            m_capsHandlers = new CapsHandlers(httpServer, httpListen, httpPort, httpServer.UseSSL);
+            m_regionName = regionName;
+        }
+
+        /// <summary>
+        /// Register all CAPS http service handlers
+        /// </summary>
+        public void RegisterHandlers()
+        {
+            DeregisterHandlers();
+
+            string capsBase = "/CAPS/" + m_capsObjectPath;
+
+            RegisterRegionServiceHandlers(capsBase);
+            RegisterInventoryServiceHandlers(capsBase);
+
+        }
+
+        public void RegisterRegionServiceHandlers(string capsBase)
+        {
+            try
+            {
+                // the root of all evil
+                m_capsHandlers["SEED"] = new RestStreamHandler("POST", capsBase + m_requestPath, CapsRequest);
+                m_log.DebugFormat(
+                    "[CAPS]: Registered seed capability {0} for {1}", capsBase + m_requestPath, m_agentID);
+
+                //m_capsHandlers["MapLayer"] =
+                //    new LLSDStreamhandler<OSDMapRequest, OSDMapLayerResponse>("POST",
+                //                                                                capsBase + m_mapLayerPath,
+                //                                                                GetMapLayer);
+                m_capsHandlers["UpdateScriptTaskInventory"] =
+                    new RestStreamHandler("POST", capsBase + m_notecardTaskUpdatePath, ScriptTaskInventory);
+                m_capsHandlers["UpdateScriptTask"] = m_capsHandlers["UpdateScriptTaskInventory"];
+
+            }
+            catch (Exception e)
+            {
+                m_log.Error("[CAPS]: " + e.ToString());
+            }
+        }
+
+        public void RegisterInventoryServiceHandlers(string capsBase)
+        {
+            try
+            {
+                // I don't think this one works...
+                m_capsHandlers["NewFileAgentInventory"] =
+                    new LLSDStreamhandler<LLSDAssetUploadRequest, LLSDAssetUploadResponse>("POST",
+                                                                                           capsBase + m_newInventory,
+                                                                                           NewAgentInventoryRequest);
+                m_capsHandlers["UpdateNotecardAgentInventory"] =
+                    new RestStreamHandler("POST", capsBase + m_notecardUpdatePath, NoteCardAgentInventory);
+                m_capsHandlers["UpdateScriptAgentInventory"] = m_capsHandlers["UpdateNotecardAgentInventory"];
+                m_capsHandlers["UpdateScriptAgent"] = m_capsHandlers["UpdateScriptAgentInventory"];
+                
+                // As of RC 1.22.9 of the Linden client this is
+                // supported
+
+                // m_capsHandlers["WebFetchInventoryDescendents"] =new RestStreamHandler("POST", capsBase + m_fetchInventoryPath, FetchInventoryDescendentsRequest);
+
+                // justincc: I've disabled the CAPS service for now to fix problems with selecting textures, and
+                // subsequent inventory breakage, in the edit object pane (such as mantis 1085).  This requires
+                // enhancements (probably filling out the folder part of the LLSD reply) to our CAPS service,
+                // but when I went on the Linden grid, the
+                // simulators I visited (version 1.21) were, surprisingly, no longer supplying this capability.  Instead,
+                // the 1.19.1.4 client appeared to be happily flowing inventory data over UDP
+                //
+                // This is very probably just a temporary measure - once the CAPS service appears again on the Linden grid
+                // we will be
+                // able to get the data we need to implement the necessary part of the protocol to fix the issue above.
+                //                m_capsHandlers["FetchInventoryDescendents"] =
+                //                    new RestStreamHandler("POST", capsBase + m_fetchInventoryPath, FetchInventoryRequest);
+
+                // m_capsHandlers["FetchInventoryDescendents"] =
+                //     new LLSDStreamhandler<LLSDFetchInventoryDescendents, LLSDInventoryDescendents>("POST",
+                //                                                                                    capsBase + m_fetchInventory,
+                //                                                                                    FetchInventory));
+                // m_capsHandlers["RequestTextureDownload"] = new RestStreamHandler("POST",
+                //                                                                  capsBase + m_requestTexture,
+                //                                                                  RequestTexture);
+            }
+            catch (Exception e)
+            {
+                m_log.Error("[CAPS]: " + e.ToString());
+            }
+        }
+
+        /// <summary>
+        /// Register a handler.  This allows modules to register handlers.
+        /// </summary>
+        /// <param name="capName"></param>
+        /// <param name="handler"></param>
+        public void RegisterHandler(string capName, IRequestHandler handler)
+        {
+            m_capsHandlers[capName] = handler;
+            //m_log.DebugFormat("[CAPS]: Registering handler for \"{0}\": path {1}", capName, handler.Path);
+        }
+
+        /// <summary>
+        /// Remove all CAPS service handlers.
+        ///
+        /// </summary>
+        /// <param name="httpListener"></param>
+        /// <param name="path"></param>
+        /// <param name="restMethod"></param>
+        public void DeregisterHandlers()
+        {
+            if (m_capsHandlers != null)
+            {
+                foreach (string capsName in m_capsHandlers.Caps)
+                {
+                    m_capsHandlers.Remove(capsName);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Construct a client response detailing all the capabilities this server can provide.
+        /// </summary>
+        /// <param name="request"></param>
+        /// <param name="path"></param>
+        /// <param name="param"></param>
+        /// <param name="httpRequest">HTTP request header object</param>
+        /// <param name="httpResponse">HTTP response header object</param>
+        /// <returns></returns>
+        public string CapsRequest(string request, string path, string param,
+                                  OSHttpRequest httpRequest, OSHttpResponse httpResponse)
+        {
+            //m_log.Debug("[CAPS]: Seed Caps Request in region: " + m_regionName);
+
+            string result = LLSDHelpers.SerialiseLLSDReply(m_capsHandlers.CapsDetails);
+
+            //m_log.DebugFormat("[CAPS] CapsRequest {0}", result);
+
+            return result;
+        }
+
+        // FIXME: these all should probably go into the respective region
+        // modules
+
+        /// <summary>
+        /// Processes a fetch inventory request and sends the reply
+
+        /// </summary>
+        /// <param name="request"></param>
+        /// <param name="path"></param>
+        /// <param name="param"></param>
+        /// <returns></returns>
+        // Request is like:
+        //<llsd>
+        //   <map><key>folders</key>
+        //       <array>
+        //            <map>
+        //                <key>fetch-folders</key><boolean>1</boolean><key>fetch-items</key><boolean>1</boolean><key>folder-id</key><uuid>8e1e3a30-b9bf-11dc-95ff-0800200c9a66</uuid><key>owner-id</key><uuid>11111111-1111-0000-0000-000100bba000</uuid><key>sort-order</key><integer>1</integer>
+        //            </map>
+        //       </array>
+        //   </map>
+        //</llsd>
+        //
+        // multiple fetch-folder maps are allowed within the larger folders map.
+        public string FetchInventoryRequest(string request, string path, string param)
+        {
+            // string unmodifiedRequest = request.ToString();
+
+            //m_log.DebugFormat("[AGENT INVENTORY]: Received CAPS fetch inventory request {0}", unmodifiedRequest);
+            m_log.Debug("[CAPS]: Inventory Request in region: " + m_regionName);
+
+            Hashtable hash = new Hashtable();
+            try
+            {
+                hash = (Hashtable)LLSD.LLSDDeserialize(Utils.StringToBytes(request));
+            }
+            catch (LLSD.LLSDParseException pe)
+            {
+                m_log.Error("[AGENT INVENTORY]: Fetch error: " + pe.Message);
+                m_log.Error("Request: " + request.ToString());
+            }
+
+            ArrayList foldersrequested = (ArrayList)hash["folders"];
+
+            string response = "";
+
+            for (int i = 0; i < foldersrequested.Count; i++)
+            {
+                string inventoryitemstr = "";
+                Hashtable inventoryhash = (Hashtable)foldersrequested[i];
+
+                LLSDFetchInventoryDescendents llsdRequest = new LLSDFetchInventoryDescendents();
+                LLSDHelpers.DeserialiseOSDMap(inventoryhash, llsdRequest);
+                LLSDInventoryDescendents reply = FetchInventoryReply(llsdRequest);
+
+                inventoryitemstr = LLSDHelpers.SerialiseLLSDReply(reply);
+                inventoryitemstr = inventoryitemstr.Replace("<llsd><map><key>folders</key><array>", "");
+                inventoryitemstr = inventoryitemstr.Replace("</array></map></llsd>", "");
+
+                response += inventoryitemstr;
+            }
+
+            if (response.Length == 0)
+            {
+                // Ter-guess: If requests fail a lot, the client seems to stop requesting descendants.
+                // Therefore, I'm concluding that the client only has so many threads available to do requests
+                // and when a thread stalls..   is stays stalled.
+                // Therefore we need to return something valid
+                response = "<llsd><map><key>folders</key><array /></map></llsd>";
+            }
+            else
+            {
+                response = "<llsd><map><key>folders</key><array>" + response + "</array></map></llsd>";
+            }
+
+            //m_log.DebugFormat("[AGENT INVENTORY]: Replying to CAPS fetch inventory request with following xml");
+            //m_log.Debug(Util.GetFormattedXml(response));
+
+            return response;
+        }
+
+        public string FetchInventoryDescendentsRequest(string request, string path, string param,OSHttpRequest httpRequest, OSHttpResponse httpResponse)
+        {
+            // m_log.Debug("[CAPS]: FetchInventoryDescendentsRequest in region: " + m_regionName + "request is "+request);
+
+            // nasty temporary hack here, the linden client falsely identifies the uuid 00000000-0000-0000-0000-000000000000 as a string which breaks us
+            // correctly mark it as a uuid
+            request = request.Replace("<string>00000000-0000-0000-0000-000000000000</string>", "<uuid>00000000-0000-0000-0000-000000000000</uuid>");
+            
+            // another hack <integer>1</integer> results in a System.ArgumentException: Object type System.Int32 cannot be converted to target type: System.Boolean
+            request = request.Replace("<key>fetch_folders</key><integer>0</integer>", "<key>fetch_folders</key><boolean>0</boolean>");
+            request = request.Replace("<key>fetch_folders</key><integer>1</integer>", "<key>fetch_folders</key><boolean>1</boolean>");
+            Hashtable hash = new Hashtable();
+            try
+            {
+                hash = (Hashtable)LLSD.LLSDDeserialize(Utils.StringToBytes(request));
+            }
+            catch (LLSD.LLSDParseException pe)
+            {
+                m_log.Error("[AGENT INVENTORY]: Fetch error: " + pe.Message);
+                m_log.Error("Request: " + request.ToString());
+            }
+
+            ArrayList foldersrequested = (ArrayList)hash["folders"];
+
+            string response = "";
+            for (int i = 0; i < foldersrequested.Count; i++)
+            {
+                string inventoryitemstr = "";
+                Hashtable inventoryhash = (Hashtable)foldersrequested[i];
+
+                LLSDFetchInventoryDescendents llsdRequest = new LLSDFetchInventoryDescendents();
+                
+                try{
+                LLSDHelpers.DeserialiseOSDMap(inventoryhash, llsdRequest);
+                }
+                catch(Exception e)
+                {
+                    m_log.Debug("[CAPS]: caught exception doing OSD deserialize" + e);
+                }
+                LLSDInventoryDescendents reply = FetchInventoryReply(llsdRequest);
+
+                inventoryitemstr = LLSDHelpers.SerialiseLLSDReply(reply);
+                inventoryitemstr = inventoryitemstr.Replace("<llsd><map><key>folders</key><array>", "");
+                inventoryitemstr = inventoryitemstr.Replace("</array></map></llsd>", "");
+
+                response += inventoryitemstr;
+            }
+            
+            
+            if (response.Length == 0)
+            {
+                // Ter-guess: If requests fail a lot, the client seems to stop requesting descendants.
+                // Therefore, I'm concluding that the client only has so many threads available to do requests
+                // and when a thread stalls..   is stays stalled.
+                // Therefore we need to return something valid
+                response = "<llsd><map><key>folders</key><array /></map></llsd>";
+            }
+            else
+            {
+                response = "<llsd><map><key>folders</key><array>" + response + "</array></map></llsd>";
+            }
+
+            //m_log.DebugFormat("[CAPS]: Replying to CAPS fetch inventory request with following xml");
+            //m_log.Debug("[CAPS] "+response);
+
+            return response;
+        }
+        
+
+
+        /// <summary>
+        /// Construct an LLSD reply packet to a CAPS inventory request
+        /// </summary>
+        /// <param name="invFetch"></param>
+        /// <returns></returns>
+        private LLSDInventoryDescendents FetchInventoryReply(LLSDFetchInventoryDescendents invFetch)
+        {
+            LLSDInventoryDescendents reply = new LLSDInventoryDescendents();
+            LLSDInventoryFolderContents contents = new LLSDInventoryFolderContents();
+            contents.agent_id = m_agentID;
+            contents.owner_id =  invFetch.owner_id;
+            contents.folder_id = invFetch.folder_id;
+
+            // The version number being sent back was originally 1.
+            // Unfortunately, on 1.19.1.4, this means that we see a problem where on subsequent logins
+            // without clearing client cache, objects in the root folder disappear until the cache is cleared,
+            // at which point they reappear.
+            //
+            // Seeing the version to something other than 0 may be the right thing to do, but there is
+            // a greater subtlety of the second life protocol that needs to be understood first.
+            contents.version = 0;
+
+            contents.descendents = 0;
+            reply.folders.Array.Add(contents);
+            List<InventoryItemBase> itemList = null;
+            if (CAPSFetchInventoryDescendents != null)
+            {
+                itemList = CAPSFetchInventoryDescendents(m_agentID, invFetch.folder_id, invFetch.owner_id, invFetch.fetch_folders, invFetch.fetch_items, invFetch.sort_order);
+            }
+
+            if (itemList != null)
+            {
+                foreach (InventoryItemBase invItem in itemList)
+                {
+                    contents.items.Array.Add(ConvertInventoryItem(invItem));
+                }
+            }
+            /* The following block is removed as it ALWAYS sends the error to the client because the RC 1.22.9 client tries to 
+                find items that have become dissasociated with a paret folder and have parent of 00000000-0000-00000....
+            else
+            {
+                IClientAPI client = GetClient(m_agentID);
+
+                // We're going to both notify the client of inventory service failure and send back a 'no folder contents' response.
+                // If we don't send back the response,
+                // the client becomes unhappy (see Teravus' comment in FetchInventoryRequest())
+                if (client != null)
+                {
+                    client.SendAgentAlertMessage(
+                        "AGIN0001E: The inventory service has either failed or is not responding.  Your inventory will not function properly for the rest of this session.  Please clear your cache and relog.",
+                        true);
+                }
+                else
+                {
+                    m_log.ErrorFormat(
+                        "[AGENT INVENTORY]: Could not lookup controlling client for {0} in order to notify them of the inventory service failure",
+                        m_agentID);
+                }
+            }*/
+
+            contents.descendents = contents.items.Array.Count;
+            return reply;
+        }
+
+        /// <summary>
+        /// Convert an internal inventory item object into an LLSD object.
+        /// </summary>
+        /// <param name="invItem"></param>
+        /// <returns></returns>
+        private LLSDInventoryItem ConvertInventoryItem(InventoryItemBase invItem)
+        {
+            LLSDInventoryItem llsdItem = new LLSDInventoryItem();
+            llsdItem.asset_id = invItem.AssetID;
+            llsdItem.created_at = invItem.CreationDate;
+            llsdItem.desc = invItem.Description;
+            llsdItem.flags = 0;
+            llsdItem.item_id = invItem.ID;
+            llsdItem.name = invItem.Name;
+            llsdItem.parent_id = invItem.Folder;
+            try
+            {
+                // TODO reevaluate after upgrade to libomv >= r2566. Probably should use UtilsConversions.
+                llsdItem.type = TaskInventoryItem.Types[invItem.AssetType];
+                llsdItem.inv_type = TaskInventoryItem.InvTypes[invItem.InvType];
+            }
+            catch (Exception e)
+            {
+                m_log.Error("[CAPS]: Problem setting asset/inventory type while converting inventory item " + invItem.Name + " to LLSD:", e);
+            }
+            llsdItem.permissions = new LLSDPermissions();
+            llsdItem.permissions.creator_id = invItem.CreatorIdAsUuid;
+            llsdItem.permissions.base_mask = (int)invItem.CurrentPermissions;
+            llsdItem.permissions.everyone_mask = (int)invItem.EveryOnePermissions;
+            llsdItem.permissions.group_id = UUID.Zero;
+            llsdItem.permissions.group_mask = 0;
+            llsdItem.permissions.is_owner_group = false;
+            llsdItem.permissions.next_owner_mask = (int)invItem.NextPermissions;
+            llsdItem.permissions.owner_id = m_agentID; // FixMe
+            llsdItem.permissions.owner_mask = (int)invItem.CurrentPermissions;
+            llsdItem.sale_info = new LLSDSaleInfo();
+            llsdItem.sale_info.sale_price = 10;
+            llsdItem.sale_info.sale_type = "not";
+
+            return llsdItem;
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="mapReq"></param>
+        /// <returns></returns>
+        public LLSDMapLayerResponse GetMapLayer(LLSDMapRequest mapReq)
+        {
+            m_log.Debug("[CAPS]: MapLayer Request in region: " + m_regionName);
+            LLSDMapLayerResponse mapResponse = new LLSDMapLayerResponse();
+            mapResponse.LayerData.Array.Add(GetOSDMapLayerResponse());
+            return mapResponse;
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <returns></returns>
+        protected static OSDMapLayer GetOSDMapLayerResponse()
+        {
+            OSDMapLayer mapLayer = new OSDMapLayer();
+            mapLayer.Right = 5000;
+            mapLayer.Top = 5000;
+            mapLayer.ImageID = new UUID("00000000-0000-1111-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)
+        {
+            m_log.Debug("texture request " + request);
+            // Needs implementing (added to remove compiler warning)
+            return String.Empty;
+        }
+
+        #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 = String.Empty;
+
+            if (m_capsEventQueue.Count > 0)
+            {
+                lock (m_capsEventQueue)
+                {
+                    string item = m_capsEventQueue.Dequeue();
+                    res = item;
+                }
+            }
+            else
+            {
+                res = 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 = m_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);
+            m_eventQueueCount++;
+
+            m_capsEventQueue.Enqueue(res);
+            return res;
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <returns></returns>
+        public string CreateEmptyEventResponse()
+        {
+            LLSDCapEvent eventItem = new LLSDCapEvent();
+            eventItem.id = m_eventQueueCount;
+            eventItem.events.Array.Add(new LLSDEmpty());
+            string res = LLSDHelpers.SerialiseLLSDReply(eventItem);
+            m_eventQueueCount++;
+            return res;
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Called by the script task update handler.  Provides a URL to which the client can upload a new asset.
+        /// </summary>
+        /// <param name="request"></param>
+        /// <param name="path"></param>
+        /// <param name="param"></param>
+        /// <param name="httpRequest">HTTP request header object</param>
+        /// <param name="httpResponse">HTTP response header object</param>
+        /// <returns></returns>
+        public string ScriptTaskInventory(string request, string path, string param,
+                                          OSHttpRequest httpRequest, OSHttpResponse httpResponse)
+        {
+            try
+            {
+                m_log.Debug("[CAPS]: ScriptTaskInventory Request in region: " + m_regionName);
+                //m_log.DebugFormat("[CAPS]: request: {0}, path: {1}, param: {2}", request, path, param);
+
+                Hashtable hash = (Hashtable) LLSD.LLSDDeserialize(Utils.StringToBytes(request));
+                LLSDTaskScriptUpdate llsdUpdateRequest = new LLSDTaskScriptUpdate();
+                LLSDHelpers.DeserialiseOSDMap(hash, llsdUpdateRequest);
+
+                string capsBase = "/CAPS/" + m_capsObjectPath;
+                string uploaderPath = Util.RandomClass.Next(5000, 8000).ToString("0000");
+
+                TaskInventoryScriptUpdater uploader =
+                    new TaskInventoryScriptUpdater(
+                        llsdUpdateRequest.item_id,
+                        llsdUpdateRequest.task_id,
+                        llsdUpdateRequest.is_script_running,
+                        capsBase + uploaderPath,
+                        m_httpListener,
+                        m_dumpAssetsToFile);
+                uploader.OnUpLoad += TaskScriptUpdated;
+
+                m_httpListener.AddStreamHandler(
+                    new BinaryStreamHandler("POST", capsBase + uploaderPath, uploader.uploaderCaps));
+
+                string protocol = "http://";
+
+                if (m_httpListener.UseSSL)
+                    protocol = "https://";
+
+                string uploaderURL = protocol + m_httpListenerHostName + ":" + m_httpListenPort.ToString() + capsBase +
+                                     uploaderPath;
+
+                LLSDAssetUploadResponse uploadResponse = new LLSDAssetUploadResponse();
+                uploadResponse.uploader = uploaderURL;
+                uploadResponse.state = "upload";
+
+//                m_log.InfoFormat("[CAPS]: " +
+//                                 "ScriptTaskInventory response: {0}",
+//                                 LLSDHelpers.SerialiseLLSDReply(uploadResponse)));
+
+                return LLSDHelpers.SerialiseLLSDReply(uploadResponse);
+            }
+            catch (Exception e)
+            {
+                m_log.Error("[CAPS]: " + e.ToString());
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Called by the notecard update handler.  Provides a URL to which the client can upload a new asset.
+        /// </summary>
+        /// <param name="request"></param>
+        /// <param name="path"></param>
+        /// <param name="param"></param>
+        /// <returns></returns>
+        public string NoteCardAgentInventory(string request, string path, string param,
+                                             OSHttpRequest httpRequest, OSHttpResponse httpResponse)
+        {
+            //m_log.Debug("[CAPS]: NoteCardAgentInventory Request in region: " + m_regionName + "\n" + request);
+            //m_log.Debug("[CAPS]: NoteCardAgentInventory Request is: " + request);
+            
+            //OpenMetaverse.StructuredData.OSDMap hash = (OpenMetaverse.StructuredData.OSDMap)OpenMetaverse.StructuredData.LLSDParser.DeserializeBinary(Utils.StringToBytes(request));
+            Hashtable hash = (Hashtable) LLSD.LLSDDeserialize(Utils.StringToBytes(request));
+            LLSDItemUpdate llsdRequest = new LLSDItemUpdate();
+            LLSDHelpers.DeserialiseOSDMap(hash, llsdRequest);
+
+            string capsBase = "/CAPS/" + m_capsObjectPath;
+            string uploaderPath = Util.RandomClass.Next(5000, 8000).ToString("0000");
+
+            ItemUpdater uploader =
+                new ItemUpdater(llsdRequest.item_id, capsBase + uploaderPath, m_httpListener, m_dumpAssetsToFile);
+            uploader.OnUpLoad += ItemUpdated;
+
+            m_httpListener.AddStreamHandler(
+                new BinaryStreamHandler("POST", capsBase + uploaderPath, uploader.uploaderCaps));
+
+            string protocol = "http://";
+
+            if (m_httpListener.UseSSL)
+                protocol = "https://";
+
+            string uploaderURL = protocol + m_httpListenerHostName + ":" + m_httpListenPort.ToString() + capsBase +
+                                 uploaderPath;
+
+            LLSDAssetUploadResponse uploadResponse = new LLSDAssetUploadResponse();
+            uploadResponse.uploader = uploaderURL;
+            uploadResponse.state = "upload";
+
+//            m_log.InfoFormat("[CAPS]: " +
+//                             "NoteCardAgentInventory response: {0}",
+//                             LLSDHelpers.SerialiseLLSDReply(uploadResponse)));
+
+            return LLSDHelpers.SerialiseLLSDReply(uploadResponse);
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="llsdRequest"></param>
+        /// <returns></returns>
+        public LLSDAssetUploadResponse NewAgentInventoryRequest(LLSDAssetUploadRequest llsdRequest)
+        {
+            //m_log.Debug("[CAPS]: NewAgentInventoryRequest Request is: " + llsdRequest.ToString());
+            //m_log.Debug("asset upload request via CAPS" + llsdRequest.inventory_type + " , " + llsdRequest.asset_type);
+
+            if (llsdRequest.asset_type == "texture" ||
+                llsdRequest.asset_type == "animation" ||
+                llsdRequest.asset_type == "sound")
+            {
+                IClientAPI client = null;
+                IScene scene = null;
+                if (GetClient != null)
+                {
+                    client = GetClient(m_agentID);
+                    scene = client.Scene;
+
+                    IMoneyModule mm = scene.RequestModuleInterface<IMoneyModule>();
+
+                    if (mm != null)
+                    {
+                        if (!mm.UploadCovered(client))
+                        {
+                            if (client != null)
+                                client.SendAgentAlertMessage("Unable to upload asset. Insufficient funds.", false);
+
+                            LLSDAssetUploadResponse errorResponse = new LLSDAssetUploadResponse();
+                            errorResponse.uploader = "";
+                            errorResponse.state = "error";
+                            return errorResponse;
+                        }
+                    }
+                }
+            }
+
+
+            string assetName = llsdRequest.name;
+            string assetDes = llsdRequest.description;
+            string capsBase = "/CAPS/" + m_capsObjectPath;
+            UUID newAsset = UUID.Random();
+            UUID newInvItem = UUID.Random();
+            UUID parentFolder = llsdRequest.folder_id;
+            string uploaderPath = Util.RandomClass.Next(5000, 8000).ToString("0000");
+
+            AssetUploader uploader =
+                new AssetUploader(assetName, assetDes, newAsset, newInvItem, parentFolder, llsdRequest.inventory_type,
+                                  llsdRequest.asset_type, capsBase + uploaderPath, m_httpListener, m_dumpAssetsToFile);
+            m_httpListener.AddStreamHandler(
+                new BinaryStreamHandler("POST", capsBase + uploaderPath, uploader.uploaderCaps));
+
+            string protocol = "http://";
+
+            if (m_httpListener.UseSSL)
+                protocol = "https://";
+
+            string uploaderURL = protocol + m_httpListenerHostName + ":" + m_httpListenPort.ToString() + capsBase +
+                                 uploaderPath;
+
+            LLSDAssetUploadResponse uploadResponse = new LLSDAssetUploadResponse();
+            uploadResponse.uploader = uploaderURL;
+            uploadResponse.state = "upload";
+            uploader.OnUpLoad += UploadCompleteHandler;
+            return uploadResponse;
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="assetID"></param>
+        /// <param name="inventoryItem"></param>
+        /// <param name="data"></param>
+        public void UploadCompleteHandler(string assetName, string assetDescription, UUID assetID,
+                                          UUID inventoryItem, UUID parentFolder, byte[] data, string inventoryType,
+                                          string assetType)
+        {
+            sbyte assType = 0;
+            sbyte inType = 0;
+
+            if (inventoryType == "sound")
+            {
+                inType = 1;
+                assType = 1;
+            }
+            else if (inventoryType == "animation")
+            {
+                inType = 19;
+                assType = 20;
+            }
+            else if (inventoryType == "wearable")
+            {
+                inType = 18;
+                switch (assetType)
+                {
+                    case "bodypart":
+                        assType = 13;
+                        break;
+                    case "clothing":
+                        assType = 5;
+                        break;
+                }
+            }
+
+            AssetBase asset;
+            asset = new AssetBase();
+            asset.FullID = assetID;
+            asset.Type = assType;
+            asset.Name = assetName;
+            asset.Data = data;
+            if (AddNewAsset != null)
+                AddNewAsset(asset);
+            else if (m_assetCache != null)
+                m_assetCache.Store(asset);
+
+            InventoryItemBase item = new InventoryItemBase();
+            item.Owner = m_agentID;
+            item.CreatorId = m_agentID.ToString();
+            item.ID = inventoryItem;
+            item.AssetID = asset.FullID;
+            item.Description = assetDescription;
+            item.Name = assetName;
+            item.AssetType = assType;
+            item.InvType = inType;
+            item.Folder = parentFolder;
+            item.CurrentPermissions = 2147483647;
+            item.BasePermissions = 2147483647;
+            item.EveryOnePermissions = 0;
+            item.NextPermissions = 2147483647;
+            item.CreationDate = Util.UnixTimeSinceEpoch();
+
+            if (AddNewInventoryItem != null)
+            {
+                AddNewInventoryItem(m_agentID, item);
+            }
+        }
+
+        /// <summary>
+        /// Called when new asset data for an agent inventory item update has been uploaded.
+        /// </summary>
+        /// <param name="itemID">Item to update</param>
+        /// <param name="data">New asset data</param>
+        /// <returns></returns>
+        public UUID ItemUpdated(UUID itemID, byte[] data)
+        {
+            if (ItemUpdatedCall != null)
+            {
+                return ItemUpdatedCall(m_agentID, itemID, data);
+            }
+
+            return UUID.Zero;
+        }
+
+        /// <summary>
+        /// Called when new asset data for an agent inventory item update has been uploaded.
+        /// </summary>
+        /// <param name="itemID">Item to update</param>
+        /// <param name="primID">Prim containing item to update</param>
+        /// <param name="isScriptRunning">Signals whether the script to update is currently running</param>
+        /// <param name="data">New asset data</param>
+        public void TaskScriptUpdated(UUID itemID, UUID primID, bool isScriptRunning, byte[] data)
+        {
+            if (TaskScriptUpdatedCall != null)
+            {
+                TaskScriptUpdatedCall(m_agentID, itemID, primID, isScriptRunning, data);
+            }
+        }
+
+        public class AssetUploader
+        {
+            public event UpLoadedAsset OnUpLoad;
+            private UpLoadedAsset handlerUpLoad = null;
+
+            private string uploaderPath = String.Empty;
+            private UUID newAssetID;
+            private UUID inventoryItemID;
+            private UUID parentFolder;
+            private IHttpServer httpListener;
+            private bool m_dumpAssetsToFile;
+            private string m_assetName = String.Empty;
+            private string m_assetDes = String.Empty;
+
+            private string m_invType = String.Empty;
+            private string m_assetType = String.Empty;
+
+            public AssetUploader(string assetName, string description, UUID assetID, UUID inventoryItem,
+                                 UUID parentFolderID, string invType, string assetType, string path,
+                                 IHttpServer httpServer, bool dumpAssetsToFile)
+            {
+                m_assetName = assetName;
+                m_assetDes = description;
+                newAssetID = assetID;
+                inventoryItemID = inventoryItem;
+                uploaderPath = path;
+                httpListener = httpServer;
+                parentFolder = parentFolderID;
+                m_assetType = assetType;
+                m_invType = invType;
+                m_dumpAssetsToFile = dumpAssetsToFile;
+            }
+
+            /// <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)
+            {
+                UUID inv = inventoryItemID;
+                string res = String.Empty;
+                LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete();
+                uploadComplete.new_asset = newAssetID.ToString();
+                uploadComplete.new_inventory_item = inv;
+                uploadComplete.state = "complete";
+
+                res = LLSDHelpers.SerialiseLLSDReply(uploadComplete);
+
+                httpListener.RemoveStreamHandler("POST", uploaderPath);
+
+                // TODO: probably make this a better set of extensions here
+                string extension = ".jp2";
+                if (m_invType != "image")
+                {
+                    extension = ".dat";
+                }
+
+                if (m_dumpAssetsToFile)
+                {
+                    SaveAssetToFile(m_assetName + extension, data);
+                }
+                handlerUpLoad = OnUpLoad;
+                if (handlerUpLoad != null)
+                {
+                    handlerUpLoad(m_assetName, m_assetDes, newAssetID, inv, parentFolder, data, m_invType, m_assetType);
+                }
+
+                return res;
+            }
+            ///Left this in and commented in case there are unforseen issues
+            //private void SaveAssetToFile(string filename, byte[] data)
+            //{
+            //    FileStream fs = File.Create(filename);
+            //    BinaryWriter bw = new BinaryWriter(fs);
+            //    bw.Write(data);
+            //    bw.Close();
+            //    fs.Close();
+            //}
+            private static void SaveAssetToFile(string filename, byte[] data)
+            {
+                string assetPath = "UserAssets";
+                if (!Directory.Exists(assetPath))
+                {
+                    Directory.CreateDirectory(assetPath);
+                }
+                FileStream fs = File.Create(Path.Combine(assetPath, Util.safeFileName(filename)));
+                BinaryWriter bw = new BinaryWriter(fs);
+                bw.Write(data);
+                bw.Close();
+                fs.Close();
+            }
+        }
+
+        /// <summary>
+        /// This class is a callback invoked when a client sends asset data to
+        /// an agent inventory notecard update url
+        /// </summary>
+        public class ItemUpdater
+        {
+            public event UpdateItem OnUpLoad;
+
+            private UpdateItem handlerUpdateItem = null;
+
+            private string uploaderPath = String.Empty;
+            private UUID inventoryItemID;
+            private IHttpServer httpListener;
+            private bool m_dumpAssetToFile;
+
+            public ItemUpdater(UUID inventoryItem, string path, IHttpServer httpServer, bool dumpAssetToFile)
+            {
+                m_dumpAssetToFile = dumpAssetToFile;
+
+                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)
+            {
+                UUID inv = inventoryItemID;
+                string res = String.Empty;
+                LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete();
+                UUID assetID = UUID.Zero;
+                handlerUpdateItem = OnUpLoad;
+                if (handlerUpdateItem != null)
+                {
+                    assetID = handlerUpdateItem(inv, data);
+                }
+
+                uploadComplete.new_asset = assetID.ToString();
+                uploadComplete.new_inventory_item = inv;
+                uploadComplete.state = "complete";
+
+                res = LLSDHelpers.SerialiseLLSDReply(uploadComplete);
+
+                httpListener.RemoveStreamHandler("POST", uploaderPath);
+
+                if (m_dumpAssetToFile)
+                {
+                    SaveAssetToFile("updateditem" + Util.RandomClass.Next(1, 1000) + ".dat", data);
+                }
+
+                return res;
+            }
+            ///Left this in and commented in case there are unforseen issues
+            //private void SaveAssetToFile(string filename, byte[] data)
+            //{
+            //    FileStream fs = File.Create(filename);
+            //    BinaryWriter bw = new BinaryWriter(fs);
+            //    bw.Write(data);
+            //    bw.Close();
+            //    fs.Close();
+            //}
+            private static void SaveAssetToFile(string filename, byte[] data)
+            {
+                string assetPath = "UserAssets";
+                if (!Directory.Exists(assetPath))
+                {
+                    Directory.CreateDirectory(assetPath);
+                }
+                FileStream fs = File.Create(Path.Combine(assetPath, filename));
+                BinaryWriter bw = new BinaryWriter(fs);
+                bw.Write(data);
+                bw.Close();
+                fs.Close();
+            }
+        }
+
+        /// <summary>
+        /// This class is a callback invoked when a client sends asset data to
+        /// a task inventory script update url
+        /// </summary>
+        public class TaskInventoryScriptUpdater
+        {
+            public event UpdateTaskScript OnUpLoad;
+
+            private UpdateTaskScript handlerUpdateTaskScript = null;
+
+            private string uploaderPath = String.Empty;
+            private UUID inventoryItemID;
+            private UUID primID;
+            private bool isScriptRunning;
+            private IHttpServer httpListener;
+            private bool m_dumpAssetToFile;
+
+            public TaskInventoryScriptUpdater(UUID inventoryItemID, UUID primID, int isScriptRunning,
+                                              string path, IHttpServer httpServer, bool dumpAssetToFile)
+            {
+                m_dumpAssetToFile = dumpAssetToFile;
+
+                this.inventoryItemID = inventoryItemID;
+                this.primID = primID;
+
+                // This comes in over the packet as an integer, but actually appears to be treated as a bool
+                this.isScriptRunning = (0 == isScriptRunning ? false : true);
+
+                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)
+            {
+                try
+                {
+//                    m_log.InfoFormat("[CAPS]: " +
+//                                     "TaskInventoryScriptUpdater received data: {0}, path: {1}, param: {2}",
+//                                     data, path, param));
+
+                    string res = String.Empty;
+                    LLSDTaskInventoryUploadComplete uploadComplete = new LLSDTaskInventoryUploadComplete();
+
+                    handlerUpdateTaskScript = OnUpLoad;
+                    if (handlerUpdateTaskScript != null)
+                    {
+                        handlerUpdateTaskScript(inventoryItemID, primID, isScriptRunning, data);
+                    }
+
+                    uploadComplete.item_id = inventoryItemID;
+                    uploadComplete.task_id = primID;
+                    uploadComplete.state = "complete";
+
+                    res = LLSDHelpers.SerialiseLLSDReply(uploadComplete);
+
+                    httpListener.RemoveStreamHandler("POST", uploaderPath);
+
+                    if (m_dumpAssetToFile)
+                    {
+                        SaveAssetToFile("updatedtaskscript" + Util.RandomClass.Next(1, 1000) + ".dat", data);
+                    }
+
+//                    m_log.InfoFormat("[CAPS]: TaskInventoryScriptUpdater.uploaderCaps res: {0}", res);
+
+                    return res;
+                }
+                catch (Exception e)
+                {
+                    m_log.Error("[CAPS]: " + e.ToString());
+                }
+
+                // XXX Maybe this should be some meaningful error packet
+                return null;
+            }
+            ///Left this in and commented in case there are unforseen issues
+            //private void SaveAssetToFile(string filename, byte[] data)
+            //{
+            //    FileStream fs = File.Create(filename);
+            //    BinaryWriter bw = new BinaryWriter(fs);
+            //    bw.Write(data);
+            //    bw.Close();
+            //    fs.Close();
+            //}
+            private static void SaveAssetToFile(string filename, byte[] data)
+            {
+                string assetPath = "UserAssets";
+                if (!Directory.Exists(assetPath))
+                {
+                    Directory.CreateDirectory(assetPath);
+                }
+                FileStream fs = File.Create(Path.Combine(assetPath, filename));
+                BinaryWriter bw = new BinaryWriter(fs);
+                bw.Write(data);
+                bw.Close();
+                fs.Close();
+            }
+        }
+    }
+}
diff --git a/OpenSim/Framework/Capabilities/CapsHandlers.cs b/OpenSim/Framework/Capabilities/CapsHandlers.cs
index 5d42bfc..f000aed 100644
--- a/OpenSim/Framework/Capabilities/CapsHandlers.cs
+++ b/OpenSim/Framework/Capabilities/CapsHandlers.cs
@@ -1,171 +1,171 @@
-/*

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

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

- *

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

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

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

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

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

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

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

- *     * Neither the name of the OpenSimulator 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;

-using System.Collections.Generic;

-using OpenSim.Framework.Servers;

-using OpenSim.Framework.Servers.HttpServer;

-

-namespace OpenSim.Framework.Capabilities

-{

-    /// <summary>

-    /// CapsHandlers is a cap handler container but also takes

-    /// care of adding and removing cap handlers to and from the

-    /// supplied BaseHttpServer.

-    /// </summary>

-    public class CapsHandlers

-    {

-        private Dictionary <string, IRequestHandler> m_capsHandlers = new Dictionary<string, IRequestHandler>();

-        private IHttpServer m_httpListener;

-        private string m_httpListenerHostName;

-        private uint m_httpListenerPort;

-        private bool m_useSSL = false;

-

-        /// <summary></summary>

-        /// CapsHandlers is a cap handler container but also takes

-        /// care of adding and removing cap handlers to and from the

-        /// supplied BaseHttpServer.

-        /// </summary>

-        /// <param name="httpListener">base HTTP server</param>

-        /// <param name="httpListenerHostname">host name of the HTTP

-        /// server</param>

-        /// <param name="httpListenerPort">HTTP port</param>

-        public CapsHandlers(BaseHttpServer httpListener, string httpListenerHostname, uint httpListenerPort)

-         : this (httpListener,httpListenerHostname,httpListenerPort, false)

-        {

-        }

-

-        /// <summary></summary>

-        /// CapsHandlers is a cap handler container but also takes

-        /// care of adding and removing cap handlers to and from the

-        /// supplied BaseHttpServer.

-        /// </summary>

-        /// <param name="httpListener">base HTTP server</param>

-        /// <param name="httpListenerHostname">host name of the HTTP

-        /// server</param>

-        /// <param name="httpListenerPort">HTTP port</param>

-        public CapsHandlers(IHttpServer httpListener, string httpListenerHostname, uint httpListenerPort, bool https)

-        {

-            m_httpListener = httpListener;

-            m_httpListenerHostName = httpListenerHostname;

-            m_httpListenerPort = httpListenerPort;

-            m_useSSL = https;

-            if (m_useSSL)

-            {

-                m_httpListenerHostName = httpListener.SSLCommonName;

-                m_httpListenerPort = httpListener.SSLPort;

-            }

-        }

-

-        /// <summary>

-        /// Remove the cap handler for a capability.

-        /// </summary>

-        /// <param name="capsName">name of the capability of the cap

-        /// handler to be removed</param>

-        public void Remove(string capsName)

-        {

-            // This line must be here, or caps will break!

-            m_httpListener.RemoveStreamHandler("POST", m_capsHandlers[capsName].Path);

-            m_capsHandlers.Remove(capsName);

-        }

-

-        public bool ContainsCap(string cap)

-        {

-            return m_capsHandlers.ContainsKey(cap);

-        }

-

-        /// <summary>

-        /// The indexer allows us to treat the CapsHandlers object

-        /// in an intuitive dictionary like way.

-        /// </summary>

-        /// <Remarks>

-        /// The indexer will throw an exception when you try to

-        /// retrieve a cap handler for a cap that is not contained in

-        /// CapsHandlers.

-        /// </Remarks>

-        public IRequestHandler this[string idx]

-        {

-            get

-            {

-                return m_capsHandlers[idx];

-            }

-

-            set

-            {

-                if (m_capsHandlers.ContainsKey(idx))

-                {

-                    m_httpListener.RemoveStreamHandler("POST", m_capsHandlers[idx].Path);

-                    m_capsHandlers.Remove(idx);

-                }

-

-                if (null == value) return;

-

-                m_capsHandlers[idx] = value;

-                m_httpListener.AddStreamHandler(value);

-            }

-        }

-

-        /// <summary>

-        /// Return the list of cap names for which this CapsHandlers

-        /// object contains cap handlers.

-        /// </summary>

-        public string[] Caps

-        {

-            get

-            {

-                string[] __keys = new string[m_capsHandlers.Keys.Count];

-                m_capsHandlers.Keys.CopyTo(__keys, 0);

-                return __keys;

-            }

-        }

-

-        /// <summary>

-        /// Return an LLSD-serializable Hashtable describing the

-        /// capabilities and their handler details.

-        /// </summary>

-        public Hashtable CapsDetails

-        {

-            get

-            {

-                Hashtable caps = new Hashtable();

-                string protocol = "http://";

-                

-                if (m_useSSL)

-                    protocol = "https://";

-

-                string baseUrl = protocol + m_httpListenerHostName + ":" + m_httpListenerPort.ToString();

-                foreach (string capsName in m_capsHandlers.Keys)

-                {

-                    // skip SEED cap

-                    if ("SEED" == capsName) continue;

-                    caps[capsName] = baseUrl + m_capsHandlers[capsName].Path;

-                }

-                return caps;

-            }

-        }

-    }

-}

+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator 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;
+using System.Collections.Generic;
+using OpenSim.Framework.Servers;
+using OpenSim.Framework.Servers.HttpServer;
+
+namespace OpenSim.Framework.Capabilities
+{
+    /// <summary>
+    /// CapsHandlers is a cap handler container but also takes
+    /// care of adding and removing cap handlers to and from the
+    /// supplied BaseHttpServer.
+    /// </summary>
+    public class CapsHandlers
+    {
+        private Dictionary <string, IRequestHandler> m_capsHandlers = new Dictionary<string, IRequestHandler>();
+        private IHttpServer m_httpListener;
+        private string m_httpListenerHostName;
+        private uint m_httpListenerPort;
+        private bool m_useSSL = false;
+
+        /// <summary></summary>
+        /// CapsHandlers is a cap handler container but also takes
+        /// care of adding and removing cap handlers to and from the
+        /// supplied BaseHttpServer.
+        /// </summary>
+        /// <param name="httpListener">base HTTP server</param>
+        /// <param name="httpListenerHostname">host name of the HTTP
+        /// server</param>
+        /// <param name="httpListenerPort">HTTP port</param>
+        public CapsHandlers(BaseHttpServer httpListener, string httpListenerHostname, uint httpListenerPort)
+         : this (httpListener,httpListenerHostname,httpListenerPort, false)
+        {
+        }
+
+        /// <summary></summary>
+        /// CapsHandlers is a cap handler container but also takes
+        /// care of adding and removing cap handlers to and from the
+        /// supplied BaseHttpServer.
+        /// </summary>
+        /// <param name="httpListener">base HTTP server</param>
+        /// <param name="httpListenerHostname">host name of the HTTP
+        /// server</param>
+        /// <param name="httpListenerPort">HTTP port</param>
+        public CapsHandlers(IHttpServer httpListener, string httpListenerHostname, uint httpListenerPort, bool https)
+        {
+            m_httpListener = httpListener;
+            m_httpListenerHostName = httpListenerHostname;
+            m_httpListenerPort = httpListenerPort;
+            m_useSSL = https;
+            if (m_useSSL)
+            {
+                m_httpListenerHostName = httpListener.SSLCommonName;
+                m_httpListenerPort = httpListener.SSLPort;
+            }
+        }
+
+        /// <summary>
+        /// Remove the cap handler for a capability.
+        /// </summary>
+        /// <param name="capsName">name of the capability of the cap
+        /// handler to be removed</param>
+        public void Remove(string capsName)
+        {
+            // This line must be here, or caps will break!
+            m_httpListener.RemoveStreamHandler("POST", m_capsHandlers[capsName].Path);
+            m_capsHandlers.Remove(capsName);
+        }
+
+        public bool ContainsCap(string cap)
+        {
+            return m_capsHandlers.ContainsKey(cap);
+        }
+
+        /// <summary>
+        /// The indexer allows us to treat the CapsHandlers object
+        /// in an intuitive dictionary like way.
+        /// </summary>
+        /// <Remarks>
+        /// The indexer will throw an exception when you try to
+        /// retrieve a cap handler for a cap that is not contained in
+        /// CapsHandlers.
+        /// </Remarks>
+        public IRequestHandler this[string idx]
+        {
+            get
+            {
+                return m_capsHandlers[idx];
+            }
+
+            set
+            {
+                if (m_capsHandlers.ContainsKey(idx))
+                {
+                    m_httpListener.RemoveStreamHandler("POST", m_capsHandlers[idx].Path);
+                    m_capsHandlers.Remove(idx);
+                }
+
+                if (null == value) return;
+
+                m_capsHandlers[idx] = value;
+                m_httpListener.AddStreamHandler(value);
+            }
+        }
+
+        /// <summary>
+        /// Return the list of cap names for which this CapsHandlers
+        /// object contains cap handlers.
+        /// </summary>
+        public string[] Caps
+        {
+            get
+            {
+                string[] __keys = new string[m_capsHandlers.Keys.Count];
+                m_capsHandlers.Keys.CopyTo(__keys, 0);
+                return __keys;
+            }
+        }
+
+        /// <summary>
+        /// Return an LLSD-serializable Hashtable describing the
+        /// capabilities and their handler details.
+        /// </summary>
+        public Hashtable CapsDetails
+        {
+            get
+            {
+                Hashtable caps = new Hashtable();
+                string protocol = "http://";
+                
+                if (m_useSSL)
+                    protocol = "https://";
+
+                string baseUrl = protocol + m_httpListenerHostName + ":" + m_httpListenerPort.ToString();
+                foreach (string capsName in m_capsHandlers.Keys)
+                {
+                    // skip SEED cap
+                    if ("SEED" == capsName) continue;
+                    caps[capsName] = baseUrl + m_capsHandlers[capsName].Path;
+                }
+                return caps;
+            }
+        }
+    }
+}
diff --git a/OpenSim/Framework/Capabilities/CapsUtil.cs b/OpenSim/Framework/Capabilities/CapsUtil.cs
index cd8c001..46dbd3d 100644
--- a/OpenSim/Framework/Capabilities/CapsUtil.cs
+++ b/OpenSim/Framework/Capabilities/CapsUtil.cs
@@ -1,62 +1,62 @@
-/*

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

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

- *

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

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

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

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

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

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

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

- *     * Neither the name of the OpenSimulator 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 OpenMetaverse;

-

-namespace OpenSim.Framework.Capabilities

-{    

-    /// <summary>

-    /// Capabilities utility methods

-    /// </summary>

-    public class CapsUtil

-    {

-        /// <summary>

-        /// Generate a CAPS seed path using a previously generated CAPS object path component

-        /// </summary>

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

-        /// <returns></returns>

-        public static string GetCapsSeedPath(string capsObjectPath)

-        {

-            return "/CAPS/" + capsObjectPath + "0000/";

-        }

-        

-        /// <summary>

-        /// Get a random CAPS object path component that will be used as the identifying part of all future CAPS requests

-        /// </summary>

-        /// <returns></returns>

-        public static string GetRandomCapsObjectPath()

-        {

-            UUID caps = UUID.Random();

-            string capsPath = caps.ToString();

-            // I'm commenting this, rather than delete, to keep as historical record.

-            // The caps seed is now a full UUID string that gets added four more digits

-            // for producing certain CAPs URLs in OpenSim

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

-            return capsPath;

-        }

-    }

-}

+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator 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 OpenMetaverse;
+
+namespace OpenSim.Framework.Capabilities
+{    
+    /// <summary>
+    /// Capabilities utility methods
+    /// </summary>
+    public class CapsUtil
+    {
+        /// <summary>
+        /// Generate a CAPS seed path using a previously generated CAPS object path component
+        /// </summary>
+        /// <param name="capsKey"></param>
+        /// <returns></returns>
+        public static string GetCapsSeedPath(string capsObjectPath)
+        {
+            return "/CAPS/" + capsObjectPath + "0000/";
+        }
+        
+        /// <summary>
+        /// Get a random CAPS object path component that will be used as the identifying part of all future CAPS requests
+        /// </summary>
+        /// <returns></returns>
+        public static string GetRandomCapsObjectPath()
+        {
+            UUID caps = UUID.Random();
+            string capsPath = caps.ToString();
+            // I'm commenting this, rather than delete, to keep as historical record.
+            // The caps seed is now a full UUID string that gets added four more digits
+            // for producing certain CAPs URLs in OpenSim
+            //capsPath = capsPath.Remove(capsPath.Length - 4, 4);
+            return capsPath;
+        }
+    }
+}
diff --git a/OpenSim/Framework/Capabilities/LLSD.cs b/OpenSim/Framework/Capabilities/LLSD.cs
index c8bc273..84f43c1 100644
--- a/OpenSim/Framework/Capabilities/LLSD.cs
+++ b/OpenSim/Framework/Capabilities/LLSD.cs
@@ -1,679 +1,679 @@
-/*

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

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

- *

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

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

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

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

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

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

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

- *     * Neither the name of the OpenSimulator 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.Globalization;

-using System.IO;

-using System.Security.Cryptography;

-using System.Text;

-using System.Xml;

-using OpenMetaverse;

-

-namespace OpenSim.Framework.Capabilities

-{

-    /// <summary>

-    /// Borrowed from (a older version of) libsl for now, as their new llsd code doesn't work we our decoding code.

-    /// </summary>

-    public static class LLSD

-    {

-        /// <summary>

-        ///

-        /// </summary>

-        public class LLSDParseException : Exception

-        {

-            public LLSDParseException(string message) : base(message)

-            {

-            }

-        }

-

-        /// <summary>

-        ///

-        /// </summary>

-        public class LLSDSerializeException : Exception

-        {

-            public LLSDSerializeException(string message) : base(message)

-            {

-            }

-        }

-

-        /// <summary>

-        ///

-        /// </summary>

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

-        /// <returns></returns>

-        public static object LLSDDeserialize(byte[] b)

-        {

-            return LLSDDeserialize(new MemoryStream(b, false));

-        }

-

-        /// <summary>

-        ///

-        /// </summary>

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

-        /// <returns></returns>

-        public static object LLSDDeserialize(Stream st)

-        {

-            XmlTextReader reader = new XmlTextReader(st);

-            reader.Read();

-            SkipWS(reader);

-

-            if (reader.NodeType != XmlNodeType.Element || reader.LocalName != "llsd")

-                throw new LLSDParseException("Expected <llsd>");

-

-            reader.Read();

-            object ret = LLSDParseOne(reader);

-            SkipWS(reader);

-

-            if (reader.NodeType != XmlNodeType.EndElement || reader.LocalName != "llsd")

-                throw new LLSDParseException("Expected </llsd>");

-

-            return ret;

-        }

-

-        /// <summary>

-        ///

-        /// </summary>

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

-        /// <returns></returns>

-        public static byte[] LLSDSerialize(object obj)

-        {

-            StringWriter sw = new StringWriter();

-            XmlTextWriter writer = new XmlTextWriter(sw);

-            writer.Formatting = Formatting.None;

-

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

-            LLSDWriteOne(writer, obj);

-            writer.WriteEndElement();

-

-            writer.Close();

-

-            return Encoding.UTF8.GetBytes(sw.ToString());

-        }

-

-        /// <summary>

-        ///

-        /// </summary>

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

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

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

-        {

-            if (obj == null)

-            {

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

-                writer.WriteEndElement();

-                return;

-            }

-

-            if (obj is string)

-            {

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

-                writer.WriteString((string) obj);

-                writer.WriteEndElement();

-            }

-            else if (obj is int)

-            {

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

-                writer.WriteString(obj.ToString());

-                writer.WriteEndElement();

-            }

-            else if (obj is double)

-            {

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

-                writer.WriteString(obj.ToString());

-                writer.WriteEndElement();

-            }

-            else if (obj is bool)

-            {

-                bool b = (bool) obj;

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

-                writer.WriteString(b ? "1" : "0");

-                writer.WriteEndElement();

-            }

-            else if (obj is ulong)

-            {

-                throw new Exception("ulong in LLSD is currently not implemented, fix me!");

-            }

-            else if (obj is UUID)

-            {

-                UUID u = (UUID) obj;

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

-                writer.WriteString(u.ToString());

-                writer.WriteEndElement();

-            }

-            else if (obj is Hashtable)

-            {

-                Hashtable h = obj as Hashtable;

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

-                foreach (string key in h.Keys)

-                {

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

-                    writer.WriteString(key);

-                    writer.WriteEndElement();

-                    LLSDWriteOne(writer, h[key]);

-                }

-                writer.WriteEndElement();

-            }

-            else if (obj is ArrayList)

-            {

-                ArrayList a = obj as ArrayList;

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

-                foreach (object item in a)

-                {

-                    LLSDWriteOne(writer, item);

-                }

-                writer.WriteEndElement();

-            }

-            else if (obj is byte[])

-            {

-                byte[] b = obj as byte[];

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

-

-                writer.WriteStartAttribute(String.Empty, "encoding", String.Empty);

-                writer.WriteString("base64");

-                writer.WriteEndAttribute();

-

-                //// Calculate the length of the base64 output

-                //long length = (long)(4.0d * b.Length / 3.0d);

-                //if (length % 4 != 0) length += 4 - (length % 4);

-

-                //// Create the char[] for base64 output and fill it

-                //char[] tmp = new char[length];

-                //int i = Convert.ToBase64CharArray(b, 0, b.Length, tmp, 0);

-

-                //writer.WriteString(new String(tmp));

-

-                writer.WriteString(Convert.ToBase64String(b));

-                writer.WriteEndElement();

-            }

-            else

-            {

-                throw new LLSDSerializeException("Unknown type " + obj.GetType().Name);

-            }

-        }

-

-        /// <summary>

-        ///

-        /// </summary>

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

-        /// <returns></returns>

-        public static object LLSDParseOne(XmlTextReader reader)

-        {

-            SkipWS(reader);

-            if (reader.NodeType != XmlNodeType.Element)

-                throw new LLSDParseException("Expected an element");

-

-            string dtype = reader.LocalName;

-            object ret = null;

-

-            switch (dtype)

-            {

-                case "undef":

-                    {

-                        if (reader.IsEmptyElement)

-                        {

-                            reader.Read();

-                            return null;

-                        }

-

-                        reader.Read();

-                        SkipWS(reader);

-                        ret = null;

-                        break;

-                    }

-                case "boolean":

-                    {

-                        if (reader.IsEmptyElement)

-                        {

-                            reader.Read();

-                            return false;

-                        }

-

-                        reader.Read();

-                        string s = reader.ReadString().Trim();

-

-                        if (s == String.Empty || s == "false" || s == "0")

-                            ret = false;

-                        else if (s == "true" || s == "1")

-                            ret = true;

-                        else

-                            throw new LLSDParseException("Bad boolean value " + s);

-

-                        break;

-                    }

-                case "integer":

-                    {

-                        if (reader.IsEmptyElement)

-                        {

-                            reader.Read();

-                            return 0;

-                        }

-

-                        reader.Read();

-                        ret = Convert.ToInt32(reader.ReadString().Trim());

-                        break;

-                    }

-                case "real":

-                    {

-                        if (reader.IsEmptyElement)

-                        {

-                            reader.Read();

-                            return 0.0f;

-                        }

-

-                        reader.Read();

-                        ret = Convert.ToDouble(reader.ReadString().Trim());

-                        break;

-                    }

-                case "uuid":

-                    {

-                        if (reader.IsEmptyElement)

-                        {

-                            reader.Read();

-                            return UUID.Zero;

-                        }

-

-                        reader.Read();

-                        ret = new UUID(reader.ReadString().Trim());

-                        break;

-                    }

-                case "string":

-                    {

-                        if (reader.IsEmptyElement)

-                        {

-                            reader.Read();

-                            return String.Empty;

-                        }

-

-                        reader.Read();

-                        ret = reader.ReadString();

-                        break;

-                    }

-                case "binary":

-                    {

-                        if (reader.IsEmptyElement)

-                        {

-                            reader.Read();

-                            return new byte[0];

-                        }

-

-                        if (reader.GetAttribute("encoding") != null &&

-                            reader.GetAttribute("encoding") != "base64")

-                        {

-                            throw new LLSDParseException("Unknown encoding: " + reader.GetAttribute("encoding"));

-                        }

-

-                        reader.Read();

-                        FromBase64Transform b64 = new FromBase64Transform(FromBase64TransformMode.IgnoreWhiteSpaces);

-                        byte[] inp = Encoding.UTF8.GetBytes(reader.ReadString());

-                        ret = b64.TransformFinalBlock(inp, 0, inp.Length);

-                        break;

-                    }

-                case "date":

-                    {

-                        reader.Read();

-                        throw new Exception("LLSD TODO: date");

-                    }

-                case "map":

-                    {

-                        return LLSDParseMap(reader);

-                    }

-                case "array":

-                    {

-                        return LLSDParseArray(reader);

-                    }

-                default:

-                    throw new LLSDParseException("Unknown element <" + dtype + ">");

-            }

-

-            if (reader.NodeType != XmlNodeType.EndElement || reader.LocalName != dtype)

-            {

-                throw new LLSDParseException("Expected </" + dtype + ">");

-            }

-

-            reader.Read();

-            return ret;

-        }

-

-        /// <summary>

-        ///

-        /// </summary>

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

-        /// <returns></returns>

-        public static Hashtable LLSDParseMap(XmlTextReader reader)

-        {

-            Hashtable ret = new Hashtable();

-

-            if (reader.NodeType != XmlNodeType.Element || reader.LocalName != "map")

-                throw new LLSDParseException("Expected <map>");

-

-            if (reader.IsEmptyElement)

-            {

-                reader.Read();

-                return ret;

-            }

-

-            reader.Read();

-

-            while (true)

-            {

-                SkipWS(reader);

-                if (reader.NodeType == XmlNodeType.EndElement && reader.LocalName == "map")

-                {

-                    reader.Read();

-                    break;

-                }

-

-                if (reader.NodeType != XmlNodeType.Element || reader.LocalName != "key")

-                    throw new LLSDParseException("Expected <key>");

-

-                string key = reader.ReadString();

-

-                if (reader.NodeType != XmlNodeType.EndElement || reader.LocalName != "key")

-                    throw new LLSDParseException("Expected </key>");

-

-                reader.Read();

-                object val = LLSDParseOne(reader);

-                ret[key] = val;

-            }

-

-            return ret; // TODO

-        }

-

-        /// <summary>

-        ///

-        /// </summary>

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

-        /// <returns></returns>

-        public static ArrayList LLSDParseArray(XmlTextReader reader)

-        {

-            ArrayList ret = new ArrayList();

-

-            if (reader.NodeType != XmlNodeType.Element || reader.LocalName != "array")

-                throw new LLSDParseException("Expected <array>");

-

-            if (reader.IsEmptyElement)

-            {

-                reader.Read();

-                return ret;

-            }

-

-            reader.Read();

-

-            while (true)

-            {

-                SkipWS(reader);

-

-                if (reader.NodeType == XmlNodeType.EndElement && reader.LocalName == "array")

-                {

-                    reader.Read();

-                    break;

-                }

-

-                ret.Insert(ret.Count, LLSDParseOne(reader));

-            }

-

-            return ret; // TODO

-        }

-

-        /// <summary>

-        ///

-        /// </summary>

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

-        /// <returns></returns>

-        private static string GetSpaces(int count)

-        {

-            StringBuilder b = new StringBuilder();

-            for (int i = 0; i < count; i++) b.Append(" ");

-            return b.ToString();

-        }

-

-        /// <summary>

-        ///

-        /// </summary>

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

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

-        /// <returns></returns>

-        public static String LLSDDump(object obj, int indent)

-        {

-            if (obj == null)

-            {

-                return GetSpaces(indent) + "- undef\n";

-            }

-            else if (obj is string)

-            {

-                return GetSpaces(indent) + "- string \"" + (string) obj + "\"\n";

-            }

-            else if (obj is int)

-            {

-                return GetSpaces(indent) + "- integer " + obj.ToString() + "\n";

-            }

-            else if (obj is double)

-            {

-                return GetSpaces(indent) + "- float " + obj.ToString() + "\n";

-            }

-            else if (obj is UUID)

-            {

-                return GetSpaces(indent) + "- uuid " + ((UUID) obj).ToString() + Environment.NewLine;

-            }

-            else if (obj is Hashtable)

-            {

-                StringBuilder ret = new StringBuilder();

-                ret.Append(GetSpaces(indent) + "- map" + Environment.NewLine);

-                Hashtable map = (Hashtable) obj;

-

-                foreach (string key in map.Keys)

-                {

-                    ret.Append(GetSpaces(indent + 2) + "- key \"" + key + "\"" + Environment.NewLine);

-                    ret.Append(LLSDDump(map[key], indent + 3));

-                }

-

-                return ret.ToString();

-            }

-            else if (obj is ArrayList)

-            {

-                StringBuilder ret = new StringBuilder();

-                ret.Append(GetSpaces(indent) + "- array\n");

-                ArrayList list = (ArrayList) obj;

-

-                foreach (object item in list)

-                {

-                    ret.Append(LLSDDump(item, indent + 2));

-                }

-

-                return ret.ToString();

-            }

-            else if (obj is byte[])

-            {

-                return GetSpaces(indent) + "- binary\n" + Utils.BytesToHexString((byte[]) obj, GetSpaces(indent)) +

-                       Environment.NewLine;

-            }

-            else

-            {

-                return GetSpaces(indent) + "- unknown type " + obj.GetType().Name + Environment.NewLine;

-            }

-        }

-

-        public static object ParseTerseLLSD(string llsd)

-        {

-            int notused;

-            return ParseTerseLLSD(llsd, out notused);

-        }

-

-        public static object ParseTerseLLSD(string llsd, out int endPos)

-        {

-            if (llsd.Length == 0)

-            {

-                endPos = 0;

-                return null;

-            }

-

-            // Identify what type of object this is

-            switch (llsd[0])

-            {

-                case '!':

-                    throw new LLSDParseException("Undefined value type encountered");

-                case '1':

-                    endPos = 1;

-                    return true;

-                case '0':

-                    endPos = 1;

-                    return false;

-                case 'i':

-                    {

-                        if (llsd.Length < 2) throw new LLSDParseException("Integer value type with no value");

-                        int value;

-                        endPos = FindEnd(llsd, 1);

-

-                        if (Int32.TryParse(llsd.Substring(1, endPos - 1), out value))

-                            return value;

-                        else

-                            throw new LLSDParseException("Failed to parse integer value type");

-                    }

-                case 'r':

-                    {

-                        if (llsd.Length < 2) throw new LLSDParseException("Real value type with no value");

-                        double value;

-                        endPos = FindEnd(llsd, 1);

-

-                        if (Double.TryParse(llsd.Substring(1, endPos - 1), NumberStyles.Float,

-                                            Utils.EnUsCulture.NumberFormat, out value))

-                            return value;

-                        else

-                            throw new LLSDParseException("Failed to parse double value type");

-                    }

-                case 'u':

-                    {

-                        if (llsd.Length < 17) throw new LLSDParseException("UUID value type with no value");

-                        UUID value;

-                        endPos = FindEnd(llsd, 1);

-

-                        if (UUID.TryParse(llsd.Substring(1, endPos - 1), out value))

-                            return value;

-                        else

-                            throw new LLSDParseException("Failed to parse UUID value type");

-                    }

-                case 'b':

-                    //byte[] value = new byte[llsd.Length - 1];

-                    // This isn't the actual binary LLSD format, just the terse format sent

-                    // at login so I don't even know if there is a binary type

-                    throw new LLSDParseException("Binary value type is unimplemented");

-                case 's':

-                case 'l':

-                    if (llsd.Length < 2) throw new LLSDParseException("String value type with no value");

-                    endPos = FindEnd(llsd, 1);

-                    return llsd.Substring(1, endPos - 1);

-                case 'd':

-                    // Never seen one before, don't know what the format is

-                    throw new LLSDParseException("Date value type is unimplemented");

-                case '[':

-                    {

-                        if (llsd.IndexOf(']') == -1) throw new LLSDParseException("Invalid array");

-

-                        int pos = 0;

-                        ArrayList array = new ArrayList();

-

-                        while (llsd[pos] != ']')

-                        {

-                            ++pos;

-

-                            // Advance past comma if need be

-                            if (llsd[pos] == ',') ++pos;

-

-                            // Allow a single whitespace character

-                            if (pos < llsd.Length && llsd[pos] == ' ') ++pos;

-

-                            int end;

-                            array.Add(ParseTerseLLSD(llsd.Substring(pos), out end));

-                            pos += end;

-                        }

-

-                        endPos = pos + 1;

-                        return array;

-                    }

-                case '{':

-                    {

-                        if (llsd.IndexOf('}') == -1) throw new LLSDParseException("Invalid map");

-

-                        int pos = 0;

-                        Hashtable hashtable = new Hashtable();

-

-                        while (llsd[pos] != '}')

-                        {

-                            ++pos;

-

-                            // Advance past comma if need be

-                            if (llsd[pos] == ',') ++pos;

-

-                            // Allow a single whitespace character

-                            if (pos < llsd.Length && llsd[pos] == ' ') ++pos;

-

-                            if (llsd[pos] != '\'') throw new LLSDParseException("Expected a map key");

-                            int endquote = llsd.IndexOf('\'', pos + 1);

-                            if (endquote == -1 || (endquote + 1) >= llsd.Length || llsd[endquote + 1] != ':')

-                                throw new LLSDParseException("Invalid map format");

-                            string key = llsd.Substring(pos, endquote - pos);

-                            key = key.Replace("'", String.Empty);

-                            pos += (endquote - pos) + 2;

-

-                            int end;

-                            hashtable.Add(key, ParseTerseLLSD(llsd.Substring(pos), out end));

-                            pos += end;

-                        }

-

-                        endPos = pos + 1;

-                        return hashtable;

-                    }

-                default:

-                    throw new Exception("Unknown value type");

-            }

-        }

-

-        private static int FindEnd(string llsd, int start)

-        {

-            int end = llsd.IndexOfAny(new char[] {',', ']', '}'});

-            if (end == -1) end = llsd.Length - 1;

-            return end;

-        }

-

-        /// <summary>

-        ///

-        /// </summary>

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

-        private static void SkipWS(XmlTextReader reader)

-        {

-            while (

-                reader.NodeType == XmlNodeType.Comment ||

-                reader.NodeType == XmlNodeType.Whitespace ||

-                reader.NodeType == XmlNodeType.SignificantWhitespace ||

-                reader.NodeType == XmlNodeType.XmlDeclaration)

-            {

-                reader.Read();

-            }

-        }

-    }

-}

+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator 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.Globalization;
+using System.IO;
+using System.Security.Cryptography;
+using System.Text;
+using System.Xml;
+using OpenMetaverse;
+
+namespace OpenSim.Framework.Capabilities
+{
+    /// <summary>
+    /// Borrowed from (a older version of) libsl for now, as their new llsd code doesn't work we our decoding code.
+    /// </summary>
+    public static class LLSD
+    {
+        /// <summary>
+        ///
+        /// </summary>
+        public class LLSDParseException : Exception
+        {
+            public LLSDParseException(string message) : base(message)
+            {
+            }
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        public class LLSDSerializeException : Exception
+        {
+            public LLSDSerializeException(string message) : base(message)
+            {
+            }
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="b"></param>
+        /// <returns></returns>
+        public static object LLSDDeserialize(byte[] b)
+        {
+            return LLSDDeserialize(new MemoryStream(b, false));
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="st"></param>
+        /// <returns></returns>
+        public static object LLSDDeserialize(Stream st)
+        {
+            XmlTextReader reader = new XmlTextReader(st);
+            reader.Read();
+            SkipWS(reader);
+
+            if (reader.NodeType != XmlNodeType.Element || reader.LocalName != "llsd")
+                throw new LLSDParseException("Expected <llsd>");
+
+            reader.Read();
+            object ret = LLSDParseOne(reader);
+            SkipWS(reader);
+
+            if (reader.NodeType != XmlNodeType.EndElement || reader.LocalName != "llsd")
+                throw new LLSDParseException("Expected </llsd>");
+
+            return ret;
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="obj"></param>
+        /// <returns></returns>
+        public static byte[] LLSDSerialize(object obj)
+        {
+            StringWriter sw = new StringWriter();
+            XmlTextWriter writer = new XmlTextWriter(sw);
+            writer.Formatting = Formatting.None;
+
+            writer.WriteStartElement(String.Empty, "llsd", String.Empty);
+            LLSDWriteOne(writer, obj);
+            writer.WriteEndElement();
+
+            writer.Close();
+
+            return Encoding.UTF8.GetBytes(sw.ToString());
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="obj"></param>
+        public static void LLSDWriteOne(XmlTextWriter writer, object obj)
+        {
+            if (obj == null)
+            {
+                writer.WriteStartElement(String.Empty, "undef", String.Empty);
+                writer.WriteEndElement();
+                return;
+            }
+
+            if (obj is string)
+            {
+                writer.WriteStartElement(String.Empty, "string", String.Empty);
+                writer.WriteString((string) obj);
+                writer.WriteEndElement();
+            }
+            else if (obj is int)
+            {
+                writer.WriteStartElement(String.Empty, "integer", String.Empty);
+                writer.WriteString(obj.ToString());
+                writer.WriteEndElement();
+            }
+            else if (obj is double)
+            {
+                writer.WriteStartElement(String.Empty, "real", String.Empty);
+                writer.WriteString(obj.ToString());
+                writer.WriteEndElement();
+            }
+            else if (obj is bool)
+            {
+                bool b = (bool) obj;
+                writer.WriteStartElement(String.Empty, "boolean", String.Empty);
+                writer.WriteString(b ? "1" : "0");
+                writer.WriteEndElement();
+            }
+            else if (obj is ulong)
+            {
+                throw new Exception("ulong in LLSD is currently not implemented, fix me!");
+            }
+            else if (obj is UUID)
+            {
+                UUID u = (UUID) obj;
+                writer.WriteStartElement(String.Empty, "uuid", String.Empty);
+                writer.WriteString(u.ToString());
+                writer.WriteEndElement();
+            }
+            else if (obj is Hashtable)
+            {
+                Hashtable h = obj as Hashtable;
+                writer.WriteStartElement(String.Empty, "map", String.Empty);
+                foreach (string key in h.Keys)
+                {
+                    writer.WriteStartElement(String.Empty, "key", String.Empty);
+                    writer.WriteString(key);
+                    writer.WriteEndElement();
+                    LLSDWriteOne(writer, h[key]);
+                }
+                writer.WriteEndElement();
+            }
+            else if (obj is ArrayList)
+            {
+                ArrayList a = obj as ArrayList;
+                writer.WriteStartElement(String.Empty, "array", String.Empty);
+                foreach (object item in a)
+                {
+                    LLSDWriteOne(writer, item);
+                }
+                writer.WriteEndElement();
+            }
+            else if (obj is byte[])
+            {
+                byte[] b = obj as byte[];
+                writer.WriteStartElement(String.Empty, "binary", String.Empty);
+
+                writer.WriteStartAttribute(String.Empty, "encoding", String.Empty);
+                writer.WriteString("base64");
+                writer.WriteEndAttribute();
+
+                //// Calculate the length of the base64 output
+                //long length = (long)(4.0d * b.Length / 3.0d);
+                //if (length % 4 != 0) length += 4 - (length % 4);
+
+                //// Create the char[] for base64 output and fill it
+                //char[] tmp = new char[length];
+                //int i = Convert.ToBase64CharArray(b, 0, b.Length, tmp, 0);
+
+                //writer.WriteString(new String(tmp));
+
+                writer.WriteString(Convert.ToBase64String(b));
+                writer.WriteEndElement();
+            }
+            else
+            {
+                throw new LLSDSerializeException("Unknown type " + obj.GetType().Name);
+            }
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <returns></returns>
+        public static object LLSDParseOne(XmlTextReader reader)
+        {
+            SkipWS(reader);
+            if (reader.NodeType != XmlNodeType.Element)
+                throw new LLSDParseException("Expected an element");
+
+            string dtype = reader.LocalName;
+            object ret = null;
+
+            switch (dtype)
+            {
+                case "undef":
+                    {
+                        if (reader.IsEmptyElement)
+                        {
+                            reader.Read();
+                            return null;
+                        }
+
+                        reader.Read();
+                        SkipWS(reader);
+                        ret = null;
+                        break;
+                    }
+                case "boolean":
+                    {
+                        if (reader.IsEmptyElement)
+                        {
+                            reader.Read();
+                            return false;
+                        }
+
+                        reader.Read();
+                        string s = reader.ReadString().Trim();
+
+                        if (s == String.Empty || s == "false" || s == "0")
+                            ret = false;
+                        else if (s == "true" || s == "1")
+                            ret = true;
+                        else
+                            throw new LLSDParseException("Bad boolean value " + s);
+
+                        break;
+                    }
+                case "integer":
+                    {
+                        if (reader.IsEmptyElement)
+                        {
+                            reader.Read();
+                            return 0;
+                        }
+
+                        reader.Read();
+                        ret = Convert.ToInt32(reader.ReadString().Trim());
+                        break;
+                    }
+                case "real":
+                    {
+                        if (reader.IsEmptyElement)
+                        {
+                            reader.Read();
+                            return 0.0f;
+                        }
+
+                        reader.Read();
+                        ret = Convert.ToDouble(reader.ReadString().Trim());
+                        break;
+                    }
+                case "uuid":
+                    {
+                        if (reader.IsEmptyElement)
+                        {
+                            reader.Read();
+                            return UUID.Zero;
+                        }
+
+                        reader.Read();
+                        ret = new UUID(reader.ReadString().Trim());
+                        break;
+                    }
+                case "string":
+                    {
+                        if (reader.IsEmptyElement)
+                        {
+                            reader.Read();
+                            return String.Empty;
+                        }
+
+                        reader.Read();
+                        ret = reader.ReadString();
+                        break;
+                    }
+                case "binary":
+                    {
+                        if (reader.IsEmptyElement)
+                        {
+                            reader.Read();
+                            return new byte[0];
+                        }
+
+                        if (reader.GetAttribute("encoding") != null &&
+                            reader.GetAttribute("encoding") != "base64")
+                        {
+                            throw new LLSDParseException("Unknown encoding: " + reader.GetAttribute("encoding"));
+                        }
+
+                        reader.Read();
+                        FromBase64Transform b64 = new FromBase64Transform(FromBase64TransformMode.IgnoreWhiteSpaces);
+                        byte[] inp = Encoding.UTF8.GetBytes(reader.ReadString());
+                        ret = b64.TransformFinalBlock(inp, 0, inp.Length);
+                        break;
+                    }
+                case "date":
+                    {
+                        reader.Read();
+                        throw new Exception("LLSD TODO: date");
+                    }
+                case "map":
+                    {
+                        return LLSDParseMap(reader);
+                    }
+                case "array":
+                    {
+                        return LLSDParseArray(reader);
+                    }
+                default:
+                    throw new LLSDParseException("Unknown element <" + dtype + ">");
+            }
+
+            if (reader.NodeType != XmlNodeType.EndElement || reader.LocalName != dtype)
+            {
+                throw new LLSDParseException("Expected </" + dtype + ">");
+            }
+
+            reader.Read();
+            return ret;
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <returns></returns>
+        public static Hashtable LLSDParseMap(XmlTextReader reader)
+        {
+            Hashtable ret = new Hashtable();
+
+            if (reader.NodeType != XmlNodeType.Element || reader.LocalName != "map")
+                throw new LLSDParseException("Expected <map>");
+
+            if (reader.IsEmptyElement)
+            {
+                reader.Read();
+                return ret;
+            }
+
+            reader.Read();
+
+            while (true)
+            {
+                SkipWS(reader);
+                if (reader.NodeType == XmlNodeType.EndElement && reader.LocalName == "map")
+                {
+                    reader.Read();
+                    break;
+                }
+
+                if (reader.NodeType != XmlNodeType.Element || reader.LocalName != "key")
+                    throw new LLSDParseException("Expected <key>");
+
+                string key = reader.ReadString();
+
+                if (reader.NodeType != XmlNodeType.EndElement || reader.LocalName != "key")
+                    throw new LLSDParseException("Expected </key>");
+
+                reader.Read();
+                object val = LLSDParseOne(reader);
+                ret[key] = val;
+            }
+
+            return ret; // TODO
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <returns></returns>
+        public static ArrayList LLSDParseArray(XmlTextReader reader)
+        {
+            ArrayList ret = new ArrayList();
+
+            if (reader.NodeType != XmlNodeType.Element || reader.LocalName != "array")
+                throw new LLSDParseException("Expected <array>");
+
+            if (reader.IsEmptyElement)
+            {
+                reader.Read();
+                return ret;
+            }
+
+            reader.Read();
+
+            while (true)
+            {
+                SkipWS(reader);
+
+                if (reader.NodeType == XmlNodeType.EndElement && reader.LocalName == "array")
+                {
+                    reader.Read();
+                    break;
+                }
+
+                ret.Insert(ret.Count, LLSDParseOne(reader));
+            }
+
+            return ret; // TODO
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="count"></param>
+        /// <returns></returns>
+        private static string GetSpaces(int count)
+        {
+            StringBuilder b = new StringBuilder();
+            for (int i = 0; i < count; i++) b.Append(" ");
+            return b.ToString();
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="obj"></param>
+        /// <param name="indent"></param>
+        /// <returns></returns>
+        public static String LLSDDump(object obj, int indent)
+        {
+            if (obj == null)
+            {
+                return GetSpaces(indent) + "- undef\n";
+            }
+            else if (obj is string)
+            {
+                return GetSpaces(indent) + "- string \"" + (string) obj + "\"\n";
+            }
+            else if (obj is int)
+            {
+                return GetSpaces(indent) + "- integer " + obj.ToString() + "\n";
+            }
+            else if (obj is double)
+            {
+                return GetSpaces(indent) + "- float " + obj.ToString() + "\n";
+            }
+            else if (obj is UUID)
+            {
+                return GetSpaces(indent) + "- uuid " + ((UUID) obj).ToString() + Environment.NewLine;
+            }
+            else if (obj is Hashtable)
+            {
+                StringBuilder ret = new StringBuilder();
+                ret.Append(GetSpaces(indent) + "- map" + Environment.NewLine);
+                Hashtable map = (Hashtable) obj;
+
+                foreach (string key in map.Keys)
+                {
+                    ret.Append(GetSpaces(indent + 2) + "- key \"" + key + "\"" + Environment.NewLine);
+                    ret.Append(LLSDDump(map[key], indent + 3));
+                }
+
+                return ret.ToString();
+            }
+            else if (obj is ArrayList)
+            {
+                StringBuilder ret = new StringBuilder();
+                ret.Append(GetSpaces(indent) + "- array\n");
+                ArrayList list = (ArrayList) obj;
+
+                foreach (object item in list)
+                {
+                    ret.Append(LLSDDump(item, indent + 2));
+                }
+
+                return ret.ToString();
+            }
+            else if (obj is byte[])
+            {
+                return GetSpaces(indent) + "- binary\n" + Utils.BytesToHexString((byte[]) obj, GetSpaces(indent)) +
+                       Environment.NewLine;
+            }
+            else
+            {
+                return GetSpaces(indent) + "- unknown type " + obj.GetType().Name + Environment.NewLine;
+            }
+        }
+
+        public static object ParseTerseLLSD(string llsd)
+        {
+            int notused;
+            return ParseTerseLLSD(llsd, out notused);
+        }
+
+        public static object ParseTerseLLSD(string llsd, out int endPos)
+        {
+            if (llsd.Length == 0)
+            {
+                endPos = 0;
+                return null;
+            }
+
+            // Identify what type of object this is
+            switch (llsd[0])
+            {
+                case '!':
+                    throw new LLSDParseException("Undefined value type encountered");
+                case '1':
+                    endPos = 1;
+                    return true;
+                case '0':
+                    endPos = 1;
+                    return false;
+                case 'i':
+                    {
+                        if (llsd.Length < 2) throw new LLSDParseException("Integer value type with no value");
+                        int value;
+                        endPos = FindEnd(llsd, 1);
+
+                        if (Int32.TryParse(llsd.Substring(1, endPos - 1), out value))
+                            return value;
+                        else
+                            throw new LLSDParseException("Failed to parse integer value type");
+                    }
+                case 'r':
+                    {
+                        if (llsd.Length < 2) throw new LLSDParseException("Real value type with no value");
+                        double value;
+                        endPos = FindEnd(llsd, 1);
+
+                        if (Double.TryParse(llsd.Substring(1, endPos - 1), NumberStyles.Float,
+                                            Utils.EnUsCulture.NumberFormat, out value))
+                            return value;
+                        else
+                            throw new LLSDParseException("Failed to parse double value type");
+                    }
+                case 'u':
+                    {
+                        if (llsd.Length < 17) throw new LLSDParseException("UUID value type with no value");
+                        UUID value;
+                        endPos = FindEnd(llsd, 1);
+
+                        if (UUID.TryParse(llsd.Substring(1, endPos - 1), out value))
+                            return value;
+                        else
+                            throw new LLSDParseException("Failed to parse UUID value type");
+                    }
+                case 'b':
+                    //byte[] value = new byte[llsd.Length - 1];
+                    // This isn't the actual binary LLSD format, just the terse format sent
+                    // at login so I don't even know if there is a binary type
+                    throw new LLSDParseException("Binary value type is unimplemented");
+                case 's':
+                case 'l':
+                    if (llsd.Length < 2) throw new LLSDParseException("String value type with no value");
+                    endPos = FindEnd(llsd, 1);
+                    return llsd.Substring(1, endPos - 1);
+                case 'd':
+                    // Never seen one before, don't know what the format is
+                    throw new LLSDParseException("Date value type is unimplemented");
+                case '[':
+                    {
+                        if (llsd.IndexOf(']') == -1) throw new LLSDParseException("Invalid array");
+
+                        int pos = 0;
+                        ArrayList array = new ArrayList();
+
+                        while (llsd[pos] != ']')
+                        {
+                            ++pos;
+
+                            // Advance past comma if need be
+                            if (llsd[pos] == ',') ++pos;
+
+                            // Allow a single whitespace character
+                            if (pos < llsd.Length && llsd[pos] == ' ') ++pos;
+
+                            int end;
+                            array.Add(ParseTerseLLSD(llsd.Substring(pos), out end));
+                            pos += end;
+                        }
+
+                        endPos = pos + 1;
+                        return array;
+                    }
+                case '{':
+                    {
+                        if (llsd.IndexOf('}') == -1) throw new LLSDParseException("Invalid map");
+
+                        int pos = 0;
+                        Hashtable hashtable = new Hashtable();
+
+                        while (llsd[pos] != '}')
+                        {
+                            ++pos;
+
+                            // Advance past comma if need be
+                            if (llsd[pos] == ',') ++pos;
+
+                            // Allow a single whitespace character
+                            if (pos < llsd.Length && llsd[pos] == ' ') ++pos;
+
+                            if (llsd[pos] != '\'') throw new LLSDParseException("Expected a map key");
+                            int endquote = llsd.IndexOf('\'', pos + 1);
+                            if (endquote == -1 || (endquote + 1) >= llsd.Length || llsd[endquote + 1] != ':')
+                                throw new LLSDParseException("Invalid map format");
+                            string key = llsd.Substring(pos, endquote - pos);
+                            key = key.Replace("'", String.Empty);
+                            pos += (endquote - pos) + 2;
+
+                            int end;
+                            hashtable.Add(key, ParseTerseLLSD(llsd.Substring(pos), out end));
+                            pos += end;
+                        }
+
+                        endPos = pos + 1;
+                        return hashtable;
+                    }
+                default:
+                    throw new Exception("Unknown value type");
+            }
+        }
+
+        private static int FindEnd(string llsd, int start)
+        {
+            int end = llsd.IndexOfAny(new char[] {',', ']', '}'});
+            if (end == -1) end = llsd.Length - 1;
+            return end;
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="reader"></param>
+        private static void SkipWS(XmlTextReader reader)
+        {
+            while (
+                reader.NodeType == XmlNodeType.Comment ||
+                reader.NodeType == XmlNodeType.Whitespace ||
+                reader.NodeType == XmlNodeType.SignificantWhitespace ||
+                reader.NodeType == XmlNodeType.XmlDeclaration)
+            {
+                reader.Read();
+            }
+        }
+    }
+}
diff --git a/OpenSim/Framework/Capabilities/LLSDArray.cs b/OpenSim/Framework/Capabilities/LLSDArray.cs
index d7a98b7..3459e49 100644
--- a/OpenSim/Framework/Capabilities/LLSDArray.cs
+++ b/OpenSim/Framework/Capabilities/LLSDArray.cs
@@ -1,41 +1,41 @@
-/*

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

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

- *

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

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

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

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

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

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

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

- *     * Neither the name of the OpenSimulator 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.Framework.Capabilities

-{

-    [LLSDType("ARRAY")]

-    public class OSDArray

-    {

-        public ArrayList Array = new ArrayList();

-

-        public OSDArray()

-        {

-        }

-    }

+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator 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.Framework.Capabilities
+{
+    [LLSDType("ARRAY")]
+    public class OSDArray
+    {
+        public ArrayList Array = new ArrayList();
+
+        public OSDArray()
+        {
+        }
+    }
 }
\ No newline at end of file
diff --git a/OpenSim/Framework/Capabilities/LLSDAssetUploadComplete.cs b/OpenSim/Framework/Capabilities/LLSDAssetUploadComplete.cs
index 65c1369..ab6cee5 100644
--- a/OpenSim/Framework/Capabilities/LLSDAssetUploadComplete.cs
+++ b/OpenSim/Framework/Capabilities/LLSDAssetUploadComplete.cs
@@ -1,45 +1,45 @@
-/*

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

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

- *

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

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

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

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

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

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

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

- *     * Neither the name of the OpenSimulator 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 OpenMetaverse;

-

-namespace OpenSim.Framework.Capabilities

-{

-    [LLSDType("MAP")]

-    public class LLSDAssetUploadComplete

-    {

-        public string new_asset = String.Empty;

-        public UUID new_inventory_item = UUID.Zero;

-        public string state = String.Empty;

-        //public bool success = false;

-

-        public LLSDAssetUploadComplete()

-        {

-        }

-    }

-}

+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator 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 OpenMetaverse;
+
+namespace OpenSim.Framework.Capabilities
+{
+    [LLSDType("MAP")]
+    public class LLSDAssetUploadComplete
+    {
+        public string new_asset = String.Empty;
+        public UUID new_inventory_item = UUID.Zero;
+        public string state = String.Empty;
+        //public bool success = false;
+
+        public LLSDAssetUploadComplete()
+        {
+        }
+    }
+}
diff --git a/OpenSim/Framework/Capabilities/LLSDAssetUploadRequest.cs b/OpenSim/Framework/Capabilities/LLSDAssetUploadRequest.cs
index 96a43a7..6e66f0a 100644
--- a/OpenSim/Framework/Capabilities/LLSDAssetUploadRequest.cs
+++ b/OpenSim/Framework/Capabilities/LLSDAssetUploadRequest.cs
@@ -1,46 +1,46 @@
-/*

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

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

- *

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

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

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

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

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

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

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

- *     * Neither the name of the OpenSimulator 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 OpenMetaverse;

-

-namespace OpenSim.Framework.Capabilities

-{

-    [OSDMap]

-    public class LLSDAssetUploadRequest

-    {

-        public string asset_type = String.Empty;

-        public string description = String.Empty;

-        public UUID folder_id = UUID.Zero;

-        public string inventory_type = String.Empty;

-        public string name = String.Empty;

-

-        public LLSDAssetUploadRequest()

-        {

-        }

-    }

-}

+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator 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 OpenMetaverse;
+
+namespace OpenSim.Framework.Capabilities
+{
+    [OSDMap]
+    public class LLSDAssetUploadRequest
+    {
+        public string asset_type = String.Empty;
+        public string description = String.Empty;
+        public UUID folder_id = UUID.Zero;
+        public string inventory_type = String.Empty;
+        public string name = String.Empty;
+
+        public LLSDAssetUploadRequest()
+        {
+        }
+    }
+}
diff --git a/OpenSim/Framework/Capabilities/LLSDAssetUploadResponse.cs b/OpenSim/Framework/Capabilities/LLSDAssetUploadResponse.cs
index 492f419..08f14e3 100644
--- a/OpenSim/Framework/Capabilities/LLSDAssetUploadResponse.cs
+++ b/OpenSim/Framework/Capabilities/LLSDAssetUploadResponse.cs
@@ -1,42 +1,42 @@
-/*

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

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

- *

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

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

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

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

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

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

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

- *     * Neither the name of the OpenSimulator 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.Framework.Capabilities

-{

-    [OSDMap]

-    public class LLSDAssetUploadResponse

-    {

-        public string uploader = String.Empty;

-        public string state = String.Empty;

-

-        public LLSDAssetUploadResponse()

-        {

-        }

-    }

+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator 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.Framework.Capabilities
+{
+    [OSDMap]
+    public class LLSDAssetUploadResponse
+    {
+        public string uploader = String.Empty;
+        public string state = String.Empty;
+
+        public LLSDAssetUploadResponse()
+        {
+        }
+    }
 }
\ No newline at end of file
diff --git a/OpenSim/Framework/Capabilities/LLSDCapEvent.cs b/OpenSim/Framework/Capabilities/LLSDCapEvent.cs
index 71b2ed3..63abd62 100644
--- a/OpenSim/Framework/Capabilities/LLSDCapEvent.cs
+++ b/OpenSim/Framework/Capabilities/LLSDCapEvent.cs
@@ -1,40 +1,40 @@
-/*

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

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

- *

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

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

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

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

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

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

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

- *     * Neither the name of the OpenSimulator 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.Capabilities

-{

-    [LLSDType("MAP")]

-    public class LLSDCapEvent

-    {

-        public int id = 0;

-        public OSDArray events = new OSDArray();

-

-        public LLSDCapEvent()

-        {

-        }

-    }

+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator 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.Capabilities
+{
+    [LLSDType("MAP")]
+    public class LLSDCapEvent
+    {
+        public int id = 0;
+        public OSDArray events = new OSDArray();
+
+        public LLSDCapEvent()
+        {
+        }
+    }
 }
\ No newline at end of file
diff --git a/OpenSim/Framework/Capabilities/LLSDEmpty.cs b/OpenSim/Framework/Capabilities/LLSDEmpty.cs
index 0dce725..f94fcba 100644
--- a/OpenSim/Framework/Capabilities/LLSDEmpty.cs
+++ b/OpenSim/Framework/Capabilities/LLSDEmpty.cs
@@ -1,37 +1,37 @@
-/*

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

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

- *

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

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

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

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

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

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

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

- *     * Neither the name of the OpenSimulator 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.Capabilities

-{

-    [LLSDType("MAP")]

-    public class LLSDEmpty

-    {

-        public LLSDEmpty()

-        {

-        }

-    }

+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator 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.Capabilities
+{
+    [LLSDType("MAP")]
+    public class LLSDEmpty
+    {
+        public LLSDEmpty()
+        {
+        }
+    }
 }
\ No newline at end of file
diff --git a/OpenSim/Framework/Capabilities/LLSDHelpers.cs b/OpenSim/Framework/Capabilities/LLSDHelpers.cs
index 1bda92c..8f1a40e 100644
--- a/OpenSim/Framework/Capabilities/LLSDHelpers.cs
+++ b/OpenSim/Framework/Capabilities/LLSDHelpers.cs
@@ -1,172 +1,172 @@
-/*

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

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

- *

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

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

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

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

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

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

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

- *     * Neither the name of the OpenSimulator 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;

-

-namespace OpenSim.Framework.Capabilities

-{

-    public class LLSDHelpers

-    {

-//        private static readonly log4net.ILog m_log

-//            = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);

-

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

-            SerializeOSDType(writer, obj);

-            writer.WriteEndElement();

-            writer.Close();

-

-            //m_log.DebugFormat("[LLSD Helpers]: Generated serialized LLSD reply {0}", sw.ToString());

-

-            return sw.ToString();

-        }

-

-        private static void SerializeOSDType(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++)

-                        {

-                            if (fields[i] != null && fields[i].GetValue(obj) != null)

-                            {

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

-                                    string fieldName = fields[i].Name;

-                                    fieldName = fieldName.Replace("___", "-");

-                                    writer.WriteString(fieldName);

-                                    writer.WriteEndElement();

-                                    SerializeOSDType(writer, fieldValue);

-                                }

-                                else

-                                {

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

-                                    string fieldName = fields[i].Name;

-                                    fieldName = fieldName.Replace("___", "-");

-                                    writer.WriteString(fieldName);

-                                    writer.WriteEndElement();

-                                    LLSD.LLSDWriteOne(writer, fieldValue);

-                                    // OpenMetaverse.StructuredData.LLSDParser.SerializeXmlElement(

-                                    //    writer, OpenMetaverse.StructuredData.OSD.FromObject(fieldValue));

-                                }

-                            }

-                            else

-                            {

-                                // TODO from ADAM: There is a nullref being caused by fields[i] being null

-                                // on some computers. Unsure what is causing this, but would appreciate

-                                // if sdague could take a look at this.

-                            }

-                        }

-                        writer.WriteEndElement();

-                        break;

-                    case "ARRAY":

-                        // OSDArray arrayObject = obj as OSDArray;

-                        // 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)

-                            {

-                                SerializeOSDType(writer, item);

-                            }

-                            writer.WriteEndElement();

-                        }

-                        break;

-                }

-            }

-            else

-            {

-                LLSD.LLSDWriteOne(writer, obj);

-                //OpenMetaverse.StructuredData.LLSDParser.SerializeXmlElement(

-                //    writer, OpenMetaverse.StructuredData.OSD.FromObject(obj));

-            }

-        }

-

-        public static object DeserialiseOSDMap(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())

-                        {

-                            string keyName = (string)enumerator.Key;

-                            keyName = keyName.Replace("-","_");

-                            FieldInfo field = myType.GetField(keyName);

-                            if (field != null)

-                            {

-                                // if (enumerator.Value is OpenMetaverse.StructuredData.OSDMap)

-                                if (enumerator.Value is Hashtable)

-                                {

-                                    object fieldValue = field.GetValue(obj);

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

-                                    //  DeserialiseOSDMap((OpenMetaverse.StructuredData.OSDMap) 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://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator 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;
+
+namespace OpenSim.Framework.Capabilities
+{
+    public class LLSDHelpers
+    {
+//        private static readonly log4net.ILog m_log
+//            = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+
+        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);
+            SerializeOSDType(writer, obj);
+            writer.WriteEndElement();
+            writer.Close();
+
+            //m_log.DebugFormat("[LLSD Helpers]: Generated serialized LLSD reply {0}", sw.ToString());
+
+            return sw.ToString();
+        }
+
+        private static void SerializeOSDType(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++)
+                        {
+                            if (fields[i] != null && fields[i].GetValue(obj) != null)
+                            {
+                                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);
+                                    string fieldName = fields[i].Name;
+                                    fieldName = fieldName.Replace("___", "-");
+                                    writer.WriteString(fieldName);
+                                    writer.WriteEndElement();
+                                    SerializeOSDType(writer, fieldValue);
+                                }
+                                else
+                                {
+                                    writer.WriteStartElement(String.Empty, "key", String.Empty);
+                                    string fieldName = fields[i].Name;
+                                    fieldName = fieldName.Replace("___", "-");
+                                    writer.WriteString(fieldName);
+                                    writer.WriteEndElement();
+                                    LLSD.LLSDWriteOne(writer, fieldValue);
+                                    // OpenMetaverse.StructuredData.LLSDParser.SerializeXmlElement(
+                                    //    writer, OpenMetaverse.StructuredData.OSD.FromObject(fieldValue));
+                                }
+                            }
+                            else
+                            {
+                                // TODO from ADAM: There is a nullref being caused by fields[i] being null
+                                // on some computers. Unsure what is causing this, but would appreciate
+                                // if sdague could take a look at this.
+                            }
+                        }
+                        writer.WriteEndElement();
+                        break;
+                    case "ARRAY":
+                        // OSDArray arrayObject = obj as OSDArray;
+                        // 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)
+                            {
+                                SerializeOSDType(writer, item);
+                            }
+                            writer.WriteEndElement();
+                        }
+                        break;
+                }
+            }
+            else
+            {
+                LLSD.LLSDWriteOne(writer, obj);
+                //OpenMetaverse.StructuredData.LLSDParser.SerializeXmlElement(
+                //    writer, OpenMetaverse.StructuredData.OSD.FromObject(obj));
+            }
+        }
+
+        public static object DeserialiseOSDMap(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())
+                        {
+                            string keyName = (string)enumerator.Key;
+                            keyName = keyName.Replace("-","_");
+                            FieldInfo field = myType.GetField(keyName);
+                            if (field != null)
+                            {
+                                // if (enumerator.Value is OpenMetaverse.StructuredData.OSDMap)
+                                if (enumerator.Value is Hashtable)
+                                {
+                                    object fieldValue = field.GetValue(obj);
+                                    DeserialiseOSDMap((Hashtable) enumerator.Value, fieldValue);
+                                    //  DeserialiseOSDMap((OpenMetaverse.StructuredData.OSDMap) 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/Capabilities/LLSDInventoryItem.cs b/OpenSim/Framework/Capabilities/LLSDInventoryItem.cs
index 8d3e322..d0498f6 100644
--- a/OpenSim/Framework/Capabilities/LLSDInventoryItem.cs
+++ b/OpenSim/Framework/Capabilities/LLSDInventoryItem.cs
@@ -1,97 +1,97 @@
-/*

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

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

- *

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

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

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

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

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

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

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

- *     * Neither the name of the OpenSimulator 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 OpenMetaverse;

-

-namespace OpenSim.Framework.Capabilities

-{

-    [OSDMap]

-    public class LLSDInventoryItem

-    {

-        public UUID parent_id;

-

-        public UUID asset_id;

-        public UUID item_id;

-        public LLSDPermissions permissions;

-        public string type;

-        public string inv_type;

-        public int flags;

-

-        public LLSDSaleInfo sale_info;

-        public string name;

-        public string desc;

-        public int created_at;

-    }

-

-    [OSDMap]

-    public class LLSDPermissions

-    {

-        public UUID creator_id;

-        public UUID owner_id;

-        public UUID group_id;

-        public int base_mask;

-        public int owner_mask;

-        public int group_mask;

-        public int everyone_mask;

-        public int next_owner_mask;

-        public bool is_owner_group;

-    }

-

-    [OSDMap]

-    public class LLSDSaleInfo

-    {

-        public int sale_price;

-        public string sale_type;

-    }

-

-    [OSDMap]

-    public class LLSDInventoryDescendents

-    {

-        public OSDArray folders = new OSDArray();

-    }

-

-    [OSDMap]

-    public class LLSDFetchInventoryDescendents

-    {

-        public UUID folder_id;

-        public UUID owner_id;

-        public int sort_order;

-        public bool fetch_folders;

-        public bool fetch_items;

-    }

-

-    [OSDMap]

-    public class LLSDInventoryFolderContents

-    {

-        public UUID agent_id; 

-        public int descendents;

-        public UUID folder_id; 

-        public OSDArray items = new OSDArray();

-        public UUID owner_id; 

-        public int version;

-    }

-}

+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator 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 OpenMetaverse;
+
+namespace OpenSim.Framework.Capabilities
+{
+    [OSDMap]
+    public class LLSDInventoryItem
+    {
+        public UUID parent_id;
+
+        public UUID asset_id;
+        public UUID item_id;
+        public LLSDPermissions permissions;
+        public string type;
+        public string inv_type;
+        public int flags;
+
+        public LLSDSaleInfo sale_info;
+        public string name;
+        public string desc;
+        public int created_at;
+    }
+
+    [OSDMap]
+    public class LLSDPermissions
+    {
+        public UUID creator_id;
+        public UUID owner_id;
+        public UUID group_id;
+        public int base_mask;
+        public int owner_mask;
+        public int group_mask;
+        public int everyone_mask;
+        public int next_owner_mask;
+        public bool is_owner_group;
+    }
+
+    [OSDMap]
+    public class LLSDSaleInfo
+    {
+        public int sale_price;
+        public string sale_type;
+    }
+
+    [OSDMap]
+    public class LLSDInventoryDescendents
+    {
+        public OSDArray folders = new OSDArray();
+    }
+
+    [OSDMap]
+    public class LLSDFetchInventoryDescendents
+    {
+        public UUID folder_id;
+        public UUID owner_id;
+        public int sort_order;
+        public bool fetch_folders;
+        public bool fetch_items;
+    }
+
+    [OSDMap]
+    public class LLSDInventoryFolderContents
+    {
+        public UUID agent_id; 
+        public int descendents;
+        public UUID folder_id; 
+        public OSDArray items = new OSDArray();
+        public UUID owner_id; 
+        public int version;
+    }
+}
diff --git a/OpenSim/Framework/Capabilities/LLSDItemUpdate.cs b/OpenSim/Framework/Capabilities/LLSDItemUpdate.cs
index a3a4d3a..96e2b61 100644
--- a/OpenSim/Framework/Capabilities/LLSDItemUpdate.cs
+++ b/OpenSim/Framework/Capabilities/LLSDItemUpdate.cs
@@ -1,41 +1,41 @@
-/*

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

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

- *

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

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

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

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

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

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

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

- *     * Neither the name of the OpenSimulator 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 OpenMetaverse;

-

-namespace OpenSim.Framework.Capabilities

-{

-    [OSDMap]

-    public class LLSDItemUpdate

-    {

-        public UUID item_id;

-

-        public LLSDItemUpdate()

-        {

-        }

-    }

-}

+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator 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 OpenMetaverse;
+
+namespace OpenSim.Framework.Capabilities
+{
+    [OSDMap]
+    public class LLSDItemUpdate
+    {
+        public UUID item_id;
+
+        public LLSDItemUpdate()
+        {
+        }
+    }
+}
diff --git a/OpenSim/Framework/Capabilities/LLSDMapLayer.cs b/OpenSim/Framework/Capabilities/LLSDMapLayer.cs
index 75dc2fd..4aeb1ff 100644
--- a/OpenSim/Framework/Capabilities/LLSDMapLayer.cs
+++ b/OpenSim/Framework/Capabilities/LLSDMapLayer.cs
@@ -1,45 +1,45 @@
-/*

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

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

- *

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

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

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

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

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

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

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

- *     * Neither the name of the OpenSimulator 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 OpenMetaverse;

-

-namespace OpenSim.Framework.Capabilities

-{

-    [LLSDType("MAP")]

-    public class OSDMapLayer

-    {

-        public int Left = 0;

-        public int Right = 0;

-        public int Top = 0;

-        public int Bottom = 0;

-        public UUID ImageID = UUID.Zero;

-

-        public OSDMapLayer()

-        {

-        }

-    }

-}

+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator 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 OpenMetaverse;
+
+namespace OpenSim.Framework.Capabilities
+{
+    [LLSDType("MAP")]
+    public class OSDMapLayer
+    {
+        public int Left = 0;
+        public int Right = 0;
+        public int Top = 0;
+        public int Bottom = 0;
+        public UUID ImageID = UUID.Zero;
+
+        public OSDMapLayer()
+        {
+        }
+    }
+}
diff --git a/OpenSim/Framework/Capabilities/LLSDMapLayerResponse.cs b/OpenSim/Framework/Capabilities/LLSDMapLayerResponse.cs
index f9b47f5..839e34c 100644
--- a/OpenSim/Framework/Capabilities/LLSDMapLayerResponse.cs
+++ b/OpenSim/Framework/Capabilities/LLSDMapLayerResponse.cs
@@ -1,40 +1,40 @@
-/*

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

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

- *

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

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

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

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

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

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

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

- *     * Neither the name of the OpenSimulator 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.Capabilities

-{

-    [LLSDType("MAP")]

-    public class LLSDMapLayerResponse

-    {

-        public LLSDMapRequest AgentData = new LLSDMapRequest();

-        public OSDArray LayerData = new OSDArray();

-

-        public LLSDMapLayerResponse()

-        {

-        }

-    }

+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator 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.Capabilities
+{
+    [LLSDType("MAP")]
+    public class LLSDMapLayerResponse
+    {
+        public LLSDMapRequest AgentData = new LLSDMapRequest();
+        public OSDArray LayerData = new OSDArray();
+
+        public LLSDMapLayerResponse()
+        {
+        }
+    }
 }
\ No newline at end of file
diff --git a/OpenSim/Framework/Capabilities/LLSDMapRequest.cs b/OpenSim/Framework/Capabilities/LLSDMapRequest.cs
index 334920d..debf387 100644
--- a/OpenSim/Framework/Capabilities/LLSDMapRequest.cs
+++ b/OpenSim/Framework/Capabilities/LLSDMapRequest.cs
@@ -1,39 +1,39 @@
-/*

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

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

- *

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

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

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

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

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

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

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

- *     * Neither the name of the OpenSimulator 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.Capabilities

-{

-    [LLSDType("MAP")]

-    public class LLSDMapRequest

-    {

-        public int Flags = 0;

-

-        public LLSDMapRequest()

-        {

-        }

-    }

+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator 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.Capabilities
+{
+    [LLSDType("MAP")]
+    public class LLSDMapRequest
+    {
+        public int Flags = 0;
+
+        public LLSDMapRequest()
+        {
+        }
+    }
 }
\ No newline at end of file
diff --git a/OpenSim/Framework/Capabilities/LLSDMethod.cs b/OpenSim/Framework/Capabilities/LLSDMethod.cs
index 67f2680..cd2574d 100644
--- a/OpenSim/Framework/Capabilities/LLSDMethod.cs
+++ b/OpenSim/Framework/Capabilities/LLSDMethod.cs
@@ -1,31 +1,31 @@
-/*

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

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

- *

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

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

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

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

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

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

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

- *     * Neither the name of the OpenSimulator 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.Capabilities

-{

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

+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator 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.Capabilities
+{
+    public delegate TResponse LLSDMethod<TRequest, TResponse>(TRequest request);
 }
\ No newline at end of file
diff --git a/OpenSim/Framework/Capabilities/LLSDMethodString.cs b/OpenSim/Framework/Capabilities/LLSDMethodString.cs
index 8e23cf5..38700d5 100644
--- a/OpenSim/Framework/Capabilities/LLSDMethodString.cs
+++ b/OpenSim/Framework/Capabilities/LLSDMethodString.cs
@@ -1,31 +1,31 @@
-/*

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

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

- *

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

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

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

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

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

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

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

- *     * Neither the name of the OpenSimulator 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.Capabilities

-{

-    public delegate TResponse LLSDMethodString<TRequest, TResponse>(TRequest request, string path);

-}

+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator 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.Capabilities
+{
+    public delegate TResponse LLSDMethodString<TRequest, TResponse>(TRequest request, string path);
+}
diff --git a/OpenSim/Framework/Capabilities/LLSDParcelVoiceInfoResponse.cs b/OpenSim/Framework/Capabilities/LLSDParcelVoiceInfoResponse.cs
index dec85df..b34a668 100644
--- a/OpenSim/Framework/Capabilities/LLSDParcelVoiceInfoResponse.cs
+++ b/OpenSim/Framework/Capabilities/LLSDParcelVoiceInfoResponse.cs
@@ -1,51 +1,51 @@
-/*

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

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

-*

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

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

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

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

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

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

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

-*     * Neither the name of the OpenSimulator 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.Framework.Capabilities

-{

-    [OSDMap]

-    public class LLSDParcelVoiceInfoResponse

-    {

-        public int parcel_local_id;

-        public string region_name;

-        public Hashtable voice_credentials;

-

-        public LLSDParcelVoiceInfoResponse()

-        {

-        }

-

-        public LLSDParcelVoiceInfoResponse(string region, int localID, Hashtable creds)

-        {

-            region_name = region;

-            parcel_local_id = localID;

-            voice_credentials = creds;

-        }

-    }

+/*
+* Copyright (c) Contributors, http://opensimulator.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSimulator 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.Framework.Capabilities
+{
+    [OSDMap]
+    public class LLSDParcelVoiceInfoResponse
+    {
+        public int parcel_local_id;
+        public string region_name;
+        public Hashtable voice_credentials;
+
+        public LLSDParcelVoiceInfoResponse()
+        {
+        }
+
+        public LLSDParcelVoiceInfoResponse(string region, int localID, Hashtable creds)
+        {
+            region_name = region;
+            parcel_local_id = localID;
+            voice_credentials = creds;
+        }
+    }
 }
\ No newline at end of file
diff --git a/OpenSim/Framework/Capabilities/LLSDRemoteParcelResponse.cs b/OpenSim/Framework/Capabilities/LLSDRemoteParcelResponse.cs
index c99df78..13d69d3 100644
--- a/OpenSim/Framework/Capabilities/LLSDRemoteParcelResponse.cs
+++ b/OpenSim/Framework/Capabilities/LLSDRemoteParcelResponse.cs
@@ -1,42 +1,42 @@
-/*

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

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

-*

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

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

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

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

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

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

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

-*     * Neither the name of the OpenSimulator 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 OpenMetaverse;

-

-namespace OpenSim.Framework.Capabilities

-{

-    [LLSDType("MAP")]

-    public class LLSDRemoteParcelResponse

-    {

-        public UUID parcel_id;

-

-        public LLSDRemoteParcelResponse()

-        {

-        }

-    }

-}

+/*
+* Copyright (c) Contributors, http://opensimulator.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSimulator 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 OpenMetaverse;
+
+namespace OpenSim.Framework.Capabilities
+{
+    [LLSDType("MAP")]
+    public class LLSDRemoteParcelResponse
+    {
+        public UUID parcel_id;
+
+        public LLSDRemoteParcelResponse()
+        {
+        }
+    }
+}
diff --git a/OpenSim/Framework/Capabilities/LLSDStreamHandler.cs b/OpenSim/Framework/Capabilities/LLSDStreamHandler.cs
index 0ced4d7..df48b35 100644
--- a/OpenSim/Framework/Capabilities/LLSDStreamHandler.cs
+++ b/OpenSim/Framework/Capabilities/LLSDStreamHandler.cs
@@ -1,70 +1,70 @@
-/*

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

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

- *

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

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

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

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

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

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

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

- *     * Neither the name of the OpenSimulator 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;

-using System.IO;

-using System.Text;

-using OpenSim.Framework.Servers;

-using OpenSim.Framework.Servers.HttpServer;

-

-namespace OpenSim.Framework.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,

-                                      OSHttpRequest httpRequest, OSHttpResponse httpResponse)

-        {

-            //Encoding encoding = Encoding.UTF8;

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

-

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

-            //streamReader.Close();

-

-            // OpenMetaverse.StructuredData.OSDMap hash = (OpenMetaverse.StructuredData.OSDMap)

-            //    OpenMetaverse.StructuredData.LLSDParser.DeserializeXml(new XmlTextReader(request));

-

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

-            TRequest llsdRequest = new TRequest();

-            LLSDHelpers.DeserialiseOSDMap(hash, llsdRequest);

-

-            TResponse response = m_method(llsdRequest);

-

-            Encoding encoding = new UTF8Encoding(false);

-

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

-        }

-    }

-}

+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator 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;
+using System.IO;
+using System.Text;
+using OpenSim.Framework.Servers;
+using OpenSim.Framework.Servers.HttpServer;
+
+namespace OpenSim.Framework.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,
+                                      OSHttpRequest httpRequest, OSHttpResponse httpResponse)
+        {
+            //Encoding encoding = Encoding.UTF8;
+            //StreamReader streamReader = new StreamReader(request, false);
+
+            //string requestBody = streamReader.ReadToEnd();
+            //streamReader.Close();
+
+            // OpenMetaverse.StructuredData.OSDMap hash = (OpenMetaverse.StructuredData.OSDMap)
+            //    OpenMetaverse.StructuredData.LLSDParser.DeserializeXml(new XmlTextReader(request));
+
+            Hashtable hash = (Hashtable) LLSD.LLSDDeserialize(request);
+            TRequest llsdRequest = new TRequest();
+            LLSDHelpers.DeserialiseOSDMap(hash, llsdRequest);
+
+            TResponse response = m_method(llsdRequest);
+
+            Encoding encoding = new UTF8Encoding(false);
+
+            return encoding.GetBytes(LLSDHelpers.SerialiseLLSDReply(response));
+        }
+    }
+}
diff --git a/OpenSim/Framework/Capabilities/LLSDTaskInventoryUploadComplete.cs b/OpenSim/Framework/Capabilities/LLSDTaskInventoryUploadComplete.cs
index 370a8a1..47fdaca 100644
--- a/OpenSim/Framework/Capabilities/LLSDTaskInventoryUploadComplete.cs
+++ b/OpenSim/Framework/Capabilities/LLSDTaskInventoryUploadComplete.cs
@@ -1,50 +1,50 @@
-/*

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

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

- *

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

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

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

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

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

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

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

- *     * Neither the name of the OpenSimulator 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 OpenMetaverse;

-

-namespace OpenSim.Framework.Capabilities

-{

-    [OSDMap]

-    public class LLSDTaskInventoryUploadComplete

-    {

-        /// <summary>

-        /// The task inventory item that was updated

-        /// </summary>

-        public UUID item_id;

-

-        /// <summary>

-        /// The task that was updated

-        /// </summary>

-        public UUID task_id;

-

-        /// <summary>

-        /// State of the upload.  So far have only even seen this set to "complete"

-        /// </summary>

-        public string state;

-    }

-}

+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator 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 OpenMetaverse;
+
+namespace OpenSim.Framework.Capabilities
+{
+    [OSDMap]
+    public class LLSDTaskInventoryUploadComplete
+    {
+        /// <summary>
+        /// The task inventory item that was updated
+        /// </summary>
+        public UUID item_id;
+
+        /// <summary>
+        /// The task that was updated
+        /// </summary>
+        public UUID task_id;
+
+        /// <summary>
+        /// State of the upload.  So far have only even seen this set to "complete"
+        /// </summary>
+        public string state;
+    }
+}
diff --git a/OpenSim/Framework/Capabilities/LLSDTaskScriptUpdate.cs b/OpenSim/Framework/Capabilities/LLSDTaskScriptUpdate.cs
index e495e9c..9d7c17f 100644
--- a/OpenSim/Framework/Capabilities/LLSDTaskScriptUpdate.cs
+++ b/OpenSim/Framework/Capabilities/LLSDTaskScriptUpdate.cs
@@ -1,50 +1,50 @@
-/*

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

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

- *

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

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

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

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

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

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

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

- *     * Neither the name of the OpenSimulator 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 OpenMetaverse;

-

-namespace OpenSim.Framework.Capabilities

-{

-    [OSDMap]

-    public class LLSDTaskScriptUpdate

-    {

-        /// <summary>

-        /// The item containing the script to update

-        /// </summary>

-        public UUID item_id;

-

-        /// <summary>

-        /// The task containing the script

-        /// </summary>

-        public UUID task_id;

-

-        /// <summary>

-        /// Signals whether the script is currently active

-        /// </summary>

-        public int is_script_running;

-    }

-}

+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator 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 OpenMetaverse;
+
+namespace OpenSim.Framework.Capabilities
+{
+    [OSDMap]
+    public class LLSDTaskScriptUpdate
+    {
+        /// <summary>
+        /// The item containing the script to update
+        /// </summary>
+        public UUID item_id;
+
+        /// <summary>
+        /// The task containing the script
+        /// </summary>
+        public UUID task_id;
+
+        /// <summary>
+        /// Signals whether the script is currently active
+        /// </summary>
+        public int is_script_running;
+    }
+}
diff --git a/OpenSim/Framework/Capabilities/LLSDTest.cs b/OpenSim/Framework/Capabilities/LLSDTest.cs
index ba90796..5f77c3d 100644
--- a/OpenSim/Framework/Capabilities/LLSDTest.cs
+++ b/OpenSim/Framework/Capabilities/LLSDTest.cs
@@ -1,40 +1,40 @@
-/*

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

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

- *

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

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

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

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

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

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

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

- *     * Neither the name of the OpenSimulator 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.Capabilities

-{

-    [LLSDType("MAP")]

-    public class LLSDTest

-    {

-        public int Test1 = 20;

-        public int Test2 = 10;

-

-        public LLSDTest()

-        {

-        }

-    }

+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator 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.Capabilities
+{
+    [LLSDType("MAP")]
+    public class LLSDTest
+    {
+        public int Test1 = 20;
+        public int Test2 = 10;
+
+        public LLSDTest()
+        {
+        }
+    }
 }
\ No newline at end of file
diff --git a/OpenSim/Framework/Capabilities/LLSDType.cs b/OpenSim/Framework/Capabilities/LLSDType.cs
index c2f1f01..d5ca1ab 100644
--- a/OpenSim/Framework/Capabilities/LLSDType.cs
+++ b/OpenSim/Framework/Capabilities/LLSDType.cs
@@ -1,55 +1,55 @@
-/*

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

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

- *

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

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

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

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

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

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

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

- *     * Neither the name of the OpenSimulator 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.Framework.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 OSDMap : LLSDType

-    {

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

-        {

-        }

-    }

+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator 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.Framework.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 OSDMap : LLSDType
+    {
+        public OSDMap() : base("MAP")
+        {
+        }
+    }
 }
\ No newline at end of file
diff --git a/OpenSim/Framework/Capabilities/LLSDVoiceAccountResponse.cs b/OpenSim/Framework/Capabilities/LLSDVoiceAccountResponse.cs
index 93fa596..53c11e7 100644
--- a/OpenSim/Framework/Capabilities/LLSDVoiceAccountResponse.cs
+++ b/OpenSim/Framework/Capabilities/LLSDVoiceAccountResponse.cs
@@ -1,57 +1,57 @@
-/*

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

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

-*

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

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

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

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

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

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

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

-*     * Neither the name of the OpenSimulator 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.Capabilities

-{

-    [OSDMap]

-    public class LLSDVoiceAccountResponse

-    {

-        public string username;

-        public string password;

-        public string voice_sip_uri_hostname;

-        public string voice_account_server_name;

-

-        public LLSDVoiceAccountResponse()

-        {

-        }

-

-        public LLSDVoiceAccountResponse(string user, string pass)

-        {

-            username = user;

-            password = pass;

-        }

-

-        public LLSDVoiceAccountResponse(string user, string pass, string sipUriHost, string accountServer)

-        {

-            username = user;

-            password = pass;

-            voice_sip_uri_hostname = sipUriHost;

-            voice_account_server_name = accountServer;

-        }

-    }

+/*
+* Copyright (c) Contributors, http://opensimulator.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSimulator 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.Capabilities
+{
+    [OSDMap]
+    public class LLSDVoiceAccountResponse
+    {
+        public string username;
+        public string password;
+        public string voice_sip_uri_hostname;
+        public string voice_account_server_name;
+
+        public LLSDVoiceAccountResponse()
+        {
+        }
+
+        public LLSDVoiceAccountResponse(string user, string pass)
+        {
+            username = user;
+            password = pass;
+        }
+
+        public LLSDVoiceAccountResponse(string user, string pass, string sipUriHost, string accountServer)
+        {
+            username = user;
+            password = pass;
+            voice_sip_uri_hostname = sipUriHost;
+            voice_account_server_name = accountServer;
+        }
+    }
 }
\ No newline at end of file