56 files changed, 1534 insertions, 8265 deletions
diff --git a/OpenSim/Framework/AgentCircuitData.cs b/OpenSim/Framework/AgentCircuitData.cs
index c0168e2..353e5bf 100644
--- a/OpenSim/Framework/AgentCircuitData.cs
+++ b/OpenSim/Framework/AgentCircuitData.cs
@@ -75,6 +75,11 @@ namespace OpenSim.Framework
        public uint circuitcode;
        /// <summary>
+        /// How this agent got here
+        /// </summary>
+        public uint teleportFlags;
+        /// <summary>
        /// Agent's account first name
        /// </summary>
        public string firstname;
@@ -97,10 +102,18 @@ namespace OpenSim.Framework
        public UUID SessionID;
        /// <summary>
+        /// Hypergrid service token; generated by the user domain, consumed by the receiving grid.
+        /// There is one such unique token for each grid visited.
+        /// </summary>
+        public string ServiceSessionID = string.Empty;
+        /// <summary>
        /// Position the Agent's Avatar starts in the region
        /// </summary>
        public Vector3 startpos;
+        public Dictionary<string, object> ServiceURLs;
        public AgentCircuitData()
        {
        }
@@ -136,17 +149,19 @@ namespace OpenSim.Framework
            args["base_folder"] = OSD.FromUUID(BaseFolder);
            args["caps_path"] = OSD.FromString(CapsPath);
-            OSDArray childrenSeeds = new OSDArray(ChildrenCapSeeds.Count);
+            if (ChildrenCapSeeds != null)
-            foreach (KeyValuePair<ulong, string> kvp in ChildrenCapSeeds)
            {
-                OSDMap pair = new OSDMap();
+                OSDArray childrenSeeds = new OSDArray(ChildrenCapSeeds.Count);
-                pair["handle"] = OSD.FromString(kvp.Key.ToString());
+                foreach (KeyValuePair<ulong, string> kvp in ChildrenCapSeeds)
-                pair["seed"] = OSD.FromString(kvp.Value);
+                {
-                childrenSeeds.Add(pair);
+                    OSDMap pair = new OSDMap();
+                    pair["handle"] = OSD.FromString(kvp.Key.ToString());
+                    pair["seed"] = OSD.FromString(kvp.Value);
+                    childrenSeeds.Add(pair);
+                }
+                if (ChildrenCapSeeds.Count > 0)
+                    args["children_seeds"] = childrenSeeds;
            }
-            if (ChildrenCapSeeds.Count > 0)
-                args["children_seeds"] = childrenSeeds;
            args["child"] = OSD.FromBoolean(child);
            args["circuit_code"] = OSD.FromString(circuitcode.ToString());
            args["first_name"] = OSD.FromString(firstname);
@@ -154,7 +169,52 @@ namespace OpenSim.Framework
            args["inventory_folder"] = OSD.FromUUID(InventoryFolder);
            args["secure_session_id"] = OSD.FromUUID(SecureSessionID);
            args["session_id"] = OSD.FromUUID(SessionID);
+            
+            args["service_session_id"] = OSD.FromString(ServiceSessionID);
            args["start_pos"] = OSD.FromString(startpos.ToString());
+            args["appearance_serial"] = OSD.FromInteger(Appearance.Serial);
+            if (Appearance != null)
+            {
+                //System.Console.WriteLine("XXX Before packing Wearables");
+                if ((Appearance.Wearables != null) && (Appearance.Wearables.Length > 0))
+                {
+                    OSDArray wears = new OSDArray(Appearance.Wearables.Length * 2);
+                    foreach (AvatarWearable awear in Appearance.Wearables)
+                    {
+                        wears.Add(OSD.FromUUID(awear.ItemID));
+                        wears.Add(OSD.FromUUID(awear.AssetID));
+                        //System.Console.WriteLine("XXX ItemID=" + awear.ItemID + " assetID=" + awear.AssetID);
+                    }
+                    args["wearables"] = wears;
+                }
+                //System.Console.WriteLine("XXX Before packing Attachments");
+                Dictionary<int, UUID[]> attachments = Appearance.GetAttachmentDictionary();
+                if ((attachments != null) && (attachments.Count > 0))
+                {
+                    OSDArray attachs = new OSDArray(attachments.Count);
+                    foreach (KeyValuePair<int, UUID[]> kvp in attachments)
+                    {
+                        AttachmentData adata = new AttachmentData(kvp.Key, kvp.Value[0], kvp.Value[1]);
+                        attachs.Add(adata.PackUpdateMessage());
+                        //System.Console.WriteLine("XXX att.pt=" + kvp.Key + "; itemID=" + kvp.Value[0] + "; assetID=" + kvp.Value[1]);
+                    }
+                    args["attachments"] = attachs;
+                }
+            }
+            if (ServiceURLs != null && ServiceURLs.Count > 0)
+            {
+                OSDArray urls = new OSDArray(ServiceURLs.Count * 2);
+                foreach (KeyValuePair<string, object> kvp in ServiceURLs)
+                {
+                    //System.Console.WriteLine("XXX " + kvp.Key + "=" + kvp.Value);
+                    urls.Add(OSD.FromString(kvp.Key));
+                    urls.Add(OSD.FromString((kvp.Value == null) ? string.Empty : kvp.Value.ToString()));
+                }
+                args["service_urls"] = urls;
+            }
            return args;
        }
@@ -193,6 +253,8 @@ namespace OpenSim.Framework
                    }
                }
            }
+            else
+                ChildrenCapSeeds = new Dictionary<ulong, string>();
            if (args["child"] != null)
                child = args["child"].AsBoolean();
@@ -208,10 +270,51 @@ namespace OpenSim.Framework
                SecureSessionID = args["secure_session_id"].AsUUID();
            if (args["session_id"] != null)
                SessionID = args["session_id"].AsUUID();
+            if (args["service_session_id"] != null)
+                ServiceSessionID = args["service_session_id"].AsString();
            if (args["start_pos"] != null)
-                Vector3.TryParse(args["start_pos"].AsString(), out startpos); 
+                Vector3.TryParse(args["start_pos"].AsString(), out startpos);
+            Appearance = new AvatarAppearance(AgentID);
+            if (args["appearance_serial"] != null)
+                Appearance.Serial = args["appearance_serial"].AsInteger();
+            if ((args["wearables"] != null) && (args["wearables"]).Type == OSDType.Array)
+            {
+                OSDArray wears = (OSDArray)(args["wearables"]);
+                for (int i = 0; i < wears.Count / 2; i++) 
+                {
+                    Appearance.Wearables[i].ItemID = wears[i*2].AsUUID();
+                    Appearance.Wearables[i].AssetID = wears[(i*2)+1].AsUUID();
+                }
+           }
+            if ((args["attachments"] != null) && (args["attachments"]).Type == OSDType.Array)
+            {
+                OSDArray attachs = (OSDArray)(args["attachments"]);
+                AttachmentData[] attachments = new AttachmentData[attachs.Count];
+                int i = 0;
+                foreach (OSD o in attachs)
+                {
+                    if (o.Type == OSDType.Map)
+                    {
+                        attachments[i++] = new AttachmentData((OSDMap)o);
+                    }
+                }
+                Appearance.SetAttachments(attachments);
+            }
+            ServiceURLs = new Dictionary<string, object>();
+            if (args.ContainsKey("service_urls") && args["service_urls"] != null && (args["service_urls"]).Type == OSDType.Array)
+            {
+                OSDArray urls = (OSDArray)(args["service_urls"]);
+                for (int i = 0; i < urls.Count / 2; i++)
+                {
+                    ServiceURLs[urls[i * 2].AsString()] = urls[(i * 2) + 1].AsString();
+                    //System.Console.WriteLine("XXX " + urls[i * 2].AsString() + "=" + urls[(i * 2) + 1].AsString());
+                }
+            }
        }
    }
diff --git a/OpenSim/Framework/AssetBase.cs b/OpenSim/Framework/AssetBase.cs
index 212f41d..19ca232 100644
--- a/OpenSim/Framework/AssetBase.cs
+++ b/OpenSim/Framework/AssetBase.cs
@@ -59,9 +59,10 @@ namespace OpenSim.Framework
            m_metadata.FullID = UUID.Zero;
            m_metadata.ID = UUID.Zero.ToString();
            m_metadata.Type = (sbyte)AssetType.Unknown;
+            m_metadata.CreatorID = String.Empty;
        }
-        public AssetBase(UUID assetID, string name, sbyte assetType)
+        public AssetBase(UUID assetID, string name, sbyte assetType, string creatorID)
        {
            if (assetType == (sbyte)AssetType.Unknown)
            {
@@ -74,9 +75,10 @@ namespace OpenSim.Framework
            m_metadata.FullID = assetID;
            m_metadata.Name = name;
            m_metadata.Type = assetType;
+            m_metadata.CreatorID = creatorID;
        }
-        public AssetBase(string assetID, string name, sbyte assetType)
+        public AssetBase(string assetID, string name, sbyte assetType, string creatorID)
        {
            if (assetType == (sbyte)AssetType.Unknown)
            {
@@ -89,6 +91,7 @@ namespace OpenSim.Framework
            m_metadata.ID = assetID;
            m_metadata.Name = name;
            m_metadata.Type = assetType;
+            m_metadata.CreatorID = creatorID;
        }
        public bool ContainsReferences
@@ -220,7 +223,6 @@ namespace OpenSim.Framework
    public class AssetMetadata
    {
        private UUID m_fullid;
-        // m_id added as a dirty hack to transition from FullID to ID
        private string m_id;
        private string m_name = String.Empty;
        private string m_description = String.Empty;
@@ -230,8 +232,7 @@ namespace OpenSim.Framework
        private byte[] m_sha1;
        private bool m_local;
        private bool m_temporary;
-        //private Dictionary<string, Uri> m_methods = new Dictionary<string, Uri>();
+        private string m_creatorid;
-        //private OSDMap m_extra_data;
        public UUID FullID
        {
@@ -289,8 +290,21 @@ namespace OpenSim.Framework
        public string ContentType
        {
-            get { return m_content_type; }
+            get
-            set { m_content_type = value; }
+            {
+                if (!String.IsNullOrEmpty(m_content_type))
+                    return m_content_type;
+                else
+                    return SLUtil.SLAssetTypeToContentType(m_type);
+            }
+            set
+            {
+                m_content_type = value;
+                sbyte type = (sbyte)SLUtil.ContentTypeToSLAssetType(value);
+                if (type != -1)
+                    m_type = type;
+            }
        }
        public byte[] SHA1
@@ -311,16 +325,10 @@ namespace OpenSim.Framework
            set { m_temporary = value; }
        }
-        //public Dictionary<string, Uri> Methods
+        public string CreatorID
-        //{
+        {
-        //    get { return m_methods; }
+            get { return m_creatorid; }
-        //    set { m_methods = value; }
+            set { m_creatorid = value; }
-        //}
+        }
-        //public OSDMap ExtraData
-        //{
-        //    get { return m_extra_data; }
-        //    set { m_extra_data = value; }
-        //}
    }
 }
diff --git a/OpenSim/Framework/AssetLandmark.cs b/OpenSim/Framework/AssetLandmark.cs
index 058b442..7806c1f 100644
--- a/OpenSim/Framework/AssetLandmark.cs
+++ b/OpenSim/Framework/AssetLandmark.cs
@@ -38,7 +38,7 @@ namespace OpenSim.Framework
        public int Version;
        public AssetLandmark(AssetBase a)
-            : base(a.FullID, a.Name, a.Type)
+            : base(a.FullID, a.Name, a.Type, a.Metadata.CreatorID)
        {
            Data = a.Data;
            Description = a.Description;
diff --git a/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs b/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs
index 6ab1b58..097ad7d 100644
--- a/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs
+++ b/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs
@@ -41,11 +41,12 @@ namespace OpenSim.Framework.AssetLoader.Filesystem
 {
    public class AssetLoaderFileSystem : IAssetLoader
    {
+        private static readonly UUID LIBRARY_OWNER_ID = new UUID("11111111-1111-0000-0000-000100bba000");
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
        protected static AssetBase CreateAsset(string assetIdStr, string name, string path, sbyte type)
        {
-            AssetBase asset = new AssetBase(new UUID(assetIdStr), name, type);
+            AssetBase asset = new AssetBase(new UUID(assetIdStr), name, type, LIBRARY_OWNER_ID.ToString());
            if (!String.IsNullOrEmpty(path))
            {
diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs
index a2a5c84..5da8ba1 100644
--- a/OpenSim/Framework/AvatarAppearance.cs
+++ b/OpenSim/Framework/AvatarAppearance.cs
@@ -559,6 +559,16 @@ namespace OpenSim.Framework
        private Dictionary<int, UUID[]> m_attachments = new Dictionary<int, UUID[]>();
+        public void SetAttachments(AttachmentData[] data)
+        {
+            foreach (AttachmentData a in data)
+            {
+                m_attachments[a.AttachPoint] = new UUID[2];
+                m_attachments[a.AttachPoint][0] = a.ItemID;
+                m_attachments[a.AttachPoint][1] = a.AssetID;
+            }
+        }
        public void SetAttachments(Hashtable data)
        {
            m_attachments.Clear();
@@ -588,6 +598,11 @@ namespace OpenSim.Framework
            }
        }
+        public Dictionary<int, UUID[]> GetAttachmentDictionary()
+        {
+            return m_attachments;
+        }
        public Hashtable GetAttachments()
        {
            if (m_attachments.Count == 0)
diff --git a/OpenSim/Framework/Capabilities/Caps.cs b/OpenSim/Framework/Capabilities/Caps.cs
index 74c6ab0..b27d011 100644
--- a/OpenSim/Framework/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Capabilities/Caps.cs
@@ -888,7 +888,7 @@ namespace OpenSim.Framework.Capabilities
            }
            AssetBase asset;
-            asset = new AssetBase(assetID, assetName, assType);
+            asset = new AssetBase(assetID, assetName, assType, m_agentID.ToString());
            asset.Data = data;
            if (AddNewAsset != null)
                AddNewAsset(asset);
diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs
index 825ab81..a1ac84c 100644
--- a/OpenSim/Framework/ChildAgentDataUpdate.cs
+++ b/OpenSim/Framework/ChildAgentDataUpdate.cs
@@ -41,14 +41,14 @@ namespace OpenSim.Framework
        public Guid AgentID;
        public bool alwaysrun;
        public float AVHeight;
-        public sLLVector3 cameraPosition;
+        public Vector3 cameraPosition;
        public float drawdistance;
        public float godlevel;
        public uint GroupAccess;
-        public sLLVector3 Position;
+        public Vector3 Position;
        public ulong regionHandle;
        public byte[] throttles;
-        public sLLVector3 Velocity;
+        public Vector3 Velocity;
        public ChildAgentDataUpdate()
        {
@@ -177,14 +177,13 @@ namespace OpenSim.Framework
            Size = new Vector3();
            Size.Z = cAgent.AVHeight;
-            Center = new Vector3(cAgent.cameraPosition.x, cAgent.cameraPosition.y, cAgent.cameraPosition.z);
+            Center = cAgent.cameraPosition;
            Far = cAgent.drawdistance;
-            Position = new Vector3(cAgent.Position.x, cAgent.Position.y, cAgent.Position.z);
+            Position = cAgent.Position;
            RegionHandle = cAgent.regionHandle;
            Throttles = cAgent.throttles;
-            Velocity = new Vector3(cAgent.Velocity.x, cAgent.Velocity.y, cAgent.Velocity.z);
+            Velocity = cAgent.Velocity;
        }
    }
    public class AgentGroupData
@@ -274,7 +273,7 @@ namespace OpenSim.Framework
            get { return m_id; }
            set { m_id = value; }
        }
-        public ulong RegionHandle;
+        public UUID RegionID;
        public uint CircuitCode;
        public UUID SessionID;
@@ -321,7 +320,7 @@ namespace OpenSim.Framework
            OSDMap args = new OSDMap();
            args["message_type"] = OSD.FromString("AgentData");
-            args["region_handle"] = OSD.FromString(RegionHandle.ToString());
+            args["region_id"] = OSD.FromString(RegionID.ToString());
            args["circuit_code"] = OSD.FromString(CircuitCode.ToString());
            args["agent_uuid"] = OSD.FromUUID(AgentID);
            args["session_uuid"] = OSD.FromUUID(SessionID);
@@ -334,6 +333,7 @@ namespace OpenSim.Framework
            args["left_axis"] = OSD.FromString(LeftAxis.ToString());
            args["up_axis"] = OSD.FromString(UpAxis.ToString());
+            
            args["changed_grid"] = OSD.FromBoolean(ChangedGrid);
            args["far"] = OSD.FromReal(Far);
            args["aspect"] = OSD.FromReal(Aspect);
@@ -353,7 +353,7 @@ namespace OpenSim.Framework
            args["agent_access"] = OSD.FromString(AgentAccess.ToString());
            args["active_group_id"] = OSD.FromUUID(ActiveGroupID);
+          
            if ((Groups != null) && (Groups.Length > 0))
            {
                OSDArray groups = new OSDArray(Groups.Length);
@@ -378,6 +378,7 @@ namespace OpenSim.Framework
            //    args["agent_textures"] = textures;
            //}
+           
            if ((AgentTextures != null) && (AgentTextures.Length > 0))
                args["texture_entry"] = OSD.FromBinary(AgentTextures);
@@ -393,6 +394,7 @@ namespace OpenSim.Framework
                args["wearables"] = wears;
            }
+            
            if ((Attachments != null) && (Attachments.Length > 0))
            {
                OSDArray attachs = new OSDArray(Attachments.Length);
@@ -401,9 +403,11 @@ namespace OpenSim.Framework
                args["attachments"] = attachs;
            }
            if ((CallbackURI != null) && (!CallbackURI.Equals("")))
                args["callback_uri"] = OSD.FromString(CallbackURI);
            return args;
        }
@@ -414,8 +418,8 @@ namespace OpenSim.Framework
        /// <param name="hash"></param>
        public virtual void Unpack(OSDMap args)
        {
-            if (args.ContainsKey("region_handle"))
+            if (args.ContainsKey("region_id"))
-                UInt64.TryParse(args["region_handle"].AsString(), out RegionHandle);
+                UUID.TryParse(args["region_id"].AsString(), out RegionID);
            if (args["circuit_code"] != null)
                UInt32.TryParse((string)args["circuit_code"].AsString(), out CircuitCode);
@@ -572,7 +576,7 @@ namespace OpenSim.Framework
        {
            System.Console.WriteLine("------------ AgentData ------------");
            System.Console.WriteLine("UUID: " + AgentID);
-            System.Console.WriteLine("Region: " + RegionHandle);
+            System.Console.WriteLine("Region: " + RegionID);
            System.Console.WriteLine("Position: " + Position);
        }
    }
diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
deleted file mode 100644
index 6648c36..0000000
--- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
+++ /dev/null
@@ -1,847 +0,0 @@
-/*
- * 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.Generic;
-using System.Reflection;
-using log4net;
-using OpenMetaverse;
-using OpenSim.Services.Interfaces;
-namespace OpenSim.Framework.Communications.Cache
-{
-    internal delegate void AddItemDelegate(InventoryItemBase itemInfo);
-    internal delegate void UpdateItemDelegate(InventoryItemBase itemInfo);
-    internal delegate void DeleteItemDelegate(UUID itemID);
-    internal delegate void QueryItemDelegate(UUID itemID);
-    internal delegate void QueryFolderDelegate(UUID folderID);
-    internal delegate void CreateFolderDelegate(string folderName, UUID folderID, ushort folderType, UUID parentID);
-    internal delegate void MoveFolderDelegate(UUID folderID, UUID parentID);
-    internal delegate void PurgeFolderDelegate(UUID folderID);
-    internal delegate void UpdateFolderDelegate(string name, UUID folderID, ushort type, UUID parentID);
-    internal delegate void SendInventoryDescendentsDelegate(
-        IClientAPI client, UUID folderID, bool fetchFolders, bool fetchItems);
-    public delegate void OnItemReceivedDelegate(UUID itemID);
-    public delegate void OnInventoryReceivedDelegate(UUID userID);
-    /// <summary>
-    /// Stores user profile and inventory data received from backend services for a particular user.
-    /// </summary>
-    public class CachedUserInfo
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
-        //// <value>
-        /// Fired when a particular item has been received from the inventory service
-        /// </value>
-        public event OnItemReceivedDelegate OnItemReceived;
-        /// <value>
-        /// Fired once the entire inventory has been received for the user
-        /// </value>
-        public event OnInventoryReceivedDelegate OnInventoryReceived;
-        /// <summary>
-        /// The comms manager holds references to services (user, grid, inventory, etc.)
-        /// </summary>
-        private readonly IInventoryService m_InventoryService;
-        public UserProfileData UserProfile { get { return m_userProfile; } }
-        private UserProfileData m_userProfile;
-        /// <summary>
-        /// Have we received the user's inventory from the inventory service?
-        /// </summary>
-        public bool HasReceivedInventory { get { return m_hasReceivedInventory; } }
-        private bool m_hasReceivedInventory;
-        /// <summary>
-        /// Inventory requests waiting for receipt of this user's inventory from the inventory service.
-        /// </summary>
-        private readonly IList<IInventoryRequest> m_pendingRequests = new List<IInventoryRequest>();
-        /// <summary>
-        /// The root folder of this user's inventory.  Returns null if the root folder has not yet been received.
-        /// </summary>
-        public InventoryFolderImpl RootFolder { get { return m_rootFolder; } }
-        private InventoryFolderImpl m_rootFolder;
-        public UUID SessionID
-        {
-            get { return m_session_id; }
-            set { m_session_id = value; }
-        }
-        private UUID m_session_id = UUID.Zero;
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name="commsManager"></param>
-        /// <param name="userProfile"></param>
-        public CachedUserInfo(IInventoryService invService, UserProfileData userProfile)
-        {
-            m_userProfile = userProfile;
-            m_InventoryService = invService;
-        }
-        /// <summary>
-        /// This allows a request to be added to be processed once we receive a user's inventory
-        /// from the inventory service.  If we already have the inventory, the request
-        /// is executed immediately instead.
-        /// </summary>
-        /// <param name="parent"></param>
-        protected void AddRequest(IInventoryRequest request)
-        {
-            lock (m_pendingRequests)
-            {
-                if (HasReceivedInventory)
-                {
-                    request.Execute();
-                }
-                else
-                {
-                    m_pendingRequests.Add(request);
-                }
-            }
-        }
-        /// <summary>
-        /// Helper function for InventoryReceive() - Store a folder temporarily until we've received entire folder list
-        /// </summary>
-        /// <param name="folder"></param>
-        private void AddFolderToDictionary(InventoryFolderImpl folder, IDictionary<UUID, IList<InventoryFolderImpl>> dictionary)
-        {
-            UUID parentFolderId = folder.ParentID;
-            if (dictionary.ContainsKey(parentFolderId))
-            {
-                dictionary[parentFolderId].Add(folder);
-            }
-            else
-            {
-                IList<InventoryFolderImpl> folders = new List<InventoryFolderImpl>();
-                folders.Add(folder);
-                dictionary[parentFolderId] = folders;
-            }
-        }
-        /// <summary>
-        /// Recursively, in depth-first order, add all the folders we've received (stored 
-        /// in a dictionary indexed by parent ID) into the tree that describes user folder
-        /// heirarchy
-        /// Any folder that is resolved into the tree is also added to resolvedFolderDictionary,
-        /// indexed by folder ID.
-        /// </summary>
-        /// <param name="parentId">
-        /// A <see cref="UUID"/>
-        /// </param>
-        private void ResolveReceivedFolders(InventoryFolderImpl parentFolder, 
-                                            IDictionary<UUID, IList<InventoryFolderImpl>> receivedFolderDictionary, 
-                                            IDictionary<UUID, InventoryFolderImpl> resolvedFolderDictionary)
-        {
-            if (receivedFolderDictionary.ContainsKey(parentFolder.ID))
-            {
-                List<InventoryFolderImpl> resolvedFolders = new List<InventoryFolderImpl>(); // Folders we've resolved with this invocation
-                foreach (InventoryFolderImpl folder in receivedFolderDictionary[parentFolder.ID])
-                {
-                    if (parentFolder.ContainsChildFolder(folder.ID))
-                    {
-                        m_log.WarnFormat(
-                            "[INVENTORY CACHE]: Received folder {0} {1} from inventory service which has already been received",
-                            folder.Name, folder.ID);
-                    }
-                    else
-                    {
-                        if (resolvedFolderDictionary.ContainsKey(folder.ID)) 
-                        {
-                            m_log.WarnFormat(
-                                "[INVENTORY CACHE]: Received folder {0} {1} from inventory service has already been received but with different parent",
-                                folder.Name, folder.ID);
-                        }
-                        else
-                        {
-                            resolvedFolders.Add(folder);
-                            resolvedFolderDictionary[folder.ID] = folder;
-                            parentFolder.AddChildFolder(folder);
-                        }
-                    }
-                } // foreach (folder in pendingCategorizationFolders[parentFolder.ID])
-                receivedFolderDictionary.Remove(parentFolder.ID);
-                foreach (InventoryFolderImpl folder in resolvedFolders)
-                    ResolveReceivedFolders(folder, receivedFolderDictionary, resolvedFolderDictionary);
-            } // if (receivedFolderDictionary.ContainsKey(parentFolder.ID))
-        }
-        /// <summary>
-        /// Drop all cached inventory.
-        /// </summary>
-        public void DropInventory()
-        {
-            m_log.Debug("[INVENTORY CACHE]: DropInventory called");
-            // Make sure there aren't pending requests around when we do this
-            // FIXME: There is still a race condition where an inventory operation can be requested (since these aren't being locked).
-            // Will have to extend locking to exclude this very soon.
-            lock (m_pendingRequests)
-            {
-                m_hasReceivedInventory = false;
-                m_rootFolder = null;
-            }
-        }
-        
-        /// <summary>
-        /// Fetch inventory for this user.
-        /// </summary>
-        /// This has to be executed as a separate step once user information is retreived.
-        /// This will occur synchronously if the inventory service is in the same process as this class, and
-        /// asynchronously otherwise.
-        public void FetchInventory()
-        {
-            m_InventoryService.GetUserInventory(UserProfile.ID, InventoryReceive);
-        }
-        /// <summary>
-        /// Callback invoked when the inventory is received from an async request to the inventory service
-        /// </summary>
-        /// <param name="userID"></param>
-        /// <param name="inventoryCollection"></param>
-        public void InventoryReceive(ICollection<InventoryFolderImpl> folders, ICollection<InventoryItemBase> items)
-        {
-            // FIXME: Exceptions thrown upwards never appear on the console.  Could fix further up if these
-            // are simply being swallowed
-            try
-            {
-                // collection of all received folders, indexed by their parent ID
-                IDictionary<UUID, IList<InventoryFolderImpl>> receivedFolders =
-                    new Dictionary<UUID, IList<InventoryFolderImpl>>();
-                // collection of all folders that have been placed into the folder heirarchy starting at m_rootFolder
-                // This dictonary exists so we don't have to do an InventoryFolderImpl.FindFolder(), which is O(n) on the
-                // number of folders in our inventory. 
-                // Maybe we should make this structure a member so we can skip InventoryFolderImpl.FindFolder() calls later too?
-                IDictionary<UUID, InventoryFolderImpl> resolvedFolders =
-                    new Dictionary<UUID, InventoryFolderImpl>();
-                // Take all received folders, find the root folder, and put ther rest into
-                // the pendingCategorizationFolders collection
-                foreach (InventoryFolderImpl folder in folders)
-                    AddFolderToDictionary(folder, receivedFolders);
-                if (!receivedFolders.ContainsKey(UUID.Zero))
-                    throw new Exception("Database did not return a root inventory folder");
-                else
-                {
-                    IList<InventoryFolderImpl> rootFolderList = receivedFolders[UUID.Zero];
-                    m_rootFolder = rootFolderList[0];
-                    resolvedFolders[m_rootFolder.ID] = m_rootFolder;
-                    if (rootFolderList.Count > 1)
-                    {
-                        for (int i = 1; i < rootFolderList.Count; i++)
-                        {
-                            m_log.WarnFormat(
-                                "[INVENTORY CACHE]: Discarding extra root folder {0}. Using previously received root folder {1}",
-                                rootFolderList[i].ID, RootFolder.ID);
-                        }
-                    }
-                    receivedFolders.Remove(UUID.Zero);
-                }
-                // Now take the pendingCategorizationFolders collection, and turn that into a tree,
-                // with the root being RootFolder
-                if (RootFolder != null)
-                    ResolveReceivedFolders(RootFolder, receivedFolders, resolvedFolders);
-                // Generate a warning for folders that are not part of the heirarchy
-                foreach (KeyValuePair<UUID, IList<InventoryFolderImpl>> folderList in receivedFolders)
-                {
-                    foreach (InventoryFolderImpl folder in folderList.Value)
-                        m_log.WarnFormat("[INVENTORY CACHE]: Malformed Database: Unresolved Pending Folder {0}", folder.Name);
-                }
-                // Take all ther received items and put them into the folder tree heirarchy
-                foreach (InventoryItemBase item in items) {
-                    InventoryFolderImpl folder = resolvedFolders.ContainsKey(item.Folder) ? resolvedFolders[item.Folder] : null;
-                    ItemReceive(item, folder);
-                }
-            }
-            catch (Exception e)
-            {
-                m_log.ErrorFormat("[INVENTORY CACHE]: Error processing inventory received from inventory service, {0}", e);
-            }
-            // Deal with pending requests
-            lock (m_pendingRequests)
-            {
-                // We're going to change inventory status within the lock to avoid a race condition
-                // where requests are processed after the AddRequest() method has been called.
-                m_hasReceivedInventory = true;
-                foreach (IInventoryRequest request in m_pendingRequests)
-                {
-                    request.Execute();
-                }
-            }
-            if (OnInventoryReceived != null)
-                OnInventoryReceived(UserProfile.ID);
-        }
-        /// <summary>
-        /// Callback invoked when an item is received from an async request to the inventory service.
-        ///
-        /// We're assuming here that items are always received after all the folders
-        /// received.
-        /// If folder is null, we will search for it starting from RootFolder (an O(n) operation),
-        /// otherwise we'll just put it into folder
-        /// </summary>
-        /// <param name="folderInfo"></param>
-        private void ItemReceive(InventoryItemBase itemInfo, InventoryFolderImpl folder)
-        {
-            //            m_log.DebugFormat(
-            //                "[INVENTORY CACHE]: Received item {0} {1} for user {2}",
-            //                itemInfo.Name, itemInfo.ID, userID);
-            if (folder == null && RootFolder != null)
-                folder = RootFolder.FindFolder(itemInfo.Folder);
-            if (null == folder)
-            {
-                m_log.WarnFormat(
-                    "Received item {0} {1} but its folder {2} does not exist",
-                    itemInfo.Name, itemInfo.ID, itemInfo.Folder);
-                return;
-            }
-            lock (folder.Items)
-            {
-                folder.Items[itemInfo.ID] = itemInfo;
-            }
-            if (OnItemReceived != null)
-                OnItemReceived(itemInfo.ID);
-        }
-        /// <summary>
-        /// Create a folder in this agent's inventory.
-        /// </summary>
-        ///
-        /// If the inventory service has not yet delievered the inventory
-        /// for this user then the request will be queued.
-        /// 
-        /// <param name="parentID"></param>
-        /// <returns></returns>
-        public bool CreateFolder(string folderName, UUID folderID, ushort folderType, UUID parentID)
-        {
-            //            m_log.DebugFormat(
-            //                "[AGENT INVENTORY]: Creating inventory folder {0} {1} for {2} {3}", folderID, folderName, remoteClient.Name, remoteClient.AgentId);
-            if (m_hasReceivedInventory)
-            {
-                InventoryFolderImpl parentFolder = RootFolder.FindFolder(parentID);
-                if (null == parentFolder)
-                {
-                    m_log.WarnFormat(
-                        "[AGENT INVENTORY]: Tried to create folder {0} {1} but the parent {2} does not exist",
-                        folderName, folderID, parentID);
-                    return false;
-                }
-                InventoryFolderImpl createdFolder = parentFolder.CreateChildFolder(folderID, folderName, folderType);
-                if (createdFolder != null)
-                {
-                    InventoryFolderBase createdBaseFolder = new InventoryFolderBase();
-                    createdBaseFolder.Owner = createdFolder.Owner;
-                    createdBaseFolder.ID = createdFolder.ID;
-                    createdBaseFolder.Name = createdFolder.Name;
-                    createdBaseFolder.ParentID = createdFolder.ParentID;
-                    createdBaseFolder.Type = createdFolder.Type;
-                    createdBaseFolder.Version = createdFolder.Version;
-                    m_InventoryService.AddFolder(createdBaseFolder);
-                    return true;
-                }
-                else
-                {
-                    m_log.WarnFormat(
-                         "[AGENT INVENTORY]: Tried to create folder {0} {1} but the folder already exists",
-                         folderName, folderID);
-                    return false;
-                }
-            }
-            else
-            {
-                AddRequest(
-                    new InventoryRequest(
-                        Delegate.CreateDelegate(typeof(CreateFolderDelegate), this, "CreateFolder"),
-                        new object[] { folderName, folderID, folderType, parentID }));
-                return true;
-            }
-        }
-        /// <summary>
-        /// Handle a client request to update the inventory folder
-        /// </summary>
-        ///
-        /// If the inventory service has not yet delievered the inventory
-        /// for this user then the request will be queued.
-        ///
-        /// FIXME: We call add new inventory folder because in the data layer, we happen to use an SQL REPLACE
-        /// so this will work to rename an existing folder.  Needless to say, to rely on this is very confusing,
-        /// and needs to be changed.
-        ///
-        /// <param name="folderID"></param>
-        /// <param name="type"></param>
-        /// <param name="name"></param>
-        /// <param name="parentID"></param>
-        public bool UpdateFolder(string name, UUID folderID, ushort type, UUID parentID)
-        {
-            //            m_log.DebugFormat(
-            //                "[AGENT INVENTORY]: Updating inventory folder {0} {1} for {2} {3}", folderID, name, remoteClient.Name, remoteClient.AgentId);
-            if (m_hasReceivedInventory)
-            {
-                InventoryFolderImpl folder = RootFolder.FindFolder(folderID);
-                
-                // Delegate movement if updated parent id isn't the same as the existing parentId
-                if (folder.ParentID != parentID)
-                    MoveFolder(folderID, parentID);
-                
-                InventoryFolderBase baseFolder = new InventoryFolderBase();
-                baseFolder.Owner = m_userProfile.ID;
-                baseFolder.ID = folderID;
-                baseFolder.Name = name;
-                baseFolder.ParentID = parentID;
-                baseFolder.Type = (short)type;
-                baseFolder.Version = RootFolder.Version;
-                m_InventoryService.UpdateFolder(baseFolder);
-                folder.Name = name;
-                folder.Type = (short)type;
-            }
-            else
-            {
-                AddRequest(
-                    new InventoryRequest(
-                        Delegate.CreateDelegate(typeof(UpdateFolderDelegate), this, "UpdateFolder"),
-                        new object[] { name, folderID, type, parentID }));
-            }
-            return true;
-        }
-        /// <summary>
-        /// Handle an inventory folder move request from the client.
-        ///
-        /// If the inventory service has not yet delievered the inventory
-        /// for this user then the request will be queued.
-        /// </summary>
-        ///
-        /// <param name="folderID"></param>
-        /// <param name="parentID"></param>
-        /// <returns>
-        /// true if the delete was successful, or if it was queued pending folder receipt
-        /// false if the folder to be deleted did not exist.
-        /// </returns>
-        public bool MoveFolder(UUID folderID, UUID parentID)
-        {
-            //            m_log.DebugFormat(
-            //                "[AGENT INVENTORY]: Moving inventory folder {0} into folder {1} for {2} {3}",
-            //                parentID, remoteClient.Name, remoteClient.Name, remoteClient.AgentId);
-            if (m_hasReceivedInventory)
-            {
-                InventoryFolderBase baseFolder = new InventoryFolderBase();
-                baseFolder.Owner = m_userProfile.ID;
-                baseFolder.ID = folderID;
-                baseFolder.ParentID = parentID;
-                m_InventoryService.MoveFolder(baseFolder);
-                
-                InventoryFolderImpl folder = RootFolder.FindFolder(folderID);
-                InventoryFolderImpl parentFolder = RootFolder.FindFolder(parentID);
-                if (parentFolder != null && folder != null)
-                {
-                    InventoryFolderImpl oldParentFolder = RootFolder.FindFolder(folder.ParentID);
-                    if (oldParentFolder != null)
-                    {
-                        oldParentFolder.RemoveChildFolder(folderID);
-                        parentFolder.AddChildFolder(folder);
-                    }
-                    else
-                    {
-                        return false;
-                    }
-                }
-                else
-                { 
-                    return false;
-                }
-                return true;
-            }
-            else
-            {
-                AddRequest(
-                    new InventoryRequest(
-                        Delegate.CreateDelegate(typeof(MoveFolderDelegate), this, "MoveFolder"),
-                        new object[] { folderID, parentID }));
-                return true;
-            }
-        }
-        /// <summary>
-        /// This method will delete all the items and folders in the given folder.
-        /// </summary>
-        /// If the inventory service has not yet delievered the inventory
-        /// for this user then the request will be queued.
-        ///
-        /// <param name="folderID"></param>
-        public bool PurgeFolder(UUID folderID)
-        {
-            //            m_log.InfoFormat("[AGENT INVENTORY]: Purging folder {0} for {1} uuid {2}",
-            //                folderID, remoteClient.Name, remoteClient.AgentId);
-            if (m_hasReceivedInventory)
-            {
-                InventoryFolderImpl purgedFolder = RootFolder.FindFolder(folderID);
-                if (purgedFolder != null)
-                {
-                    // XXX Nasty - have to create a new object to hold details we already have
-                    InventoryFolderBase purgedBaseFolder = new InventoryFolderBase();
-                    purgedBaseFolder.Owner = purgedFolder.Owner;
-                    purgedBaseFolder.ID = purgedFolder.ID;
-                    purgedBaseFolder.Name = purgedFolder.Name;
-                    purgedBaseFolder.ParentID = purgedFolder.ParentID;
-                    purgedBaseFolder.Type = purgedFolder.Type;
-                    purgedBaseFolder.Version = purgedFolder.Version;
-                    m_InventoryService.PurgeFolder(purgedBaseFolder);
-                    purgedFolder.Purge();
-                    return true;
-                }
-            }
-            else
-            {
-                AddRequest(
-                    new InventoryRequest(
-                        Delegate.CreateDelegate(typeof(PurgeFolderDelegate), this, "PurgeFolder"),
-                        new object[] { folderID }));
-                return true;
-            }
-            return false;
-        }
-        /// <summary>
-        /// Add an item to the user's inventory.
-        /// </summary>
-        /// If the item has no folder set (i.e. it is UUID.Zero), then it is placed in the most appropriate folder
-        /// for that type.
-        /// <param name="itemInfo"></param>
-        public void AddItem(InventoryItemBase item)
-        {
-            if (m_hasReceivedInventory)
-            {
-                if (item.Folder == UUID.Zero)
-                {
-                    InventoryFolderImpl f = FindFolderForType(item.AssetType);
-                    if (f != null)
-                        item.Folder = f.ID;
-                    else
-                        item.Folder = RootFolder.ID;
-                }
-                ItemReceive(item, null);
-                
-                m_InventoryService.AddItem(item);
-            }
-            else
-            {
-                AddRequest(
-                    new InventoryRequest(
-                        Delegate.CreateDelegate(typeof(AddItemDelegate), this, "AddItem"),
-                        new object[] { item }));
-            }
-        }
-        /// <summary>
-        /// Update an item in the user's inventory
-        /// </summary>
-        /// <param name="userID"></param>
-        /// <param name="itemInfo"></param>
-        public void UpdateItem(InventoryItemBase item)
-        {
-            if (m_hasReceivedInventory)
-            {
-                m_InventoryService.UpdateItem(item);
-            }
-            else
-            {
-                AddRequest(
-                    new InventoryRequest(
-                        Delegate.CreateDelegate(typeof(UpdateItemDelegate), this, "UpdateItem"),
-                        new object[] { item }));
-            }
-        }
-        /// <summary>
-        /// Delete an item from the user's inventory
-        ///
-        /// If the inventory service has not yet delievered the inventory
-        /// for this user then the request will be queued.
-        /// </summary>
-        /// <param name="itemID"></param>
-        /// <returns>
-        /// true on a successful delete or a if the request is queued.
-        /// Returns false on an immediate failure
-        /// </returns>
-        public bool DeleteItem(UUID itemID)
-        {
-            if (m_hasReceivedInventory)
-            {
-                // XXX For historical reasons (grid comms), we need to retrieve the whole item in order to delete, even though
-                // really only the item id is required.
-                InventoryItemBase item = RootFolder.FindItem(itemID);
-                if (null == item)
-                {
-                    m_log.WarnFormat("[AGENT INVENTORY]: Tried to delete item {0} which does not exist", itemID);
-                    return false;
-                }
-                if (RootFolder.DeleteItem(item.ID))
-                {
-                    List<UUID> uuids = new List<UUID>();
-                    uuids.Add(itemID);
-                    return m_InventoryService.DeleteItems(this.UserProfile.ID, uuids);
-                }
-            }
-            else
-            {
-                AddRequest(
-                    new InventoryRequest(
-                        Delegate.CreateDelegate(typeof(DeleteItemDelegate), this, "DeleteItem"),
-                        new object[] { itemID }));
-                return true;
-            }
-            return false;
-        }
-        /// <summary>
-        /// Send details of the inventory items and/or folders in a given folder to the client.
-        /// </summary>
-        /// <param name="client"></param>
-        /// <param name="folderID"></param>
-        /// <param name="fetchFolders"></param>
-        /// <param name="fetchItems"></param>
-        /// <returns>true if the request was queued or successfully processed, false otherwise</returns>
-        public bool SendInventoryDecendents(IClientAPI client, UUID folderID, int version, bool fetchFolders, bool fetchItems)
-        {
-            if (m_hasReceivedInventory)
-            {
-                InventoryFolderImpl folder;
-                if ((folder = RootFolder.FindFolder(folderID)) != null)
-                {
-                    //                            m_log.DebugFormat(
-                    //                                "[AGENT INVENTORY]: Found folder {0} for client {1}",
-                    //                                folderID, remoteClient.AgentId);
-                    client.SendInventoryFolderDetails(
-                        client.AgentId, folderID, folder.RequestListOfItems(),
-                        folder.RequestListOfFolders(), version, fetchFolders, fetchItems);
-                    return true;
-                }
-                else
-                {
-                    m_log.WarnFormat(
-                        "[AGENT INVENTORY]: Could not find folder {0} requested by user {1} {2}",
-                        folderID, client.Name, client.AgentId);
-                    return false;
-                }
-            }
-            else
-            {
-                AddRequest(
-                    new InventoryRequest(
-                        Delegate.CreateDelegate(typeof(SendInventoryDescendentsDelegate), this, "SendInventoryDecendents", false, false),
-                        new object[] { client, folderID, fetchFolders, fetchItems }));
-                return true;
-            }
-        }
-        /// <summary>
-        /// Find an appropriate folder for the given asset type
-        /// </summary>
-        /// <param name="type"></param>
-        /// <returns>null if no appropriate folder exists</returns>
-        public InventoryFolderImpl FindFolderForType(int type)
-        {
-            if (RootFolder == null)
-                return null;
-            return RootFolder.FindFolderForType(type);
-        }
-        // Load additional items that other regions have put into the database
-        // The item will be added tot he local cache. Returns true if the item
-        // was found and can be sent to the client
-        //
-        public bool QueryItem(InventoryItemBase item)
-        {
-            if (m_hasReceivedInventory)
-            {
-                InventoryItemBase invItem = RootFolder.FindItem(item.ID);
-                if (invItem != null)
-                {
-                    // Item is in local cache, just update client
-                    //
-                    return true;
-                }
-                InventoryItemBase itemInfo = null;
-                itemInfo = m_InventoryService.GetItem(item);
-                if (itemInfo != null)
-                {
-                    InventoryFolderImpl folder = RootFolder.FindFolder(itemInfo.Folder);
-                    ItemReceive(itemInfo, folder);
-                    return true;
-                }
-                return false;
-            }
-            else
-            {
-                AddRequest(
-                    new InventoryRequest(
-                        Delegate.CreateDelegate(typeof(QueryItemDelegate), this, "QueryItem"),
-                        new object[] { item.ID }));
-                return true;
-            }
-        }
-        public bool QueryFolder(InventoryFolderBase folder)
-        {
-            if (m_hasReceivedInventory)
-            {
-                InventoryFolderBase invFolder = RootFolder.FindFolder(folder.ID);
-                if (invFolder != null)
-                {
-                    // Folder is in local cache, just update client
-                    //
-                    return true;
-                }
-                InventoryFolderBase folderInfo = null;
-                folderInfo = m_InventoryService.GetFolder(folder);
-                if (folderInfo != null)
-                {
-                    InventoryFolderImpl createdFolder = RootFolder.CreateChildFolder(folderInfo.ID, folderInfo.Name, (ushort)folderInfo.Type);
-                    createdFolder.Version = folderInfo.Version;
-                    createdFolder.Owner = folderInfo.Owner;
-                    createdFolder.ParentID = folderInfo.ParentID;
-                    return true;
-                }
-                return false;
-            }
-            else
-            {
-                AddRequest(
-                    new InventoryRequest(
-                        Delegate.CreateDelegate(typeof(QueryFolderDelegate), this, "QueryFolder"),
-                        new object[] { folder.ID }));
-                return true;
-            }
-        }
-    }
-    /// <summary>
-    /// Should be implemented by callers which require a callback when the user's inventory is received
-    /// </summary>
-    public interface IInventoryRequest
-    {
-        /// <summary>
-        /// This is the method executed once we have received the user's inventory by which the request can be fulfilled.
-        /// </summary>
-        void Execute();
-    }
-    /// <summary>
-    /// Generic inventory request
-    /// </summary>
-    class InventoryRequest : IInventoryRequest
-    {
-        private Delegate m_delegate;
-        private Object[] m_args;
-        internal InventoryRequest(Delegate delegat, Object[] args)
-        {
-            m_delegate = delegat;
-            m_args = args;
-        }
-        public void Execute()
-        {
-            if (m_delegate != null)
-                m_delegate.DynamicInvoke(m_args);
-        }
-    }
-}
diff --git a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
deleted file mode 100644
index 74ba0a5..0000000
--- a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
+++ /dev/null
@@ -1,257 +0,0 @@
-/*
- * 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.Generic;
-using System.IO;
-using System.Reflection;
-using System.Xml;
-using log4net;
-using Nini.Config;
-using OpenMetaverse;
-namespace OpenSim.Framework.Communications.Cache
-{
-    /// <summary>
-    /// Basically a hack to give us a Inventory library while we don't have a inventory server
-    /// once the server is fully implemented then should read the data from that
-    /// </summary>
-    public class LibraryRootFolder : InventoryFolderImpl
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        private UUID libOwner = new UUID("11111111-1111-0000-0000-000100bba000");
-        /// <summary>
-        /// Holds the root library folder and all its descendents.  This is really only used during inventory
-        /// setup so that we don't have to repeatedly search the tree of library folders.
-        /// </summary>
-        protected Dictionary<UUID, InventoryFolderImpl> libraryFolders
-            = new Dictionary<UUID, InventoryFolderImpl>();
-        
-        public LibraryRootFolder(string pLibrariesLocation)
-        {
-            Owner = libOwner;
-            ID = new UUID("00000112-000f-0000-0000-000100bba000");
-            Name = "OpenSim Library";
-            ParentID = UUID.Zero;
-            Type = (short) 8;
-            Version = (ushort) 1;
-            libraryFolders.Add(ID, this);
-            LoadLibraries(pLibrariesLocation);
-        }
-        public InventoryItemBase CreateItem(UUID inventoryID, UUID assetID, string name, string description,
-                                            int assetType, int invType, UUID parentFolderID)
-        {
-            InventoryItemBase item = new InventoryItemBase();
-            item.Owner = libOwner;
-            item.CreatorId = libOwner.ToString();
-            item.ID = inventoryID;
-            item.AssetID = assetID;
-            item.Description = description;
-            item.Name = name;
-            item.AssetType = assetType;
-            item.InvType = invType;
-            item.Folder = parentFolderID;
-            item.BasePermissions = 0x7FFFFFFF;
-            item.EveryOnePermissions = 0x7FFFFFFF;
-            item.CurrentPermissions = 0x7FFFFFFF;
-            item.NextPermissions = 0x7FFFFFFF;
-            return item;
-        }
-        /// <summary>
-        /// Use the asset set information at path to load assets
-        /// </summary>
-        /// <param name="path"></param>
-        /// <param name="assets"></param>
-        protected void LoadLibraries(string librariesControlPath)
-        {
-            m_log.InfoFormat("[LIBRARY INVENTORY]: Loading library control file {0}", librariesControlPath);
-            LoadFromFile(librariesControlPath, "Libraries control", ReadLibraryFromConfig);
-        }
-        /// <summary>
-        /// Read a library set from config
-        /// </summary>
-        /// <param name="config"></param>
-        protected void ReadLibraryFromConfig(IConfig config, string path)
-        {
-            string basePath = Path.GetDirectoryName(path);
-            string foldersPath
-                = Path.Combine(
-                    basePath, config.GetString("foldersFile", String.Empty));
-            LoadFromFile(foldersPath, "Library folders", ReadFolderFromConfig);
-            string itemsPath
-                = Path.Combine(
-                    basePath, config.GetString("itemsFile", String.Empty));
-            LoadFromFile(itemsPath, "Library items", ReadItemFromConfig);
-        }
-        /// <summary>
-        /// Read a library inventory folder from a loaded configuration
-        /// </summary>
-        /// <param name="source"></param>
-        private void ReadFolderFromConfig(IConfig config, string path)
-        {
-            InventoryFolderImpl folderInfo = new InventoryFolderImpl();
-            folderInfo.ID = new UUID(config.GetString("folderID", ID.ToString()));
-            folderInfo.Name = config.GetString("name", "unknown");
-            folderInfo.ParentID = new UUID(config.GetString("parentFolderID", ID.ToString()));
-            folderInfo.Type = (short)config.GetInt("type", 8);
-            folderInfo.Owner = libOwner;
-            folderInfo.Version = 1;
-            if (libraryFolders.ContainsKey(folderInfo.ParentID))
-            {
-                InventoryFolderImpl parentFolder = libraryFolders[folderInfo.ParentID];
-                libraryFolders.Add(folderInfo.ID, folderInfo);
-                parentFolder.AddChildFolder(folderInfo);
-//                 m_log.InfoFormat("[LIBRARY INVENTORY]: Adding folder {0} ({1})", folderInfo.name, folderInfo.folderID);
-            }
-            else
-            {
-                m_log.WarnFormat(
-                    "[LIBRARY INVENTORY]: Couldn't add folder {0} ({1}) since parent folder with ID {2} does not exist!",
-                    folderInfo.Name, folderInfo.ID, folderInfo.ParentID);
-            }
-        }
-        /// <summary>
-        /// Read a library inventory item metadata from a loaded configuration
-        /// </summary>
-        /// <param name="source"></param>
-        private void ReadItemFromConfig(IConfig config, string path)
-        {
-            InventoryItemBase item = new InventoryItemBase();
-            item.Owner = libOwner;
-            item.CreatorId = libOwner.ToString();
-            item.ID = new UUID(config.GetString("inventoryID", ID.ToString()));
-            item.AssetID = new UUID(config.GetString("assetID", item.ID.ToString()));
-            item.Folder = new UUID(config.GetString("folderID", ID.ToString()));
-            item.Name = config.GetString("name", String.Empty);
-            item.Description = config.GetString("description", item.Name);
-            item.InvType = config.GetInt("inventoryType", 0);
-            item.AssetType = config.GetInt("assetType", item.InvType);
-            item.CurrentPermissions = (uint)config.GetLong("currentPermissions", 0x7FFFFFFF);
-            item.NextPermissions = (uint)config.GetLong("nextPermissions", 0x7FFFFFFF);
-            item.EveryOnePermissions = (uint)config.GetLong("everyonePermissions", 0x7FFFFFFF);
-            item.BasePermissions = (uint)config.GetLong("basePermissions", 0x7FFFFFFF);
-            item.Flags = (uint)config.GetInt("flags", 0);
-            if (libraryFolders.ContainsKey(item.Folder))
-            {
-                InventoryFolderImpl parentFolder = libraryFolders[item.Folder];
-                try
-                {
-                    parentFolder.Items.Add(item.ID, item);
-                }
-                catch (Exception)
-                {
-                    m_log.WarnFormat("[LIBRARY INVENTORY] Item {1} [{0}] not added, duplicate item", item.ID, item.Name);
-                }
-            }
-            else
-            {
-                m_log.WarnFormat(
-                    "[LIBRARY INVENTORY]: Couldn't add item {0} ({1}) since parent folder with ID {2} does not exist!",
-                    item.Name, item.ID, item.Folder);
-            }
-        }
-        private delegate void ConfigAction(IConfig config, string path);
-        /// <summary>
-        /// Load the given configuration at a path and perform an action on each Config contained within it
-        /// </summary>
-        /// <param name="path"></param>
-        /// <param name="fileDescription"></param>
-        /// <param name="action"></param>
-        private static void LoadFromFile(string path, string fileDescription, ConfigAction action)
-        {
-            if (File.Exists(path))
-            {
-                try
-                {
-                    XmlConfigSource source = new XmlConfigSource(path);
-                    for (int i = 0; i < source.Configs.Count; i++)
-                    {
-                        action(source.Configs[i], path);
-                    }
-                }
-                catch (XmlException e)
-                {
-                    m_log.ErrorFormat("[LIBRARY INVENTORY]: Error loading {0} : {1}", path, e);
-                }
-            }
-            else
-            {
-                m_log.ErrorFormat("[LIBRARY INVENTORY]: {0} file {1} does not exist!", fileDescription, path);
-            }
-        }
-        /// <summary>
-        /// Looks like a simple getter, but is written like this for some consistency with the other Request
-        /// methods in the superclass
-        /// </summary>
-        /// <returns></returns>
-        public Dictionary<UUID, InventoryFolderImpl> RequestSelfAndDescendentFolders()
-        {
-            Dictionary<UUID, InventoryFolderImpl> fs = new Dictionary<UUID, InventoryFolderImpl>();
-            fs.Add(ID, this);
-            List<InventoryFolderImpl> fis = TraverseFolder(this);
-            foreach (InventoryFolderImpl f in fis)
-            {
-                fs.Add(f.ID, f);
-            }
-            //return libraryFolders;
-            return fs;
-        }
-        private List<InventoryFolderImpl> TraverseFolder(InventoryFolderImpl node)
-        {
-            List<InventoryFolderImpl> folders = node.RequestListOfFolderImpls();
-            List<InventoryFolderImpl> subs = new List<InventoryFolderImpl>();
-            foreach (InventoryFolderImpl f in folders)
-                subs.AddRange(TraverseFolder(f));
-            folders.AddRange(subs);
-            return folders;
-        }
-    }
-}
diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
deleted file mode 100644
index acae4b1..0000000
--- a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
+++ /dev/null
@@ -1,277 +0,0 @@
-/*
- * 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.Generic;
-using System.Reflection;
-using log4net;
-using OpenMetaverse;
-using OpenSim.Services.Interfaces;
-namespace OpenSim.Framework.Communications.Cache
-{
-    /// <summary>
-    /// Holds user profile information and retrieves it from backend services.
-    /// </summary>
-    public class UserProfileCacheService
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        /// <value>
-        /// Standard format for names.
-        /// </value>
-        public const string NAME_FORMAT = "{0} {1}";
-        
-        /// <summary>
-        /// The comms manager holds references to services (user, grid, inventory, etc.)
-        /// </summary>
-        private readonly CommunicationsManager m_commsManager;
-        /// <summary>
-        /// User profiles indexed by UUID
-        /// </summary>
-        private readonly Dictionary<UUID, CachedUserInfo> m_userProfilesById 
-            = new Dictionary<UUID, CachedUserInfo>();
-        
-        /// <summary>
-        /// User profiles indexed by name
-        /// </summary>
-        private readonly Dictionary<string, CachedUserInfo> m_userProfilesByName 
-            = new Dictionary<string, CachedUserInfo>();
-        
-        /// <summary>
-        /// The root library folder.
-        /// </summary>
-        public readonly InventoryFolderImpl LibraryRoot;
-        private IInventoryService m_InventoryService;
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name="commsManager"></param>
-        /// <param name="libraryRootFolder"></param>
-        public UserProfileCacheService(CommunicationsManager commsManager, LibraryRootFolder libraryRootFolder)
-        {
-            m_commsManager = commsManager;
-            LibraryRoot = libraryRootFolder;
-        }
-        public void SetInventoryService(IInventoryService invService)
-        {
-            m_InventoryService = invService;
-        }
-        /// <summary>
-        /// A new user has moved into a region in this instance so retrieve their profile from the user service.
-        /// </summary>
-        /// 
-        /// It isn't strictly necessary to make this call since user data can be lazily requested later on.  However, 
-        /// it might be helpful in order to avoid an initial response delay later on
-        /// 
-        /// <param name="userID"></param>
-        public void AddNewUser(UUID userID)
-        {
-            if (userID == UUID.Zero)
-                return;
-            
-            //m_log.DebugFormat("[USER CACHE]: Adding user profile for {0}", userID);
-            GetUserDetails(userID);
-        }
-        /// <summary>
-        /// Remove this user's profile cache.
-        /// </summary>
-        /// <param name="userID"></param>
-        /// <returns>true if the user was successfully removed, false otherwise</returns>
-        public bool RemoveUser(UUID userId)
-        {
-            if (!RemoveFromCaches(userId))
-            {
-                m_log.WarnFormat(
-                    "[USER CACHE]: Tried to remove the profile of user {0}, but this was not in the scene", userId);
-                
-                return false;
-            }
-            return true;
-        }
-        /// <summary>
-        /// Get details of the given user.
-        /// </summary>
-        /// If the user isn't in cache then the user is requested from the profile service.
-        /// <param name="userID"></param>
-        /// <returns>null if no user details are found</returns>
-        public CachedUserInfo GetUserDetails(string fname, string lname)
-        {
-            lock (m_userProfilesByName)
-            {
-                CachedUserInfo userInfo;
-                
-                if (m_userProfilesByName.TryGetValue(string.Format(NAME_FORMAT, fname, lname), out userInfo))
-                {
-                    return userInfo;
-                }
-                else
-                {
-                    UserProfileData userProfile = m_commsManager.UserService.GetUserProfile(fname, lname);
-                    if (userProfile != null)
-                    {
-                        if ((userProfile.UserAssetURI == null || userProfile.UserAssetURI == "") && m_commsManager.NetworkServersInfo != null)
-                            userProfile.UserAssetURI = m_commsManager.NetworkServersInfo.AssetURL;
-                        if ((userProfile.UserInventoryURI == null || userProfile.UserInventoryURI == "") && m_commsManager.NetworkServersInfo != null)
-                            userProfile.UserInventoryURI = m_commsManager.NetworkServersInfo.InventoryURL;
-                        return AddToCaches(userProfile);
-                    }
-                    else
-                        return null;
-                }
-            }
-        }
-        
-        /// <summary>
-        /// Get details of the given user.
-        /// </summary>
-        /// If the user isn't in cache then the user is requested from the profile service.
-        /// <param name="userID"></param>
-        /// <returns>null if no user details are found</returns>
-        public CachedUserInfo GetUserDetails(UUID userID)
-        {
-            if (userID == UUID.Zero)
-                return null;
-            lock (m_userProfilesById)
-            {
-                if (m_userProfilesById.ContainsKey(userID))
-                {
-                    return m_userProfilesById[userID];
-                }
-                else
-                {
-                    UserProfileData userProfile = m_commsManager.UserService.GetUserProfile(userID);
-                    if (userProfile != null)
-                    {
-                        if ((userProfile.UserAssetURI == null || userProfile.UserAssetURI == "") && m_commsManager.NetworkServersInfo != null)
-                            userProfile.UserAssetURI = m_commsManager.NetworkServersInfo.AssetURL;
-                        if ((userProfile.UserInventoryURI == null || userProfile.UserInventoryURI == "") && m_commsManager.NetworkServersInfo != null)
-                            userProfile.UserInventoryURI = m_commsManager.NetworkServersInfo.InventoryURL;
-                        return AddToCaches(userProfile);
-                    }
-                    else
-                        return null;
-                }
-            }
-        }
-        
-        /// <summary>
-        /// Update an existing profile
-        /// </summary>
-        /// <param name="userProfile"></param>
-        /// <returns>true if a user profile was found to update, false otherwise</returns>
-        // Commented out for now.  The implementation needs to be improved by protecting against race conditions,
-        // probably by making sure that the update doesn't use the UserCacheInfo.UserProfile directly (possibly via
-        // returning a read only class from the cache).
-//        public bool StoreProfile(UserProfileData userProfile)
-//        {
-//            lock (m_userProfilesById)
-//            {
-//                CachedUserInfo userInfo = GetUserDetails(userProfile.ID);
-//
-//                if (userInfo != null)
-//                {
-//                    userInfo.m_userProfile = userProfile;
-//                    m_commsManager.UserService.UpdateUserProfile(userProfile);
-//
-//                    return true;
-//                }
-//            }
-//
-//            return false;
-//        }
-        
-        /// <summary>
-        /// Populate caches with the given user profile
-        /// </summary>
-        /// <param name="userProfile"></param>
-        protected CachedUserInfo AddToCaches(UserProfileData userProfile)
-        {
-            CachedUserInfo createdUserInfo = new CachedUserInfo(m_InventoryService, userProfile);
-            
-            lock (m_userProfilesById)
-            {
-                m_userProfilesById[createdUserInfo.UserProfile.ID] = createdUserInfo;
-                
-                lock (m_userProfilesByName)
-                {
-                    m_userProfilesByName[createdUserInfo.UserProfile.Name] = createdUserInfo;
-                }
-            }
-            
-            return createdUserInfo;
-        }
-        
-        /// <summary>
-        /// Remove profile belong to the given uuid from the caches
-        /// </summary>
-        /// <param name="userUuid"></param>
-        /// <returns>true if there was a profile to remove, false otherwise</returns>
-        protected bool RemoveFromCaches(UUID userId)
-        {
-            lock (m_userProfilesById)
-            {
-                if (m_userProfilesById.ContainsKey(userId))
-                {
-                    CachedUserInfo userInfo = m_userProfilesById[userId];
-                    m_userProfilesById.Remove(userId);
-                    
-                    lock (m_userProfilesByName)
-                    {
-                        m_userProfilesByName.Remove(userInfo.UserProfile.Name);
-                    }
-                    
-                    return true;
-                }
-            }
-            
-            return false;
-        }
-        /// <summary>
-        /// Preloads User data into the region cache. Modules may use this service to add non-standard clients
-        /// </summary>
-        /// <param name="userData"></param>
-        public void PreloadUserCache(UserProfileData userData)
-        {
-            AddToCaches(userData);
-        }
-    }
-}
diff --git a/OpenSim/Framework/Communications/Clients/AuthClient.cs b/OpenSim/Framework/Communications/Clients/AuthClient.cs
deleted file mode 100644
index adae637..0000000
--- a/OpenSim/Framework/Communications/Clients/AuthClient.cs
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * 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 Nwc.XmlRpc;
-using OpenMetaverse;
-namespace OpenSim.Framework.Communications.Clients
-{
-    public class AuthClient
-    {
-        public static string GetNewKey(string authurl, UUID userID, UUID authToken)
-        {
-            //Hashtable keyParams = new Hashtable();
-            //keyParams["user_id"] = userID;
-            //keyParams["auth_token"] = authKey;
-            List<string> SendParams = new List<string>();
-            SendParams.Add(userID.ToString());
-            SendParams.Add(authToken.ToString());
-            XmlRpcRequest request = new XmlRpcRequest("hg_new_auth_key", SendParams);
-            XmlRpcResponse reply;
-            try
-            {
-                reply = request.Send(authurl, 6000);
-            }
-            catch (Exception e)
-            {
-                System.Console.WriteLine("[HGrid]: Failed to get new key. Reason: " + e.Message);
-                return string.Empty;
-            }
-            if (!reply.IsFault)
-            {
-                string newKey = string.Empty;
-                if (reply.Value != null)
-                    newKey = (string)reply.Value;
-                return newKey;
-            }
-            else
-            {
-                System.Console.WriteLine("[HGrid]: XmlRpc request to get auth key failed with message {0}" + reply.FaultString + ", code " + reply.FaultCode);
-                return string.Empty;
-            }
-        }
-        public static bool VerifyKey(string authurl, UUID userID, string authKey)
-        {
-            List<string> SendParams = new List<string>();
-            SendParams.Add(userID.ToString());
-            SendParams.Add(authKey);
-            System.Console.WriteLine("[HGrid]: Verifying user key with authority " + authurl);
-            XmlRpcRequest request = new XmlRpcRequest("hg_verify_auth_key", SendParams);
-            XmlRpcResponse reply;
-            try
-            {
-                reply = request.Send(authurl, 10000);
-            }
-            catch (Exception e)
-            {
-                System.Console.WriteLine("[HGrid]: Failed to verify key. Reason: " + e.Message);
-                return false;
-            }
-            if (reply != null)
-            {
-                if (!reply.IsFault)
-                {
-                    bool success = false;
-                    if (reply.Value != null)
-                        success = (bool)reply.Value;
-                    return success;
-                }
-                else
-                {
-                    System.Console.WriteLine("[HGrid]: XmlRpc request to verify key failed with message {0}" + reply.FaultString + ", code " + reply.FaultCode);
-                    return false;
-                }
-            }
-            else
-            {
-                System.Console.WriteLine("[HGrid]: XmlRpc request to verify key returned null reply");
-                return false;
-            }
-        }
-        public static bool VerifySession(string authurl, UUID userID, UUID sessionID)
-        {
-            Hashtable requestData = new Hashtable();
-            requestData["avatar_uuid"] = userID.ToString();
-            requestData["session_id"] = sessionID.ToString();
-            ArrayList SendParams = new ArrayList();
-            SendParams.Add(requestData);
-            XmlRpcRequest UserReq = new XmlRpcRequest("check_auth_session", SendParams);
-            XmlRpcResponse UserResp = null;
-            try
-            {
-                UserResp = UserReq.Send(authurl, 3000);
-            }
-            catch (Exception e)
-            {
-                System.Console.WriteLine("[Session Auth]: VerifySession XmlRpc: " + e.Message); 
-                return false;
-            }
-            Hashtable responseData = (Hashtable)UserResp.Value;
-            if (responseData != null && responseData.ContainsKey("auth_session") && responseData["auth_session"] != null && responseData["auth_session"].ToString() == "TRUE")
-            {
-                //System.Console.WriteLine("[Authorization]: userserver reported authorized session for user " + userID);
-                return true;
-            }
-            else
-            {
-                //System.Console.WriteLine("[Authorization]: userserver reported unauthorized session for user " + userID);
-                return false;
-            }
-        }
-    }
-}
diff --git a/OpenSim/Framework/Communications/Clients/GridClient.cs b/OpenSim/Framework/Communications/Clients/GridClient.cs
deleted file mode 100644
index 4836556..0000000
--- a/OpenSim/Framework/Communications/Clients/GridClient.cs
+++ /dev/null
@@ -1,392 +0,0 @@
-/*
- * 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.Net;
-using System.Reflection;
-using log4net;
-using OpenMetaverse;
-using Nwc.XmlRpc;
-namespace OpenSim.Framework.Communications.Clients
-{
-    public class GridClient
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
-        public bool RegisterRegion(
-            string gridServerURL, string sendKey, string receiveKey, RegionInfo regionInfo, out bool forcefulBanLines)
-        {
-            m_log.InfoFormat(
-                "[GRID CLIENT]: Registering region {0} with grid at {1}", regionInfo.RegionName, gridServerURL);
-            
-            forcefulBanLines = true;
-            Hashtable GridParams = new Hashtable();
-            // Login / Authentication
-            GridParams["authkey"] = sendKey;
-            GridParams["recvkey"] = receiveKey;
-            GridParams["UUID"] = regionInfo.RegionID.ToString();
-            GridParams["sim_ip"] = regionInfo.ExternalHostName;
-            GridParams["sim_port"] = regionInfo.InternalEndPoint.Port.ToString();
-            GridParams["region_locx"] = regionInfo.RegionLocX.ToString();
-            GridParams["region_locy"] = regionInfo.RegionLocY.ToString();
-            GridParams["sim_name"] = regionInfo.RegionName;
-            GridParams["http_port"] = regionInfo.HttpPort.ToString();
-            GridParams["remoting_port"] = ConfigSettings.DefaultRegionRemotingPort.ToString();
-            GridParams["map-image-id"] = regionInfo.RegionSettings.TerrainImageID.ToString();
-            GridParams["originUUID"] = regionInfo.originRegionID.ToString();
-            GridParams["server_uri"] = regionInfo.ServerURI;
-            GridParams["region_secret"] = regionInfo.regionSecret;
-            GridParams["major_interface_version"] = VersionInfo.MajorInterfaceVersion.ToString();
-            if (regionInfo.MasterAvatarAssignedUUID != UUID.Zero)
-                GridParams["master_avatar_uuid"] = regionInfo.MasterAvatarAssignedUUID.ToString();
-            else
-                GridParams["master_avatar_uuid"] = regionInfo.EstateSettings.EstateOwner.ToString();
-            // Package into an XMLRPC Request
-            ArrayList SendParams = new ArrayList();
-            SendParams.Add(GridParams);
-            // Send Request
-            XmlRpcRequest GridReq = new XmlRpcRequest("simulator_login", SendParams);
-            XmlRpcResponse GridResp;
-            try
-            {
-                // The timeout should always be significantly larger than the timeout for the grid server to request
-                // the initial status of the region before confirming registration.
-                GridResp = GridReq.Send(gridServerURL, 90000);
-            }
-            catch (Exception e)
-            {
-                Exception e2
-                    = new Exception(
-                        String.Format(
-                            "Unable to register region with grid at {0}. Grid service not running?",
-                            gridServerURL),
-                        e);
-                throw e2;
-            }
-            Hashtable GridRespData = (Hashtable)GridResp.Value;
-            // Hashtable griddatahash = GridRespData;
-            // Process Response
-            if (GridRespData.ContainsKey("error"))
-            {
-                string errorstring = (string)GridRespData["error"];
-                Exception e = new Exception(
-                    String.Format("Unable to connect to grid at {0}: {1}", gridServerURL, errorstring));
-                throw e;
-            }
-            else
-            {
-                // m_knownRegions = RequestNeighbours(regionInfo.RegionLocX, regionInfo.RegionLocY);
-                if (GridRespData.ContainsKey("allow_forceful_banlines"))
-                {
-                    if ((string)GridRespData["allow_forceful_banlines"] != "TRUE")
-                    {
-                        forcefulBanLines = false;
-                    }
-                }
-            }
-            return true;
-        }
-        public bool DeregisterRegion(string gridServerURL, string sendKey, string receiveKey, RegionInfo regionInfo, out string errorMsg)
-        {
-            errorMsg = "";
-            Hashtable GridParams = new Hashtable();
-            GridParams["UUID"] = regionInfo.RegionID.ToString();
-            // Package into an XMLRPC Request
-            ArrayList SendParams = new ArrayList();
-            SendParams.Add(GridParams);
-            // Send Request
-            XmlRpcRequest GridReq = new XmlRpcRequest("simulator_after_region_moved", SendParams);
-            XmlRpcResponse GridResp = null;
-            try
-            {
-                GridResp = GridReq.Send(gridServerURL, 10000);
-            }
-            catch (Exception e)
-            {
-                Exception e2
-                    = new Exception(
-                        String.Format(
-                            "Unable to deregister region with grid at {0}. Grid service not running?",
-                            gridServerURL),
-                        e);
-                throw e2;
-            }
-            Hashtable GridRespData = (Hashtable)GridResp.Value;
-            // Hashtable griddatahash = GridRespData;
-            // Process Response
-            if (GridRespData != null && GridRespData.ContainsKey("error"))
-            {
-                errorMsg = (string)GridRespData["error"];
-                return false;
-            }
-            return true;
-        }
-        public bool RequestNeighborInfo(
-            string gridServerURL, string sendKey, string receiveKey, UUID regionUUID,
-            out RegionInfo regionInfo, out string errorMsg)
-        {
-            // didn't find it so far, we have to go the long way
-            regionInfo = null;
-            errorMsg = string.Empty;
-            Hashtable requestData = new Hashtable();
-            requestData["region_UUID"] = regionUUID.ToString();
-            requestData["authkey"] = sendKey;
-            ArrayList SendParams = new ArrayList();
-            SendParams.Add(requestData);
-            XmlRpcRequest gridReq = new XmlRpcRequest("simulator_data_request", SendParams);
-            XmlRpcResponse gridResp = null;
-            try
-            {
-                gridResp = gridReq.Send(gridServerURL, 3000);
-            }
-            catch (Exception e)
-            {
-                errorMsg = e.Message;
-                return false;
-            }
-            Hashtable responseData = (Hashtable)gridResp.Value;
-            if (responseData.ContainsKey("error"))
-            {
-                errorMsg = (string)responseData["error"];
-                return false; ;
-            }
-            regionInfo = BuildRegionInfo(responseData, String.Empty);
-            return true; 
-        }
-        public bool RequestNeighborInfo(
-            string gridServerURL, string sendKey, string receiveKey, ulong regionHandle, 
-            out RegionInfo regionInfo, out string errorMsg)
-        {
-            // didn't find it so far, we have to go the long way
-            regionInfo = null;
-            errorMsg = string.Empty;
-            try
-            {
-                Hashtable requestData = new Hashtable();
-                requestData["region_handle"] = regionHandle.ToString();
-                requestData["authkey"] = sendKey;
-                ArrayList SendParams = new ArrayList();
-                SendParams.Add(requestData);
-                XmlRpcRequest GridReq = new XmlRpcRequest("simulator_data_request", SendParams);
-                XmlRpcResponse GridResp = GridReq.Send(gridServerURL, 3000);
-                Hashtable responseData = (Hashtable)GridResp.Value;
-                if (responseData.ContainsKey("error"))
-                {
-                    errorMsg = (string)responseData["error"];
-                    return false;
-                }
-                uint regX = Convert.ToUInt32((string)responseData["region_locx"]);
-                uint regY = Convert.ToUInt32((string)responseData["region_locy"]);
-                string externalHostName = (string)responseData["sim_ip"];
-                uint simPort = Convert.ToUInt32(responseData["sim_port"]);
-                string regionName = (string)responseData["region_name"];
-                UUID regionID = new UUID((string)responseData["region_UUID"]);
-                uint remotingPort = Convert.ToUInt32((string)responseData["remoting_port"]);
-                uint httpPort = 9000;
-                if (responseData.ContainsKey("http_port"))
-                {
-                    httpPort = Convert.ToUInt32((string)responseData["http_port"]);
-                }
-                // Ok, so this is definitively the wrong place to do this, way too hard coded, but it doesn't seem we GET this info?
-                string simURI = "http://" + externalHostName + ":" + simPort;
-                // string externalUri = (string) responseData["sim_uri"];
-                //IPEndPoint neighbourInternalEndPoint = new IPEndPoint(IPAddress.Parse(internalIpStr), (int) port);
-                regionInfo = RegionInfo.Create(regionID, regionName, regX, regY, externalHostName, httpPort, simPort, remotingPort, simURI);
-            }
-            catch (Exception e)
-            {
-                errorMsg = e.Message;
-                return false;
-            }
-            return true;
-        }
-        public bool RequestClosestRegion(
-             string gridServerURL, string sendKey, string receiveKey, string regionName, 
-             out RegionInfo regionInfo, out string errorMsg)
-        {
-            regionInfo = null;
-            errorMsg = string.Empty;
-            try
-            {
-                Hashtable requestData = new Hashtable();
-                requestData["region_name_search"] = regionName;
-                requestData["authkey"] = sendKey;
-                ArrayList SendParams = new ArrayList();
-                SendParams.Add(requestData);
-                XmlRpcRequest GridReq = new XmlRpcRequest("simulator_data_request", SendParams);
-                XmlRpcResponse GridResp = GridReq.Send(gridServerURL, 3000);
-                Hashtable responseData = (Hashtable)GridResp.Value;
-                if (responseData.ContainsKey("error"))
-                {
-                    errorMsg = (string)responseData["error"];
-                    return false;
-                }
-                regionInfo = BuildRegionInfo(responseData, "");
-            }
-            catch (Exception e)
-            {
-                errorMsg = e.Message;
-                return false;
-            }
-            return true;
-        }
-        /// <summary>
-        /// Performs a XML-RPC query against the grid server returning mapblock information in the specified coordinates
-        /// </summary>
-        /// <remarks>REDUNDANT - OGS1 is to be phased out in favour of OGS2</remarks>
-        /// <param name="minX">Minimum X value</param>
-        /// <param name="minY">Minimum Y value</param>
-        /// <param name="maxX">Maximum X value</param>
-        /// <param name="maxY">Maximum Y value</param>
-        /// <returns>Hashtable of hashtables containing map data elements</returns>
-        public bool MapBlockQuery(
-            string gridServerURL, int minX, int minY, int maxX, int maxY, out Hashtable respData, out string errorMsg)
-        {
-            respData = new Hashtable();
-            errorMsg = string.Empty;
-            Hashtable param = new Hashtable();
-            param["xmin"] = minX;
-            param["ymin"] = minY;
-            param["xmax"] = maxX;
-            param["ymax"] = maxY;
-            IList parameters = new ArrayList();
-            parameters.Add(param);
-            try
-            {
-                XmlRpcRequest req = new XmlRpcRequest("map_block", parameters);
-                XmlRpcResponse resp = req.Send(gridServerURL, 10000);
-                respData = (Hashtable)resp.Value;
-                return true;
-            }
-            catch (Exception e)
-            {
-                errorMsg = e.Message;
-                return false;
-            }
-        }
-        public bool SearchRegionByName(string gridServerURL, IList parameters, out Hashtable respData, out string errorMsg)
-        {
-            respData = null;
-            errorMsg = string.Empty;
-            try
-            {
-                XmlRpcRequest request = new XmlRpcRequest("search_for_region_by_name", parameters);
-                XmlRpcResponse resp = request.Send(gridServerURL, 10000);
-                respData = (Hashtable)resp.Value;
-                if (respData != null && respData.Contains("faultCode"))
-                {
-                    errorMsg = (string)respData["faultString"];
-                    return false;
-                }
-                return true;
-            }
-            catch (Exception e)
-            {
-                errorMsg = e.Message;
-                return false;
-            }
-        }
-        public RegionInfo BuildRegionInfo(Hashtable responseData, string prefix)
-        {
-            uint regX = Convert.ToUInt32((string)responseData[prefix + "region_locx"]);
-            uint regY = Convert.ToUInt32((string)responseData[prefix + "region_locy"]);
-            string internalIpStr = (string)responseData[prefix + "sim_ip"];
-            uint port = Convert.ToUInt32(responseData[prefix + "sim_port"]);
-            IPEndPoint neighbourInternalEndPoint = new IPEndPoint(Util.GetHostFromDNS(internalIpStr), (int)port);
-            RegionInfo regionInfo = new RegionInfo(regX, regY, neighbourInternalEndPoint, internalIpStr);
-            regionInfo.RemotingPort = Convert.ToUInt32((string)responseData[prefix + "remoting_port"]);
-            regionInfo.RemotingAddress = internalIpStr;
-            if (responseData.ContainsKey(prefix + "http_port"))
-            {
-                regionInfo.HttpPort = Convert.ToUInt32((string)responseData[prefix + "http_port"]);
-            }
-            regionInfo.RegionID = new UUID((string)responseData[prefix + "region_UUID"]);
-            regionInfo.RegionName = (string)responseData[prefix + "region_name"];
-            regionInfo.RegionSettings.TerrainImageID = new UUID((string)responseData[prefix + "map_UUID"]);
-            return regionInfo;
-        }
-    }
-}
diff --git a/OpenSim/Framework/Communications/Clients/InventoryClient.cs b/OpenSim/Framework/Communications/Clients/InventoryClient.cs
deleted file mode 100644
index e4f5e2a..0000000
--- a/OpenSim/Framework/Communications/Clients/InventoryClient.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-/**
- * Copyright (c), Contributors. All rights reserved.
- * 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 Organizations nor the names of Individual
- *       Contributors may be used to endorse or promote products derived from
- *       this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-using System;
-using OpenSim.Framework.Servers;
-using OpenSim.Framework.Servers.HttpServer;
-using OpenMetaverse;
-namespace OpenSim.Framework.Communications.Clients
-{
-    public class InventoryClient
-    {
-        private string ServerURL;
-        public InventoryClient(string url)
-        {
-            ServerURL = url;
-        }
-        public void GetInventoryItemAsync(InventoryItemBase item, ReturnResponse<InventoryItemBase> callBack)
-        {
-            System.Console.WriteLine("[HGrid] GetInventory from " + ServerURL);
-            try
-            {
-                RestSessionObjectPosterResponse<InventoryItemBase, InventoryItemBase> requester
-                        = new RestSessionObjectPosterResponse<InventoryItemBase, InventoryItemBase>();
-                requester.ResponseCallback = callBack;
-                requester.BeginPostObject(ServerURL + "/GetItem/", item, string.Empty, string.Empty);
-            }
-            catch (Exception e)
-            {
-                System.Console.WriteLine("[HGrid]: Exception posting to inventory: " + e);
-            }
-        }
-        public InventoryItemBase GetInventoryItem(InventoryItemBase item)
-        {
-            System.Console.WriteLine("[HGrid] GetInventory " + item.ID + " from " + ServerURL);
-            try
-            {
-                item = SynchronousRestSessionObjectPoster<Guid, InventoryItemBase>.BeginPostObject("POST", ServerURL + "/GetItem/", item.ID.Guid, "", "");
-                return item;
-            }
-            catch (Exception e)
-            {
-                System.Console.WriteLine("[HGrid]: Exception posting to inventory: " + e);
-            }
-            return null;
-        }
-    }
-}
diff --git a/OpenSim/Framework/Communications/Clients/RegionClient.cs b/OpenSim/Framework/Communications/Clients/RegionClient.cs
deleted file mode 100644
index ee7dec8..0000000
--- a/OpenSim/Framework/Communications/Clients/RegionClient.cs
+++ /dev/null
@@ -1,755 +0,0 @@
-/*
- * 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.Generic;
-using System.IO;
-using System.Net;
-using System.Reflection;
-using System.Text;
-using OpenMetaverse;
-using OpenMetaverse.StructuredData;
-using GridRegion = OpenSim.Services.Interfaces.GridRegion;
-using log4net;
-namespace OpenSim.Framework.Communications.Clients
-{
-    public class RegionClient
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        public bool DoCreateChildAgentCall(GridRegion region, AgentCircuitData aCircuit, string authKey, uint teleportFlags, out string reason)
-        {
-            reason = String.Empty;
-            // Eventually, we want to use a caps url instead of the agentID
-            string uri = string.Empty;
-            try
-            {
-                uri = "http://" + region.ExternalEndPoint.Address + ":" + region.HttpPort + "/agent/" + aCircuit.AgentID + "/";
-            }
-            catch (Exception e)
-            {
-                m_log.Debug("[REST COMMS]: Unable to resolve external endpoint on agent create. Reason: " + e.Message);
-                reason = e.Message;
-                return false;
-            }
-            //Console.WriteLine("   >>> DoCreateChildAgentCall <<< " + uri);
-            HttpWebRequest AgentCreateRequest = (HttpWebRequest)WebRequest.Create(uri);
-            AgentCreateRequest.Method = "POST";
-            AgentCreateRequest.ContentType = "application/json";
-            AgentCreateRequest.Timeout = 10000;
-            //AgentCreateRequest.KeepAlive = false;
-            AgentCreateRequest.Headers.Add("Authorization", authKey);
-            // Fill it in
-            OSDMap args = null;
-            try
-            {
-                args = aCircuit.PackAgentCircuitData();
-            }
-            catch (Exception e)
-            {
-                m_log.Debug("[REST COMMS]: PackAgentCircuitData failed with exception: " + e.Message);
-            }
-            // Add the regionhandle of the destination region
-            ulong regionHandle = GetRegionHandle(region.RegionHandle);
-            args["destination_handle"] = OSD.FromString(regionHandle.ToString());
-            args["teleport_flags"] = OSD.FromString(teleportFlags.ToString());
-            string strBuffer = "";
-            byte[] buffer = new byte[1];
-            try
-            {
-                strBuffer = OSDParser.SerializeJsonString(args);
-                Encoding str = Util.UTF8;
-                buffer = str.GetBytes(strBuffer);
-            }
-            catch (Exception e)
-            {
-                m_log.WarnFormat("[REST COMMS]: Exception thrown on serialization of ChildCreate: {0}", e.Message);
-                // ignore. buffer will be empty, caller should check.
-            }
-            Stream os = null;
-            try
-            { // send the Post
-                AgentCreateRequest.ContentLength = buffer.Length;   //Count bytes to send
-                os = AgentCreateRequest.GetRequestStream();
-                os.Write(buffer, 0, strBuffer.Length);         //Send it
-                //m_log.InfoFormat("[REST COMMS]: Posted CreateChildAgent request to remote sim {0}", uri);
-            }
-            //catch (WebException ex)
-            catch
-            {
-                //m_log.InfoFormat("[REST COMMS]: Bad send on ChildAgentUpdate {0}", ex.Message);
-                reason = "cannot contact remote region";
-                return false;
-            }
-            finally
-            {
-                if (os != null)
-                    os.Close();
-            }
-            // Let's wait for the response
-            //m_log.Info("[REST COMMS]: Waiting for a reply after DoCreateChildAgentCall");
-            WebResponse webResponse = null;
-            StreamReader sr = null;
-            try
-            {
-                webResponse = AgentCreateRequest.GetResponse();
-                if (webResponse == null)
-                {
-                    m_log.Info("[REST COMMS]: Null reply on DoCreateChildAgentCall post");
-                }
-                else
-                {
-                    sr = new StreamReader(webResponse.GetResponseStream());
-                    string response = sr.ReadToEnd().Trim();
-                    m_log.InfoFormat("[REST COMMS]: DoCreateChildAgentCall reply was {0} ", response);
-                    if (!String.IsNullOrEmpty(response))
-                    {
-                        try
-                        {
-                            // we assume we got an OSDMap back
-                            OSDMap r = GetOSDMap(response);
-                            bool success = r["success"].AsBoolean();
-                            reason = r["reason"].AsString();
-                            return success;
-                        }
-                        catch (NullReferenceException e)
-                        {
-                            m_log.InfoFormat("[REST COMMS]: exception on reply of DoCreateChildAgentCall {0}", e.Message);
-                            // check for old style response
-                            if (response.ToLower().StartsWith("true"))
-                                return true;
-                            return false;
-                        }
-                    }
-                }
-            }
-            catch (WebException ex)
-            {
-                m_log.InfoFormat("[REST COMMS]: exception on reply of DoCreateChildAgentCall {0}", ex.Message);
-                // ignore, really
-            }
-            finally
-            {
-                if (sr != null)
-                    sr.Close();
-            }
-            return true;
-        }
-        public bool DoChildAgentUpdateCall(GridRegion region, IAgentData cAgentData)
-        {
-            // Eventually, we want to use a caps url instead of the agentID
-            string uri = string.Empty;
-            try
-            {
-                uri = "http://" + region.ExternalEndPoint.Address + ":" + region.HttpPort + "/agent/" + cAgentData.AgentID + "/";
-            }
-            catch (Exception e)
-            {
-                m_log.Debug("[REST COMMS]: Unable to resolve external endpoint on agent update. Reason: " + e.Message);
-                return false;
-            }
-            //Console.WriteLine("   >>> DoChildAgentUpdateCall <<< " + uri);
-            HttpWebRequest ChildUpdateRequest = (HttpWebRequest)WebRequest.Create(uri);
-            ChildUpdateRequest.Method = "PUT";
-            ChildUpdateRequest.ContentType = "application/json";
-            ChildUpdateRequest.Timeout = 10000;
-            //ChildUpdateRequest.KeepAlive = false;
-            // Fill it in
-            OSDMap args = null;
-            try
-            {
-                args = cAgentData.Pack();
-            }
-            catch (Exception e)
-            {
-                m_log.Debug("[REST COMMS]: PackUpdateMessage failed with exception: " + e.Message);
-            }
-            // Add the regionhandle of the destination region
-            ulong regionHandle = GetRegionHandle(region.RegionHandle);
-            args["destination_handle"] = OSD.FromString(regionHandle.ToString());
-            string strBuffer = "";
-            byte[] buffer = new byte[1];
-            try
-            {
-                strBuffer = OSDParser.SerializeJsonString(args);
-                Encoding str = Util.UTF8;
-                buffer = str.GetBytes(strBuffer);
-            }
-            catch (Exception e)
-            {
-                m_log.WarnFormat("[REST COMMS]: Exception thrown on serialization of ChildUpdate: {0}", e.Message);
-                // ignore. buffer will be empty, caller should check.
-            }
-            Stream os = null;
-            try
-            { // send the Post
-                ChildUpdateRequest.ContentLength = buffer.Length;   //Count bytes to send
-                os = ChildUpdateRequest.GetRequestStream();
-                os.Write(buffer, 0, strBuffer.Length);         //Send it
-                //m_log.InfoFormat("[REST COMMS]: Posted ChildAgentUpdate request to remote sim {0}", uri);
-            }
-            //catch (WebException ex)
-            catch
-            {
-                //m_log.InfoFormat("[REST COMMS]: Bad send on ChildAgentUpdate {0}", ex.Message);
-                return false;
-            }
-            finally
-            {
-                if (os != null)
-                    os.Close();
-            }
-            // Let's wait for the response
-            //m_log.Info("[REST COMMS]: Waiting for a reply after ChildAgentUpdate");
-            WebResponse webResponse = null;
-            StreamReader sr = null;
-            try
-            {
-                webResponse = ChildUpdateRequest.GetResponse();
-                if (webResponse == null)
-                {
-                    m_log.Info("[REST COMMS]: Null reply on ChilAgentUpdate post");
-                }
-                sr = new StreamReader(webResponse.GetResponseStream());
-                //reply = sr.ReadToEnd().Trim();
-                sr.ReadToEnd().Trim();
-                sr.Close();
-                //m_log.InfoFormat("[REST COMMS]: ChilAgentUpdate reply was {0} ", reply);
-            }
-            catch (WebException ex)
-            {
-                m_log.InfoFormat("[REST COMMS]: exception on reply of ChilAgentUpdate {0}", ex.Message);
-                // ignore, really
-            }
-            finally
-            {
-                if (sr != null)
-                    sr.Close();
-            }
-            return true;
-        }
-        public bool DoRetrieveRootAgentCall(GridRegion region, UUID id, out IAgentData agent)
-        {
-            agent = null;
-            // Eventually, we want to use a caps url instead of the agentID
-            string uri = "http://" + region.ExternalEndPoint.Address + ":" + region.HttpPort + "/agent/" + id + "/" + region.RegionHandle.ToString() + "/";
-            //Console.WriteLine("   >>> DoRetrieveRootAgentCall <<< " + uri);
-            HttpWebRequest request = (HttpWebRequest)WebRequest.Create(uri);
-            request.Method = "GET";
-            request.Timeout = 10000;
-            //request.Headers.Add("authorization", ""); // coming soon
-            HttpWebResponse webResponse = null;
-            string reply = string.Empty;
-            StreamReader sr = null;
-            try
-            {
-                webResponse = (HttpWebResponse)request.GetResponse();
-                if (webResponse == null)
-                {
-                    m_log.Info("[REST COMMS]: Null reply on agent get ");
-                }
-                sr = new StreamReader(webResponse.GetResponseStream());
-                reply = sr.ReadToEnd().Trim();
-                //Console.WriteLine("[REST COMMS]: ChilAgentUpdate reply was " + reply);
-            }
-            catch (WebException ex)
-            {
-                m_log.InfoFormat("[REST COMMS]: exception on reply of agent get {0}", ex.Message);
-                // ignore, really
-                return false;
-            }
-            finally
-            {
-                if (sr != null)
-                    sr.Close();
-            }
-            if (webResponse.StatusCode == HttpStatusCode.OK)
-            {
-                // we know it's jason
-                OSDMap args = GetOSDMap(reply);
-                if (args == null)
-                {
-                    //Console.WriteLine("[REST COMMS]: Error getting OSDMap from reply");
-                    return false;
-                }
-                agent = new CompleteAgentData();
-                agent.Unpack(args);
-                return true;
-            }
-            //Console.WriteLine("[REST COMMS]: DoRetrieveRootAgentCall returned status " + webResponse.StatusCode);
-            return false;
-        }
-        public bool DoReleaseAgentCall(ulong regionHandle, UUID id, string uri)
-        {
-            //m_log.Debug("   >>> DoReleaseAgentCall <<< " + uri);
-            WebRequest request = WebRequest.Create(uri);
-            request.Method = "DELETE";
-            request.Timeout = 10000;
-            StreamReader sr = null;
-            try
-            {
-                WebResponse webResponse = request.GetResponse();
-                if (webResponse == null)
-                {
-                    m_log.Info("[REST COMMS]: Null reply on agent delete ");
-                }
-                sr = new StreamReader(webResponse.GetResponseStream());
-                //reply = sr.ReadToEnd().Trim();
-                sr.ReadToEnd().Trim();
-                sr.Close();
-                //m_log.InfoFormat("[REST COMMS]: ChilAgentUpdate reply was {0} ", reply);
-            }
-            catch (WebException ex)
-            {
-                m_log.InfoFormat("[REST COMMS]: exception on reply of agent delete {0}", ex.Message);
-                // ignore, really
-            }
-            finally
-            {
-                if (sr != null)
-                    sr.Close();
-            }
-            return true;
-        }
-        public bool DoCloseAgentCall(GridRegion region, UUID id)
-        {
-            string uri = string.Empty;
-            try
-            {
-                uri = "http://" + region.ExternalEndPoint.Address + ":" + region.HttpPort + "/agent/" + id + "/" + region.RegionHandle.ToString() + "/";
-            }
-            catch (Exception e)
-            {
-                m_log.Debug("[REST COMMS]: Unable to resolve external endpoint on agent close. Reason: " + e.Message);
-                return false;
-            }
-            //Console.WriteLine("   >>> DoCloseAgentCall <<< " + uri);
-            WebRequest request = WebRequest.Create(uri);
-            request.Method = "DELETE";
-            request.Timeout = 10000;
-            StreamReader sr = null;
-            try
-            {
-                WebResponse webResponse = request.GetResponse();
-                if (webResponse == null)
-                {
-                    m_log.Info("[REST COMMS]: Null reply on agent delete ");
-                }
-                sr = new StreamReader(webResponse.GetResponseStream());
-                //reply = sr.ReadToEnd().Trim();
-                sr.ReadToEnd().Trim();
-                sr.Close();
-                //m_log.InfoFormat("[REST COMMS]: ChilAgentUpdate reply was {0} ", reply);
-            }
-            catch (WebException ex)
-            {
-                m_log.InfoFormat("[REST COMMS]: exception on reply of agent delete {0}", ex.Message);
-                // ignore, really
-            }
-            finally
-            {
-                if (sr != null)
-                    sr.Close();
-            }
-            return true;
-        }
-        public bool DoCreateObjectCall(GridRegion region, ISceneObject sog, string sogXml2, bool allowScriptCrossing)
-        {
-            ulong regionHandle = GetRegionHandle(region.RegionHandle);
-            string uri 
-                = "http://" + region.ExternalEndPoint.Address + ":" + region.HttpPort 
-                    + "/object/" + sog.UUID + "/" + regionHandle.ToString() + "/";
-            //m_log.Debug("   >>> DoCreateChildAgentCall <<< " + uri);
-            WebRequest ObjectCreateRequest = WebRequest.Create(uri);
-            ObjectCreateRequest.Method = "POST";
-            ObjectCreateRequest.ContentType = "application/json";
-            ObjectCreateRequest.Timeout = 10000;
-            OSDMap args = new OSDMap(2);
-            args["sog"] = OSD.FromString(sogXml2);
-            args["extra"] = OSD.FromString(sog.ExtraToXmlString());
-            if (allowScriptCrossing)
-            {
-                string state = sog.GetStateSnapshot();
-                if (state.Length > 0)
-                    args["state"] = OSD.FromString(state);
-            }
-            string strBuffer = "";
-            byte[] buffer = new byte[1];
-            try
-            {
-                strBuffer = OSDParser.SerializeJsonString(args);
-                Encoding str = Util.UTF8;
-                buffer = str.GetBytes(strBuffer);
-            }
-            catch (Exception e)
-            {
-                m_log.WarnFormat("[REST COMMS]: Exception thrown on serialization of CreateObject: {0}", e.Message);
-                // ignore. buffer will be empty, caller should check.
-            }
-            Stream os = null;
-            try
-            { // send the Post
-                ObjectCreateRequest.ContentLength = buffer.Length;   //Count bytes to send
-                os = ObjectCreateRequest.GetRequestStream();
-                os.Write(buffer, 0, strBuffer.Length);         //Send it
-                m_log.InfoFormat("[REST COMMS]: Posted ChildAgentUpdate request to remote sim {0}", uri);
-            }
-            //catch (WebException ex)
-            catch
-            {
-                // m_log.InfoFormat("[REST COMMS]: Bad send on CreateObject {0}", ex.Message);
-                return false;
-            }
-            finally
-            {
-                if (os != null)
-                    os.Close();
-            }
-            // Let's wait for the response
-            //m_log.Info("[REST COMMS]: Waiting for a reply after DoCreateChildAgentCall");
-            StreamReader sr = null;
-            try
-            {
-                WebResponse webResponse = ObjectCreateRequest.GetResponse();
-                if (webResponse == null)
-                {
-                    m_log.Info("[REST COMMS]: Null reply on DoCreateObjectCall post");
-                }
-                sr = new StreamReader(webResponse.GetResponseStream());
-                //reply = sr.ReadToEnd().Trim();
-                sr.ReadToEnd().Trim();
-                //m_log.InfoFormat("[REST COMMS]: DoCreateChildAgentCall reply was {0} ", reply);
-            }
-            catch (WebException ex)
-            {
-                m_log.InfoFormat("[REST COMMS]: exception on reply of DoCreateObjectCall {0}", ex.Message);
-                // ignore, really
-            }
-            finally
-            {
-                if (sr != null)
-                    sr.Close();
-            }
-            return true;
-        }
-        public bool DoCreateObjectCall(GridRegion region, UUID userID, UUID itemID)
-        {
-            ulong regionHandle = GetRegionHandle(region.RegionHandle);
-            string uri = "http://" + region.ExternalEndPoint.Address + ":" + region.HttpPort + "/object/" + UUID.Zero + "/" + regionHandle.ToString() + "/";
-            //m_log.Debug("   >>> DoCreateChildAgentCall <<< " + uri);
-            WebRequest ObjectCreateRequest = WebRequest.Create(uri);
-            ObjectCreateRequest.Method = "PUT";
-            ObjectCreateRequest.ContentType = "application/json";
-            ObjectCreateRequest.Timeout = 10000;
-            OSDMap args = new OSDMap(2);
-            args["userid"] = OSD.FromUUID(userID);
-            args["itemid"] = OSD.FromUUID(itemID);
-            string strBuffer = "";
-            byte[] buffer = new byte[1];
-            try
-            {
-                strBuffer = OSDParser.SerializeJsonString(args);
-                Encoding str = Util.UTF8;
-                buffer = str.GetBytes(strBuffer);
-            }
-            catch (Exception e)
-            {
-                m_log.WarnFormat("[REST COMMS]: Exception thrown on serialization of CreateObject: {0}", e.Message);
-                // ignore. buffer will be empty, caller should check.
-            }
-            Stream os = null;
-            try
-            { // send the Post
-                ObjectCreateRequest.ContentLength = buffer.Length;   //Count bytes to send
-                os = ObjectCreateRequest.GetRequestStream();
-                os.Write(buffer, 0, strBuffer.Length);         //Send it
-                //m_log.InfoFormat("[REST COMMS]: Posted CreateObject request to remote sim {0}", uri);
-            }
-            //catch (WebException ex)
-            catch
-            {
-                // m_log.InfoFormat("[REST COMMS]: Bad send on CreateObject {0}", ex.Message);
-                return false;
-            }
-            finally
-            {
-                if (os != null)
-                    os.Close();
-            }
-            // Let's wait for the response
-            //m_log.Info("[REST COMMS]: Waiting for a reply after DoCreateChildAgentCall");
-            StreamReader sr = null;
-            try
-            {
-                WebResponse webResponse = ObjectCreateRequest.GetResponse();
-                if (webResponse == null)
-                {
-                    m_log.Info("[REST COMMS]: Null reply on DoCreateObjectCall post");
-                }
-                sr = new StreamReader(webResponse.GetResponseStream());
-                sr.ReadToEnd().Trim();
-                sr.ReadToEnd().Trim();
-                //m_log.InfoFormat("[REST COMMS]: DoCreateChildAgentCall reply was {0} ", reply);
-            }
-            catch (WebException ex)
-            {
-                m_log.InfoFormat("[REST COMMS]: exception on reply of DoCreateObjectCall {0}", ex.Message);
-                // ignore, really
-            }
-            finally
-            {
-                if (sr != null)
-                    sr.Close();
-            }
-            return true;
-        }
-        public bool DoHelloNeighbourCall(RegionInfo region, RegionInfo thisRegion)
-        {
-            string uri = "http://" + region.ExternalEndPoint.Address + ":" + region.HttpPort + "/region/" + thisRegion.RegionID + "/";
-            //m_log.Debug("   >>> DoHelloNeighbourCall <<< " + uri);
-            WebRequest HelloNeighbourRequest = WebRequest.Create(uri);
-            HelloNeighbourRequest.Method = "POST";
-            HelloNeighbourRequest.ContentType = "application/json";
-            HelloNeighbourRequest.Timeout = 10000;
-            // Fill it in
-            OSDMap args = null;
-            try
-            {
-                args = thisRegion.PackRegionInfoData();
-            }
-            catch (Exception e)
-            {
-                m_log.Debug("[REST COMMS]: PackRegionInfoData failed with exception: " + e.Message);
-            }
-            // Add the regionhandle of the destination region
-            ulong regionHandle = GetRegionHandle(region.RegionHandle);
-            args["destination_handle"] = OSD.FromString(regionHandle.ToString());
-            string strBuffer = "";
-            byte[] buffer = new byte[1];
-            try
-            {
-                strBuffer = OSDParser.SerializeJsonString(args);
-                Encoding str = Util.UTF8;
-                buffer = str.GetBytes(strBuffer);
-            }
-            catch (Exception e)
-            {
-                m_log.WarnFormat("[REST COMMS]: Exception thrown on serialization of HelloNeighbour: {0}", e.Message);
-                // ignore. buffer will be empty, caller should check.
-            }
-            Stream os = null;
-            try
-            { // send the Post
-                HelloNeighbourRequest.ContentLength = buffer.Length;   //Count bytes to send
-                os = HelloNeighbourRequest.GetRequestStream();
-                os.Write(buffer, 0, strBuffer.Length);         //Send it
-                //m_log.InfoFormat("[REST COMMS]: Posted HelloNeighbour request to remote sim {0}", uri);
-            }
-            //catch (WebException ex)
-            catch
-            {
-                //m_log.InfoFormat("[REST COMMS]: Bad send on HelloNeighbour {0}", ex.Message);
-                return false;
-            }
-            finally
-            {
-                if (os != null)
-                    os.Close();
-            }
-            // Let's wait for the response
-            //m_log.Info("[REST COMMS]: Waiting for a reply after DoHelloNeighbourCall");
-            StreamReader sr = null;
-            try
-            {
-                WebResponse webResponse = HelloNeighbourRequest.GetResponse();
-                if (webResponse == null)
-                {
-                    m_log.Info("[REST COMMS]: Null reply on DoHelloNeighbourCall post");
-                }
-                sr = new StreamReader(webResponse.GetResponseStream());
-                //reply = sr.ReadToEnd().Trim();
-                sr.ReadToEnd().Trim();
-                //m_log.InfoFormat("[REST COMMS]: DoHelloNeighbourCall reply was {0} ", reply);
-            }
-            catch (WebException ex)
-            {
-                m_log.InfoFormat("[REST COMMS]: exception on reply of DoHelloNeighbourCall {0}", ex.Message);
-                // ignore, really
-            }
-            finally
-            {
-                if (sr != null)
-                    sr.Close();
-            }
-            return true;
-        }
-        #region Hyperlinks
-        public virtual ulong GetRegionHandle(ulong handle)
-        {
-            return handle;
-        }
-        public virtual bool IsHyperlink(ulong handle)
-        {
-            return false;
-        }
-        public virtual void SendUserInformation(GridRegion regInfo, AgentCircuitData aCircuit)
-        {
-        }
-        public virtual void AdjustUserInformation(AgentCircuitData aCircuit)
-        {
-        }
-        #endregion /* Hyperlinks */
-        public static OSDMap GetOSDMap(string data)
-        {
-            OSDMap args = null;
-            try
-            {
-                OSD buffer;
-                // We should pay attention to the content-type, but let's assume we know it's Json
-                buffer = OSDParser.DeserializeJson(data);
-                if (buffer.Type == OSDType.Map)
-                {
-                    args = (OSDMap)buffer;
-                    return args;
-                }
-                else
-                {
-                    // uh?
-                    System.Console.WriteLine("[REST COMMS]: Got OSD of type " + buffer.Type.ToString());
-                    return null;
-                }
-            }
-            catch (Exception ex)
-            {
-                System.Console.WriteLine("[REST COMMS]: exception on parse of REST message " + ex.Message);
-                return null;
-            }
-        }
-    }
-}
diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs
deleted file mode 100644
index 4bf9018..0000000
--- a/OpenSim/Framework/Communications/CommunicationsManager.cs
+++ /dev/null
@@ -1,264 +0,0 @@
-/*
- * 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.Generic;
-using OpenMetaverse;
-using OpenSim.Framework.Communications.Cache;
-namespace OpenSim.Framework.Communications
-{
-    /// <summary>
-    /// This class manages references to OpenSim non-region services (inventory, user, etc.)
-    /// </summary>
-    /// 
-    /// TODO: Service retrieval needs to be managed via plugin and interfaces requests, as happens for region
-    /// modules from scene.  Among other things, this will allow this class to be used in many different contexts
-    /// (from a grid service executable, to provide services on a region) without lots of messy nulls and confusion.
-    /// Also, a post initialize step on the plugins will be needed so that we don't get tortuous problems with 
-    /// circular dependencies between plugins.
-    public class CommunicationsManager
-    {
-        //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        protected Dictionary<UUID, string[]> m_nameRequestCache = new Dictionary<UUID, string[]>();
-        public IUserService UserService
-        {
-            get { return m_userService; }
-        }
-        protected IUserService m_userService;
-        public IMessagingService MessageService
-        {
-            get { return m_messageService; }
-        }
-        protected IMessagingService m_messageService;
-        public UserProfileCacheService UserProfileCacheService
-        {
-            get { return m_userProfileCacheService; }
-        }
-        protected UserProfileCacheService m_userProfileCacheService;
-        public IAvatarService AvatarService
-        {
-            get { return m_avatarService; }
-        }
-        protected IAvatarService m_avatarService;
-        public IInterServiceInventoryServices InterServiceInventoryService
-        {
-            get { return m_interServiceInventoryService; }
-        }
-        protected IInterServiceInventoryServices m_interServiceInventoryService;
-        public NetworkServersInfo NetworkServersInfo
-        {
-            get { return m_networkServersInfo; }
-        }
-        protected NetworkServersInfo m_networkServersInfo;
-             
-        /// <summary>
-        /// Interface to user service for administrating users.
-        /// </summary>
-        public IUserAdminService UserAdminService
-        {
-            get { return m_userAdminService; }
-        }
-        protected IUserAdminService m_userAdminService;
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name="serversInfo"></param>
-        public CommunicationsManager(NetworkServersInfo serversInfo,
-                                     LibraryRootFolder libraryRootFolder)
-        {
-            m_networkServersInfo = serversInfo;
-            m_userProfileCacheService = new UserProfileCacheService(this, libraryRootFolder);
-        }
-        #region Friend Methods
-        /// <summary>
-        /// Adds a new friend to the database for XUser
-        /// </summary>
-        /// <param name="friendlistowner">The agent that who's friends list is being added to</param>
-        /// <param name="friend">The agent that being added to the friends list of the friends list owner</param>
-        /// <param name="perms">A uint bit vector for set perms that the friend being added has; 0 = none, 1=This friend can see when they sign on, 2 = map, 4 edit objects </param>
-        public void AddNewUserFriend(UUID friendlistowner, UUID friend, uint perms)
-        {
-            m_userService.AddNewUserFriend(friendlistowner, friend, perms);
-        }
-        /// <summary>
-        /// Logs off a user and does the appropriate communications
-        /// </summary>
-        /// <param name="userid"></param>
-        /// <param name="regionid"></param>
-        /// <param name="regionhandle"></param>
-        /// <param name="position"></param>
-        /// <param name="lookat"></param>
-        public void LogOffUser(UUID userid, UUID regionid, ulong regionhandle, Vector3 position, Vector3 lookat)
-        {
-            m_userService.LogOffUser(userid, regionid, regionhandle, position, lookat);
-        }
-        /// <summary>
-        /// Logs off a user and does the appropriate communications (deprecated as of 2008-08-27)
-        /// </summary>
-        /// <param name="userid"></param>
-        /// <param name="regionid"></param>
-        /// <param name="regionhandle"></param>
-        /// <param name="posx"></param>
-        /// <param name="posy"></param>
-        /// <param name="posz"></param>
-        public void LogOffUser(UUID userid, UUID regionid, ulong regionhandle, float posx, float posy, float posz)
-        {
-            m_userService.LogOffUser(userid, regionid, regionhandle, posx, posy, posz);
-        }
-        /// <summary>
-        /// Delete friend on friendlistowner's friendlist.
-        /// </summary>
-        /// <param name="friendlistowner">The agent that who's friends list is being updated</param>
-        /// <param name="friend">The Ex-friend agent</param>
-        public void RemoveUserFriend(UUID friendlistowner, UUID friend)
-        {
-            m_userService.RemoveUserFriend(friendlistowner, friend);
-        }
-        /// <summary>
-        /// Update permissions for friend on friendlistowner's friendlist.
-        /// </summary>
-        /// <param name="friendlistowner">The agent that who's friends list is being updated</param>
-        /// <param name="friend">The agent that is getting or loosing permissions</param>
-        /// <param name="perms">A uint bit vector for set perms that the friend being added has; 0 = none, 1=This friend can see when they sign on, 2 = map, 4 edit objects </param>
-        public void UpdateUserFriendPerms(UUID friendlistowner, UUID friend, uint perms)
-        {
-            m_userService.UpdateUserFriendPerms(friendlistowner, friend, perms);
-        }
-        /// <summary>
-        /// Returns a list of FriendsListItems that describe the friends and permissions in the friend relationship for UUID friendslistowner
-        /// </summary>
-        /// <param name="friendlistowner">The agent that we're retreiving the friends Data.</param>
-        public List<FriendListItem> GetUserFriendList(UUID friendlistowner)
-        {
-            return m_userService.GetUserFriendList(friendlistowner);
-        }
-        public Dictionary<UUID, FriendRegionInfo> GetFriendRegionInfos(List<UUID> uuids)
-        {
-            return m_messageService.GetFriendRegionInfos(uuids);
-        }
-        #endregion
-        #region Packet Handlers
-        public void UpdateAvatarPropertiesRequest(IClientAPI remote_client, UserProfileData UserProfile)
-        {
-            m_userService.UpdateUserProfile(UserProfile);
-            return;
-        }
-        public void HandleUUIDNameRequest(UUID uuid, IClientAPI remote_client)
-        {
-            if (uuid == m_userProfileCacheService.LibraryRoot.Owner)
-            {
-                remote_client.SendNameReply(uuid, "Mr", "OpenSim");
-            }
-            else
-            {
-                string[] names = doUUIDNameRequest(uuid);
-                if (names.Length == 2)
-                {
-                    remote_client.SendNameReply(uuid, names[0], names[1]);
-                }
-            }
-        }
-        private string[] doUUIDNameRequest(UUID uuid)
-        {
-            lock (m_nameRequestCache)
-            {
-                if (m_nameRequestCache.ContainsKey(uuid))
-                    return m_nameRequestCache[uuid];
-            }
-            string[] returnstring = new string[0];
-            CachedUserInfo uinfo = UserProfileCacheService.GetUserDetails(uuid);
-            if ((uinfo != null) && (uinfo.UserProfile != null))
-            {
-                returnstring = new string[2];
-                returnstring[0] = uinfo.UserProfile.FirstName;
-                returnstring[1] = uinfo.UserProfile.SurName;
-                lock (m_nameRequestCache)
-                {
-                    if (!m_nameRequestCache.ContainsKey(uuid))
-                        m_nameRequestCache.Add(uuid, returnstring);
-                }
-            }
-            
-            return returnstring;
-        }
-        public bool UUIDNameCachedTest(UUID uuid)
-        {
-            lock (m_nameRequestCache)
-                return m_nameRequestCache.ContainsKey(uuid);
-        }
-        public string UUIDNameRequestString(UUID uuid)
-        {
-            string[] names = doUUIDNameRequest(uuid);
-            if (names.Length == 2)
-            {
-                string firstname = names[0];
-                string lastname = names[1];
-                return firstname + " " + lastname;
-            }
-            return "(hippos)";
-        }
-        public List<AvatarPickerAvatar> GenerateAgentPickerRequestResponse(UUID queryID, string query)
-        {
-            List<AvatarPickerAvatar> pickerlist = m_userService.GenerateAgentPickerRequestResponse(queryID, query);
-            return pickerlist;
-        }
-        #endregion
-    }
-}
diff --git a/OpenSim/Framework/Communications/IAuthentication.cs b/OpenSim/Framework/Communications/IAuthentication.cs
deleted file mode 100644
index bd568e4..0000000
--- a/OpenSim/Framework/Communications/IAuthentication.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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.Communications
-{
-    public interface IAuthentication
-    {
-        string GetNewKey(string url, UUID userID, UUID authToken);
-        bool VerifyKey(UUID userID, string key);
-        bool VerifySession(UUID iserID, UUID sessionID);
-    }
-}
diff --git a/OpenSim/Framework/Communications/IAvatarService.cs b/OpenSim/Framework/Communications/IAvatarService.cs
deleted file mode 100644
index 760aa62..0000000
--- a/OpenSim/Framework/Communications/IAvatarService.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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.Communications
-{
-    public interface IAvatarService
-    {
-        /// <summary>
-        /// Get avatar appearance information
-        /// </summary>
-        /// <param name="user"></param>
-        /// <returns></returns>
-        AvatarAppearance GetUserAppearance(UUID user);
-        /// <summary>
-        /// Update avatar appearance information
-        /// </summary>
-        /// <param name="user"></param>
-        /// <param name="appearance"></param>
-        void UpdateUserAppearance(UUID user, AvatarAppearance appearance);
-    }
-}
diff --git a/OpenSim/Framework/Communications/IInterServiceInventoryServices.cs b/OpenSim/Framework/Communications/IInterServiceInventoryServices.cs
deleted file mode 100644
index 7f17872..0000000
--- a/OpenSim/Framework/Communications/IInterServiceInventoryServices.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * 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.Generic;
-using OpenMetaverse;
-namespace OpenSim.Framework.Communications
-{
-    /// <summary>
-    /// Inventory operations used between grid services.
-    /// </summary>
-    public interface IInterServiceInventoryServices
-    {
-        /// <summary>
-        /// Create a new inventory for the given user.
-        /// </summary>
-        /// <param name="user"></param>
-        /// <returns>true if the inventory was successfully created, false otherwise</returns>
-        bool CreateNewUserInventory(UUID user);
-        /// <summary>
-        /// Returns a list of all the folders in a given user's inventory.
-        /// </summary>
-        /// <param name="userId"></param>
-        /// <returns>A flat list of the user's inventory folder tree,
-        /// null if there is no inventory for this user</returns>
-        List<InventoryFolderBase> GetInventorySkeleton(UUID userId);
-        
-        /// <summary>
-        /// Returns a list of all the active gestures in a user's inventory.
-        /// </summary>
-        /// <param name="userId">
-        /// The <see cref="UUID"/> of the user
-        /// </param>
-        /// <returns>
-        /// A flat list of the gesture items.
-        /// </returns>
-        List<InventoryItemBase> GetActiveGestures(UUID userId);
-    }
-}
diff --git a/OpenSim/Framework/Communications/IMessagingService.cs b/OpenSim/Framework/Communications/IMessagingService.cs
deleted file mode 100644
index 5d65f19..0000000
--- a/OpenSim/Framework/Communications/IMessagingService.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * 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.Generic;
-using OpenMetaverse;
-namespace OpenSim.Framework.Communications
-{
-    public interface IMessagingService
-    {
-        Dictionary<UUID, FriendRegionInfo> GetFriendRegionInfos (List<UUID> uuids);
-    }
-}
diff --git a/OpenSim/Framework/Communications/IUserAdminService.cs b/OpenSim/Framework/Communications/IUserAdminService.cs
deleted file mode 100644
index 423b49b..0000000
--- a/OpenSim/Framework/Communications/IUserAdminService.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * 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.Communications
-{
-    /// <summary>
-    /// Interface for the service for administrating users
-    /// </summary>
-    public interface IUserAdminService
-    {
-        /// <summary>
-        /// Add a new user
-        /// </summary>
-        /// <param name="firstName">The first name</param>
-        /// <param name="lastName">The last name</param>
-        /// <param name="pass">password of avatar</param>
-        /// <param name="email">email of user</param>
-        /// <param name="regX">region X</param>
-        /// <param name="regY">region Y</param>
-        /// <returns>The UUID of the created user profile.  On failure, returns UUID.Zero</returns>
-        UUID AddUser(string firstName, string lastName, string pass, string email, uint regX, uint regY);
-        /// <summary>
-        /// Add a new user with a specified UUID.   SHOULD ONLY BE USED in very special circumstances from modules!
-        /// </summary>
-        /// <param name="firstName">The first name</param>
-        /// <param name="lastName">The last name</param>
-        /// <param name="pass">password of avatar</param>
-        /// <param name="email">email of user</param>
-        /// <param name="regX">region X</param>
-        /// <param name="regY">region Y</param>
-        /// <param name="setUUID">The set UUID</param>
-        /// <returns>The UUID of the created user profile.  On failure, returns UUID.Zero</returns>
-        UUID AddUser(string firstName, string lastName, string pass, string email, uint regX, uint regY, UUID setUUID);
-        /// <summary>
-        /// Reset a user password
-        /// </summary>
-        /// <param name="firstName"></param>
-        /// <param name="lastName"></param>
-        /// <param name="newPassword"></param>
-        /// <returns>true if the update was successful, false otherwise</returns>
-        bool ResetUserPassword(string firstName, string lastName, string newPassword);
-    }
-}
diff --git a/OpenSim/Framework/Communications/Osp/OspInventoryWrapperPlugin.cs b/OpenSim/Framework/Communications/Osp/OspInventoryWrapperPlugin.cs
index e96c5e8..bcd1eee 100644
--- a/OpenSim/Framework/Communications/Osp/OspInventoryWrapperPlugin.cs
+++ b/OpenSim/Framework/Communications/Osp/OspInventoryWrapperPlugin.cs
@@ -28,6 +28,7 @@
 using System.Collections.Generic;
 using OpenSim.Data;
 using OpenMetaverse;
+using OpenSim.Services.Interfaces;
 namespace OpenSim.Framework.Communications.Osp
 {
@@ -37,12 +38,13 @@ namespace OpenSim.Framework.Communications.Osp
    public class OspInventoryWrapperPlugin : IInventoryDataPlugin
    {
        protected IInventoryDataPlugin m_wrappedPlugin;
-        protected CommunicationsManager m_commsManager;
+        //protected CommunicationsManager m_commsManager;
+        protected IUserAccountService m_userAccountService;
-        public OspInventoryWrapperPlugin(IInventoryDataPlugin wrappedPlugin, CommunicationsManager commsManager)
+        public OspInventoryWrapperPlugin(IInventoryDataPlugin wrappedPlugin, IUserAccountService userService)
        {
            m_wrappedPlugin = wrappedPlugin;
-            m_commsManager = commsManager;
+            m_userAccountService = userService;
        }
            
        public string Name { get { return "OspInventoryWrapperPlugin"; } }
@@ -81,7 +83,7 @@ namespace OpenSim.Framework.Communications.Osp
        protected InventoryItemBase PostProcessItem(InventoryItemBase item)
        {
-            item.CreatorIdAsUuid = OspResolver.ResolveOspa(item.CreatorId, m_commsManager);
+            item.CreatorIdAsUuid = OspResolver.ResolveOspa(item.CreatorId, m_userAccountService);
            return item;
        }
        
diff --git a/OpenSim/Framework/Communications/Osp/OspResolver.cs b/OpenSim/Framework/Communications/Osp/OspResolver.cs
index 4013896..24ea64d 100644
--- a/OpenSim/Framework/Communications/Osp/OspResolver.cs
+++ b/OpenSim/Framework/Communications/Osp/OspResolver.cs
@@ -30,7 +30,7 @@ using System.Text;
 using log4net;
 using OpenMetaverse;
 using OpenSim.Framework;
-using OpenSim.Framework.Communications.Cache;
+using OpenSim.Services.Interfaces;
 namespace OpenSim.Framework.Communications.Osp
 {
@@ -55,11 +55,11 @@ namespace OpenSim.Framework.Communications.Osp
        /// <param name="userId"></param>
        /// <param name="commsManager"></param>
        /// <returns>The OSPA.  Null if a user with the given UUID could not be found.</returns>
-        public static string MakeOspa(UUID userId, CommunicationsManager commsManager)
+        public static string MakeOspa(UUID userId, IUserAccountService userService)
        {
-            CachedUserInfo userInfo = commsManager.UserProfileCacheService.GetUserDetails(userId);
+            UserAccount account = userService.GetUserAccount(UUID.Zero, userId);
-            if (userInfo != null)
+            if (account != null)
-                return MakeOspa(userInfo.UserProfile.FirstName, userInfo.UserProfile.SurName);
+                return MakeOspa(account.FirstName, account.LastName);
            return null;
        }
@@ -88,7 +88,7 @@ namespace OpenSim.Framework.Communications.Osp
        /// A suitable UUID for use in Second Life client communication.  If the string was not a valid ospa, then UUID.Zero
        /// is returned.
        /// </returns>
-        public static UUID ResolveOspa(string ospa, CommunicationsManager commsManager)
+        public static UUID ResolveOspa(string ospa, IUserAccountService userService)
        {
            if (!ospa.StartsWith(OSPA_PREFIX))
                return UUID.Zero;
@@ -112,7 +112,7 @@ namespace OpenSim.Framework.Communications.Osp
                string value = tuple.Substring(tupleSeparatorIndex + 1).Trim();
                
                if (OSPA_NAME_KEY == key)
-                    return ResolveOspaName(value, commsManager);
+                    return ResolveOspaName(value, userService);
            }
            
            return UUID.Zero;
@@ -137,8 +137,11 @@ namespace OpenSim.Framework.Communications.Osp
        /// <returns>
        /// An OpenSim internal identifier for the name given.  Returns null if the name was not valid
        /// </returns>
-        protected static UUID ResolveOspaName(string name, CommunicationsManager commsManager)
+        protected static UUID ResolveOspaName(string name, IUserAccountService userService)
        {
+            if (userService == null)
+                return UUID.Zero;
            int nameSeparatorIndex = name.IndexOf(OSPA_NAME_VALUE_SEPARATOR);
            
            if (nameSeparatorIndex < 0)
@@ -149,10 +152,10 @@ namespace OpenSim.Framework.Communications.Osp
            
            string firstName = name.Remove(nameSeparatorIndex).TrimEnd();
            string lastName = name.Substring(nameSeparatorIndex + 1).TrimStart();
-            
-            CachedUserInfo userInfo = commsManager.UserProfileCacheService.GetUserDetails(firstName, lastName);
+            UserAccount account = userService.GetUserAccount(UUID.Zero, firstName, lastName);
-            if (userInfo != null)
+            if (account != null)
-                return userInfo.UserProfile.ID;
+                return account.PrincipalID;
            // XXX: Disable temporary user profile creation for now as implementation is incomplete - justincc
            /*
diff --git a/OpenSim/Framework/Communications/Services/GridInfoService.cs b/OpenSim/Framework/Communications/Services/GridInfoService.cs
deleted file mode 100644
index cd2a152..0000000
--- a/OpenSim/Framework/Communications/Services/GridInfoService.cs
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * 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.Net;
-using System.Reflection;
-using System.Text;
-using log4net;
-using Nini.Config;
-using Nwc.XmlRpc;
-using OpenSim.Framework.Servers.HttpServer;
-namespace OpenSim.Framework.Communications.Services
-{
-    public class GridInfoService
-    {
-        private static readonly ILog _log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        private Hashtable _info = new Hashtable();
-        /// <summary>
-        /// Instantiate a GridInfoService object.
-        /// </summary>
-        /// <param name="configPath">path to config path containing
-        /// grid information</param>
-        /// <remarks>
-        /// GridInfoService uses the [GridInfo] section of the
-        /// standard OpenSim.ini file --- which is not optimal, but
-        /// anything else requires a general redesign of the config
-        /// system.
-        /// </remarks>
-        public GridInfoService(IConfigSource configSource)
-        {
-            loadGridInfo(configSource);
-        }
-        /// <summary>
-        /// Default constructor, uses OpenSim.ini.
-        /// </summary>
-        public GridInfoService()
-        {
-            try
-            {
-                IConfigSource configSource = new IniConfigSource(Path.Combine(Util.configDir(), "OpenSim.ini"));
-                loadGridInfo(configSource);
-            }
-            catch (FileNotFoundException)
-            {
-                _log.Warn(
-                    "[GRID INFO SERVICE]: No OpenSim.ini file found --- GridInfoServices WILL NOT BE AVAILABLE to your users");
-            }
-        }
-        private void loadGridInfo(IConfigSource configSource)
-        {
-            _info["platform"] = "OpenSim";
-            try
-            {
-                IConfig startupCfg = configSource.Configs["Startup"];
-                IConfig gridCfg = configSource.Configs["GridInfo"];
-                IConfig netCfg = configSource.Configs["Network"];
-                bool grid = startupCfg.GetBoolean("gridmode", false);
-                if (grid)
-                    _info["mode"] = "grid";
-                else
-                    _info["mode"] = "standalone";
-                if (null != gridCfg)
-                {
-                    foreach (string k in gridCfg.GetKeys())
-                    {
-                        _info[k] = gridCfg.GetString(k);
-                    }
-                }
-                else if (null != netCfg)
-                {
-                    if (grid)
-                        _info["login"] 
-                            = netCfg.GetString(
-                                "user_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultUserServerHttpPort.ToString());
-                    else
-                        _info["login"] 
-                            = String.Format(
-                                "http://127.0.0.1:{0}/", 
-                                netCfg.GetString(
-                                    "http_listener_port", ConfigSettings.DefaultRegionHttpPort.ToString()));
-                    
-                    IssueWarning();
-                }
-                else
-                {
-                    _info["login"] = "http://127.0.0.1:9000/";
-                    IssueWarning();
-                }
-            }
-            catch (Exception)
-            {
-                _log.Debug("[GRID INFO SERVICE]: Cannot get grid info from config source, using minimal defaults");
-            }
-            
-            _log.DebugFormat("[GRID INFO SERVICE]: Grid info service initialized with {0} keys", _info.Count);
-        }
-        private void IssueWarning()
-        {
-            _log.Warn("[GRID INFO SERVICE]: found no [GridInfo] section in your OpenSim.ini");
-            _log.Warn("[GRID INFO SERVICE]: trying to guess sensible defaults, you might want to provide better ones:");
-            
-            foreach (string k in _info.Keys)
-            {
-                _log.WarnFormat("[GRID INFO SERVICE]: {0}: {1}", k, _info[k]);
-            }
-        }
-        public XmlRpcResponse XmlRpcGridInfoMethod(XmlRpcRequest request, IPEndPoint remoteClient)
-        {
-            XmlRpcResponse response = new XmlRpcResponse();
-            Hashtable responseData = new Hashtable();
-            _log.Info("[GRID INFO SERVICE]: Request for grid info");
-            foreach (string k in _info.Keys)
-            {
-                responseData[k] = _info[k];
-            }
-            response.Value = responseData;
-            return response;
-        }
-        public string RestGetGridInfoMethod(string request, string path, string param,
-                                            OSHttpRequest httpRequest, OSHttpResponse httpResponse)
-        {
-            StringBuilder sb = new StringBuilder();
-            sb.Append("<gridinfo>\n");
-            foreach (string k in _info.Keys)
-            {
-                sb.AppendFormat("<{0}>{1}</{0}>\n", k, _info[k]);
-            }
-            sb.Append("</gridinfo>\n");
-            return sb.ToString();
-        }
-    }
-}
diff --git a/OpenSim/Framework/Communications/Services/HGLoginAuthService.cs b/OpenSim/Framework/Communications/Services/HGLoginAuthService.cs
deleted file mode 100644
index d3f813e..0000000
--- a/OpenSim/Framework/Communications/Services/HGLoginAuthService.cs
+++ /dev/null
@@ -1,339 +0,0 @@
-/*
- * 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.Net;
-using System.Reflection;
-using System.Text.RegularExpressions;
-using OpenSim.Framework;
-using OpenSim.Framework.Communications.Cache;
-using OpenSim.Framework.Capabilities;
-using OpenSim.Framework.Servers;
-using OpenMetaverse;
-using log4net;
-using Nini.Config;
-using Nwc.XmlRpc;
-namespace OpenSim.Framework.Communications.Services
-{
-    public class HGLoginAuthService : LoginService
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        protected NetworkServersInfo m_serversInfo;
-        protected bool m_authUsers = false;
-        /// <summary>
-        /// Used by the login service to make requests to the inventory service.
-        /// </summary>
-        protected IInterServiceInventoryServices m_interServiceInventoryService;
-        /// <summary>
-        /// Used to make requests to the local regions.
-        /// </summary>
-        protected ILoginServiceToRegionsConnector m_regionsConnector;
-        public HGLoginAuthService(
-            UserManagerBase userManager, string welcomeMess,
-            IInterServiceInventoryServices interServiceInventoryService,
-            NetworkServersInfo serversInfo,
-            bool authenticate, LibraryRootFolder libraryRootFolder, ILoginServiceToRegionsConnector regionsConnector)
-            : base(userManager, libraryRootFolder, welcomeMess)
-        {
-            this.m_serversInfo = serversInfo;
-            if (m_serversInfo != null)
-            {
-                m_defaultHomeX = this.m_serversInfo.DefaultHomeLocX;
-                m_defaultHomeY = this.m_serversInfo.DefaultHomeLocY;
-            }
-            m_authUsers = authenticate;
-            m_interServiceInventoryService = interServiceInventoryService;
-            m_regionsConnector = regionsConnector;
-            m_interInventoryService = interServiceInventoryService;
-        }
-        public void SetServersInfo(NetworkServersInfo sinfo)
-        {
-            m_serversInfo = sinfo;
-        }
-        public override XmlRpcResponse XmlRpcLoginMethod(XmlRpcRequest request, IPEndPoint remoteClient)
-        {
-            m_log.Info("[HGLOGIN]: HGLogin called " + request.MethodName);
-            XmlRpcResponse response = base.XmlRpcLoginMethod(request, remoteClient);
-            Hashtable responseData = (Hashtable)response.Value;
-            responseData["grid_service"] = m_serversInfo.GridURL;
-            responseData["grid_service_send_key"] = m_serversInfo.GridSendKey;
-            responseData["inventory_service"] = m_serversInfo.InventoryURL;
-            responseData["asset_service"] = m_serversInfo.AssetURL;
-            responseData["asset_service_send_key"] = m_serversInfo.AssetSendKey;
-            int x = (Int32)responseData["region_x"];
-            int y = (Int32)responseData["region_y"];
-            uint ux = (uint)(x / Constants.RegionSize);
-            uint uy = (uint)(y / Constants.RegionSize);
-            ulong regionHandle = Util.UIntsToLong(ux, uy);
-            responseData["region_handle"] = regionHandle.ToString();
-            // Let's remove the seed cap from the login
-            //responseData.Remove("seed_capability");
-            // Let's add the appearance
-            UUID userID = UUID.Zero;
-            UUID.TryParse((string)responseData["agent_id"], out userID);
-            AvatarAppearance appearance = m_userManager.GetUserAppearance(userID);
-            if (appearance == null)
-            {
-                m_log.WarnFormat("[INTER]: Appearance not found for {0}. Creating default.", userID);
-                appearance = new AvatarAppearance();
-            }
-            responseData["appearance"] = appearance.ToHashTable();
-            // Let's also send the auth token
-            UUID token = UUID.Random();
-            responseData["auth_token"] = token.ToString();
-            UserProfileData userProfile = m_userManager.GetUserProfile(userID);
-            if (userProfile != null)
-            {
-                userProfile.WebLoginKey = token;
-                m_userManager.CommitAgent(ref userProfile);
-            }
-            m_log.Warn("[HGLOGIN]: Auth token: " + token);
-            return response;
-        }
-        public XmlRpcResponse XmlRpcGenerateKeyMethod(XmlRpcRequest request, IPEndPoint remoteClient)
-        {
-            // Verify the key of who's calling
-            UUID userID = UUID.Zero;
-            UUID authKey = UUID.Zero; 
-            UUID.TryParse((string)request.Params[0], out userID);
-            UUID.TryParse((string)request.Params[1], out authKey);
-            m_log.InfoFormat("[HGLOGIN] HGGenerateKey called with authToken ", authKey);
-            string newKey = string.Empty;
-            if (!(m_userManager is IAuthentication))
-            {
-                m_log.Debug("[HGLOGIN]: UserManager is not IAuthentication service. Returning empty key.");
-            }
-            else
-            {
-                newKey = ((IAuthentication)m_userManager).GetNewKey(m_serversInfo.UserURL, userID, authKey);
-            }
-            XmlRpcResponse response = new XmlRpcResponse();
-            response.Value = (string) newKey;
-            return response;
-        }
-        public XmlRpcResponse XmlRpcVerifyKeyMethod(XmlRpcRequest request, IPEndPoint remoteClient)
-        {
-            bool success = false;
-            if (request.Params.Count >= 2)
-            {
-                // Verify the key of who's calling
-                UUID userID = UUID.Zero;
-                string authKey = string.Empty;
-                if (UUID.TryParse((string)request.Params[0], out userID))
-                {
-                    authKey = (string)request.Params[1];
-                    m_log.InfoFormat("[HGLOGIN] HGVerifyKey called with key {0}", authKey);
-                    if (!(m_userManager is IAuthentication))
-                    {
-                        m_log.Debug("[HGLOGIN]: UserManager is not IAuthentication service. Denying.");
-                    }
-                    else
-                    {
-                        success = ((IAuthentication)m_userManager).VerifyKey(userID, authKey);
-                    }
-                }
-            }
-            m_log.DebugFormat("[HGLOGIN]: Response to VerifyKey is {0}", success);
-            XmlRpcResponse response = new XmlRpcResponse();
-            response.Value = success;
-            return response;
-        }
-        public override UserProfileData GetTheUser(string firstname, string lastname)
-        {
-            UserProfileData profile = m_userManager.GetUserProfile(firstname, lastname);
-            if (profile != null)
-            {
-                return profile;
-            }
-            if (!m_authUsers)
-            {
-                //no current user account so make one
-                m_log.Info("[LOGIN]: No user account found so creating a new one.");
-                m_userManager.AddUser(firstname, lastname, "test", "", m_defaultHomeX, m_defaultHomeY);
-                return m_userManager.GetUserProfile(firstname, lastname);
-            }
-            return null;
-        }
-        public override bool AuthenticateUser(UserProfileData profile, string password)
-        {
-            if (!m_authUsers)
-            {
-                //for now we will accept any password in sandbox mode
-                m_log.Info("[LOGIN]: Authorising user (no actual password check)");
-                return true;
-            }
-            else
-            {
-                m_log.Info(
-                    "[LOGIN]: Authenticating " + profile.FirstName + " " + profile.SurName);
-                if (!password.StartsWith("$1$"))
-                    password = "$1$" + Util.Md5Hash(password);
-                password = password.Remove(0, 3); //remove $1$
-                string s = Util.Md5Hash(password + ":" + profile.PasswordSalt);
-                bool loginresult = (profile.PasswordHash.Equals(s.ToString(), StringComparison.InvariantCultureIgnoreCase)
-                            || profile.PasswordHash.Equals(password, StringComparison.InvariantCulture));
-                return loginresult;
-            }
-        }
-        protected override RegionInfo RequestClosestRegion(string region)
-        {
-            return m_regionsConnector.RequestClosestRegion(region);
-        }
-        protected override RegionInfo GetRegionInfo(ulong homeRegionHandle)
-        {
-            return m_regionsConnector.RequestNeighbourInfo(homeRegionHandle);
-        }
-        protected override RegionInfo GetRegionInfo(UUID homeRegionId)
-        {
-            return m_regionsConnector.RequestNeighbourInfo(homeRegionId);
-        }
-        /// <summary>
-        /// Not really informing the region. Just filling out the response fields related to the region. 
-        /// </summary>
-        /// <param name="sim"></param>
-        /// <param name="user"></param>
-        /// <param name="response"></param>
-        /// <returns>true if the region was successfully contacted, false otherwise</returns>
-        protected override bool PrepareLoginToRegion(RegionInfo regionInfo, UserProfileData user, LoginResponse response, IPEndPoint remoteClient)
-        {
-            IPEndPoint endPoint = regionInfo.ExternalEndPoint;
-            response.SimAddress = endPoint.Address.ToString();
-            response.SimPort = (uint)endPoint.Port;
-            response.RegionX = regionInfo.RegionLocX;
-            response.RegionY = regionInfo.RegionLocY;
-            response.SimHttpPort = regionInfo.HttpPort;
-            string capsPath = CapsUtil.GetRandomCapsObjectPath();
-            string capsSeedPath = CapsUtil.GetCapsSeedPath(capsPath);
-            // Don't use the following!  It Fails for logging into any region not on the same port as the http server!
-            // Kept here so it doesn't happen again!
-            // response.SeedCapability = regionInfo.ServerURI + capsSeedPath;
-            string seedcap = "http://";
-            if (m_serversInfo.HttpUsesSSL)
-            {
-                // For NAT
-                string host = NetworkUtil.GetHostFor(remoteClient.Address, m_serversInfo.HttpSSLCN);
-                seedcap = "https://" + host + ":" + m_serversInfo.httpSSLPort + capsSeedPath;
-            }
-            else
-            {
-                // For NAT
-                string host = NetworkUtil.GetHostFor(remoteClient.Address, regionInfo.ExternalHostName);
-                seedcap = "http://" + host + ":" + m_serversInfo.HttpListenerPort + capsSeedPath;
-            }
-            response.SeedCapability = seedcap;
-            // Notify the target of an incoming user
-            m_log.InfoFormat(
-                "[LOGIN]: Telling {0} @ {1},{2} ({3}) to prepare for client connection",
-                regionInfo.RegionName, response.RegionX, response.RegionY, regionInfo.ServerURI);
-            // Update agent with target sim
-            user.CurrentAgent.Region = regionInfo.RegionID;
-            user.CurrentAgent.Handle = regionInfo.RegionHandle;
-            return true;
-        }
-        public override void LogOffUser(UserProfileData theUser, string message)
-        {
-            RegionInfo SimInfo;
-            try
-            {
-                SimInfo = this.m_regionsConnector.RequestNeighbourInfo(theUser.CurrentAgent.Handle);
-                if (SimInfo == null)
-                {
-                    m_log.Error("[LOCAL LOGIN]: Region user was in isn't currently logged in");
-                    return;
-                }
-            }
-            catch (Exception)
-            {
-                m_log.Error("[LOCAL LOGIN]: Unable to look up region to log user off");
-                return;
-            }
-            m_regionsConnector.LogOffUserFromGrid(SimInfo.RegionHandle, theUser.ID, theUser.CurrentAgent.SecureSessionID, "Logging you off");
-        }
-        protected override bool AllowLoginWithoutInventory()
-        {
-            return true;
-        }
-    }
-}
diff --git a/OpenSim/Framework/Communications/Services/LoginResponse.cs b/OpenSim/Framework/Communications/Services/LoginResponse.cs
deleted file mode 100644
index ec5f428..0000000
--- a/OpenSim/Framework/Communications/Services/LoginResponse.cs
+++ /dev/null
@@ -1,823 +0,0 @@
-/*
- * 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.Reflection;
-using log4net;
-using Nwc.XmlRpc;
-using OpenMetaverse;
-using OpenMetaverse.StructuredData;
-namespace OpenSim.Framework.Communications.Services
-{
-    /// <summary>
-    /// A temp class to handle login response.
-    /// Should make use of UserProfileManager where possible.
-    /// </summary>
-    public class LoginResponse
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        private Hashtable loginFlagsHash;
-        private Hashtable globalTexturesHash;
-        private Hashtable loginError;
-        private Hashtable uiConfigHash;
-        private ArrayList loginFlags;
-        private ArrayList globalTextures;
-        private ArrayList eventCategories;
-        private ArrayList uiConfig;
-        private ArrayList classifiedCategories;
-        private ArrayList inventoryRoot;
-        private ArrayList initialOutfit;
-        private ArrayList agentInventory;
-        private ArrayList inventoryLibraryOwner;
-        private ArrayList inventoryLibRoot;
-        private ArrayList inventoryLibrary;
-        private ArrayList activeGestures;
-        private UserInfo userProfile;
-        private UUID agentID;
-        private UUID sessionID;
-        private UUID secureSessionID;
-        // Login Flags
-        private string dst;
-        private string stipendSinceLogin;
-        private string gendered;
-        private string everLoggedIn;
-        private string login;
-        private uint simPort;
-        private uint simHttpPort;
-        private string simAddress;
-        private string agentAccess;
-        private string agentAccessMax;
-        private Int32 circuitCode;
-        private uint regionX;
-        private uint regionY;
-        // Login
-        private string firstname;
-        private string lastname;
-        // Global Textures
-        private string sunTexture;
-        private string cloudTexture;
-        private string moonTexture;
-        // Error Flags
-        private string errorReason;
-        private string errorMessage;
-        // Response
-        private XmlRpcResponse xmlRpcResponse;
-        // private XmlRpcResponse defaultXmlRpcResponse;
-        private string welcomeMessage;
-        private string startLocation;
-        private string allowFirstLife;
-        private string home;
-        private string seedCapability;
-        private string lookAt;
-        private BuddyList m_buddyList = null;
-        public LoginResponse()
-        {
-            loginFlags = new ArrayList();
-            globalTextures = new ArrayList();
-            eventCategories = new ArrayList();
-            uiConfig = new ArrayList();
-            classifiedCategories = new ArrayList();
-            loginError = new Hashtable();
-            uiConfigHash = new Hashtable();
-            // defaultXmlRpcResponse = new XmlRpcResponse();
-            userProfile = new UserInfo();
-            inventoryRoot = new ArrayList();
-            initialOutfit = new ArrayList();
-            agentInventory = new ArrayList();
-            inventoryLibrary = new ArrayList();
-            inventoryLibraryOwner = new ArrayList();
-            activeGestures = new ArrayList();
-            xmlRpcResponse = new XmlRpcResponse();
-            // defaultXmlRpcResponse = new XmlRpcResponse();
-            SetDefaultValues();
-        }
-        private void SetDefaultValues()
-        {
-            DST = TimeZone.CurrentTimeZone.IsDaylightSavingTime(DateTime.Now) ? "Y" : "N";
-            StipendSinceLogin = "N";
-            Gendered = "Y";
-            EverLoggedIn = "Y";
-            login = "false";
-            firstname = "Test";
-            lastname = "User";
-            agentAccess = "M";
-            agentAccessMax = "A";
-            startLocation = "last";
-            allowFirstLife = "Y";
-            SunTexture = "cce0f112-878f-4586-a2e2-a8f104bba271";
-            CloudTexture = "dc4b9f0b-d008-45c6-96a4-01dd947ac621";
-            MoonTexture = "ec4b9f0b-d008-45c6-96a4-01dd947ac621";
-            ErrorMessage = "You have entered an invalid name/password combination.  Check Caps/lock.";
-            ErrorReason = "key";
-            welcomeMessage = "Welcome to OpenSim!";
-            seedCapability = String.Empty;
-            home = "{'region_handle':[r" + (1000*Constants.RegionSize).ToString() + ",r" + (1000*Constants.RegionSize).ToString() + "], 'position':[r" +
-                   userProfile.homepos.X.ToString() + ",r" + userProfile.homepos.Y.ToString() + ",r" +
-                   userProfile.homepos.Z.ToString() + "], 'look_at':[r" + userProfile.homelookat.X.ToString() + ",r" +
-                   userProfile.homelookat.Y.ToString() + ",r" + userProfile.homelookat.Z.ToString() + "]}";
-            lookAt = "[r0.99949799999999999756,r0.03166859999999999814,r0]";
-            RegionX = (uint) 255232;
-            RegionY = (uint) 254976;
-            // Classifieds;
-            AddClassifiedCategory((Int32) 1, "Shopping");
-            AddClassifiedCategory((Int32) 2, "Land Rental");
-            AddClassifiedCategory((Int32) 3, "Property Rental");
-            AddClassifiedCategory((Int32) 4, "Special Attraction");
-            AddClassifiedCategory((Int32) 5, "New Products");
-            AddClassifiedCategory((Int32) 6, "Employment");
-            AddClassifiedCategory((Int32) 7, "Wanted");
-            AddClassifiedCategory((Int32) 8, "Service");
-            AddClassifiedCategory((Int32) 9, "Personal");
-            SessionID = UUID.Random();
-            SecureSessionID = UUID.Random();
-            AgentID = UUID.Random();
-            Hashtable InitialOutfitHash = new Hashtable();
-            InitialOutfitHash["folder_name"] = "Nightclub Female";
-            InitialOutfitHash["gender"] = "female";
-            initialOutfit.Add(InitialOutfitHash);
-        }
-        #region Login Failure Methods
-        public XmlRpcResponse GenerateFailureResponse(string reason, string message, string login)
-        {
-            // Overwrite any default values;
-            xmlRpcResponse = new XmlRpcResponse();
-            // Ensure Login Failed message/reason;
-            ErrorMessage = message;
-            ErrorReason = reason;
-            loginError["reason"] = ErrorReason;
-            loginError["message"] = ErrorMessage;
-            loginError["login"] = login;
-            xmlRpcResponse.Value = loginError;
-            return (xmlRpcResponse);
-        }
-        public OSD GenerateFailureResponseLLSD(string reason, string message, string login)
-        {
-            OSDMap map = new OSDMap();
-            // Ensure Login Failed message/reason;
-            ErrorMessage = message;
-            ErrorReason = reason;
-            map["reason"] = OSD.FromString(ErrorReason);
-            map["message"] = OSD.FromString(ErrorMessage);
-            map["login"] = OSD.FromString(login);
-            return map;
-        }
-        public XmlRpcResponse CreateFailedResponse()
-        {
-            return (CreateLoginFailedResponse());
-        }
-        public OSD CreateFailedResponseLLSD()
-        {
-            return CreateLoginFailedResponseLLSD();
-        }
-        public XmlRpcResponse CreateLoginFailedResponse()
-        {
-            return
-                (GenerateFailureResponse("key",
-                                         "Could not authenticate your avatar. Please check your username and password, and check the grid if problems persist.",
-                                         "false"));
-        }
-        public OSD CreateLoginFailedResponseLLSD()
-        {
-            return GenerateFailureResponseLLSD(
-                "key",
-                "Could not authenticate your avatar. Please check your username and password, and check the grid if problems persist.",
-                "false");
-        }
-        /// <summary>
-        /// Response to indicate that login failed because the agent's inventory was not available.
-        /// </summary>
-        /// <returns></returns>
-        public XmlRpcResponse CreateLoginInventoryFailedResponse()
-        {
-            return GenerateFailureResponse(
-                "key",
-                "The avatar inventory service is not responding.  Please notify your login region operator.",
-                "false");
-        }
-        public XmlRpcResponse CreateAlreadyLoggedInResponse()
-        {
-            return
-                (GenerateFailureResponse("presence",
-                                         "You appear to be already logged in. " +
-                                         "If this is not the case please wait for your session to timeout. " +
-                                         "If this takes longer than a few minutes please contact the grid owner. " +
-                                         "Please wait 5 minutes if you are going to connect to a region nearby to the region you were at previously.",
-                                         "false"));
-        }
-        public OSD CreateAlreadyLoggedInResponseLLSD()
-        {
-            return GenerateFailureResponseLLSD(
-                "presence",
-                "You appear to be already logged in. " +
-                "If this is not the case please wait for your session to timeout. " +
-                "If this takes longer than a few minutes please contact the grid owner",
-                "false");
-        }
-        public XmlRpcResponse CreateLoginBlockedResponse()
-        {
-            return
-                (GenerateFailureResponse("presence",
-                "Logins are currently restricted. Please try again later",
-                                         "false"));
-        }
-        public OSD CreateLoginBlockedResponseLLSD()
-        {
-            return GenerateFailureResponseLLSD(
-                "presence",
-                "Logins are currently restricted. Please try again later",
-                "false");
-        }
-        public XmlRpcResponse CreateDeadRegionResponse()
-        {
-            return
-                (GenerateFailureResponse("key",
-                                         "The region you are attempting to log into is not responding. Please select another region and try again.",
-                                         "false"));
-        }
-        public OSD CreateDeadRegionResponseLLSD()
-        {
-            return GenerateFailureResponseLLSD(
-                "key",
-                "The region you are attempting to log into is not responding. Please select another region and try again.",
-                "false");
-        }
-        public XmlRpcResponse CreateGridErrorResponse()
-        {
-            return
-                (GenerateFailureResponse("key",
-                                         "Error connecting to grid. Could not percieve credentials from login XML.",
-                                         "false"));
-        }
-        public OSD CreateGridErrorResponseLLSD()
-        {
-            return GenerateFailureResponseLLSD(
-                "key",
-                "Error connecting to grid. Could not perceive credentials from login XML.",
-                "false");
-        }
-        #endregion
-        public virtual XmlRpcResponse ToXmlRpcResponse()
-        {
-            try
-            {
-                Hashtable responseData = new Hashtable();
-                loginFlagsHash = new Hashtable();
-                loginFlagsHash["daylight_savings"] = DST;
-                loginFlagsHash["stipend_since_login"] = StipendSinceLogin;
-                loginFlagsHash["gendered"] = Gendered;
-                loginFlagsHash["ever_logged_in"] = EverLoggedIn;
-                loginFlags.Add(loginFlagsHash);
-                responseData["first_name"] = Firstname;
-                responseData["last_name"] = Lastname;
-                responseData["agent_access"] = agentAccess;
-                responseData["agent_access_max"] = agentAccessMax;
-                globalTexturesHash = new Hashtable();
-                globalTexturesHash["sun_texture_id"] = SunTexture;
-                globalTexturesHash["cloud_texture_id"] = CloudTexture;
-                globalTexturesHash["moon_texture_id"] = MoonTexture;
-                globalTextures.Add(globalTexturesHash);
-                // this.eventCategories.Add(this.eventCategoriesHash);
-                AddToUIConfig("allow_first_life", allowFirstLife);
-                uiConfig.Add(uiConfigHash);
-                responseData["sim_port"] = (Int32) SimPort;
-                responseData["sim_ip"] = SimAddress;
-                responseData["http_port"] = (Int32)SimHttpPort;
-                responseData["agent_id"] = AgentID.ToString();
-                responseData["session_id"] = SessionID.ToString();
-                responseData["secure_session_id"] = SecureSessionID.ToString();
-                responseData["circuit_code"] = CircuitCode;
-                responseData["seconds_since_epoch"] = (Int32) (DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;
-                responseData["login-flags"] = loginFlags;
-                responseData["global-textures"] = globalTextures;
-                responseData["seed_capability"] = seedCapability;
-                responseData["event_categories"] = eventCategories;
-                responseData["event_notifications"] = new ArrayList(); // todo
-                responseData["classified_categories"] = classifiedCategories;
-                responseData["ui-config"] = uiConfig;
-                if (agentInventory != null)
-                {
-                    responseData["inventory-skeleton"] = agentInventory;
-                    responseData["inventory-root"] = inventoryRoot;
-                }
-                responseData["inventory-skel-lib"] = inventoryLibrary;
-                responseData["inventory-lib-root"] = inventoryLibRoot;
-                responseData["gestures"] = activeGestures;
-                responseData["inventory-lib-owner"] = inventoryLibraryOwner;
-                responseData["initial-outfit"] = initialOutfit;
-                responseData["start_location"] = startLocation;
-                responseData["seed_capability"] = seedCapability;
-                responseData["home"] = home;
-                responseData["look_at"] = lookAt;
-                responseData["message"] = welcomeMessage;
-                responseData["region_x"] = (Int32)(RegionX * Constants.RegionSize);
-                responseData["region_y"] = (Int32)(RegionY * Constants.RegionSize);
-                if (m_buddyList != null)
-                {
-                    responseData["buddy-list"] = m_buddyList.ToArray();
-                }
-                responseData["login"] = "true";
-                xmlRpcResponse.Value = responseData;
-                return (xmlRpcResponse);
-            }
-            catch (Exception e)
-            {
-                m_log.Warn("[CLIENT]: LoginResponse: Error creating XML-RPC Response: " + e.Message);
-                return (GenerateFailureResponse("Internal Error", "Error generating Login Response", "false"));
-            }
-        }
-        public OSD ToLLSDResponse()
-        {
-            try
-            {
-                OSDMap map = new OSDMap();
-                map["first_name"] = OSD.FromString(Firstname);
-                map["last_name"] = OSD.FromString(Lastname);
-                map["agent_access"] = OSD.FromString(agentAccess);
-                map["agent_access_max"] = OSD.FromString(agentAccessMax);
-                map["sim_port"] = OSD.FromInteger(SimPort);
-                map["sim_ip"] = OSD.FromString(SimAddress);
-                map["agent_id"] = OSD.FromUUID(AgentID);
-                map["session_id"] = OSD.FromUUID(SessionID);
-                map["secure_session_id"] = OSD.FromUUID(SecureSessionID);
-                map["circuit_code"] = OSD.FromInteger(CircuitCode);
-                map["seconds_since_epoch"] = OSD.FromInteger((int)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds);
-                #region Login Flags
-                OSDMap loginFlagsLLSD = new OSDMap();
-                loginFlagsLLSD["daylight_savings"] = OSD.FromString(DST);
-                loginFlagsLLSD["stipend_since_login"] = OSD.FromString(StipendSinceLogin);
-                loginFlagsLLSD["gendered"] = OSD.FromString(Gendered);
-                loginFlagsLLSD["ever_logged_in"] = OSD.FromString(EverLoggedIn);
-                map["login-flags"] = WrapOSDMap(loginFlagsLLSD);
-                #endregion Login Flags
-                #region Global Textures
-                OSDMap globalTexturesLLSD = new OSDMap();
-                globalTexturesLLSD["sun_texture_id"] = OSD.FromString(SunTexture);
-                globalTexturesLLSD["cloud_texture_id"] = OSD.FromString(CloudTexture);
-                globalTexturesLLSD["moon_texture_id"] = OSD.FromString(MoonTexture);
-                map["global-textures"] = WrapOSDMap(globalTexturesLLSD);
-                #endregion Global Textures
-                map["seed_capability"] = OSD.FromString(seedCapability);
-                map["event_categories"] = ArrayListToOSDArray(eventCategories);
-                //map["event_notifications"] = new OSDArray(); // todo
-                map["classified_categories"] = ArrayListToOSDArray(classifiedCategories);
-                #region UI Config
-                OSDMap uiConfigLLSD = new OSDMap();
-                uiConfigLLSD["allow_first_life"] = OSD.FromString(allowFirstLife);
-                map["ui-config"] = WrapOSDMap(uiConfigLLSD);
-                #endregion UI Config
-                #region Inventory
-                map["inventory-skeleton"] = ArrayListToOSDArray(agentInventory);
-                map["inventory-skel-lib"] = ArrayListToOSDArray(inventoryLibrary);
-                map["inventory-root"] = ArrayListToOSDArray(inventoryRoot); ;
-                map["inventory-lib-root"] = ArrayListToOSDArray(inventoryLibRoot);
-                map["inventory-lib-owner"] = ArrayListToOSDArray(inventoryLibraryOwner);
-                #endregion Inventory
-                map["gestures"] = ArrayListToOSDArray(activeGestures);
-                map["initial-outfit"] = ArrayListToOSDArray(initialOutfit);
-                map["start_location"] = OSD.FromString(startLocation);
-                map["seed_capability"] = OSD.FromString(seedCapability);
-                map["home"] = OSD.FromString(home);
-                map["look_at"] = OSD.FromString(lookAt);
-                map["message"] = OSD.FromString(welcomeMessage);
-                map["region_x"] = OSD.FromInteger(RegionX * Constants.RegionSize);
-                map["region_y"] = OSD.FromInteger(RegionY * Constants.RegionSize);
-                if (m_buddyList != null)
-                {
-                    map["buddy-list"] = ArrayListToOSDArray(m_buddyList.ToArray());
-                }
-                map["login"] = OSD.FromString("true");
-                return map;
-            }
-            catch (Exception e)
-            {
-                m_log.Warn("[CLIENT]: LoginResponse: Error creating LLSD Response: " + e.Message);
-                return GenerateFailureResponseLLSD("Internal Error", "Error generating Login Response", "false");
-            }
-        }
-        public OSDArray ArrayListToOSDArray(ArrayList arrlst)
-        {
-            OSDArray llsdBack = new OSDArray();
-            foreach (Hashtable ht in arrlst)
-            {
-                OSDMap mp = new OSDMap();
-                foreach (DictionaryEntry deHt in ht)
-                {
-                    mp.Add((string)deHt.Key, OSDString.FromObject(deHt.Value));
-                }
-                llsdBack.Add(mp);
-            }
-            return llsdBack;
-        }
-        private static OSDArray WrapOSDMap(OSDMap wrapMe)
-        {
-            OSDArray array = new OSDArray();
-            array.Add(wrapMe);
-            return array;
-        }
-        public void SetEventCategories(string category, string value)
-        {
-            //  this.eventCategoriesHash[category] = value;
-            //TODO
-        }
-        public void AddToUIConfig(string itemName, string item)
-        {
-            uiConfigHash[itemName] = item;
-        }
-        public void AddClassifiedCategory(Int32 ID, string categoryName)
-        {
-            Hashtable hash = new Hashtable();
-            hash["category_name"] = categoryName;
-            hash["category_id"] = ID;
-            classifiedCategories.Add(hash);
-            // this.classifiedCategoriesHash.Clear();
-        }
-        #region Properties
-        public string Login
-        {
-            get { return login; }
-            set { login = value; }
-        }
-        public string DST
-        {
-            get { return dst; }
-            set { dst = value; }
-        }
-        public string StipendSinceLogin
-        {
-            get { return stipendSinceLogin; }
-            set { stipendSinceLogin = value; }
-        }
-        public string Gendered
-        {
-            get { return gendered; }
-            set { gendered = value; }
-        }
-        public string EverLoggedIn
-        {
-            get { return everLoggedIn; }
-            set { everLoggedIn = value; }
-        }
-        public uint SimPort
-        {
-            get { return simPort; }
-            set { simPort = value; }
-        }
-        public uint SimHttpPort
-        {
-            get { return simHttpPort; }
-            set { simHttpPort = value; }
-        }
-        public string SimAddress
-        {
-            get { return simAddress; }
-            set { simAddress = value; }
-        }
-        public UUID AgentID
-        {
-            get { return agentID; }
-            set { agentID = value; }
-        }
-        public UUID SessionID
-        {
-            get { return sessionID; }
-            set { sessionID = value; }
-        }
-        public UUID SecureSessionID
-        {
-            get { return secureSessionID; }
-            set { secureSessionID = value; }
-        }
-        public Int32 CircuitCode
-        {
-            get { return circuitCode; }
-            set { circuitCode = value; }
-        }
-        public uint RegionX
-        {
-            get { return regionX; }
-            set { regionX = value; }
-        }
-        public uint RegionY
-        {
-            get { return regionY; }
-            set { regionY = value; }
-        }
-        public string SunTexture
-        {
-            get { return sunTexture; }
-            set { sunTexture = value; }
-        }
-        public string CloudTexture
-        {
-            get { return cloudTexture; }
-            set { cloudTexture = value; }
-        }
-        public string MoonTexture
-        {
-            get { return moonTexture; }
-            set { moonTexture = value; }
-        }
-        public string Firstname
-        {
-            get { return firstname; }
-            set { firstname = value; }
-        }
-        public string Lastname
-        {
-            get { return lastname; }
-            set { lastname = value; }
-        }
-        public string AgentAccess
-        {
-            get { return agentAccess; }
-            set { agentAccess = value; }
-        }
-        public string AgentAccessMax
-        {
-            get { return agentAccessMax; }
-            set { agentAccessMax = value; }
-        }
-        public string StartLocation
-        {
-            get { return startLocation; }
-            set { startLocation = value; }
-        }
-        public string LookAt
-        {
-            get { return lookAt; }
-            set { lookAt = value; }
-        }
-        public string SeedCapability
-        {
-            get { return seedCapability; }
-            set { seedCapability = value; }
-        }
-        public string ErrorReason
-        {
-            get { return errorReason; }
-            set { errorReason = value; }
-        }
-        public string ErrorMessage
-        {
-            get { return errorMessage; }
-            set { errorMessage = value; }
-        }
-        public ArrayList InventoryRoot
-        {
-            get { return inventoryRoot; }
-            set { inventoryRoot = value; }
-        }
-        public ArrayList InventorySkeleton
-        {
-            get { return agentInventory; }
-            set { agentInventory = value; }
-        }
-        public ArrayList InventoryLibrary
-        {
-            get { return inventoryLibrary; }
-            set { inventoryLibrary = value; }
-        }
-        public ArrayList InventoryLibraryOwner
-        {
-            get { return inventoryLibraryOwner; }
-            set { inventoryLibraryOwner = value; }
-        }
-        public ArrayList InventoryLibRoot
-        {
-            get { return inventoryLibRoot; }
-            set { inventoryLibRoot = value; }
-        }
-        public ArrayList ActiveGestures
-        {
-            get { return activeGestures; }
-            set { activeGestures = value; }
-        }
-                
-        public string Home
-        {
-            get { return home; }
-            set { home = value; }
-        }
-        public string Message
-        {
-            get { return welcomeMessage; }
-            set { welcomeMessage = value; }
-        }
-        public BuddyList BuddList
-        {
-            get { return m_buddyList; }
-            set { m_buddyList = value; }
-        }
-        #endregion
-        public class UserInfo
-        {
-            public string firstname;
-            public string lastname;
-            public ulong homeregionhandle;
-            public Vector3 homepos;
-            public Vector3 homelookat;
-        }
-        public class BuddyList
-        {
-            public List<BuddyInfo> Buddies = new List<BuddyInfo>();
-            public void AddNewBuddy(BuddyInfo buddy)
-            {
-                if (!Buddies.Contains(buddy))
-                {
-                    Buddies.Add(buddy);
-                }
-            }
-            public ArrayList ToArray()
-            {
-                ArrayList buddyArray = new ArrayList();
-                foreach (BuddyInfo buddy in Buddies)
-                {
-                    buddyArray.Add(buddy.ToHashTable());
-                }
-                return buddyArray;
-            }
-            public class BuddyInfo
-            {
-                public int BuddyRightsHave = 1;
-                public int BuddyRightsGiven = 1;
-                public UUID BuddyID;
-                public BuddyInfo(string buddyID)
-                {
-                    BuddyID = new UUID(buddyID);
-                }
-                public BuddyInfo(UUID buddyID)
-                {
-                    BuddyID = buddyID;
-                }
-                public Hashtable ToHashTable()
-                {
-                    Hashtable hTable = new Hashtable();
-                    hTable["buddy_rights_has"] = BuddyRightsHave;
-                    hTable["buddy_rights_given"] = BuddyRightsGiven;
-                    hTable["buddy_id"] = BuddyID.ToString();
-                    return hTable;
-                }
-            }
-        }
-    }
-}
diff --git a/OpenSim/Framework/Communications/Services/LoginService.cs b/OpenSim/Framework/Communications/Services/LoginService.cs
deleted file mode 100644
index 824cc57..0000000
--- a/OpenSim/Framework/Communications/Services/LoginService.cs
+++ /dev/null
@@ -1,1241 +0,0 @@
-/*
- * 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.Net;
-using System.Reflection;
-using System.Text.RegularExpressions;
-using System.Threading;
-using System.Web;
-using log4net;
-using Nwc.XmlRpc;
-using OpenMetaverse;
-using OpenMetaverse.StructuredData;
-using OpenSim.Framework;
-using OpenSim.Framework.Communications.Cache;
-using OpenSim.Framework.Statistics;
-using OpenSim.Services.Interfaces;
-namespace OpenSim.Framework.Communications.Services
-{
-    public abstract class LoginService
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        protected string m_welcomeMessage = "Welcome to OpenSim";
-        protected int m_minLoginLevel = 0;
-        protected UserManagerBase m_userManager = null;
-        protected Mutex m_loginMutex = new Mutex(false);
-        /// <summary>
-        /// Used during login to send the skeleton of the OpenSim Library to the client.
-        /// </summary>
-        protected LibraryRootFolder m_libraryRootFolder;
-        protected uint m_defaultHomeX;
-        protected uint m_defaultHomeY;
-        protected bool m_warn_already_logged = true;
-        /// <summary>
-        /// Used by the login service to make requests to the inventory service.
-        /// </summary>
-        protected IInterServiceInventoryServices m_interInventoryService;
-        // Hack
-        protected IInventoryService m_InventoryService;
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name="userManager"></param>
-        /// <param name="libraryRootFolder"></param>
-        /// <param name="welcomeMess"></param>
-        public LoginService(UserManagerBase userManager, LibraryRootFolder libraryRootFolder,
-                            string welcomeMess)
-        {
-            m_userManager = userManager;
-            m_libraryRootFolder = libraryRootFolder;
-            if (welcomeMess != String.Empty)
-            {
-                m_welcomeMessage = welcomeMess;
-            }
-        }
-       
-        /// <summary>
-        /// Called when we receive the client's initial XMLRPC login_to_simulator request message
-        /// </summary>
-        /// <param name="request">The XMLRPC request</param>
-        /// <returns>The response to send</returns>
-        public virtual XmlRpcResponse XmlRpcLoginMethod(XmlRpcRequest request, IPEndPoint remoteClient)
-        {
-            // Temporary fix
-            m_loginMutex.WaitOne();
-            try
-            {
-                //CFK: CustomizeResponse contains sufficient strings to alleviate the need for this.
-                //CKF: m_log.Info("[LOGIN]: Attempting login now...");
-                XmlRpcResponse response = new XmlRpcResponse();
-                Hashtable requestData = (Hashtable)request.Params[0];
-                SniffLoginKey((Uri)request.Params[2], requestData);
-                bool GoodXML = (requestData.Contains("first") && requestData.Contains("last") &&
-                                (requestData.Contains("passwd") || requestData.Contains("web_login_key")));
-                string startLocationRequest = "last";
-                UserProfileData userProfile;
-                LoginResponse logResponse = new LoginResponse();
-                string firstname;
-                string lastname;
-                if (GoodXML)
-                {
-                    if (requestData.Contains("start"))
-                    {
-                        startLocationRequest = (string)requestData["start"];
-                    }
-                    firstname = (string)requestData["first"];
-                    lastname = (string)requestData["last"];
-                    m_log.InfoFormat(
-                        "[LOGIN BEGIN]: XMLRPC Received login request message from user '{0}' '{1}'",
-                        firstname, lastname);
-                    string clientVersion = "Unknown";
-                    if (requestData.Contains("version"))
-                    {
-                        clientVersion = (string)requestData["version"];
-                    }
-                    m_log.DebugFormat(
-                        "[LOGIN]: XMLRPC Client is {0}, start location is {1}", clientVersion, startLocationRequest);
-                    if (!TryAuthenticateXmlRpcLogin(request, firstname, lastname, out userProfile))
-                    {
-                        return logResponse.CreateLoginFailedResponse();
-                    }
-                }
-                else
-                {
-                    m_log.Info(
-                        "[LOGIN END]: XMLRPC login_to_simulator login message did not contain all the required data");
-                    return logResponse.CreateGridErrorResponse();
-                }
-                if (userProfile.GodLevel < m_minLoginLevel)
-                {
-                    return logResponse.CreateLoginBlockedResponse();
-                }
-                else
-                {
-                    // If we already have a session...
-                    if (userProfile.CurrentAgent != null && userProfile.CurrentAgent.AgentOnline)
-                    {
-                        //TODO: The following statements can cause trouble:
-                        //      If agentOnline could not turn from true back to false normally
-                        //      because of some problem, for instance, the crashment of server or client,
-                        //      the user cannot log in any longer.
-                        userProfile.CurrentAgent.AgentOnline = false;
-                        m_userManager.CommitAgent(ref userProfile);
-                        // try to tell the region that their user is dead.
-                        LogOffUser(userProfile, " XMLRPC You were logged off because you logged in from another location");
-                        if (m_warn_already_logged)
-                        {
-                            // This is behavior for for grid, reject login
-                            m_log.InfoFormat(
-                                "[LOGIN END]: XMLRPC Notifying user {0} {1} that they are already logged in",
-                                firstname, lastname);
-                            return logResponse.CreateAlreadyLoggedInResponse();
-                        }
-                        else
-                        {
-                            // This is behavior for standalone (silent logout of last hung session)
-                            m_log.InfoFormat(
-                                "[LOGIN]: XMLRPC User {0} {1} is already logged in, not notifying user, kicking old presence and starting new login.",
-                                firstname, lastname);
-                        }
-                    }
-                    // Otherwise...
-                    // Create a new agent session
-                    // XXYY we don't need this
-                    //m_userManager.ResetAttachments(userProfile.ID);
-                    CreateAgent(userProfile, request);
-                    // We need to commit the agent right here, even though the userProfile info is not complete
-                    // at this point. There is another commit further down.
-                    // This is for the new sessionID to be stored so that the region can check it for session authentication. 
-                    // CustomiseResponse->PrepareLoginToRegion
-                    CommitAgent(ref userProfile);
-                    try
-                    {
-                        UUID agentID = userProfile.ID;
-                        InventoryData inventData = null;
-                        try
-                        {
-                            inventData = GetInventorySkeleton(agentID);
-                        }
-                        catch (Exception e)
-                        {
-                            m_log.ErrorFormat(
-                                "[LOGIN END]: Error retrieving inventory skeleton of agent {0} - {1}",
-                                agentID, e);
-                            // Let's not panic
-                            if (!AllowLoginWithoutInventory())
-                                return logResponse.CreateLoginInventoryFailedResponse();
-                        }
-                        if (inventData != null)
-                        {
-                            ArrayList AgentInventoryArray = inventData.InventoryArray;
-                            Hashtable InventoryRootHash = new Hashtable();
-                            InventoryRootHash["folder_id"] = inventData.RootFolderID.ToString();
-                            ArrayList InventoryRoot = new ArrayList();
-                            InventoryRoot.Add(InventoryRootHash);
-                            logResponse.InventoryRoot = InventoryRoot;
-                            logResponse.InventorySkeleton = AgentInventoryArray;
-                        }
-                        // Inventory Library Section
-                        Hashtable InventoryLibRootHash = new Hashtable();
-                        InventoryLibRootHash["folder_id"] = "00000112-000f-0000-0000-000100bba000";
-                        ArrayList InventoryLibRoot = new ArrayList();
-                        InventoryLibRoot.Add(InventoryLibRootHash);
-                        logResponse.InventoryLibRoot = InventoryLibRoot;
-                        logResponse.InventoryLibraryOwner = GetLibraryOwner();
-                        logResponse.InventoryLibrary = GetInventoryLibrary();
-                        logResponse.CircuitCode = Util.RandomClass.Next();
-                        logResponse.Lastname = userProfile.SurName;
-                        logResponse.Firstname = userProfile.FirstName;
-                        logResponse.AgentID = agentID;
-                        logResponse.SessionID = userProfile.CurrentAgent.SessionID;
-                        logResponse.SecureSessionID = userProfile.CurrentAgent.SecureSessionID;
-                        logResponse.Message = GetMessage();
-                        logResponse.BuddList = ConvertFriendListItem(m_userManager.GetUserFriendList(agentID));
-                        logResponse.StartLocation = startLocationRequest;
-                        if (CustomiseResponse(logResponse, userProfile, startLocationRequest, remoteClient))
-                        {
-                            userProfile.LastLogin = userProfile.CurrentAgent.LoginTime;
-                            CommitAgent(ref userProfile);
-                            // If we reach this point, then the login has successfully logged onto the grid
-                            if (StatsManager.UserStats != null)
-                                StatsManager.UserStats.AddSuccessfulLogin();
-                            m_log.DebugFormat(
-                                "[LOGIN END]: XMLRPC Authentication of user {0} {1} successful.  Sending response to client.",
-                                firstname, lastname);
-                            return logResponse.ToXmlRpcResponse();
-                        }
-                        else
-                        {
-                            m_log.ErrorFormat("[LOGIN END]: XMLRPC informing user {0} {1} that login failed due to an unavailable region", firstname, lastname);
-                            return logResponse.CreateDeadRegionResponse();
-                        }
-                    }
-                    catch (Exception e)
-                    {
-                        m_log.Error("[LOGIN END]: XMLRPC Login failed, " + e);
-                        m_log.Error(e.StackTrace);
-                    }
-                }
-                m_log.Info("[LOGIN END]: XMLRPC Login failed.  Sending back blank XMLRPC response");
-                return response;
-            }
-            finally
-            {
-                m_loginMutex.ReleaseMutex();
-            }
-        }
-        protected virtual bool TryAuthenticateXmlRpcLogin(
-            XmlRpcRequest request, string firstname, string lastname, out UserProfileData userProfile)
-        {
-            Hashtable requestData = (Hashtable)request.Params[0];
-            userProfile = GetTheUser(firstname, lastname);
-            if (userProfile == null)
-            {
-                m_log.Debug("[LOGIN END]: XMLRPC Could not find a profile for " + firstname + " " + lastname);
-                return false;
-            }
-            else
-            {
-                if (requestData.Contains("passwd"))
-                {
-                    string passwd = (string)requestData["passwd"];
-                    bool authenticated = AuthenticateUser(userProfile, passwd);
-                    if (!authenticated)
-                        m_log.DebugFormat("[LOGIN END]: XMLRPC User {0} {1} failed password authentication",
-                            firstname, lastname);
-                    return authenticated;
-                }
-                
-                if (requestData.Contains("web_login_key"))
-                {
-                    try
-                    {
-                        UUID webloginkey = new UUID((string)requestData["web_login_key"]);
-                        bool authenticated = AuthenticateUser(userProfile, webloginkey);
-                        if (!authenticated)
-                            m_log.DebugFormat("[LOGIN END]: XMLRPC User {0} {1} failed web login key authentication",
-                                firstname, lastname);
-                        return authenticated;
-                    }
-                    catch (Exception e)
-                    {
-                        m_log.DebugFormat(
-                            "[LOGIN END]: XMLRPC Bad web_login_key: {0} for user {1} {2}, exception {3}",
-                            requestData["web_login_key"], firstname, lastname, e);
-                        return false;
-                    }
-                }
-                m_log.DebugFormat(
-                    "[LOGIN END]: XMLRPC login request for {0} {1} contained neither a password nor a web login key",
-                    firstname, lastname);
-            }
-            return false;
-        }
-        protected virtual bool TryAuthenticateLLSDLogin(string firstname, string lastname, string passwd, out UserProfileData userProfile)
-        {
-            bool GoodLogin = false;
-            userProfile = GetTheUser(firstname, lastname);
-            if (userProfile == null)
-            {
-                m_log.Info("[LOGIN]: LLSD Could not find a profile for " + firstname + " " + lastname);
-                return false;
-            }
-            GoodLogin = AuthenticateUser(userProfile, passwd);
-            return GoodLogin;
-        }
-        /// <summary>
-        /// Called when we receive the client's initial LLSD login_to_simulator request message
-        /// </summary>
-        /// <param name="request">The LLSD request</param>
-        /// <returns>The response to send</returns>
-        public OSD LLSDLoginMethod(OSD request, IPEndPoint remoteClient)
-        {
-            // Temporary fix
-            m_loginMutex.WaitOne();
-            try
-            {
-                // bool GoodLogin = false;
-                string startLocationRequest = "last";
-                UserProfileData userProfile = null;
-                LoginResponse logResponse = new LoginResponse();
-                if (request.Type == OSDType.Map)
-                {
-                    OSDMap map = (OSDMap)request;
-                    if (map.ContainsKey("first") && map.ContainsKey("last") && map.ContainsKey("passwd"))
-                    {
-                        string firstname = map["first"].AsString();
-                        string lastname = map["last"].AsString();
-                        string passwd = map["passwd"].AsString();
-                        if (map.ContainsKey("start"))
-                        {
-                            m_log.Info("[LOGIN]: LLSD StartLocation Requested: " + map["start"].AsString());
-                            startLocationRequest = map["start"].AsString();
-                        }
-                        m_log.Info("[LOGIN]: LLSD Login Requested for: '" + firstname + "' '" + lastname + "' / " + passwd);
-                        if (!TryAuthenticateLLSDLogin(firstname, lastname, passwd, out userProfile))
-                        {
-                            return logResponse.CreateLoginFailedResponseLLSD();
-                        }
-                    }
-                    else
-                        return logResponse.CreateLoginFailedResponseLLSD();
-                }
-                else
-                    return logResponse.CreateLoginFailedResponseLLSD();
-                if (userProfile.GodLevel < m_minLoginLevel)
-                {
-                    return logResponse.CreateLoginBlockedResponseLLSD();
-                }
-                else
-                {
-                    // If we already have a session...
-                    if (userProfile.CurrentAgent != null && userProfile.CurrentAgent.AgentOnline)
-                    {
-                        userProfile.CurrentAgent.AgentOnline = false;
-                        m_userManager.CommitAgent(ref userProfile);
-                        // try to tell the region that their user is dead.
-                        LogOffUser(userProfile, " LLSD You were logged off because you logged in from another location");
-                        if (m_warn_already_logged)
-                        {
-                            // This is behavior for for grid, reject login
-                            m_log.InfoFormat(
-                                "[LOGIN END]:  LLSD Notifying user {0} {1} that they are already logged in",
-                                userProfile.FirstName, userProfile.SurName);
-                            userProfile.CurrentAgent = null;
-                            return logResponse.CreateAlreadyLoggedInResponseLLSD();
-                        }
-                        else
-                        {
-                            // This is behavior for standalone (silent logout of last hung session)
-                            m_log.InfoFormat(
-                                "[LOGIN]: LLSD User {0} {1} is already logged in, not notifying user, kicking old presence and starting new login.",
-                                userProfile.FirstName, userProfile.SurName);
-                        }
-                    }
-                    // Otherwise...
-                    // Create a new agent session
-                    // XXYY We don't need this
-                    //m_userManager.ResetAttachments(userProfile.ID);
-                    CreateAgent(userProfile, request);
-                    // We need to commit the agent right here, even though the userProfile info is not complete
-                    // at this point. There is another commit further down.
-                    // This is for the new sessionID to be stored so that the region can check it for session authentication. 
-                    // CustomiseResponse->PrepareLoginToRegion
-                    CommitAgent(ref userProfile);
-                    try
-                    {
-                        UUID agentID = userProfile.ID;
-                        //InventoryData inventData = GetInventorySkeleton(agentID);
-                        InventoryData inventData = null;
-                        try
-                        {
-                            inventData = GetInventorySkeleton(agentID);
-                        }
-                        catch (Exception e)
-                        {
-                            m_log.ErrorFormat(
-                                "[LOGIN END]:  LLSD Error retrieving inventory skeleton of agent {0}, {1} - {2}",
-                                agentID, e.GetType(), e.Message);
-                            return logResponse.CreateLoginFailedResponseLLSD();//  .CreateLoginInventoryFailedResponseLLSD ();
-                        }
-                        ArrayList AgentInventoryArray = inventData.InventoryArray;
-                        Hashtable InventoryRootHash = new Hashtable();
-                        InventoryRootHash["folder_id"] = inventData.RootFolderID.ToString();
-                        ArrayList InventoryRoot = new ArrayList();
-                        InventoryRoot.Add(InventoryRootHash);
-                        // Inventory Library Section
-                        Hashtable InventoryLibRootHash = new Hashtable();
-                        InventoryLibRootHash["folder_id"] = "00000112-000f-0000-0000-000100bba000";
-                        ArrayList InventoryLibRoot = new ArrayList();
-                        InventoryLibRoot.Add(InventoryLibRootHash);
-                        logResponse.InventoryLibRoot = InventoryLibRoot;
-                        logResponse.InventoryLibraryOwner = GetLibraryOwner();
-                        logResponse.InventoryRoot = InventoryRoot;
-                        logResponse.InventorySkeleton = AgentInventoryArray;
-                        logResponse.InventoryLibrary = GetInventoryLibrary();
-                        logResponse.CircuitCode = (Int32)Util.RandomClass.Next();
-                        logResponse.Lastname = userProfile.SurName;
-                        logResponse.Firstname = userProfile.FirstName;
-                        logResponse.AgentID = agentID;
-                        logResponse.SessionID = userProfile.CurrentAgent.SessionID;
-                        logResponse.SecureSessionID = userProfile.CurrentAgent.SecureSessionID;
-                        logResponse.Message = GetMessage();
-                        logResponse.BuddList = ConvertFriendListItem(m_userManager.GetUserFriendList(agentID));
-                        logResponse.StartLocation = startLocationRequest;
-                        try
-                        {
-                            CustomiseResponse(logResponse, userProfile, startLocationRequest, remoteClient);
-                        }
-                        catch (Exception ex)
-                        {
-                            m_log.Info("[LOGIN]:  LLSD " + ex.ToString());
-                            return logResponse.CreateDeadRegionResponseLLSD();
-                        }
-                        userProfile.LastLogin = userProfile.CurrentAgent.LoginTime;
-                        CommitAgent(ref userProfile);
-                        // If we reach this point, then the login has successfully logged onto the grid
-                        if (StatsManager.UserStats != null)
-                            StatsManager.UserStats.AddSuccessfulLogin();
-                        m_log.DebugFormat(
-                            "[LOGIN END]:  LLSD Authentication of user {0} {1} successful.  Sending response to client.",
-                            userProfile.FirstName, userProfile.SurName);
-                        return logResponse.ToLLSDResponse();
-                    }
-                    catch (Exception ex)
-                    {
-                        m_log.Info("[LOGIN]:  LLSD " + ex.ToString());
-                        return logResponse.CreateFailedResponseLLSD();
-                    }
-                }
-            }
-            finally
-            {
-                m_loginMutex.ReleaseMutex();
-            }
-        }
-        public Hashtable ProcessHTMLLogin(Hashtable keysvals)
-        {
-            // Matches all unspecified characters
-            // Currently specified,; lowercase letters, upper case letters, numbers, underline
-            //    period, space, parens, and dash.
-            Regex wfcut = new Regex("[^a-zA-Z0-9_\\.\\$ \\(\\)\\-]");
-            Hashtable returnactions = new Hashtable();
-            int statuscode = 200;
-            string firstname = String.Empty;
-            string lastname = String.Empty;
-            string location = String.Empty;
-            string region = String.Empty;
-            string grid = String.Empty;
-            string channel = String.Empty;
-            string version = String.Empty;
-            string lang = String.Empty;
-            string password = String.Empty;
-            string errormessages = String.Empty;
-            // the client requires the HTML form field be named 'username'
-            // however, the data it sends when it loads the first time is 'firstname'
-            // another one of those little nuances.
-            if (keysvals.Contains("firstname"))
-                firstname = wfcut.Replace((string)keysvals["firstname"], String.Empty, 99999);
-            if (keysvals.Contains("username"))
-                firstname = wfcut.Replace((string)keysvals["username"], String.Empty, 99999);
-            if (keysvals.Contains("lastname"))
-                lastname = wfcut.Replace((string)keysvals["lastname"], String.Empty, 99999);
-            if (keysvals.Contains("location"))
-                location = wfcut.Replace((string)keysvals["location"], String.Empty, 99999);
-            if (keysvals.Contains("region"))
-                region = wfcut.Replace((string)keysvals["region"], String.Empty, 99999);
-            if (keysvals.Contains("grid"))
-                grid = wfcut.Replace((string)keysvals["grid"], String.Empty, 99999);
-            if (keysvals.Contains("channel"))
-                channel = wfcut.Replace((string)keysvals["channel"], String.Empty, 99999);
-            if (keysvals.Contains("version"))
-                version = wfcut.Replace((string)keysvals["version"], String.Empty, 99999);
-            if (keysvals.Contains("lang"))
-                lang = wfcut.Replace((string)keysvals["lang"], String.Empty, 99999);
-            if (keysvals.Contains("password"))
-                password = wfcut.Replace((string)keysvals["password"], String.Empty, 99999);
-            // load our login form.
-            string loginform = GetLoginForm(firstname, lastname, location, region, grid, channel, version, lang, password, errormessages);
-            if (keysvals.ContainsKey("show_login_form"))
-            {
-                UserProfileData user = GetTheUser(firstname, lastname);
-                bool goodweblogin = false;
-                if (user != null)
-                    goodweblogin = AuthenticateUser(user, password);
-                if (goodweblogin)
-                {
-                    UUID webloginkey = UUID.Random();
-                    m_userManager.StoreWebLoginKey(user.ID, webloginkey);
-                    //statuscode = 301;
-                    //                    string redirectURL = "about:blank?redirect-http-hack=" +
-                    //                                         HttpUtility.UrlEncode("secondlife:///app/login?first_name=" + firstname + "&last_name=" +
-                    //                                                               lastname +
-                    //                                                               "&location=" + location + "&grid=Other&web_login_key=" + webloginkey.ToString());
-                    //m_log.Info("[WEB]: R:" + redirectURL);
-                    returnactions["int_response_code"] = statuscode;
-                    //returnactions["str_redirect_location"] = redirectURL;
-                    //returnactions["str_response_string"] = "<HTML><BODY>GoodLogin</BODY></HTML>";
-                    returnactions["str_response_string"] = webloginkey.ToString();
-                }
-                else
-                {
-                    errormessages = "The Username and password supplied did not match our records. Check your caps lock and try again";
-                    loginform = GetLoginForm(firstname, lastname, location, region, grid, channel, version, lang, password, errormessages);
-                    returnactions["int_response_code"] = statuscode;
-                    returnactions["str_response_string"] = loginform;
-                }
-            }
-            else
-            {
-                returnactions["int_response_code"] = statuscode;
-                returnactions["str_response_string"] = loginform;
-            }
-            return returnactions;
-        }
-        public string GetLoginForm(string firstname, string lastname, string location, string region,
-                                   string grid, string channel, string version, string lang,
-                                   string password, string errormessages)
-        {
-            // inject our values in the form at the markers
-            string loginform = String.Empty;
-            string file = Path.Combine(Util.configDir(), "http_loginform.html");
-            if (!File.Exists(file))
-            {
-                loginform = GetDefaultLoginForm();
-            }
-            else
-            {
-                StreamReader sr = File.OpenText(file);
-                loginform = sr.ReadToEnd();
-                sr.Close();
-            }
-            loginform = loginform.Replace("[$firstname]", firstname);
-            loginform = loginform.Replace("[$lastname]", lastname);
-            loginform = loginform.Replace("[$location]", location);
-            loginform = loginform.Replace("[$region]", region);
-            loginform = loginform.Replace("[$grid]", grid);
-            loginform = loginform.Replace("[$channel]", channel);
-            loginform = loginform.Replace("[$version]", version);
-            loginform = loginform.Replace("[$lang]", lang);
-            loginform = loginform.Replace("[$password]", password);
-            loginform = loginform.Replace("[$errors]", errormessages);
-            return loginform;
-        }
-        public string GetDefaultLoginForm()
-        {
-            string responseString =
-                "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">";
-            responseString += "<html xmlns=\"http://www.w3.org/1999/xhtml\">";
-            responseString += "<head>";
-            responseString += "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />";
-            responseString += "<meta http-equiv=\"cache-control\" content=\"no-cache\">";
-            responseString += "<meta http-equiv=\"Pragma\" content=\"no-cache\">";
-            responseString += "<title>OpenSim Login</title>";
-            responseString += "<body><br />";
-            responseString += "<div id=\"login_box\">";
-            responseString += "<form action=\"/go.cgi\" method=\"GET\" id=\"login-form\">";
-            responseString += "<div id=\"message\">[$errors]</div>";
-            responseString += "<fieldset id=\"firstname\">";
-            responseString += "<legend>First Name:</legend>";
-            responseString += "<input type=\"text\" id=\"firstname_input\" size=\"15\" maxlength=\"100\" name=\"username\" value=\"[$firstname]\" />";
-            responseString += "</fieldset>";
-            responseString += "<fieldset id=\"lastname\">";
-            responseString += "<legend>Last Name:</legend>";
-            responseString += "<input type=\"text\" size=\"15\" maxlength=\"100\" name=\"lastname\" value=\"[$lastname]\" />";
-            responseString += "</fieldset>";
-            responseString += "<fieldset id=\"password\">";
-            responseString += "<legend>Password:</legend>";
-            responseString += "<table cellspacing=\"0\" cellpadding=\"0\" border=\"0\">";
-            responseString += "<tr>";
-            responseString += "<td colspan=\"2\"><input type=\"password\" size=\"15\" maxlength=\"100\" name=\"password\" value=\"[$password]\" /></td>";
-            responseString += "</tr>";
-            responseString += "<tr>";
-            responseString += "<td valign=\"middle\"><input type=\"checkbox\" name=\"remember_password\" id=\"remember_password\" [$remember_password] style=\"margin-left:0px;\"/></td>";
-            responseString += "<td><label for=\"remember_password\">Remember password</label></td>";
-            responseString += "</tr>";
-            responseString += "</table>";
-            responseString += "</fieldset>";
-            responseString += "<input type=\"hidden\" name=\"show_login_form\" value=\"FALSE\" />";
-            responseString += "<input type=\"hidden\" name=\"method\" value=\"login\" />";
-            responseString += "<input type=\"hidden\" id=\"grid\" name=\"grid\" value=\"[$grid]\" />";
-            responseString += "<input type=\"hidden\" id=\"region\" name=\"region\" value=\"[$region]\" />";
-            responseString += "<input type=\"hidden\" id=\"location\" name=\"location\" value=\"[$location]\" />";
-            responseString += "<input type=\"hidden\" id=\"channel\" name=\"channel\" value=\"[$channel]\" />";
-            responseString += "<input type=\"hidden\" id=\"version\" name=\"version\" value=\"[$version]\" />";
-            responseString += "<input type=\"hidden\" id=\"lang\" name=\"lang\" value=\"[$lang]\" />";
-            responseString += "<div id=\"submitbtn\">";
-            responseString += "<input class=\"input_over\" type=\"submit\" value=\"Connect\" />";
-            responseString += "</div>";
-            responseString += "<div id=\"connecting\" style=\"visibility:hidden\"> Connecting...</div>";
-            responseString += "<div id=\"helplinks\"><!---";
-            responseString += "<a href=\"#join now link\" target=\"_blank\"></a> | ";
-            responseString += "<a href=\"#forgot password link\" target=\"_blank\"></a>";
-            responseString += "---></div>";
-            responseString += "<div id=\"channelinfo\"> [$channel] | [$version]=[$lang]</div>";
-            responseString += "</form>";
-            responseString += "<script language=\"JavaScript\">";
-            responseString += "document.getElementById('firstname_input').focus();";
-            responseString += "</script>";
-            responseString += "</div>";
-            responseString += "</div>";
-            responseString += "</body>";
-            responseString += "</html>";
-            return responseString;
-        }
-        /// <summary>
-        /// Saves a target agent to the database
-        /// </summary>
-        /// <param name="profile">The users profile</param>
-        /// <returns>Successful?</returns>
-        public bool CommitAgent(ref UserProfileData profile)
-        {
-            return m_userManager.CommitAgent(ref profile);
-        }
-        /// <summary>
-        /// Checks a user against it's password hash
-        /// </summary>
-        /// <param name="profile">The users profile</param>
-        /// <param name="password">The supplied password</param>
-        /// <returns>Authenticated?</returns>
-        public virtual bool AuthenticateUser(UserProfileData profile, string password)
-        {
-            bool passwordSuccess = false;
-            //m_log.InfoFormat("[LOGIN]: Authenticating {0} {1} ({2})", profile.FirstName, profile.SurName, profile.ID);
-            // Web Login method seems to also occasionally send the hashed password itself
-            // we do this to get our hash in a form that the server password code can consume
-            // when the web-login-form submits the password in the clear (supposed to be over SSL!)
-            if (!password.StartsWith("$1$"))
-                password = "$1$" + Util.Md5Hash(password);
-            password = password.Remove(0, 3); //remove $1$
-            string s = Util.Md5Hash(password + ":" + profile.PasswordSalt);
-            // Testing...
-            //m_log.Info("[LOGIN]: SubHash:" + s + " userprofile:" + profile.passwordHash);
-            //m_log.Info("[LOGIN]: userprofile:" + profile.passwordHash + " SubCT:" + password);
-            passwordSuccess = (profile.PasswordHash.Equals(s.ToString(), StringComparison.InvariantCultureIgnoreCase)
-                               || profile.PasswordHash.Equals(password, StringComparison.InvariantCulture));
-            
-            return passwordSuccess;
-        }
-        public virtual bool AuthenticateUser(UserProfileData profile, UUID webloginkey)
-        {
-            bool passwordSuccess = false;
-            m_log.InfoFormat("[LOGIN]: Authenticating {0} {1} ({2})", profile.FirstName, profile.SurName, profile.ID);
-            // Match web login key unless it's the default weblogin key UUID.Zero
-            passwordSuccess = ((profile.WebLoginKey == webloginkey) && profile.WebLoginKey != UUID.Zero);
-            return passwordSuccess;
-        }
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="profile"></param>
-        /// <param name="request"></param>
-        public void CreateAgent(UserProfileData profile, XmlRpcRequest request)
-        {
-            m_userManager.CreateAgent(profile, request);
-        }
-        public void CreateAgent(UserProfileData profile, OSD request)
-        {
-            m_userManager.CreateAgent(profile, request);
-        }
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="firstname"></param>
-        /// <param name="lastname"></param>
-        /// <returns></returns>
-        public virtual UserProfileData GetTheUser(string firstname, string lastname)
-        {
-            return m_userManager.GetUserProfile(firstname, lastname);
-        }
-        /// <summary>
-        ///
-        /// </summary>
-        /// <returns></returns>
-        public virtual string GetMessage()
-        {
-            return m_welcomeMessage;
-        }
-        private static LoginResponse.BuddyList ConvertFriendListItem(List<FriendListItem> LFL)
-        {
-            LoginResponse.BuddyList buddylistreturn = new LoginResponse.BuddyList();
-            foreach (FriendListItem fl in LFL)
-            {
-                LoginResponse.BuddyList.BuddyInfo buddyitem = new LoginResponse.BuddyList.BuddyInfo(fl.Friend);
-                buddyitem.BuddyID = fl.Friend;
-                buddyitem.BuddyRightsHave = (int)fl.FriendListOwnerPerms;
-                buddyitem.BuddyRightsGiven = (int)fl.FriendPerms;
-                buddylistreturn.AddNewBuddy(buddyitem);
-            }
-            return buddylistreturn;
-        }
-        /// <summary>
-        /// Converts the inventory library skeleton into the form required by the rpc request.
-        /// </summary>
-        /// <returns></returns>
-        protected virtual ArrayList GetInventoryLibrary()
-        {
-            Dictionary<UUID, InventoryFolderImpl> rootFolders
-                = m_libraryRootFolder.RequestSelfAndDescendentFolders();
-            ArrayList folderHashes = new ArrayList();
-            foreach (InventoryFolderBase folder in rootFolders.Values)
-            {
-                Hashtable TempHash = new Hashtable();
-                TempHash["name"] = folder.Name;
-                TempHash["parent_id"] = folder.ParentID.ToString();
-                TempHash["version"] = (Int32)folder.Version;
-                TempHash["type_default"] = (Int32)folder.Type;
-                TempHash["folder_id"] = folder.ID.ToString();
-                folderHashes.Add(TempHash);
-            }
-            return folderHashes;
-        }
-        /// <summary>
-        ///
-        /// </summary>
-        /// <returns></returns>
-        protected virtual ArrayList GetLibraryOwner()
-        {
-            //for now create random inventory library owner
-            Hashtable TempHash = new Hashtable();
-            TempHash["agent_id"] = "11111111-1111-0000-0000-000100bba000";
-            ArrayList inventoryLibOwner = new ArrayList();
-            inventoryLibOwner.Add(TempHash);
-            return inventoryLibOwner;
-        }
-        public class InventoryData
-        {
-            public ArrayList InventoryArray = null;
-            public UUID RootFolderID = UUID.Zero;
-            public InventoryData(ArrayList invList, UUID rootID)
-            {
-                InventoryArray = invList;
-                RootFolderID = rootID;
-            }
-        }
-        protected void SniffLoginKey(Uri uri, Hashtable requestData)
-        {
-            string uri_str = uri.ToString();
-            string[] parts = uri_str.Split(new char[] { '=' });
-            if (parts.Length > 1)
-            {
-                string web_login_key = parts[1];
-                requestData.Add("web_login_key", web_login_key);
-                m_log.InfoFormat("[LOGIN]: Login with web_login_key {0}", web_login_key);
-            }
-        }
-        /// <summary>
-        /// Customises the login response and fills in missing values.  This method also tells the login region to
-        /// expect a client connection.
-        /// </summary>
-        /// <param name="response">The existing response</param>
-        /// <param name="theUser">The user profile</param>
-        /// <param name="startLocationRequest">The requested start location</param>
-        /// <returns>true on success, false if the region was not successfully told to expect a user connection</returns>
-        public bool CustomiseResponse(LoginResponse response, UserProfileData theUser, string startLocationRequest, IPEndPoint client)
-        {
-            // add active gestures to login-response
-            AddActiveGestures(response, theUser);
-            // HomeLocation
-            RegionInfo homeInfo = null;
-            // use the homeRegionID if it is stored already. If not, use the regionHandle as before
-            UUID homeRegionId = theUser.HomeRegionID;
-            ulong homeRegionHandle = theUser.HomeRegion;
-            if (homeRegionId != UUID.Zero)
-            {
-                homeInfo = GetRegionInfo(homeRegionId);
-            }
-            else
-            {
-                homeInfo = GetRegionInfo(homeRegionHandle);
-            }
-            if (homeInfo != null)
-            {
-                response.Home =
-                    string.Format(
-                        "{{'region_handle':[r{0},r{1}], 'position':[r{2},r{3},r{4}], 'look_at':[r{5},r{6},r{7}]}}",
-                        (homeInfo.RegionLocX * Constants.RegionSize),
-                        (homeInfo.RegionLocY * Constants.RegionSize),
-                        theUser.HomeLocation.X, theUser.HomeLocation.Y, theUser.HomeLocation.Z,
-                        theUser.HomeLookAt.X, theUser.HomeLookAt.Y, theUser.HomeLookAt.Z);
-            }
-            else
-            {
-                m_log.InfoFormat("not found the region at {0} {1}", theUser.HomeRegionX, theUser.HomeRegionY);
-                // Emergency mode: Home-region isn't available, so we can't request the region info.
-                // Use the stored home regionHandle instead.
-                // NOTE: If the home-region moves, this will be wrong until the users update their user-profile again
-                ulong regionX = homeRegionHandle >> 32;
-                ulong regionY = homeRegionHandle & 0xffffffff;
-                response.Home =
-                    string.Format(
-                        "{{'region_handle':[r{0},r{1}], 'position':[r{2},r{3},r{4}], 'look_at':[r{5},r{6},r{7}]}}",
-                        regionX, regionY,
-                        theUser.HomeLocation.X, theUser.HomeLocation.Y, theUser.HomeLocation.Z,
-                        theUser.HomeLookAt.X, theUser.HomeLookAt.Y, theUser.HomeLookAt.Z);
-                m_log.InfoFormat("[LOGIN] Home region of user {0} {1} is not available; using computed region position {2} {3}",
-                                 theUser.FirstName, theUser.SurName,
-                                 regionX, regionY);
-            }
-            // StartLocation
-            RegionInfo regionInfo = null;
-            if (startLocationRequest == "home")
-            {
-                regionInfo = homeInfo;
-                theUser.CurrentAgent.Position = theUser.HomeLocation;
-                response.LookAt = String.Format("[r{0},r{1},r{2}]", theUser.HomeLookAt.X.ToString(), 
-                                                theUser.HomeLookAt.Y.ToString(), theUser.HomeLookAt.Z.ToString());
-            }
-            else if (startLocationRequest == "last")
-            {
-                UUID lastRegion = theUser.CurrentAgent.Region;
-                regionInfo = GetRegionInfo(lastRegion);
-                response.LookAt = String.Format("[r{0},r{1},r{2}]", theUser.CurrentAgent.LookAt.X.ToString(),
-                                                theUser.CurrentAgent.LookAt.Y.ToString(), theUser.CurrentAgent.LookAt.Z.ToString());
-            }
-            else
-            {
-                Regex reURI = new Regex(@"^uri:(?<region>[^&]+)&(?<x>\d+)&(?<y>\d+)&(?<z>\d+)$");
-                Match uriMatch = reURI.Match(startLocationRequest);
-                if (uriMatch == null)
-                {
-                    m_log.InfoFormat("[LOGIN]: Got Custom Login URL {0}, but can't process it", startLocationRequest);
-                }
-                else
-                {
-                    string region = uriMatch.Groups["region"].ToString();
-                    regionInfo = RequestClosestRegion(region);
-                    if (regionInfo == null)
-                    {
-                        m_log.InfoFormat("[LOGIN]: Got Custom Login URL {0}, can't locate region {1}", startLocationRequest, region);
-                    }
-                    else
-                    {
-                        theUser.CurrentAgent.Position = new Vector3(float.Parse(uriMatch.Groups["x"].Value, Culture.NumberFormatInfo),
-                                                                    float.Parse(uriMatch.Groups["y"].Value, Culture.NumberFormatInfo), float.Parse(uriMatch.Groups["z"].Value, Culture.NumberFormatInfo));
-                    }
-                }
-                response.LookAt = "[r0,r1,r0]";
-                // can be: last, home, safe, url
-                response.StartLocation = "url";
-            }
-            if ((regionInfo != null) && (PrepareLoginToRegion(regionInfo, theUser, response, client)))
-            {
-                return true;
-            }
-            // Get the default region handle
-            ulong defaultHandle = Utils.UIntsToLong(m_defaultHomeX * Constants.RegionSize, m_defaultHomeY * Constants.RegionSize);
-            // If we haven't already tried the default region, reset regionInfo
-            if (regionInfo != null && defaultHandle != regionInfo.RegionHandle)
-                regionInfo = null;
-            if (regionInfo == null)
-            {
-                m_log.Error("[LOGIN]: Sending user to default region " + defaultHandle + " instead");
-                regionInfo = GetRegionInfo(defaultHandle);
-            }
-            if (regionInfo == null)
-            {
-                m_log.ErrorFormat("[LOGIN]: Sending user to any region");
-                regionInfo = RequestClosestRegion(String.Empty);
-            }
-            theUser.CurrentAgent.Position = new Vector3(128f, 128f, 0f);
-            response.StartLocation = "safe";
-            return PrepareLoginToRegion(regionInfo, theUser, response, client);
-        }
-        protected abstract RegionInfo RequestClosestRegion(string region);
-        protected abstract RegionInfo GetRegionInfo(ulong homeRegionHandle);
-        protected abstract RegionInfo GetRegionInfo(UUID homeRegionId);
-        /// <summary>
-        /// If the user is already logged in, try to notify the region that the user they've got is dead.
-        /// </summary>
-        /// <param name="theUser"></param>
-        public abstract void LogOffUser(UserProfileData theUser, string message);
-        /// <summary>
-        /// Prepare a login to the given region.  This involves both telling the region to expect a connection
-        /// and appropriately customising the response to the user.
-        /// </summary>
-        /// <param name="sim"></param>
-        /// <param name="user"></param>
-        /// <param name="response"></param>
-        /// <param name="remoteClient"></param>
-        /// <returns>true if the region was successfully contacted, false otherwise</returns>
-        protected abstract bool PrepareLoginToRegion(
-            RegionInfo regionInfo, UserProfileData user, LoginResponse response, IPEndPoint client);
-        /// <summary>
-        /// Add active gestures of the user to the login response.
-        /// </summary>
-        /// <param name="response">
-        /// A <see cref="LoginResponse"/>
-        /// </param>
-        /// <param name="theUser">
-        /// A <see cref="UserProfileData"/>
-        /// </param>
-        protected void AddActiveGestures(LoginResponse response, UserProfileData theUser)
-        {
-            List<InventoryItemBase> gestures = null;
-            try
-            {
-                if (m_InventoryService != null)
-                    gestures = m_InventoryService.GetActiveGestures(theUser.ID);
-                else
-                    gestures = m_interInventoryService.GetActiveGestures(theUser.ID);
-            }
-            catch (Exception e)
-            {
-                m_log.Debug("[LOGIN]: Unable to retrieve active gestures from inventory server. Reason: " + e.Message);
-            }
-            //m_log.DebugFormat("[LOGIN]: AddActiveGestures, found {0}", gestures == null ? 0 : gestures.Count);
-            ArrayList list = new ArrayList();
-            if (gestures != null)
-            {
-                foreach (InventoryItemBase gesture in gestures)
-                {
-                    Hashtable item = new Hashtable();
-                    item["item_id"] = gesture.ID.ToString();
-                    item["asset_id"] = gesture.AssetID.ToString();
-                    list.Add(item);
-                }
-            }
-            response.ActiveGestures = list;
-        }
-        /// <summary>
-        /// Get the initial login inventory skeleton (in other words, the folder structure) for the given user.
-        /// </summary>
-        /// <param name="userID"></param>
-        /// <returns></returns>
-        /// <exception cref='System.Exception'>This will be thrown if there is a problem with the inventory service</exception>
-        protected InventoryData GetInventorySkeleton(UUID userID)
-        {
-            List<InventoryFolderBase> folders = null;
-            if (m_InventoryService != null)
-            {
-                folders = m_InventoryService.GetInventorySkeleton(userID);
-            }
-            else
-            {
-                folders = m_interInventoryService.GetInventorySkeleton(userID);
-            }
-            // If we have user auth but no inventory folders for some reason, create a new set of folders.
-            if (folders == null || folders.Count == 0)
-            {
-                m_log.InfoFormat(
-                    "[LOGIN]: A root inventory folder for user {0} was not found.  Requesting creation.", userID);
-                // Although the create user function creates a new agent inventory along with a new user profile, some
-                // tools are creating the user profile directly in the database without creating the inventory.  At
-                // this time we'll accomodate them by lazily creating the user inventory now if it doesn't already
-                // exist.
-                if (m_interInventoryService != null)
-                {
-                    if (!m_interInventoryService.CreateNewUserInventory(userID))
-                    {
-                        throw new Exception(
-                            String.Format(
-                                "The inventory creation request for user {0} did not succeed."
-                                + "  Please contact your inventory service provider for more information.",
-                                userID));
-                    }
-                }
-                else if ((m_InventoryService != null) && !m_InventoryService.CreateUserInventory(userID))
-                {
-                    throw new Exception(
-                        String.Format(
-                            "The inventory creation request for user {0} did not succeed."
-                            + "  Please contact your inventory service provider for more information.",
-                            userID));
-                }
-                m_log.InfoFormat("[LOGIN]: A new inventory skeleton was successfully created for user {0}", userID);
-                if (m_InventoryService != null)
-                    folders = m_InventoryService.GetInventorySkeleton(userID);
-                else
-                    folders = m_interInventoryService.GetInventorySkeleton(userID);
-                if (folders == null || folders.Count == 0)
-                {
-                    throw new Exception(
-                        String.Format(
-                            "A root inventory folder for user {0} could not be retrieved from the inventory service",
-                            userID));
-                }
-            }
-            UUID rootID = UUID.Zero;
-            ArrayList AgentInventoryArray = new ArrayList();
-            Hashtable TempHash;
-            foreach (InventoryFolderBase InvFolder in folders)
-            {
-                if (InvFolder.ParentID == UUID.Zero)
-                {
-                    rootID = InvFolder.ID;
-                }
-                TempHash = new Hashtable();
-                TempHash["name"] = InvFolder.Name;
-                TempHash["parent_id"] = InvFolder.ParentID.ToString();
-                TempHash["version"] = (Int32)InvFolder.Version;
-                TempHash["type_default"] = (Int32)InvFolder.Type;
-                TempHash["folder_id"] = InvFolder.ID.ToString();
-                AgentInventoryArray.Add(TempHash);
-            }
-            return new InventoryData(AgentInventoryArray, rootID);
-        }
-        protected virtual bool AllowLoginWithoutInventory()
-        {
-            return false;
-        }
-        public XmlRpcResponse XmlRPCCheckAuthSession(XmlRpcRequest request, IPEndPoint remoteClient)
-        {
-            XmlRpcResponse response = new XmlRpcResponse();
-            Hashtable requestData = (Hashtable)request.Params[0];
-            string authed = "FALSE";
-            if (requestData.Contains("avatar_uuid") && requestData.Contains("session_id"))
-            {
-                UUID guess_aid;
-                UUID guess_sid;
-                UUID.TryParse((string)requestData["avatar_uuid"], out guess_aid);
-                if (guess_aid == UUID.Zero)
-                {
-                    return Util.CreateUnknownUserErrorResponse();
-                }
-                
-                UUID.TryParse((string)requestData["session_id"], out guess_sid);
-                if (guess_sid == UUID.Zero)
-                {
-                    return Util.CreateUnknownUserErrorResponse();
-                }
-                
-                if (m_userManager.VerifySession(guess_aid, guess_sid))
-                {
-                    authed = "TRUE";
-                    m_log.InfoFormat("[UserManager]: CheckAuthSession TRUE for user {0}", guess_aid);
-                }
-                else
-                {
-                    m_log.InfoFormat("[UserManager]: CheckAuthSession FALSE");
-                    return Util.CreateUnknownUserErrorResponse();
-                }
-            }
-            
-            Hashtable responseData = new Hashtable();
-            responseData["auth_session"] = authed;
-            response.Value = responseData;
-            return response;
-        }
-    }
-}
-\ No newline at end of file
diff --git a/OpenSim/Framework/Communications/TemporaryUserProfilePlugin.cs b/OpenSim/Framework/Communications/TemporaryUserProfilePlugin.cs
deleted file mode 100644
index 2413055..0000000
--- a/OpenSim/Framework/Communications/TemporaryUserProfilePlugin.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * 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.Generic;
-using System.Reflection;
-using log4net;
-using OpenMetaverse;
-using OpenSim.Data;
-namespace OpenSim.Framework.Communications
-{
-    /// <summary>
-    /// Plugin for managing temporary user profiles.
-    /// </summary>
-    public class TemporaryUserProfilePlugin : IUserDataPlugin
-    {
-        //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
-        protected Dictionary<UUID, UserProfileData> m_profiles = new Dictionary<UUID, UserProfileData>();
-        
-        public string Name { get { return "TemporaryUserProfilePlugin"; } }
-        public string Version { get { return "0.1"; } }
-        public void Initialise() {}
-        public void Initialise(string connect) {}
-        public void Dispose() {}
-        
-        public UserProfileData GetUserByUUID(UUID user)
-        {
-            //m_log.DebugFormat("[TEMP USER PROFILE]: Received request for {0}", user);
-            
-            lock (m_profiles)
-            {
-                if (m_profiles.ContainsKey(user))
-                    return m_profiles[user];
-                else
-                    return null;
-            }
-        }
-        
-        public UserProfileData GetUserByName(string fname, string lname)
-        {
-            // We deliberately don't look up a temporary profile by name so that we don't obscure non-temporary 
-            // profiles.
-            
-            return null;
-        }
-        
-        public virtual void AddTemporaryUserProfile(UserProfileData userProfile)
-        {
-            //m_log.DebugFormat("[TEMP USER PROFILE]: Adding {0} {1}", userProfile.Name, userProfile.ID);
-            
-            lock (m_profiles)
-            {
-                m_profiles[userProfile.ID] = userProfile;
-            }
-        }
-        
-        public UserProfileData GetUserByUri(Uri uri) { return null; }
-        public List<AvatarPickerAvatar> GeneratePickerResults(UUID queryID, string query) { return null; }
-        public UserAgentData GetAgentByUUID(UUID user) { return null; }
-        public UserAgentData GetAgentByName(string name) { return null; }
-        public UserAgentData GetAgentByName(string fname, string lname) { return null; }
-        public void StoreWebLoginKey(UUID agentID, UUID webLoginKey) {}
-        public void AddNewUserProfile(UserProfileData user) {}
-        public bool UpdateUserProfile(UserProfileData user) { return false; }
-        public void AddNewUserAgent(UserAgentData agent) {}
-        public void AddNewUserFriend(UUID friendlistowner, UUID friend, uint perms) {}
-        public void RemoveUserFriend(UUID friendlistowner, UUID friend) {}
-        public void UpdateUserFriendPerms(UUID friendlistowner, UUID friend, uint perms) {}
-        public List<FriendListItem> GetUserFriendList(UUID friendlistowner) { return null; }
-        public Dictionary<UUID, FriendRegionInfo> GetFriendRegionInfos(List<UUID> uuids) { return null; }
-        public bool MoneyTransferRequest(UUID from, UUID to, uint amount) { return false; }
-        public bool InventoryTransferRequest(UUID from, UUID to, UUID inventory) { return false; }
-        public AvatarAppearance GetUserAppearance(UUID user) { return null; }
-        public void UpdateUserAppearance(UUID user, AvatarAppearance appearance) {}
-        public void ResetAttachments(UUID userID) {}
-        public void LogoutUsers(UUID regionID) {}
-    }
-}
diff --git a/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs b/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
deleted file mode 100644
index 830c877..0000000
--- a/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
+++ /dev/null
@@ -1,345 +0,0 @@
-/*
- * 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 NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
-using System.Threading;
-using OpenMetaverse;
-using OpenSim.Data;
-using OpenSim.Framework;
-using OpenSim.Framework.Communications.Cache;
-using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.Communications.Local;
-using OpenSim.Tests.Common.Mock;
-using OpenSim.Tests.Common.Setup;
-using OpenSim.Tests.Common;
-namespace OpenSim.Framework.Communications.Tests
-{
-    [TestFixture]
-    public class UserProfileCacheServiceTests
-    {
-        /// <value>Used by tests to indicate whether an async operation timed out</value>
-        private bool timedOut;
-        
-        private void InventoryReceived(UUID userId)
-        {
-            lock (this)
-            {
-                timedOut = false;
-                Monitor.PulseAll(this);
-            }
-        }
-        
-        [Test]
-        public void TestGetUserDetails()
-        {
-            TestHelper.InMethod();
-            UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000002");
-            string firstName = "Bill";
-            string lastName = "Bailey";
-            CachedUserInfo nonExistingUserInfo;
-            TestCommunicationsManager commsManager = new TestCommunicationsManager();
-            // Scene myScene = SceneSetupHelpers.SetupScene(commsManager, "");
-            // Check we can't retrieve info before it exists by uuid
-            nonExistingUserInfo = commsManager.UserProfileCacheService.GetUserDetails(userId);
-            Assert.That(nonExistingUserInfo, Is.Null, "User info found by uuid before user creation");
-            // Check we can't retrieve info before it exists by name
-            nonExistingUserInfo = commsManager.UserProfileCacheService.GetUserDetails(firstName, lastName);
-            Assert.That(nonExistingUserInfo, Is.Null, "User info found by name before user creation");
-            LocalUserServices lus = (LocalUserServices)commsManager.UserService;
-            lus.AddUser(firstName, lastName, "troll", "bill@bailey.com", 1000, 1000, userId);
-            CachedUserInfo existingUserInfo;
-            // Check we can retrieve info by uuid
-            existingUserInfo = commsManager.UserProfileCacheService.GetUserDetails(userId);
-            Assert.That(existingUserInfo, Is.Not.Null, "User info not found by uuid");
-            // Check we can retrieve info by name
-            existingUserInfo = commsManager.UserProfileCacheService.GetUserDetails(firstName, lastName);
-            Assert.That(existingUserInfo, Is.Not.Null, "User info not found by name");
-        }
-        /**
-         * Disabled as not fully implemented
-        [Test]
-        public void TestUpdateProfile()
-        {
-            UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000292");
-            string firstName = "Inspector";
-            string originalLastName = "Morse";
-            string newLastName = "Gadget";
-            UserProfileData newProfile = new UserProfileData();
-            newProfile.ID = userId;
-            newProfile.FirstName = firstName;
-            newProfile.SurName = newLastName;
-            TestCommunicationsManager commsManager = new TestCommunicationsManager();
-            UserProfileCacheService userCacheService = commsManager.UserProfileCacheService;
-            IUserDataPlugin userDataPlugin = commsManager.UserDataPlugin;
-            // Check that we can't update info before it exists
-            Assert.That(userCacheService.StoreProfile(newProfile), Is.False);
-            Assert.That(userDataPlugin.GetUserByUUID(userId), Is.Null);
-            // Check that we can update a profile once it exists
-            LocalUserServices lus = (LocalUserServices)commsManager.UserService;
-            lus.AddUser(firstName, originalLastName, "pingu", "ted@excellentadventure.com", 1000, 1000, userId);
-            Assert.That(userCacheService.StoreProfile(newProfile), Is.True);
-            UserProfileData retrievedProfile = userCacheService.GetUserDetails(userId).UserProfile;
-            Assert.That(retrievedProfile.SurName, Is.EqualTo(newLastName));
-            Assert.That(userDataPlugin.GetUserByUUID(userId).SurName, Is.EqualTo(newLastName));
-        }
-        */
-        [Test]
-        public void TestFetchInventory()
-        {
-            TestHelper.InMethod();
-            Scene myScene = SceneSetupHelpers.SetupScene("inventory");
-            timedOut = true;
-            lock (this)
-            {
-                UserProfileTestUtils.CreateUserWithInventory(myScene.CommsManager, InventoryReceived);
-                Monitor.Wait(this, 60000);
-             }
-            Assert.That(timedOut, Is.False, "Timed out");
-        }
-        [Test]
-        public void TestGetChildFolder()
-        {
-            TestHelper.InMethod();
-            Scene myScene = SceneSetupHelpers.SetupScene("inventory");
-            CachedUserInfo userInfo;
-            
-            lock (this)
-            {
-                userInfo = UserProfileTestUtils.CreateUserWithInventory(myScene.CommsManager, InventoryReceived);
-                Monitor.Wait(this, 60000);
-            }
-            UUID folderId = UUID.Parse("00000000-0000-0000-0000-000000000011");
-            Assert.That(userInfo.RootFolder.GetChildFolder(folderId), Is.Null);
-            userInfo.CreateFolder("testFolder", folderId, (ushort)AssetType.Animation, userInfo.RootFolder.ID);
-            Assert.That(userInfo.RootFolder.GetChildFolder(folderId), Is.Not.Null);
-        }
-        [Test]
-        public void TestCreateFolder()
-        {
-            TestHelper.InMethod();
-            Scene myScene = SceneSetupHelpers.SetupScene("inventory");
-            CachedUserInfo userInfo;
-            lock (this)
-            {
-                userInfo = UserProfileTestUtils.CreateUserWithInventory(myScene.CommsManager, InventoryReceived);
-                Monitor.Wait(this, 60000);
-            }
-            UUID folderId = UUID.Parse("00000000-0000-0000-0000-000000000010");
-            Assert.That(userInfo.RootFolder.ContainsChildFolder(folderId), Is.False);
-            // 1: Try a folder create that should fail because the parent id given does not exist
-            UUID missingFolderId = UUID.Random();
-            InventoryFolderBase myFolder = new InventoryFolderBase();
-            myFolder.ID = folderId;
-            Assert.That(
-                userInfo.CreateFolder("testFolder1", folderId, (ushort)AssetType.Animation, missingFolderId), Is.False);
-            Assert.That(myScene.InventoryService.GetFolder(myFolder), Is.Null);
-            Assert.That(userInfo.RootFolder.ContainsChildFolder(missingFolderId), Is.False);
-            Assert.That(userInfo.RootFolder.FindFolder(folderId), Is.Null);
-            // 2: Try a folder create that should work
-            Assert.That(
-                userInfo.CreateFolder("testFolder2", folderId, (ushort)AssetType.Animation, userInfo.RootFolder.ID), Is.True);
-            Assert.That(myScene.InventoryService.GetFolder(myFolder), Is.Not.Null);
-            Assert.That(userInfo.RootFolder.ContainsChildFolder(folderId), Is.True);
-        }
-        //[Test]
-        public void TestUpdateFolder()
-        {
-            TestHelper.InMethod();
-            Scene myScene = SceneSetupHelpers.SetupScene("inventory");
-            CachedUserInfo userInfo;
-            lock (this)
-            {
-                userInfo = UserProfileTestUtils.CreateUserWithInventory(myScene.CommsManager, InventoryReceived);
-                Monitor.Wait(this, 60000);
-            }
-            UUID folder1Id = UUID.Parse("00000000-0000-0000-0000-000000000060");
-            InventoryFolderImpl rootFolder = userInfo.RootFolder;
-            InventoryFolderBase myFolder = new InventoryFolderBase();
-            myFolder.ID = folder1Id;
-            userInfo.CreateFolder("folder1", folder1Id, (ushort)AssetType.Animation, rootFolder.ID);
-            // 1: Test updates that don't involve moving the folder
-            {
-                string newFolderName1 = "newFolderName1";
-                ushort folderType1 = (ushort)AssetType.Texture;
-                userInfo.UpdateFolder(newFolderName1, folder1Id, folderType1, rootFolder.ID);
-                InventoryFolderImpl folder1 = rootFolder.GetChildFolder(folder1Id);
-                Assert.That(newFolderName1, Is.EqualTo(folder1.Name));
-                Assert.That(folderType1, Is.EqualTo((ushort)folder1.Type));
-                InventoryFolderBase dataFolder1 = myScene.InventoryService.GetFolder(myFolder);
-                Assert.That(newFolderName1, Is.EqualTo(dataFolder1.Name));
-                Assert.That(folderType1, Is.EqualTo((ushort)dataFolder1.Type));
-            }
-            // 2: Test an update that also involves moving the folder
-            {
-                UUID folder2Id = UUID.Parse("00000000-0000-0000-0000-000000000061");
-                userInfo.CreateFolder("folder2", folder2Id, (ushort)AssetType.Animation, rootFolder.ID);
-                InventoryFolderImpl folder2 = rootFolder.GetChildFolder(folder2Id);
-                InventoryFolderBase myFolder2 = new InventoryFolderBase();
-                myFolder2.ID = folder2Id;
-                string newFolderName2 = "newFolderName2";
-                ushort folderType2 = (ushort)AssetType.Bodypart;
-                userInfo.UpdateFolder(newFolderName2, folder1Id, folderType2, folder2Id);
-                InventoryFolderImpl folder1 = folder2.GetChildFolder(folder1Id);
-                Assert.That(newFolderName2, Is.EqualTo(folder1.Name));
-                Assert.That(folderType2, Is.EqualTo((ushort)folder1.Type));
-                Assert.That(folder2Id, Is.EqualTo(folder1.ParentID));
-                Assert.That(folder2.ContainsChildFolder(folder1Id), Is.True);
-                Assert.That(rootFolder.ContainsChildFolder(folder1Id), Is.False);
-                InventoryFolderBase dataFolder1 = myScene.InventoryService.GetFolder(myFolder2);
-                Assert.That(newFolderName2, Is.EqualTo(dataFolder1.Name));
-                Assert.That(folderType2, Is.EqualTo((ushort)dataFolder1.Type));
-                Assert.That(folder2Id, Is.EqualTo(dataFolder1.ParentID));
-            }
-        }
-        [Test]
-        public void TestMoveFolder()
-        {
-            TestHelper.InMethod();
-            Scene myScene = SceneSetupHelpers.SetupScene("inventory");
-            CachedUserInfo userInfo;
-            lock (this)
-            {
-                userInfo = UserProfileTestUtils.CreateUserWithInventory(myScene.CommsManager, InventoryReceived);
-                Monitor.Wait(this, 60000);
-            }
-            UUID folder1Id = UUID.Parse("00000000-0000-0000-0000-000000000020");
-            UUID folder2Id = UUID.Parse("00000000-0000-0000-0000-000000000021");
-            UUID folderToMoveId = UUID.Parse("00000000-0000-0000-0000-000000000030");
-            InventoryFolderImpl rootFolder = userInfo.RootFolder;
-            userInfo.CreateFolder("folder1", folder1Id, (ushort)AssetType.Animation, rootFolder.ID);
-            InventoryFolderImpl folder1 = rootFolder.GetChildFolder(folder1Id);
-            userInfo.CreateFolder("folder2", folder2Id, (ushort)AssetType.Animation, rootFolder.ID);
-            InventoryFolderImpl folder2 = rootFolder.GetChildFolder(folder2Id);
-            // Check folder is currently in folder1
-            userInfo.CreateFolder("folderToMove", folderToMoveId, (ushort)AssetType.Animation, folder1Id);
-            Assert.That(folder1.ContainsChildFolder(folderToMoveId), Is.True);
-            userInfo.MoveFolder(folderToMoveId, folder2Id);
-            // Check folder is now in folder2 and no trace remains in folder1
-            InventoryFolderBase myFolder = new InventoryFolderBase();
-            myFolder.ID = folderToMoveId;
-            Assert.That(folder2.ContainsChildFolder(folderToMoveId), Is.True);
-            Assert.That(myScene.InventoryService.GetFolder(myFolder).ParentID, Is.EqualTo(folder2Id));
-            Assert.That(folder1.ContainsChildFolder(folderToMoveId), Is.False);
-        }
-        [Test]
-        public void TestPurgeFolder()
-        {
-            TestHelper.InMethod();
-            //log4net.Config.XmlConfigurator.Configure();
-            Scene myScene = SceneSetupHelpers.SetupScene("inventory");
-            CachedUserInfo userInfo;
-            lock (this)
-            {
-                userInfo = UserProfileTestUtils.CreateUserWithInventory(myScene.CommsManager, InventoryReceived);
-                Monitor.Wait(this, 60000);
-            }
-            UUID folder1Id = UUID.Parse("00000000-0000-0000-0000-000000000070");
-            InventoryFolderImpl rootFolder = userInfo.RootFolder;
-            InventoryFolderBase myFolder = new InventoryFolderBase();
-            myFolder.ID = folder1Id;
-            userInfo.CreateFolder("folder1", folder1Id, (ushort)AssetType.Animation, rootFolder.ID);
-            Assert.That(myScene.InventoryService.GetFolder(myFolder), Is.Not.Null);
-            // Test purge
-            userInfo.PurgeFolder(rootFolder.ID);
-            Assert.That(rootFolder.RequestListOfFolders(), Is.Empty);
-            Assert.That(myScene.InventoryService.GetFolder(myFolder), Is.Null);
-        }
-        [TearDown]
-        public void TearDown()
-        {
-            try
-            {
-                if (MainServer.Instance != null) MainServer.Instance.Stop();
-            }
-            catch (System.NullReferenceException)
-            { }
-        }
-    }
-}
-\ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
deleted file mode 100644
index a274ae7..0000000
--- a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
+++ /dev/null
@@ -1,453 +0,0 @@
-/*
- * 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.Net;
-using System.Text.RegularExpressions;
-using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
-using Nwc.XmlRpc;
-using OpenSim.Framework.Communications.Cache;
-using OpenSim.Framework.Communications.Services;
-using OpenSim.Region.Communications.Local;
-using OpenSim.Tests.Common.Setup;
-using OpenSim.Tests.Common.Mock;
-using OpenSim.Client.Linden;
-using OpenSim.Tests.Common;
-using OpenSim.Services.Interfaces;
-using OpenMetaverse;
-namespace OpenSim.Framework.Communications.Tests
-{
-    /// <summary>
-    /// Test the login service.  For now, most of this will be done through the LocalLoginService as LoginService
-    /// is abstract
-    /// </summary>
-    [TestFixture]
-    public class LoginServiceTests
-    {
-        private string m_firstName = "Adam";
-        private string m_lastName = "West";
-        private string m_regionExternalName = "localhost";
-        private IPEndPoint m_capsEndPoint;
-        private TestCommunicationsManager m_commsManager;
-        private TestLoginToRegionConnector m_regionConnector;
-        private LocalUserServices m_localUserServices;
-        private LoginService m_loginService;
-        private UserProfileData m_userProfileData;
-        private TestScene m_testScene;
-        [SetUp]
-        public void SetUpLoginEnviroment()
-        {
-            m_capsEndPoint = new IPEndPoint(IPAddress.Loopback, 9123);
-            m_commsManager = new TestCommunicationsManager(new NetworkServersInfo(42, 43));
-            m_regionConnector = new TestLoginToRegionConnector();
-            m_testScene = SceneSetupHelpers.SetupScene(m_commsManager, "");
-            m_regionConnector.AddRegion(new RegionInfo(42, 43, m_capsEndPoint, m_regionExternalName));
-            //IInventoryService m_inventoryService = new MockInventoryService();
-            m_localUserServices = (LocalUserServices) m_commsManager.UserService;
-            m_localUserServices.AddUser(m_firstName,m_lastName,"boingboing","abc@ftw.com",42,43);
-            m_loginService = new LLStandaloneLoginService((UserManagerBase) m_localUserServices, "Hello folks", m_testScene.InventoryService,
-                  m_commsManager.NetworkServersInfo, true, new LibraryRootFolder(String.Empty), m_regionConnector);
-            m_userProfileData = m_localUserServices.GetUserProfile(m_firstName, m_lastName);
-        }
-        /// <summary>
-        /// Test the normal response to a login.  Does not test authentication.
-        /// </summary>
-        [Test]
-        public void T010_TestUnauthenticatedLogin()
-        {
-            TestHelper.InMethod();
-            // We want to use our own LoginService for this test, one that
-            // doesn't require authentication.
-            new LLStandaloneLoginService(
-                (UserManagerBase)m_commsManager.UserService, "Hello folks", new MockInventoryService(),
-                m_commsManager.NetworkServersInfo, false, new LibraryRootFolder(String.Empty), m_regionConnector);
-            Hashtable loginParams = new Hashtable();
-            loginParams["first"] = m_firstName;
-            loginParams["last"] = m_lastName;
-            loginParams["passwd"] = "boingboing";
-            ArrayList sendParams = new ArrayList();
-            sendParams.Add(loginParams);
-            sendParams.Add(m_capsEndPoint); // is this parameter correct?
-            sendParams.Add(new Uri("http://localhost:8002/")); // is this parameter correct?
-            XmlRpcRequest request = new XmlRpcRequest("login_to_simulator", sendParams);
-            IPAddress tmpLocal = Util.GetLocalHost();
-            IPEndPoint tmpEnd = new IPEndPoint(tmpLocal, 80);
-            XmlRpcResponse response = m_loginService.XmlRpcLoginMethod(request, tmpEnd);
-            Hashtable responseData = (Hashtable)response.Value;
-            Assert.That(responseData["first_name"], Is.EqualTo(m_firstName));
-            Assert.That(responseData["last_name"], Is.EqualTo(m_lastName));
-            Assert.That(
-                responseData["circuit_code"], Is.GreaterThanOrEqualTo(0) & Is.LessThanOrEqualTo(Int32.MaxValue));
-            Regex capsSeedPattern
-                = new Regex("^http://"
-                    + NetworkUtil.GetHostFor(tmpLocal, m_regionExternalName)
-                    + ":9000/CAPS/[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}0000/$");
-            Assert.That(capsSeedPattern.IsMatch((string)responseData["seed_capability"]), Is.True);
-        }
-        [Test]
-        public void T011_TestAuthenticatedLoginSuccess()
-        {
-            TestHelper.InMethod();
-            // TODO: Not check inventory part of response yet.
-            // TODO: Not checking all of login response thoroughly yet.
-            // 1) Test for positive authentication
-            Hashtable loginParams = new Hashtable();
-            loginParams["first"] = m_firstName;
-            loginParams["last"] = m_lastName;
-            loginParams["passwd"] = "boingboing";
-            ArrayList sendParams = new ArrayList();
-            sendParams.Add(loginParams);
-            sendParams.Add(m_capsEndPoint); // is this parameter correct?
-            sendParams.Add(new Uri("http://localhost:8002/")); // is this parameter correct?
-            XmlRpcRequest request = new XmlRpcRequest("login_to_simulator", sendParams);
-            IPAddress tmpLocal = Util.GetLocalHost();
-            IPEndPoint tmpEnd = new IPEndPoint(tmpLocal, 80);
-            XmlRpcResponse response = m_loginService.XmlRpcLoginMethod(request, tmpEnd);
-            Hashtable responseData = (Hashtable)response.Value;
-            UserAgentData uagent = m_userProfileData.CurrentAgent;
-            Assert.That(uagent,Is.Not.Null);
-            Assert.That(responseData["first_name"], Is.Not.Null);
-            Assert.That(responseData["first_name"], Is.EqualTo(m_firstName));
-            Assert.That(responseData["last_name"], Is.EqualTo(m_lastName));
-            Assert.That(responseData["agent_id"], Is.EqualTo(uagent.ProfileID.ToString()));
-            Assert.That(responseData["session_id"], Is.EqualTo(uagent.SessionID.ToString()));
-            Assert.That(responseData["secure_session_id"], Is.EqualTo(uagent.SecureSessionID.ToString()));
-            ArrayList invlibroot = (ArrayList) responseData["inventory-lib-root"];
-            Hashtable invlibroothash = (Hashtable) invlibroot[0];
-            Assert.That(invlibroothash["folder_id"],Is.EqualTo("00000112-000f-0000-0000-000100bba000"));
-            Assert.That(
-                responseData["circuit_code"], Is.GreaterThanOrEqualTo(0) & Is.LessThanOrEqualTo(Int32.MaxValue));
-            Assert.That(responseData["message"], Is.EqualTo("Hello folks"));
-            Assert.That(responseData["buddy-list"], Is.Empty);
-            Assert.That(responseData["start_location"], Is.EqualTo("last"));
-            Regex capsSeedPattern
-                = new Regex("^http://"
-                    + NetworkUtil.GetHostFor(tmpLocal, m_regionExternalName)
-                    + ":9000/CAPS/[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}0000/$");
-            Assert.That(capsSeedPattern.IsMatch((string)responseData["seed_capability"]), Is.True);
-        }
-        [Test]
-        public void T012_TestAuthenticatedLoginForBuddies()
-        {
-            TestHelper.InMethod();
-            // 1.1) Test for budddies!
-            m_localUserServices.AddUser("Friend","Number1","boingboing","abc@ftw.com",42,43);
-            m_localUserServices.AddUser("Friend","Number2","boingboing","abc@ftw.com",42,43);
-            UserProfileData friend1 = m_localUserServices.GetUserProfile("Friend","Number1");
-            UserProfileData friend2 = m_localUserServices.GetUserProfile("Friend","Number2");
-            m_localUserServices.AddNewUserFriend(friend1.ID,m_userProfileData.ID,1);
-            m_localUserServices.AddNewUserFriend(friend1.ID,friend2.ID,2);
-            Hashtable loginParams = new Hashtable();
-            loginParams["first"] = "Friend";
-            loginParams["last"] = "Number1";
-            loginParams["passwd"] = "boingboing";
-            ArrayList sendParams = new ArrayList();
-            sendParams.Add(loginParams);
-            sendParams.Add(m_capsEndPoint); // is this parameter correct?
-            sendParams.Add(new Uri("http://localhost:8002/")); // is this parameter correct?
-            XmlRpcRequest request = new XmlRpcRequest("login_to_simulator", sendParams);
-            IPAddress tmpLocal = Util.GetLocalHost();
-            IPEndPoint tmpEnd = new IPEndPoint(tmpLocal, 80);
-            XmlRpcResponse response = m_loginService.XmlRpcLoginMethod(request, tmpEnd);
-            Hashtable responseData = (Hashtable)response.Value;
-            ArrayList friendslist = (ArrayList) responseData["buddy-list"];
-            Assert.That(friendslist,Is.Not.Null);
-            Hashtable buddy1 = (Hashtable) friendslist[0];
-            Hashtable buddy2 = (Hashtable) friendslist[1];
-            Assert.That(friendslist.Count, Is.EqualTo(2));
-            Assert.That(m_userProfileData.ID.ToString(), Is.EqualTo(buddy1["buddy_id"]) | Is.EqualTo(buddy2["buddy_id"]));
-            Assert.That(friend2.ID.ToString(), Is.EqualTo(buddy1["buddy_id"]) | Is.EqualTo(buddy2["buddy_id"]));
-        }
-        [Test]
-        public void T020_TestAuthenticatedLoginBadUsername()
-        {
-            TestHelper.InMethod();
-            // 2) Test for negative authentication
-            //
-            string error_auth_message = "Could not authenticate your avatar. Please check your username and password, and check the grid if problems persist.";
-            //string error_region_unavailable = "The region you are attempting to log into is not responding. Please select another region and try again.";
-            // 2.1) Test for wrong user name
-            Hashtable loginParams = new Hashtable();
-            loginParams["first"] = m_lastName;
-            loginParams["last"] = m_firstName;
-            loginParams["passwd"] = "boingboing";
-            ArrayList sendParams = new ArrayList();
-            sendParams.Add(loginParams);
-            sendParams.Add(m_capsEndPoint); // is this parameter correct?
-            sendParams.Add(new Uri("http://localhost:8002/")); // is this parameter correct?
-            XmlRpcRequest request = new XmlRpcRequest("login_to_simulator", sendParams);
-            IPAddress tmpLocal = Util.GetLocalHost();
-            IPEndPoint tmpEnd = new IPEndPoint(tmpLocal, 80);
-            XmlRpcResponse response = m_loginService.XmlRpcLoginMethod(request, tmpEnd);
-            Hashtable responseData = (Hashtable)response.Value;
-            Assert.That(responseData["message"], Is.EqualTo(error_auth_message));
-        }
-        [Test]
-        public void T021_TestAuthenticatedLoginBadPassword()
-        {
-            TestHelper.InMethod();
-            string error_auth_message = "Could not authenticate your avatar. Please check your username and password, and check the grid if problems persist.";
-            // 2.2) Test for wrong password
-            Hashtable loginParams = new Hashtable();
-            loginParams["first"] = "Friend";
-            loginParams["last"] = "Number2";
-            loginParams["passwd"] = "boing";
-            ArrayList sendParams = new ArrayList();
-            sendParams.Add(loginParams);
-            sendParams.Add(m_capsEndPoint); // is this parameter correct?
-            sendParams.Add(new Uri("http://localhost:8002/")); // is this parameter correct?
-            XmlRpcRequest request = new XmlRpcRequest("login_to_simulator", sendParams);
-            IPAddress tmpLocal = Util.GetLocalHost();
-            IPEndPoint tmpEnd = new IPEndPoint(tmpLocal, 80);
-            XmlRpcResponse response = m_loginService.XmlRpcLoginMethod(request, tmpEnd);
-            Hashtable responseData = (Hashtable)response.Value;
-            Assert.That(responseData["message"], Is.EqualTo(error_auth_message));
-        }
-        [Test]
-        public void T022_TestAuthenticatedLoginBadXml()
-        {
-            TestHelper.InMethod();
-            string error_xml_message = "Error connecting to grid. Could not percieve credentials from login XML.";
-            // 2.3) Bad XML
-            Hashtable loginParams = new Hashtable();
-            loginParams["first"] = "Friend";
-            loginParams["banana"] = "Banana";
-            loginParams["passwd"] = "boingboing";
-            ArrayList sendParams = new ArrayList();
-            sendParams.Add(loginParams);
-            sendParams.Add(m_capsEndPoint); // is this parameter correct?
-            sendParams.Add(new Uri("http://localhost:8002/")); // is this parameter correct?
-            XmlRpcRequest request = new XmlRpcRequest("login_to_simulator", sendParams);
-            IPAddress tmpLocal = Util.GetLocalHost();
-            IPEndPoint tmpEnd = new IPEndPoint(tmpLocal, 80);
-            XmlRpcResponse response = m_loginService.XmlRpcLoginMethod(request, tmpEnd);
-            Hashtable responseData = (Hashtable)response.Value;
-            Assert.That(responseData["message"], Is.EqualTo(error_xml_message));
-        }
-        // [Test]
-        // Commenting out test now that LLStandAloneLoginService no longer replies with message in this case.
-        // Kept the code for future test with grid mode, which will keep this behavior.
-        public void T023_TestAuthenticatedLoginAlreadyLoggedIn()
-        {
-            TestHelper.InMethod();
-            //Console.WriteLine("Starting T023_TestAuthenticatedLoginAlreadyLoggedIn()");
-            //log4net.Config.XmlConfigurator.Configure();
-            
-            string error_already_logged = "You appear to be already logged in. " +
-                                         "If this is not the case please wait for your session to timeout. " +
-                                         "If this takes longer than a few minutes please contact the grid owner. " +
-                                         "Please wait 5 minutes if you are going to connect to a region nearby to the region you were at previously.";
-            // 2.4) Already logged in and sucessfull post login
-            Hashtable loginParams = new Hashtable();
-            loginParams["first"] = "Adam";
-            loginParams["last"] = "West";
-            loginParams["passwd"] = "boingboing";
-            ArrayList sendParams = new ArrayList();
-            sendParams.Add(loginParams);
-            sendParams.Add(m_capsEndPoint); // is this parameter correct?
-            sendParams.Add(new Uri("http://localhost:8002/")); // is this parameter correct?
-            // First we log in.
-            XmlRpcRequest request = new XmlRpcRequest("login_to_simulator", sendParams);
-            IPAddress tmpLocal = Util.GetLocalHost();
-            IPEndPoint tmpEnd = new IPEndPoint(tmpLocal, 80);
-            XmlRpcResponse response = m_loginService.XmlRpcLoginMethod(request, tmpEnd);
-            Hashtable responseData = (Hashtable)response.Value;
-            Assert.That(responseData["message"], Is.EqualTo("Hello folks"));
-            // Then we try again, this time expecting failure.
-            request = new XmlRpcRequest("login_to_simulator", sendParams);
-            response = m_loginService.XmlRpcLoginMethod(request, tmpEnd);
-            responseData = (Hashtable)response.Value;
-            Assert.That(responseData["message"], Is.EqualTo(error_already_logged));
-            // Finally the third time we should be able to get right back in.
-            request = new XmlRpcRequest("login_to_simulator", sendParams);
-            response = m_loginService.XmlRpcLoginMethod(request, tmpEnd);
-            responseData = (Hashtable)response.Value;
-            Assert.That(responseData["message"], Is.EqualTo("Hello folks"));
-            
-            //Console.WriteLine("Finished T023_TestAuthenticatedLoginAlreadyLoggedIn()");
-        }
-        [TearDown]
-        public void TearDown()
-        {
-            try
-            {
-                if (MainServer.Instance != null) MainServer.Instance.Stop();
-            } catch (NullReferenceException)
-            {}
-        }
-        public class TestLoginToRegionConnector : ILoginServiceToRegionsConnector
-        {
-            private List<RegionInfo> m_regionsList = new List<RegionInfo>();
-            public void AddRegion(RegionInfo regionInfo)
-            {
-                lock (m_regionsList)
-                {
-                    if (!m_regionsList.Contains(regionInfo))
-                    {
-                        m_regionsList.Add(regionInfo);
-                    }
-                }
-            }
-            public void LogOffUserFromGrid(ulong regionHandle, OpenMetaverse.UUID AvatarID, OpenMetaverse.UUID RegionSecret, string message)
-            {
-            }
-            public bool NewUserConnection(ulong regionHandle, AgentCircuitData agent, out string reason)
-            {
-                reason = String.Empty;
-                lock (m_regionsList)
-                {
-                    foreach (RegionInfo regInfo in m_regionsList)
-                    {
-                        if (regInfo.RegionHandle == regionHandle)
-                            return true;
-                    }
-                }
-                reason = "Region not found";
-                return false;
-            }
-            public RegionInfo RequestClosestRegion(string region)
-            {
-                lock (m_regionsList)
-                {
-                    foreach (RegionInfo regInfo in m_regionsList)
-                    {
-                        if (regInfo.RegionName == region)
-                            return regInfo;
-                    }
-                }
-                return null;
-            }
-            public RegionInfo RequestNeighbourInfo(OpenMetaverse.UUID regionID)
-            {
-                lock (m_regionsList)
-                {
-                    foreach (RegionInfo regInfo in m_regionsList)
-                    {
-                        if (regInfo.RegionID == regionID)
-                            return regInfo;
-                    }
-                }
-                return null;
-            }
-            public RegionInfo RequestNeighbourInfo(ulong regionHandle)
-            {
-                lock (m_regionsList)
-                {
-                    foreach (RegionInfo regInfo in m_regionsList)
-                    {
-                        if (regInfo.RegionHandle == regionHandle)
-                            return regInfo;
-                    }
-                }
-                return null;
-            }
-        }
-    }
-}
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
deleted file mode 100644
index 02be141..0000000
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ /dev/null
@@ -1,930 +0,0 @@
-/*
- * 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.Generic;
-using System.Net;
-using System.Reflection;
-using System.Security.Cryptography;
-using log4net;
-using Nwc.XmlRpc;
-using OpenMetaverse;
-using OpenMetaverse.StructuredData;
-using OpenSim.Data;
-using OpenSim.Framework.Communications;
-using OpenSim.Framework.Statistics;
-using OpenSim.Services.Interfaces;
-namespace OpenSim.Framework.Communications
-{
-    /// <summary>
-    /// Base class for user management (create, read, etc)
-    /// </summary>
-    public abstract class UserManagerBase 
-        : IUserService, IUserAdminService, IAvatarService, IMessagingService, IAuthentication
-    {
-        private static readonly ILog m_log
-            = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        /// <value>
-        /// List of plugins to search for user data
-        /// </value>
-        private List<IUserDataPlugin> m_plugins = new List<IUserDataPlugin>();
-        protected CommunicationsManager m_commsManager;
-        protected IInventoryService m_InventoryService;
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name="commsManager"></param>
-        public UserManagerBase(CommunicationsManager commsManager)
-        {
-            m_commsManager = commsManager;
-        }
-        public virtual void SetInventoryService(IInventoryService invService)
-        {
-            m_InventoryService = invService;
-        }
-        /// <summary>
-        /// Add a new user data plugin - plugins will be requested in the order they were added.
-        /// </summary>
-        /// <param name="plugin">The plugin that will provide user data</param>
-        public void AddPlugin(IUserDataPlugin plugin)
-        {
-            m_plugins.Add(plugin);
-        }
-        /// <summary>
-        /// Adds a list of user data plugins, as described by `provider' and
-        /// `connect', to `_plugins'.
-        /// </summary>
-        /// <param name="provider">
-        /// The filename of the inventory server plugin DLL.
-        /// </param>
-        /// <param name="connect">
-        /// The connection string for the storage backend.
-        /// </param>
-        public void AddPlugin(string provider, string connect)
-        {
-            m_plugins.AddRange(DataPluginFactory.LoadDataPlugins<IUserDataPlugin>(provider, connect));
-        }
-        #region UserProfile
-        
-        public virtual void AddTemporaryUserProfile(UserProfileData userProfile)
-        {
-            foreach (IUserDataPlugin plugin in m_plugins)
-            {
-                plugin.AddTemporaryUserProfile(userProfile);
-            }
-        }
-        
-        public virtual UserProfileData GetUserProfile(string fname, string lname)
-        {
-            foreach (IUserDataPlugin plugin in m_plugins)
-            {
-                UserProfileData profile = plugin.GetUserByName(fname, lname);
-                if (profile != null)
-                {
-                    profile.CurrentAgent = GetUserAgent(profile.ID);
-                    return profile;
-                }
-            }
-            return null;
-        }
-        public void LogoutUsers(UUID regionID)
-        {
-            foreach (IUserDataPlugin plugin in m_plugins)
-            {
-                plugin.LogoutUsers(regionID);
-            }
-        }
-        public void ResetAttachments(UUID userID)
-        {
-            foreach (IUserDataPlugin plugin in m_plugins)
-            {
-                plugin.ResetAttachments(userID);
-            }
-        }
-        public UserProfileData GetUserProfile(Uri uri)
-        {
-            foreach (IUserDataPlugin plugin in m_plugins)
-            {
-                UserProfileData profile = plugin.GetUserByUri(uri);
-                if (null != profile)
-                    return profile;
-            }
-            return null;
-        }
-        public virtual UserAgentData GetAgentByUUID(UUID userId)
-        {
-            foreach (IUserDataPlugin plugin in m_plugins)
-            {
-                UserAgentData agent = plugin.GetAgentByUUID(userId);
-                if (agent != null)
-                {
-                    return agent;
-                }
-            }
-            return null;
-        }
-        public Uri GetUserUri(UserProfileData userProfile)
-        {
-            throw new NotImplementedException();
-        }
-        // see IUserService
-        public virtual UserProfileData GetUserProfile(UUID uuid)
-        {
-            foreach (IUserDataPlugin plugin in m_plugins)
-            {
-                UserProfileData profile = plugin.GetUserByUUID(uuid);
-                if (null != profile)
-                {
-                    profile.CurrentAgent = GetUserAgent(profile.ID);
-                    return profile;
-                }
-            }
-            return null;
-        }
-        public virtual List<AvatarPickerAvatar> GenerateAgentPickerRequestResponse(UUID queryID, string query)
-        {
-            List<AvatarPickerAvatar> allPickerList = new List<AvatarPickerAvatar>();
-            
-            foreach (IUserDataPlugin plugin in m_plugins)
-            {
-                try
-                {
-                    List<AvatarPickerAvatar> pickerList = plugin.GeneratePickerResults(queryID, query);
-                    if (pickerList != null)
-                        allPickerList.AddRange(pickerList);
-                }
-                catch (Exception)
-                {
-                    m_log.Error(
-                        "[USERSTORAGE]: Unable to generate AgentPickerData via  " + plugin.Name + "(" + query + ")");
-                }
-            }
-            return allPickerList;
-        }
-        
-        public virtual bool UpdateUserProfile(UserProfileData data)
-        {
-            bool result = false;
-            
-            foreach (IUserDataPlugin plugin in m_plugins)
-            {
-                try
-                {
-                    plugin.UpdateUserProfile(data);
-                    result = true;
-                }
-                catch (Exception e)
-                {
-                    m_log.ErrorFormat(
-                        "[USERSTORAGE]: Unable to set user {0} {1} via {2}: {3}", 
-                        data.FirstName, data.SurName, plugin.Name, e.ToString());
-                }
-            }
-            
-            return result;
-        }
-        #endregion
-        #region Get UserAgent
-        /// <summary>
-        /// Loads a user agent by uuid (not called directly)
-        /// </summary>
-        /// <param name="uuid">The agent's UUID</param>
-        /// <returns>Agent profiles</returns>
-        public UserAgentData GetUserAgent(UUID uuid)
-        {
-            foreach (IUserDataPlugin plugin in m_plugins)
-            {
-                try
-                {
-                    UserAgentData result = plugin.GetAgentByUUID(uuid);
-                    if (result != null)
-                        return result;
-                }
-                catch (Exception e)
-                {
-                    m_log.Error("[USERSTORAGE]: Unable to find user via " + plugin.Name + "(" + e.ToString() + ")");
-                }
-            }
-            return null;
-        }
-        /// <summary>
-        /// Loads a user agent by name (not called directly)
-        /// </summary>
-        /// <param name="name">The agent's name</param>
-        /// <returns>A user agent</returns>
-        public UserAgentData GetUserAgent(string name)
-        {
-            foreach (IUserDataPlugin plugin in m_plugins)
-            {
-                try
-                {
-                    UserAgentData result = plugin.GetAgentByName(name);
-                    
-                    if (result != null)
-                        return result;
-                }
-                catch (Exception e)
-                {
-                    m_log.Error("[USERSTORAGE]: Unable to find user via " + plugin.Name + "(" + e.ToString() + ")");
-                }
-            }
-            return null;
-        }
-        /// <summary>
-        /// Loads a user agent by name (not called directly)
-        /// </summary>
-        /// <param name="fname">The agent's firstname</param>
-        /// <param name="lname">The agent's lastname</param>
-        /// <returns>A user agent</returns>
-        public UserAgentData GetUserAgent(string fname, string lname)
-        {
-            foreach (IUserDataPlugin plugin in m_plugins)
-            {
-                try
-                {
-                    UserAgentData result = plugin.GetAgentByName(fname, lname);
-                    
-                    if (result != null)
-                        return result;
-                }
-                catch (Exception e)
-                {
-                    m_log.Error("[USERSTORAGE]: Unable to find user via " + plugin.Name + "(" + e.ToString() + ")");
-                }
-            }
-            return null;
-        }
-        public virtual List<FriendListItem> GetUserFriendList(UUID ownerID)
-        {
-            List<FriendListItem> allFriends = new List<FriendListItem>();
-            
-            foreach (IUserDataPlugin plugin in m_plugins)
-            {
-                try
-                {
-                    List<FriendListItem> friends = plugin.GetUserFriendList(ownerID);
-                    if (friends != null)
-                        allFriends.AddRange(friends);
-                }
-                catch (Exception e)
-                {
-                    m_log.Error("[USERSTORAGE]: Unable to GetUserFriendList via " + plugin.Name + "(" + e.ToString() + ")");
-                }
-            }
-            return allFriends;
-        }
-        public virtual Dictionary<UUID, FriendRegionInfo> GetFriendRegionInfos (List<UUID> uuids)
-        {
-            //Dictionary<UUID, FriendRegionInfo> allFriendRegions = new Dictionary<UUID, FriendRegionInfo>();
-            
-            foreach (IUserDataPlugin plugin in m_plugins)
-            {
-                try
-                {
-                    Dictionary<UUID, FriendRegionInfo> friendRegions = plugin.GetFriendRegionInfos(uuids);
-                    if (friendRegions != null)
-                        return friendRegions;
-                }
-                catch (Exception e)
-                {
-                    m_log.Error("[USERSTORAGE]: Unable to GetFriendRegionInfos via " + plugin.Name + "(" + e.ToString() + ")");
-                }
-            }
-            
-            return new Dictionary<UUID, FriendRegionInfo>();
-        }
-        public void StoreWebLoginKey(UUID agentID, UUID webLoginKey)
-        {
-            foreach (IUserDataPlugin plugin in m_plugins)
-            {
-                try
-                {
-                    plugin.StoreWebLoginKey(agentID, webLoginKey);
-                }
-                catch (Exception e)
-                {
-                    m_log.Error("[USERSTORAGE]: Unable to Store WebLoginKey via " + plugin.Name + "(" + e.ToString() + ")");
-                }
-            }
-        }
-        public virtual void AddNewUserFriend(UUID friendlistowner, UUID friend, uint perms)
-        {
-            foreach (IUserDataPlugin plugin in m_plugins)
-            {
-                try
-                {
-                    plugin.AddNewUserFriend(friendlistowner, friend, perms);
-                }
-                catch (Exception e)
-                {
-                    m_log.Error("[USERSTORAGE]: Unable to AddNewUserFriend via " + plugin.Name + "(" + e.ToString() + ")");
-                }
-            }
-        }
-        public virtual void RemoveUserFriend(UUID friendlistowner, UUID friend)
-        {
-            foreach (IUserDataPlugin plugin in m_plugins)
-            {
-                try
-                {
-                    plugin.RemoveUserFriend(friendlistowner, friend);
-                }
-                catch (Exception e)
-                {
-                    m_log.Error("[USERSTORAGE]: Unable to RemoveUserFriend via " + plugin.Name + "(" + e.ToString() + ")");
-                }
-            }
-        }
-        public virtual void UpdateUserFriendPerms(UUID friendlistowner, UUID friend, uint perms)
-        {
-            foreach (IUserDataPlugin plugin in m_plugins)
-            {
-                try
-                {
-                    plugin.UpdateUserFriendPerms(friendlistowner, friend, perms);
-                }
-                catch (Exception e)
-                {
-                    m_log.Error("[USERSTORAGE]: Unable to UpdateUserFriendPerms via " + plugin.Name + "(" + e.ToString() + ")");
-                }
-            }
-        }
-        /// <summary>
-        /// Resets the currentAgent in the user profile
-        /// </summary>
-        /// <param name="agentID">The agent's ID</param>
-        public virtual void ClearUserAgent(UUID agentID)
-        {
-            UserProfileData profile = GetUserProfile(agentID);
-            if (profile == null)
-            {
-                return;
-            }
-            profile.CurrentAgent = null;
-            UpdateUserProfile(profile);
-        }
-        #endregion
-        #region CreateAgent
-        /// <summary>
-        /// Creates and initialises a new user agent - make sure to use CommitAgent when done to submit to the DB
-        /// </summary>
-        /// <param name="profile">The users profile</param>
-        /// <param name="request">The users loginrequest</param>
-        public void CreateAgent(UserProfileData profile, XmlRpcRequest request)
-        {
-            //m_log.DebugFormat("[USER MANAGER]: Creating agent {0} {1}", profile.Name, profile.ID);
-            
-            UserAgentData agent = new UserAgentData();
-            // User connection
-            agent.AgentOnline = true;
-            if (request.Params.Count > 1)
-            {
-                if (request.Params[1] != null)
-                {
-                    IPEndPoint RemoteIPEndPoint = (IPEndPoint)request.Params[1];
-                    agent.AgentIP = RemoteIPEndPoint.Address.ToString();
-                    agent.AgentPort = (uint)RemoteIPEndPoint.Port;
-                }
-            }
-            // Generate sessions
-            RNGCryptoServiceProvider rand = new RNGCryptoServiceProvider();
-            byte[] randDataS = new byte[16];
-            byte[] randDataSS = new byte[16];
-            rand.GetBytes(randDataS);
-            rand.GetBytes(randDataSS);
-            agent.SecureSessionID = new UUID(randDataSS, 0);
-            agent.SessionID = new UUID(randDataS, 0);
-            // Profile UUID
-            agent.ProfileID = profile.ID;
-            // Current location/position/alignment
-            if (profile.CurrentAgent != null)
-            {
-                agent.Region = profile.CurrentAgent.Region;
-                agent.Handle = profile.CurrentAgent.Handle;
-                agent.Position = profile.CurrentAgent.Position;
-                agent.LookAt = profile.CurrentAgent.LookAt;
-            }
-            else
-            {
-                agent.Region = profile.HomeRegionID;
-                agent.Handle = profile.HomeRegion;
-                agent.Position = profile.HomeLocation;
-                agent.LookAt = profile.HomeLookAt;
-            }
-            // What time did the user login?
-            agent.LoginTime = Util.UnixTimeSinceEpoch();
-            agent.LogoutTime = 0;
-            profile.CurrentAgent = agent;
-        }
-        public void CreateAgent(UserProfileData profile, OSD request)
-        {
-            //m_log.DebugFormat("[USER MANAGER]: Creating agent {0} {1}", profile.Name, profile.ID);
-            
-            UserAgentData agent = new UserAgentData();
-            // User connection
-            agent.AgentOnline = true;
-            //if (request.Params.Count > 1)
-            //{
-            //    IPEndPoint RemoteIPEndPoint = (IPEndPoint)request.Params[1];
-            //    agent.AgentIP = RemoteIPEndPoint.Address.ToString();
-            //    agent.AgentPort = (uint)RemoteIPEndPoint.Port;
-            //}
-            // Generate sessions
-            RNGCryptoServiceProvider rand = new RNGCryptoServiceProvider();
-            byte[] randDataS = new byte[16];
-            byte[] randDataSS = new byte[16];
-            rand.GetBytes(randDataS);
-            rand.GetBytes(randDataSS);
-            agent.SecureSessionID = new UUID(randDataSS, 0);
-            agent.SessionID = new UUID(randDataS, 0);
-            // Profile UUID
-            agent.ProfileID = profile.ID;
-            // Current location/position/alignment
-            if (profile.CurrentAgent != null)
-            {
-                agent.Region = profile.CurrentAgent.Region;
-                agent.Handle = profile.CurrentAgent.Handle;
-                agent.Position = profile.CurrentAgent.Position;
-                agent.LookAt = profile.CurrentAgent.LookAt;
-            }
-            else
-            {
-                agent.Region = profile.HomeRegionID;
-                agent.Handle = profile.HomeRegion;
-                agent.Position = profile.HomeLocation;
-                agent.LookAt = profile.HomeLookAt;
-            }
-            // What time did the user login?
-            agent.LoginTime = Util.UnixTimeSinceEpoch();
-            agent.LogoutTime = 0;
-            profile.CurrentAgent = agent;
-        }
-        /// <summary>
-        /// Saves a target agent to the database
-        /// </summary>
-        /// <param name="profile">The users profile</param>
-        /// <returns>Successful?</returns>
-        public bool CommitAgent(ref UserProfileData profile)
-        {
-            //m_log.DebugFormat("[USER MANAGER]: Committing agent {0} {1}", profile.Name, profile.ID);
-            
-            // TODO: how is this function different from setUserProfile?  -> Add AddUserAgent() here and commit both tables "users" and "agents"
-            // TODO: what is the logic should be?
-            bool ret = false;
-            ret = AddUserAgent(profile.CurrentAgent);
-            ret = ret & UpdateUserProfile(profile);
-            return ret;
-        }
-        /// <summary>
-        /// Process a user logoff from OpenSim.
-        /// </summary>
-        /// <param name="userid"></param>
-        /// <param name="regionid"></param>
-        /// <param name="regionhandle"></param>
-        /// <param name="position"></param>
-        /// <param name="lookat"></param>
-        public virtual void LogOffUser(UUID userid, UUID regionid, ulong regionhandle, Vector3 position, Vector3 lookat)
-        {
-            if (StatsManager.UserStats != null)
-                StatsManager.UserStats.AddLogout();
-            UserProfileData userProfile = GetUserProfile(userid);
-            if (userProfile != null)
-            {
-                UserAgentData userAgent = userProfile.CurrentAgent;
-                if (userAgent != null)
-                {
-                    userAgent.AgentOnline = false;
-                    userAgent.LogoutTime = Util.UnixTimeSinceEpoch();
-                    //userAgent.sessionID = UUID.Zero;
-                    if (regionid != UUID.Zero)
-                    {
-                        userAgent.Region = regionid;
-                    }
-                    userAgent.Handle = regionhandle;
-                    userAgent.Position = position;
-                    userAgent.LookAt = lookat;
-                    //userProfile.CurrentAgent = userAgent;
-                    userProfile.LastLogin = userAgent.LogoutTime;
-                    CommitAgent(ref userProfile);
-                }
-                else
-                {
-                    // If currentagent is null, we can't reference it here or the UserServer crashes!
-                    m_log.Info("[LOGOUT]: didn't save logout position: " + userid.ToString());
-                }
-            }
-            else
-            {
-                m_log.Warn("[LOGOUT]: Unknown User logged out");
-            }
-        }
-        public void LogOffUser(UUID userid, UUID regionid, ulong regionhandle, float posx, float posy, float posz)
-        {
-            LogOffUser(userid, regionid, regionhandle, new Vector3(posx, posy, posz), new Vector3());
-        }
-        #endregion
-        /// <summary>
-        /// Add a new user
-        /// </summary>
-        /// <param name="firstName">first name</param>
-        /// <param name="lastName">last name</param>
-        /// <param name="password">password</param>
-        /// <param name="email">email</param>
-        /// <param name="regX">location X</param>
-        /// <param name="regY">location Y</param>
-        /// <returns>The UUID of the created user profile.  On failure, returns UUID.Zero</returns>
-        public virtual UUID AddUser(string firstName, string lastName, string password, string email, uint regX, uint regY)
-        {
-            return AddUser(firstName, lastName, password, email, regX, regY, UUID.Random());
-        }
-        /// <summary>
-        /// Add a new user
-        /// </summary>
-        /// <param name="firstName">first name</param>
-        /// <param name="lastName">last name</param>
-        /// <param name="password">password</param>
-        /// <param name="email">email</param>
-        /// <param name="regX">location X</param>
-        /// <param name="regY">location Y</param>
-        /// <param name="SetUUID">UUID of avatar.</param>
-        /// <returns>The UUID of the created user profile.  On failure, returns UUID.Zero</returns>
-        public virtual UUID AddUser(
-            string firstName, string lastName, string password, string email, uint regX, uint regY, UUID SetUUID)
-        {
-            UserProfileData user = new UserProfileData();
-            user.PasswordSalt = Util.Md5Hash(UUID.Random().ToString());
-            string md5PasswdHash = Util.Md5Hash(Util.Md5Hash(password) + ":" + user.PasswordSalt);
-            user.HomeLocation = new Vector3(128, 128, 100);
-            user.ID = SetUUID;
-            user.FirstName = firstName;
-            user.SurName = lastName;
-            user.PasswordHash = md5PasswdHash;
-            user.Created = Util.UnixTimeSinceEpoch();
-            user.HomeLookAt = new Vector3(100, 100, 100);
-            user.HomeRegionX = regX;
-            user.HomeRegionY = regY;
-            user.Email = email;
-            foreach (IUserDataPlugin plugin in m_plugins)
-            {
-                try
-                {
-                    plugin.AddNewUserProfile(user);
-                }
-                catch (Exception e)
-                {
-                    m_log.Error("[USERSTORAGE]: Unable to add user via " + plugin.Name + "(" + e.ToString() + ")");
-                }
-            }
-            UserProfileData userProf = GetUserProfile(firstName, lastName);
-            if (userProf == null)
-            {
-                return UUID.Zero;
-            }
-            else
-            {
-                //
-                // WARNING: This is a horrible hack
-                // The purpose here is to avoid touching the user server at this point.
-                // There are dragons there that I can't deal with right now.
-                // diva 06/09/09
-                //
-                if (m_InventoryService != null)
-                {
-                    // local service (standalone)
-                    m_log.Debug("[USERSTORAGE]: using IInventoryService to create user's inventory");
-                    m_InventoryService.CreateUserInventory(userProf.ID);
-                }
-                else if (m_commsManager.InterServiceInventoryService != null)
-                {
-                    // used by the user server
-                    m_log.Debug("[USERSTORAGE]: using m_commsManager.InterServiceInventoryService to create user's inventory");
-                    m_commsManager.InterServiceInventoryService.CreateNewUserInventory(userProf.ID);
-                }
-                return userProf.ID;
-            }
-        }
-        /// <summary>
-        /// Reset a user password.
-        /// </summary>
-        /// <param name="firstName"></param>
-        /// <param name="lastName"></param>
-        /// <param name="newPassword"></param>
-        /// <returns>true if the update was successful, false otherwise</returns>
-        public virtual bool ResetUserPassword(string firstName, string lastName, string newPassword)
-        {
-            string md5PasswdHash = Util.Md5Hash(Util.Md5Hash(newPassword) + ":" + String.Empty);
-            UserProfileData profile = GetUserProfile(firstName, lastName);
-            if (null == profile)
-            {
-                m_log.ErrorFormat("[USERSTORAGE]: Could not find user {0} {1}", firstName, lastName);
-                return false;
-            }
-            profile.PasswordHash = md5PasswdHash;
-            profile.PasswordSalt = String.Empty;
-            UpdateUserProfile(profile);
-            return true;
-        }
-        public abstract UserProfileData SetupMasterUser(string firstName, string lastName);
-        public abstract UserProfileData SetupMasterUser(string firstName, string lastName, string password);
-        public abstract UserProfileData SetupMasterUser(UUID uuid);
-        /// <summary>
-        /// Add an agent using data plugins.
-        /// </summary>
-        /// <param name="agentdata">The agent data to be added</param>
-        /// <returns>
-        /// true if at least one plugin added the user agent.  false if no plugin successfully added the agent
-        /// </returns>
-        public virtual bool AddUserAgent(UserAgentData agentdata)
-        {
-            bool result = false;
-            
-            foreach (IUserDataPlugin plugin in m_plugins)
-            {
-                try
-                {
-                    plugin.AddNewUserAgent(agentdata);
-                    result = true;
-                }
-                catch (Exception e)
-                {
-                    m_log.Error("[USERSTORAGE]: Unable to add agent via " + plugin.Name + "(" + e.ToString() + ")");
-                }
-            }
-            
-            return result;
-        }
-        /// <summary>
-        /// Get avatar appearance information
-        /// </summary>
-        /// <param name="user"></param>
-        /// <returns></returns>
-        public virtual AvatarAppearance GetUserAppearance(UUID user)
-        {
-            foreach (IUserDataPlugin plugin in m_plugins)
-            {
-                try
-                {
-                    AvatarAppearance appearance = plugin.GetUserAppearance(user);
-                    
-                    if (appearance != null)
-                        return appearance;
-                }
-                catch (Exception e)
-                {
-                    m_log.ErrorFormat(
-                        "[USERSTORAGE]: Unable to find user appearance {0} via {1} ({2})", user, plugin.Name, e);
-                }
-            }
-            
-            return null;
-        }
-        public virtual void UpdateUserAppearance(UUID user, AvatarAppearance appearance)
-        {
-            foreach (IUserDataPlugin plugin in m_plugins)
-            {
-                try
-                {
-                    plugin.UpdateUserAppearance(user, appearance);
-                }
-                catch (Exception e)
-                {
-                    m_log.ErrorFormat("[USERSTORAGE]: Unable to update user appearance {0} via {1} ({2})", user.ToString(), plugin.Name, e.ToString());
-                }
-            }
-        }
-        #region IAuthentication
-        protected Dictionary<UUID, List<string>> m_userKeys = new Dictionary<UUID, List<string>>();
-        /// <summary>
-        /// This generates authorization keys in the form
-        /// http://userserver/uuid
-        /// after verifying that the caller is, indeed, authorized to request a key
-        /// </summary>
-        /// <param name="url">URL of the user server</param>
-        /// <param name="userID">The user ID requesting the new key</param>
-        /// <param name="authToken">The original authorization token for that user, obtained during login</param>
-        /// <returns></returns>
-        public string GetNewKey(string url, UUID userID, UUID authToken)
-        {
-            UserProfileData profile = GetUserProfile(userID);
-            string newKey = string.Empty;
-            if (!url.EndsWith("/"))
-                url = url + "/";
-            if (profile != null)
-            {
-                // I'm overloading webloginkey for this, so that no changes are needed in the DB
-                // The uses of webloginkey are fairly mutually exclusive
-                if (profile.WebLoginKey.Equals(authToken))
-                {
-                    newKey = UUID.Random().ToString();
-                    List<string> keys;
-                    lock (m_userKeys)
-                    {
-                        if (m_userKeys.ContainsKey(userID))
-                        {
-                            keys = m_userKeys[userID];
-                        }
-                        else
-                        {
-                            keys = new List<string>();
-                            m_userKeys.Add(userID, keys);
-                        }
-                        keys.Add(newKey);
-                    }
-                    m_log.InfoFormat("[USERAUTH]: Successfully generated new auth key for user {0}", userID);
-                }
-                else
-                    m_log.Warn("[USERAUTH]: Unauthorized key generation request. Denying new key.");
-            }
-            else
-                m_log.Warn("[USERAUTH]: User not found.");
-            return url + newKey;
-        }
-        /// <summary>
-        /// This verifies the uuid portion of the key given out by GenerateKey
-        /// </summary>
-        /// <param name="userID"></param>
-        /// <param name="key"></param>
-        /// <returns></returns>
-        public bool VerifyKey(UUID userID, string key)
-        {
-            lock (m_userKeys)
-            {
-                if (m_userKeys.ContainsKey(userID))
-                {
-                    List<string> keys = m_userKeys[userID];
-                    if (keys.Contains(key))
-                    {
-                        // Keys are one-time only, so remove it
-                        keys.Remove(key);
-                        return true;
-                    }
-                    return false;
-                }
-                else
-                    return false;
-            }
-        }
-        
-        public virtual bool VerifySession(UUID userID, UUID sessionID)
-        {
-            UserProfileData userProfile = GetUserProfile(userID);
-            if (userProfile != null && userProfile.CurrentAgent != null)
-            {
-                m_log.DebugFormat(
-                    "[USER AUTH]: Verifying session {0} for {1}; current  session {2}", 
-                    sessionID, userID, userProfile.CurrentAgent.SessionID);
-                
-                if (userProfile.CurrentAgent.SessionID == sessionID)
-                {
-                    return true;
-                }
-            }
-            
-            return false;
-        }
-        public virtual bool AuthenticateUserByPassword(UUID userID, string password)
-        {
-//            m_log.DebugFormat("[USER AUTH]: Authenticating user {0} given password {1}", userID, password);
-            
-            UserProfileData userProfile = GetUserProfile(userID);
-            if (null == userProfile)
-                return false;
-      
-            string md5PasswordHash = Util.Md5Hash(Util.Md5Hash(password) + ":" + userProfile.PasswordSalt);
-//            m_log.DebugFormat(
-//                "[USER AUTH]: Submitted hash {0}, stored hash {1}", md5PasswordHash, userProfile.PasswordHash);
-    
-            if (md5PasswordHash == userProfile.PasswordHash)
-                return true;
-            else
-                return false;
-        }
-        #endregion
-    }
-}
diff --git a/OpenSim/Framework/ConfigSettings.cs b/OpenSim/Framework/ConfigSettings.cs
index 32415e0..8feaa37 100644
--- a/OpenSim/Framework/ConfigSettings.cs
+++ b/OpenSim/Framework/ConfigSettings.cs
@@ -44,14 +44,6 @@ namespace OpenSim.Framework
            set { m_meshEngineName = value; }
        }
-        private bool m_standalone;
-        public bool Standalone
-        {
-            get { return m_standalone; }
-            set { m_standalone = value; }
-        }
        private bool m_see_into_region_from_neighbor;
        public bool See_into_region_from_neighbor
@@ -163,7 +155,6 @@ namespace OpenSim.Framework
        public const uint DefaultAssetServerHttpPort = 8003;
        public const uint DefaultRegionHttpPort = 9000;
-        public static uint DefaultRegionRemotingPort = 8895; // This is actually assigned to, but then again, the remoting is obsolete, right?
        public const uint DefaultUserServerHttpPort = 8002;
        public const bool DefaultUserServerHttpSSL = false;
        public const uint DefaultMessageServerHttpPort = 8006;
diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs
index b4b5808..2a495b0 100644
--- a/OpenSim/Framework/EstateSettings.cs
+++ b/OpenSim/Framework/EstateSettings.cs
@@ -35,7 +35,6 @@ namespace OpenSim.Framework
    public class EstateSettings
    {
        // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        private readonly ConfigurationMember configMember;
        public delegate void SaveDelegate(EstateSettings rs);
@@ -43,7 +42,7 @@ namespace OpenSim.Framework
        // Only the client uses these
        //
-        private uint m_EstateID = 100;
+        private uint m_EstateID = 0;
        public uint EstateID
        {
@@ -51,7 +50,7 @@ namespace OpenSim.Framework
            set { m_EstateID = value; }
        }
-        private string m_EstateName;
+        private string m_EstateName = "My Estate";
        public string EstateName
        {
@@ -59,7 +58,7 @@ namespace OpenSim.Framework
            set { m_EstateName = value; }
        }
-        private uint m_ParentEstateID = 100;
+        private uint m_ParentEstateID = 1;
        public uint ParentEstateID
        {
@@ -67,7 +66,7 @@ namespace OpenSim.Framework
            set { m_ParentEstateID = value; }
        }
-        private float m_BillableFactor;
+        private float m_BillableFactor = 0.0f;
        public float BillableFactor
        {
@@ -75,7 +74,7 @@ namespace OpenSim.Framework
            set { m_BillableFactor = value; }
        }
-        private int m_PricePerMeter;
+        private int m_PricePerMeter = 1;
        public int PricePerMeter
        {
@@ -83,7 +82,7 @@ namespace OpenSim.Framework
            set { m_PricePerMeter = value; }
        }
-        private int m_RedirectGridX;
+        private int m_RedirectGridX = 0;
        public int RedirectGridX
        {
@@ -91,7 +90,7 @@ namespace OpenSim.Framework
            set { m_RedirectGridX = value; }
        }
-        private int m_RedirectGridY;
+        private int m_RedirectGridY = 0;
        public int RedirectGridY
        {
@@ -273,25 +272,6 @@ namespace OpenSim.Framework
        public EstateSettings()
        {
-            if (configMember == null)
-            {
-                try
-                {
-                    // Load legacy defaults
-                    //
-                    configMember =
-                        new ConfigurationMember(Path.Combine(Util.configDir(),
-                                "estate_settings.xml"), "ESTATE SETTINGS",
-                                loadConfigurationOptions,
-                                handleIncomingConfiguration, true);
-                    l_EstateManagers.Clear();
-                    configMember.performConfigurationRetrieve();
-                }
-                catch (Exception)
-                {
-                }
-            }
        }
        public void Save()
@@ -393,165 +373,5 @@ namespace OpenSim.Framework
            return l_EstateAccess.Contains(user);
        }
-        public void loadConfigurationOptions()
-        {
-            configMember.addConfigurationOption("billable_factor",
-                    ConfigurationOption.ConfigurationTypes.TYPE_FLOAT,
-                    String.Empty, "0.0", true);
-//            configMember.addConfigurationOption("estate_id",
-//                    ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
-//                    String.Empty, "100", true);
-//            configMember.addConfigurationOption("parent_estate_id",
-//                    ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
-//                    String.Empty, "1", true);
-            configMember.addConfigurationOption("redirect_grid_x",
-                    ConfigurationOption.ConfigurationTypes.TYPE_INT32,
-                    String.Empty, "0", true);
-            configMember.addConfigurationOption("redirect_grid_y",
-                    ConfigurationOption.ConfigurationTypes.TYPE_INT32,
-                    String.Empty, "0", true);
-            configMember.addConfigurationOption("price_per_meter",
-                    ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
-                    String.Empty, "1", true);
-            configMember.addConfigurationOption("estate_name",
-                    ConfigurationOption.ConfigurationTypes.TYPE_STRING,
-                    String.Empty, "My Estate", true);
-            configMember.addConfigurationOption("estate_manager_0",
-                    ConfigurationOption.ConfigurationTypes.TYPE_UUID,
-                    String.Empty, "00000000-0000-0000-0000-000000000000", true);
-            configMember.addConfigurationOption("estate_manager_1",
-                    ConfigurationOption.ConfigurationTypes.TYPE_UUID,
-                    String.Empty, "00000000-0000-0000-0000-000000000000", true);
-            configMember.addConfigurationOption("estate_manager_2",
-                    ConfigurationOption.ConfigurationTypes.TYPE_UUID,
-                    String.Empty, "00000000-0000-0000-0000-000000000000", true);
-            configMember.addConfigurationOption("estate_manager_3",
-                    ConfigurationOption.ConfigurationTypes.TYPE_UUID,
-                    String.Empty, "00000000-0000-0000-0000-000000000000", true);
-            configMember.addConfigurationOption("estate_manager_4",
-                    ConfigurationOption.ConfigurationTypes.TYPE_UUID,
-                    String.Empty, "00000000-0000-0000-0000-000000000000", true);
-            configMember.addConfigurationOption("estate_manager_5",
-                    ConfigurationOption.ConfigurationTypes.TYPE_UUID,
-                    String.Empty, "00000000-0000-0000-0000-000000000000", true);
-            configMember.addConfigurationOption("estate_manager_6",
-                    ConfigurationOption.ConfigurationTypes.TYPE_UUID,
-                    String.Empty, "00000000-0000-0000-0000-000000000000", true);
-            configMember.addConfigurationOption("estate_manager_7",
-                    ConfigurationOption.ConfigurationTypes.TYPE_UUID,
-                    String.Empty, "00000000-0000-0000-0000-000000000000", true);
-            configMember.addConfigurationOption("estate_manager_8",
-                    ConfigurationOption.ConfigurationTypes.TYPE_UUID,
-                    String.Empty, "00000000-0000-0000-0000-000000000000", true);
-            configMember.addConfigurationOption("estate_manager_9",
-                    ConfigurationOption.ConfigurationTypes.TYPE_UUID,
-                    String.Empty, "00000000-0000-0000-0000-000000000000", true);
-            configMember.addConfigurationOption("region_flags",
-                    ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
-                    String.Empty, "336723974", true);
-        }
-        public bool handleIncomingConfiguration(string configuration_key, object configuration_result)
-        {
-            switch (configuration_key)
-            {
-                case "region_flags":
-                    RegionFlags flags = (RegionFlags)(uint)configuration_result;
-                    if ((flags & (RegionFlags)(1<<29)) != 0)
-                        m_AllowVoice = true;
-                    if ((flags & RegionFlags.AllowDirectTeleport) != 0)
-                        m_AllowDirectTeleport = true;
-                    if ((flags & RegionFlags.DenyAnonymous) != 0)
-                         m_DenyAnonymous = true;
-                    if ((flags & RegionFlags.DenyIdentified) != 0)
-                        m_DenyIdentified = true;
-                    if ((flags & RegionFlags.DenyTransacted) != 0)
-                        m_DenyTransacted = true;
-                    if ((flags & RegionFlags.AbuseEmailToEstateOwner) != 0)
-                        m_AbuseEmailToEstateOwner = true;
-                    if ((flags & RegionFlags.BlockDwell) != 0)
-                        m_BlockDwell = true;
-                    if ((flags & RegionFlags.EstateSkipScripts) != 0)
-                        m_EstateSkipScripts = true;
-                    if ((flags & RegionFlags.ResetHomeOnTeleport) != 0)
-                        m_ResetHomeOnTeleport = true;
-                    if ((flags & RegionFlags.TaxFree) != 0)
-                        m_TaxFree = true;
-                    if ((flags & RegionFlags.PublicAllowed) != 0)
-                        m_PublicAccess = true;
-                    break;
-                case "billable_factor":
-                    m_BillableFactor = (float) configuration_result;
-                    break;
-//                case "estate_id":
-//                    m_EstateID = (uint) configuration_result;
-//                    break;
-//                case "parent_estate_id":
-//                    m_ParentEstateID = (uint) configuration_result;
-//                    break;
-                case "redirect_grid_x":
-                    m_RedirectGridX = (int) configuration_result;
-                    break;
-                case "redirect_grid_y":
-                    m_RedirectGridY = (int) configuration_result;
-                    break;
-                case "price_per_meter":
-                    m_PricePerMeter = Convert.ToInt32(configuration_result);
-                    break;
-                case "estate_name":
-                    m_EstateName = (string) configuration_result;
-                    break;
-                case "estate_manager_0":
-                    AddEstateManager((UUID)configuration_result);
-                    break;
-                case "estate_manager_1":
-                    AddEstateManager((UUID)configuration_result);
-                    break;
-                case "estate_manager_2":
-                    AddEstateManager((UUID)configuration_result);
-                    break;
-                case "estate_manager_3":
-                    AddEstateManager((UUID)configuration_result);
-                    break;
-                case "estate_manager_4":
-                    AddEstateManager((UUID)configuration_result);
-                    break;
-                case "estate_manager_5":
-                    AddEstateManager((UUID)configuration_result);
-                    break;
-                case "estate_manager_6":
-                    AddEstateManager((UUID)configuration_result);
-                    break;
-                case "estate_manager_7":
-                    AddEstateManager((UUID)configuration_result);
-                    break;
-                case "estate_manager_8":
-                    AddEstateManager((UUID)configuration_result);
-                    break;
-                case "estate_manager_9":
-                    AddEstateManager((UUID)configuration_result);
-                    break;
-            }
-            return true;
-        }
    }
 }
diff --git a/OpenSim/Framework/FriendListItem.cs b/OpenSim/Framework/FriendListItem.cs
index 39e2363..a02ec7f 100644
--- a/OpenSim/Framework/FriendListItem.cs
+++ b/OpenSim/Framework/FriendListItem.cs
@@ -39,7 +39,5 @@ namespace OpenSim.Framework
        // These are what the friend gives the listowner permission to do
        public uint FriendPerms;
-        public bool onlinestatus = false;
    }
 }
diff --git a/OpenSim/Framework/GroupData.cs b/OpenSim/Framework/GroupData.cs
index e3b8626..815946c 100644
--- a/OpenSim/Framework/GroupData.cs
+++ b/OpenSim/Framework/GroupData.cs
@@ -48,7 +48,6 @@ namespace OpenSim.Framework
    public class GroupMembershipData
    {
        // Group base data
-        //
        public UUID GroupID;
        public string GroupName;
        public bool AllowPublish = true;
@@ -61,7 +60,6 @@ namespace OpenSim.Framework
        public bool ShowInList = true;
        // Per user data
-        //
        public bool AcceptNotices = true;
        public int Contribution = 0;
        public ulong GroupPowers = 0;
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 06c5094..af88c4a 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -93,6 +93,8 @@ namespace OpenSim.Framework
    public delegate void SetAlwaysRun(IClientAPI remoteClient, bool SetAlwaysRun);
+    public delegate void GenericCall1(IClientAPI remoteClient);
    public delegate void GenericCall2();
    // really don't want to be passing packets in these events, so this is very temporary.
@@ -234,6 +236,10 @@ namespace OpenSim.Framework
        IClientAPI remoteClient, UUID transActionID, UUID folderID, uint callbackID, string description, string name,
        sbyte invType, sbyte type, byte wearableType, uint nextOwnerMask, int creationDate);
+    public delegate void LinkInventoryItem(
+        IClientAPI remoteClient, UUID transActionID, UUID folderID, uint callbackID, string description, string name,
+        sbyte invType, sbyte type, UUID olditemID);
    public delegate void FetchInventoryDescendents(
        IClientAPI remoteClient, UUID folderID, UUID ownerID, bool fetchFolders, bool fetchItems, int sortOrder);
@@ -828,6 +834,11 @@ namespace OpenSim.Framework
        /// </value>
        bool IsActive { get; set; }
+        /// <value>
+        /// Determines whether the client is logging out or not.
+        /// </value>
+        bool IsLoggingOut { get; set; }
+        
        bool SendLogoutPacketWhenClosing { set; }
        // [Obsolete("LLClientView Specific - Circuits are unique to LLClientView")]
@@ -873,7 +884,8 @@ namespace OpenSim.Framework
        event DeRezObject OnDeRezObject;
        event Action<IClientAPI> OnRegionHandShakeReply;
        event GenericCall2 OnRequestWearables;
-        event GenericCall2 OnCompleteMovementToRegion;
+        event GenericCall1 OnCompleteMovementToRegion;
+        event UpdateAgent OnPreAgentUpdate;
        event UpdateAgent OnAgentUpdate;
        event AgentRequestSit OnAgentRequestSit;
        event AgentSit OnAgentSit;
@@ -922,6 +934,7 @@ namespace OpenSim.Framework
        event ObjectPermissions OnObjectPermissions;
        event CreateNewInventoryItem OnCreateNewInventoryItem;
+        event LinkInventoryItem OnLinkInventoryItem;
        event CreateInventoryFolder OnCreateNewInventoryFolder;
        event UpdateInventoryFolder OnUpdateInventoryFolder;
        event MoveInventoryFolder OnMoveInventoryFolder;
@@ -1471,5 +1484,7 @@ namespace OpenSim.Framework
        
        void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt);
        
+        void SendChangeUserRights(UUID agentID, UUID friendID, int rights);
+        void SendTextBoxRequest(string message, int chatChannel, string objectname, string ownerFirstName, string ownerLastName, UUID objectId);
    }
 }
diff --git a/OpenSim/Framework/IProfileModule.cs b/OpenSim/Framework/IProfileModule.cs
deleted file mode 100644
index f54810e..0000000
--- a/OpenSim/Framework/IProfileModule.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * 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 OpenMetaverse;
-namespace OpenSim.Framework
-{
-    public interface IProfileModule
-    {
-        Hashtable GetProfileData(UUID userID);
-    }
-}
diff --git a/OpenSim/Framework/IScene.cs b/OpenSim/Framework/IScene.cs
index 8067052..19ab409 100644
--- a/OpenSim/Framework/IScene.cs
+++ b/OpenSim/Framework/IScene.cs
@@ -66,6 +66,8 @@ namespace OpenSim.Framework
        float TimeDilation { get; }
+        bool AllowScriptCrossings { get; }
        event restart OnRestart;
        void AddNewClient(IClientAPI client);
@@ -89,6 +91,8 @@ namespace OpenSim.Framework
        /// </exception>
        bool PresenceChildStatus(UUID agentId);
+        bool TryGetScenePresence(UUID agentID, out object scenePresence);
        T RequestModuleInterface<T>();
        T[] RequestModuleInterfaces<T>();
@@ -96,5 +100,7 @@ namespace OpenSim.Framework
        void StackModuleInterface<M>(M mod);
        void AddCommand(object module, string command, string shorthelp, string longhelp, CommandDelegate callback);
+        ISceneObject DeserializeObject(string representation);
    }
 }
diff --git a/OpenSim/Framework/MainServer.cs b/OpenSim/Framework/MainServer.cs
index 84cc05e..1f5f208 100644
--- a/OpenSim/Framework/MainServer.cs
+++ b/OpenSim/Framework/MainServer.cs
@@ -25,13 +25,17 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using OpenSim.Framework.Servers.HttpServer;
 using System.Collections.Generic;
+using System.Reflection;
+using log4net;
+using OpenSim.Framework.Servers.HttpServer;
 namespace OpenSim.Framework
 {
    public class MainServer
    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        
        private static BaseHttpServer instance = null;
        private static Dictionary<uint, BaseHttpServer> m_Servers =
                new Dictionary<uint, BaseHttpServer>();
@@ -53,6 +57,8 @@ namespace OpenSim.Framework
                return m_Servers[port];
            m_Servers[port] = new BaseHttpServer(port);
+            m_log.InfoFormat("[MAIN HTTP SERVER]: Starting main http server on port {0}", port);
            m_Servers[port].Start();
            return m_Servers[port];
diff --git a/OpenSim/Framework/MultipartForm.cs b/OpenSim/Framework/MultipartForm.cs
new file mode 100644
index 0000000..90c4007
--- /dev/null
+++ b/OpenSim/Framework/MultipartForm.cs
@@ -0,0 +1,144 @@
+/*
+ * 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.Generic;
+using System.Net;
+using System.IO;
+using System.Text;
+namespace OpenSim.Framework
+{
+    public static class MultipartForm
+    {
+        #region Helper Classes
+        public abstract class Element
+        {
+            public string Name;
+        }
+        public class File : Element
+        {
+            public string Filename;
+            public string ContentType;
+            public byte[] Data;
+            public File(string name, string filename, string contentType, byte[] data)
+            {
+                Name = name;
+                Filename = filename;
+                ContentType = contentType;
+                Data = data;
+            }
+        }
+        public class Parameter : Element
+        {
+            public string Value;
+            public Parameter(string name, string value)
+            {
+                Name = name;
+                Value = value;
+            }
+        }
+        #endregion Helper Classes
+        public static HttpWebResponse Post(HttpWebRequest request, List<Element> postParameters)
+        {
+            string boundary = Boundary();
+            // Set up the request properties
+            request.Method = "POST";
+            request.ContentType = "multipart/form-data; boundary=" + boundary;
+            #region Stream Writing
+            using (MemoryStream formDataStream = new MemoryStream())
+            {
+                foreach (var param in postParameters)
+                {
+                    if (param is File)
+                    {
+                        File file = (File)param;
+                        // Add just the first part of this param, since we will write the file data directly to the Stream
+                        string header = string.Format("--{0}\r\nContent-Disposition: form-data; name=\"{1}\"; filename=\"{2}\";\r\nContent-Type: {3}\r\n\r\n",
+                            boundary,
+                            file.Name,
+                            !String.IsNullOrEmpty(file.Filename) ? file.Filename : "tempfile",
+                            file.ContentType);
+                        formDataStream.Write(Encoding.UTF8.GetBytes(header), 0, header.Length);
+                        formDataStream.Write(file.Data, 0, file.Data.Length);
+                    }
+                    else
+                    {
+                        Parameter parameter = (Parameter)param;
+                        string postData = string.Format("--{0}\r\nContent-Disposition: form-data; name=\"{1}\"\r\n\r\n{2}\r\n",
+                            boundary,
+                            parameter.Name,
+                            parameter.Value);
+                        formDataStream.Write(Encoding.UTF8.GetBytes(postData), 0, postData.Length);
+                    }
+                }
+                // Add the end of the request
+                byte[] footer = Encoding.UTF8.GetBytes("\r\n--" + boundary + "--\r\n");
+                formDataStream.Write(footer, 0, footer.Length);
+                request.ContentLength = formDataStream.Length;
+                // Copy the temporary stream to the network stream
+                formDataStream.Seek(0, SeekOrigin.Begin);
+                using (Stream requestStream = request.GetRequestStream())
+                    formDataStream.CopyTo(requestStream, (int)formDataStream.Length);
+            }
+            #endregion Stream Writing
+            return request.GetResponse() as HttpWebResponse;
+        }
+        private static string Boundary()
+        {
+            Random rnd = new Random();
+            string formDataBoundary = String.Empty;
+            while (formDataBoundary.Length < 15)
+                formDataBoundary = formDataBoundary + rnd.Next();
+            formDataBoundary = formDataBoundary.Substring(0, 15);
+            formDataBoundary = "-----------------------------" + formDataBoundary;
+            return formDataBoundary;
+        }
+    }
+}
diff --git a/OpenSim/Framework/NetworkServersInfo.cs b/OpenSim/Framework/NetworkServersInfo.cs
index f720222..b25f8b9 100644
--- a/OpenSim/Framework/NetworkServersInfo.cs
+++ b/OpenSim/Framework/NetworkServersInfo.cs
@@ -42,8 +42,6 @@ namespace OpenSim.Framework
        public string InventoryURL = String.Empty;
        public bool secureInventoryServer = false;
        public bool isSandbox;
-        private uint? m_defaultHomeLocX;
-        private uint? m_defaultHomeLocY;
        public string UserRecvKey = String.Empty;
        public string UserSendKey = String.Empty;
        public string UserURL = String.Empty;
@@ -59,24 +57,11 @@ namespace OpenSim.Framework
        public NetworkServersInfo(uint defaultHomeLocX, uint defaultHomeLocY)
        {
-            m_defaultHomeLocX = defaultHomeLocX;
-            m_defaultHomeLocY = defaultHomeLocY;
        }
-        public uint DefaultHomeLocX
-        {
-            get { return m_defaultHomeLocX.Value; }
-        }
-        public uint DefaultHomeLocY
-        {
-            get { return m_defaultHomeLocY.Value; }
-        }
        public void loadFromConfiguration(IConfigSource config)
        {
-            m_defaultHomeLocX = (uint) config.Configs["StandAlone"].GetInt("default_location_x", 1000);
-            m_defaultHomeLocY = (uint) config.Configs["StandAlone"].GetInt("default_location_y", 1000);
            HttpListenerPort =
                (uint) config.Configs["Network"].GetInt("http_listener_port", (int) ConfigSettings.DefaultRegionHttpPort);
@@ -84,8 +69,6 @@ namespace OpenSim.Framework
                (uint)config.Configs["Network"].GetInt("http_listener_sslport", ((int)ConfigSettings.DefaultRegionHttpPort+1));
            HttpUsesSSL = config.Configs["Network"].GetBoolean("http_listener_ssl", false);
            HttpSSLCN = config.Configs["Network"].GetString("http_listener_cn", "localhost");
-            ConfigSettings.DefaultRegionRemotingPort =
-                (uint) config.Configs["Network"].GetInt("remoting_listener_port", (int) ConfigSettings.DefaultRegionRemotingPort);
            GridURL =
                config.Configs["Network"].GetString("grid_server_url",
                                                    "http://127.0.0.1:" + ConfigSettings.DefaultGridServerHttpPort.ToString());
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs
index b88f162..1208b97 100644
--- a/OpenSim/Framework/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/PrimitiveBaseShape.cs
@@ -186,40 +186,44 @@ namespace OpenSim.Framework
            PCode = (byte)PCodeEnum.Primitive;
            ExtraParams = new byte[1];
            m_textureEntry = DEFAULT_TEXTURE;
-        }
+        }
-        public PrimitiveBaseShape(Primitive prim)
+        /// <summary>
-        {
+        /// Construct a PrimitiveBaseShape object from a OpenMetaverse.Primitive object
-            PCode = (byte)prim.PrimData.PCode;
+        /// </summary>
-            ExtraParams = new byte[1];
+        /// <param name="prim"></param>
+        public PrimitiveBaseShape(Primitive prim)
-            State = prim.PrimData.State;
+        {
-            PathBegin = Primitive.PackBeginCut(prim.PrimData.PathBegin);
+            PCode = (byte)prim.PrimData.PCode;
-            PathEnd = Primitive.PackEndCut(prim.PrimData.PathEnd);
+            ExtraParams = new byte[1];
-            PathScaleX = Primitive.PackPathScale(prim.PrimData.PathScaleX);
-            PathScaleY = Primitive.PackPathScale(prim.PrimData.PathScaleY);
+            State = prim.PrimData.State;
-            PathShearX = (byte)Primitive.PackPathShear(prim.PrimData.PathShearX);
+            PathBegin = Primitive.PackBeginCut(prim.PrimData.PathBegin);
-            PathShearY = (byte)Primitive.PackPathShear(prim.PrimData.PathShearY);
+            PathEnd = Primitive.PackEndCut(prim.PrimData.PathEnd);
-            PathSkew = Primitive.PackPathTwist(prim.PrimData.PathSkew);
+            PathScaleX = Primitive.PackPathScale(prim.PrimData.PathScaleX);
-            ProfileBegin = Primitive.PackBeginCut(prim.PrimData.ProfileBegin);
+            PathScaleY = Primitive.PackPathScale(prim.PrimData.PathScaleY);
-            ProfileEnd = Primitive.PackEndCut(prim.PrimData.ProfileEnd);
+            PathShearX = (byte)Primitive.PackPathShear(prim.PrimData.PathShearX);
-            Scale = prim.Scale;
+            PathShearY = (byte)Primitive.PackPathShear(prim.PrimData.PathShearY);
-            PathCurve = (byte)prim.PrimData.PathCurve;
+            PathSkew = Primitive.PackPathTwist(prim.PrimData.PathSkew);
-            ProfileCurve = (byte)prim.PrimData.ProfileCurve;
+            ProfileBegin = Primitive.PackBeginCut(prim.PrimData.ProfileBegin);
-            ProfileHollow = Primitive.PackProfileHollow(prim.PrimData.ProfileHollow);
+            ProfileEnd = Primitive.PackEndCut(prim.PrimData.ProfileEnd);
-            PathRadiusOffset = Primitive.PackPathTwist(prim.PrimData.PathRadiusOffset);
+            Scale = prim.Scale;
-            PathRevolutions = Primitive.PackPathRevolutions(prim.PrimData.PathRevolutions);
+            PathCurve = (byte)prim.PrimData.PathCurve;
-            PathTaperX = Primitive.PackPathTaper(prim.PrimData.PathTaperX);
+            ProfileCurve = (byte)prim.PrimData.ProfileCurve;
-            PathTaperY = Primitive.PackPathTaper(prim.PrimData.PathTaperY);
+            ProfileHollow = Primitive.PackProfileHollow(prim.PrimData.ProfileHollow);
-            PathTwist = Primitive.PackPathTwist(prim.PrimData.PathTwist);
+            PathRadiusOffset = Primitive.PackPathTwist(prim.PrimData.PathRadiusOffset);
-            PathTwistBegin = Primitive.PackPathTwist(prim.PrimData.PathTwistBegin);
+            PathRevolutions = Primitive.PackPathRevolutions(prim.PrimData.PathRevolutions);
+            PathTaperX = Primitive.PackPathTaper(prim.PrimData.PathTaperX);
-            m_textureEntry = prim.Textures.GetBytes();
+            PathTaperY = Primitive.PackPathTaper(prim.PrimData.PathTaperY);
+            PathTwist = Primitive.PackPathTwist(prim.PrimData.PathTwist);
-            SculptEntry = (prim.Sculpt.Type != OpenMetaverse.SculptType.None);
+            PathTwistBegin = Primitive.PackPathTwist(prim.PrimData.PathTwistBegin);
-            SculptData = prim.Sculpt.GetBytes();
-            SculptTexture = prim.Sculpt.SculptTexture;
+            m_textureEntry = prim.Textures.GetBytes();
-            SculptType = (byte)prim.Sculpt.Type;
+            SculptEntry = (prim.Sculpt.Type != OpenMetaverse.SculptType.None);
+            SculptData = prim.Sculpt.GetBytes();
+            SculptTexture = prim.Sculpt.SculptTexture;
+            SculptType = (byte)prim.Sculpt.Type;
        }
        [XmlIgnore]
@@ -227,8 +231,12 @@ namespace OpenSim.Framework
        {
            get
            {
-                //m_log.DebugFormat("[PRIMITIVE BASE SHAPE]: get m_textureEntry length {0}", m_textureEntry.Length);
+                //m_log.DebugFormat("[SHAPE]: get m_textureEntry length {0}", m_textureEntry.Length);
-                return new Primitive.TextureEntry(m_textureEntry, 0, m_textureEntry.Length);
+                try { return new Primitive.TextureEntry(m_textureEntry, 0, m_textureEntry.Length); }
+                catch { }
+                m_log.Warn("[SHAPE]: Failed to decode texture, length=" + ((m_textureEntry != null) ? m_textureEntry.Length : 0));
+                return new Primitive.TextureEntry(null);
            }
            set { m_textureEntry = value.GetBytes(); }
diff --git a/OpenSim/Framework/RegionCommsListener.cs b/OpenSim/Framework/RegionCommsListener.cs
index 718a556..3e0955d 100644
--- a/OpenSim/Framework/RegionCommsListener.cs
+++ b/OpenSim/Framework/RegionCommsListener.cs
@@ -45,7 +45,7 @@ namespace OpenSim.Framework
        private GenericCall2 handlerExpectChildAgent = null; // OnExpectChildAgent;
        private ExpectUserDelegate handlerExpectUser = null; // OnExpectUser
        private UpdateNeighbours handlerNeighboursUpdate = null; // OnNeighboursUpdate;
-        private PrimCrossing handlerPrimCrossingIntoRegion = null; // OnPrimCrossingIntoRegion;
+//        private PrimCrossing handlerPrimCrossingIntoRegion = null; // OnPrimCrossingIntoRegion;
        private LogOffUser handlerLogOffUser = null;
        private GetLandData handlerGetLandData = null;
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 99edd99..ad98816 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -38,8 +38,8 @@ using OpenSim.Framework.Console;
 namespace OpenSim.Framework
-{
+{
-    public class RegionMeta7WindlightData : ICloneable
+    public class RegionLightShareData : ICloneable
    {
        public UUID regionID = UUID.Zero;
        public Vector3 waterColor = new Vector3(4.0f,38.0f,64.0f);
@@ -80,17 +80,17 @@ namespace OpenSim.Framework
        public bool cloudScrollYLock = false;
        public bool drawClassicClouds = true;
-        public delegate void SaveDelegate(RegionMeta7WindlightData wl);
+        public delegate void SaveDelegate(RegionLightShareData wl);
        public event SaveDelegate OnSave;
        public void Save()
        {
            if (OnSave != null)
                OnSave(this);
-        }
+        }
-        public object Clone()
+        public object Clone()
-        {
+        {
-            return this.MemberwiseClone();      // call clone method
+            return this.MemberwiseClone();      // call clone method
-        }
+        }
    }
@@ -341,10 +341,6 @@ namespace OpenSim.Framework
        private RegionSettings m_regionSettings;
        // private IConfigSource m_configSource = null;
-        public UUID MasterAvatarAssignedUUID = UUID.Zero;
-        public string MasterAvatarFirstName = String.Empty;
-        public string MasterAvatarLastName = String.Empty;
-        public string MasterAvatarSandboxPassword = String.Empty;
        public UUID originRegionID = UUID.Zero;
        public string proxyUrl = "";
        public int ProxyOffset = 0;
@@ -360,7 +356,7 @@ namespace OpenSim.Framework
        private bool m_clampPrimSize = false;
        private int m_objectCapacity = 0;
        private string m_regionType = String.Empty;
-        private RegionMeta7WindlightData m_windlight = new RegionMeta7WindlightData();
+        private RegionLightShareData m_windlight = new RegionLightShareData();
        protected uint m_httpPort;
        protected string m_serverURI;
        protected string m_regionName = String.Empty;
@@ -499,13 +495,13 @@ namespace OpenSim.Framework
            set { m_regionSettings = value; }
        }
-        public RegionMeta7WindlightData WindlightSettings
+        public RegionLightShareData WindlightSettings
        {
            get
            {
                if (m_windlight == null)
                {
-                    m_windlight = new RegionMeta7WindlightData();
+                    m_windlight = new RegionLightShareData();
                }
                return m_windlight;
@@ -658,7 +654,7 @@ namespace OpenSim.Framework
        private void ReadNiniConfig(IConfigSource source, string name)
        {
-            bool creatingNew = false;
+//            bool creatingNew = false;
            if (source.Configs.Count == 0)
            {
@@ -675,7 +671,7 @@ namespace OpenSim.Framework
                source.AddConfig(name);
-                creatingNew = true;
+//                creatingNew = true;
            }
            if (name == String.Empty)
@@ -685,7 +681,7 @@ namespace OpenSim.Framework
            {
                source.AddConfig(name);
-                creatingNew = true;
+//                creatingNew = true;
            }
            IConfig config = source.Configs[name];
@@ -704,15 +700,8 @@ namespace OpenSim.Framework
            RegionID = new UUID(regionUUID);
            originRegionID = RegionID; // What IS this?!
+          
-            
-            // Region name
-            //
            RegionName = name;
-            
-            // Region location
-            //
            string location = config.GetString("Location", String.Empty);
            if (location == String.Empty)
@@ -728,12 +717,9 @@ namespace OpenSim.Framework
            // Datastore (is this implemented? Omitted from example!)
-            //
            DataStore = config.GetString("Datastore", String.Empty);
            // Internal IP
-            //
            IPAddress address;
            
            if (config.Contains("InternalAddress"))
@@ -790,40 +776,6 @@ namespace OpenSim.Framework
            else
                m_externalHostName = externalName;
-            // Master avatar cruft
-            //
-            string masterAvatarUUID;
-            if (!creatingNew)
-            {
-                masterAvatarUUID = config.GetString("MasterAvatarUUID", UUID.Zero.ToString());
-                MasterAvatarFirstName = config.GetString("MasterAvatarFirstName", String.Empty);
-                MasterAvatarLastName = config.GetString("MasterAvatarLastName", String.Empty);
-                MasterAvatarSandboxPassword = config.GetString("MasterAvatarSandboxPassword", String.Empty);
-            }
-            else
-            {
-                masterAvatarUUID = MainConsole.Instance.CmdPrompt("Master Avatar UUID", UUID.Zero.ToString());
-                if (masterAvatarUUID != UUID.Zero.ToString())
-                {
-                    config.Set("MasterAvatarUUID", masterAvatarUUID);
-                }
-                else
-                {
-                    MasterAvatarFirstName = MainConsole.Instance.CmdPrompt("Master Avatar first name (enter for no master avatar)", String.Empty);
-                    if (MasterAvatarFirstName != String.Empty)
-                    {
-                        MasterAvatarLastName = MainConsole.Instance.CmdPrompt("Master Avatar last name", String.Empty);
-                        MasterAvatarSandboxPassword = MainConsole.Instance.CmdPrompt("Master Avatar sandbox password", String.Empty);
-                        
-                        config.Set("MasterAvatarFirstName", MasterAvatarFirstName);
-                        config.Set("MasterAvatarLastName", MasterAvatarLastName);
-                        config.Set("MasterAvatarSandboxPassword", MasterAvatarSandboxPassword);
-                    }
-                }
-            }
-            MasterAvatarAssignedUUID = new UUID(masterAvatarUUID);
            m_regionType = config.GetString("RegionType", String.Empty);
            // Prim stuff
@@ -866,20 +818,6 @@ namespace OpenSim.Framework
            config.Set("ExternalHostName", m_externalHostName);
-            if (MasterAvatarAssignedUUID != UUID.Zero)
-            {
-                config.Set("MasterAvatarUUID", MasterAvatarAssignedUUID.ToString());
-            }
-            else if (MasterAvatarFirstName != String.Empty && MasterAvatarLastName != String.Empty)
-            {
-                config.Set("MasterAvatarFirstName", MasterAvatarFirstName);
-                config.Set("MasterAvatarLastName", MasterAvatarLastName);
-            }
-            if (MasterAvatarSandboxPassword != String.Empty)
-            {
-                config.Set("MasterAvatarSandboxPassword", MasterAvatarSandboxPassword);
-            }
            if (m_nonphysPrimMax != 0)
                config.Set("NonphysicalPrimMax", m_nonphysPrimMax);
            if (m_physPrimMax != 0)
@@ -953,17 +891,6 @@ namespace OpenSim.Framework
            configMember.addConfigurationOption("external_host_name",
                                                ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
                                                "External Host Name", m_externalHostName, true);
-            configMember.addConfigurationOption("master_avatar_uuid", ConfigurationOption.ConfigurationTypes.TYPE_UUID,
-                                                "Master Avatar UUID", MasterAvatarAssignedUUID.ToString(), true);
-            configMember.addConfigurationOption("master_avatar_first",
-                                                ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
-                                                "First Name of Master Avatar", MasterAvatarFirstName, true);
-            configMember.addConfigurationOption("master_avatar_last",
-                                                ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
-                                                "Last Name of Master Avatar", MasterAvatarLastName, true);
-            configMember.addConfigurationOption("master_avatar_pass", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
-                                                "(Sandbox Mode Only)Password for Master Avatar account",
-                                                MasterAvatarSandboxPassword, true);
            configMember.addConfigurationOption("lastmap_uuid", ConfigurationOption.ConfigurationTypes.TYPE_UUID,
                                                "Last Map UUID", lastMapUUID.ToString(), true);
            configMember.addConfigurationOption("lastmap_refresh", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
@@ -1013,22 +940,6 @@ namespace OpenSim.Framework
            configMember.addConfigurationOption("external_host_name",
                                                ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
                                                "External Host Name", "127.0.0.1", false);
-            configMember.addConfigurationOption("master_avatar_uuid", ConfigurationOption.ConfigurationTypes.TYPE_UUID,
-                                                "Master Avatar UUID", UUID.Zero.ToString(), true);
-            configMember.addConfigurationOption("master_avatar_first",
-                                                ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
-                                                "First Name of Master Avatar", "Test", false,
-                                                (ConfigurationOption.ConfigurationOptionShouldBeAsked)
-                                                shouldMasterAvatarDetailsBeAsked);
-            configMember.addConfigurationOption("master_avatar_last",
-                                                ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
-                                                "Last Name of Master Avatar", "User", false,
-                                                (ConfigurationOption.ConfigurationOptionShouldBeAsked)
-                                                shouldMasterAvatarDetailsBeAsked);
-            configMember.addConfigurationOption("master_avatar_pass", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
-                                                "(Sandbox Mode Only)Password for Master Avatar account", "test", false,
-                                                (ConfigurationOption.ConfigurationOptionShouldBeAsked)
-                                                shouldMasterAvatarDetailsBeAsked);
            configMember.addConfigurationOption("lastmap_uuid", ConfigurationOption.ConfigurationTypes.TYPE_UUID,
                                    "Last Map UUID", lastMapUUID.ToString(), true);
@@ -1054,11 +965,6 @@ namespace OpenSim.Framework
                                                "Region Type", String.Empty, true);
        }
-        public bool shouldMasterAvatarDetailsBeAsked(string configuration_key)
-        {
-            return MasterAvatarAssignedUUID == UUID.Zero;
-        }
        public bool handleIncomingConfiguration(string configuration_key, object configuration_result)
        {
            switch (configuration_key)
@@ -1099,18 +1005,6 @@ namespace OpenSim.Framework
                        m_externalHostName = Util.GetLocalHost().ToString();
                    }
                    break;
-                case "master_avatar_uuid":
-                    MasterAvatarAssignedUUID = (UUID) configuration_result;
-                    break;
-                case "master_avatar_first":
-                    MasterAvatarFirstName = (string) configuration_result;
-                    break;
-                case "master_avatar_last":
-                    MasterAvatarLastName = (string) configuration_result;
-                    break;
-                case "master_avatar_pass":
-                    MasterAvatarSandboxPassword = (string)configuration_result;
-                    break;
                case "lastmap_uuid":
                    lastMapUUID = (UUID)configuration_result;
                    break;
diff --git a/OpenSim/Framework/SLUtil.cs b/OpenSim/Framework/SLUtil.cs
new file mode 100644
index 0000000..a489806
--- /dev/null
+++ b/OpenSim/Framework/SLUtil.cs
@@ -0,0 +1,380 @@
+/*
+ * 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.Generic;
+using System.Reflection;
+using log4net;
+using OpenMetaverse;
+namespace OpenSim.Framework
+{
+    public static class SLUtil
+    {
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        
+        #region SL / file extension / content-type conversions
+        public static string SLAssetTypeToContentType(int assetType)
+        {
+            switch ((AssetType)assetType)
+            {
+                case AssetType.Texture:
+                    return "image/x-j2c";
+                case AssetType.Sound:
+                    return "application/ogg";
+                case AssetType.CallingCard:
+                    return "application/vnd.ll.callingcard";
+                case AssetType.Landmark:
+                    return "application/vnd.ll.landmark";
+                case AssetType.Clothing:
+                    return "application/vnd.ll.clothing";
+                case AssetType.Object:
+                    return "application/vnd.ll.primitive";
+                case AssetType.Notecard:
+                    return "application/vnd.ll.notecard";
+                case AssetType.Folder:
+                    return "application/vnd.ll.folder";
+                case AssetType.RootFolder:
+                    return "application/vnd.ll.rootfolder";
+                case AssetType.LSLText:
+                    return "application/vnd.ll.lsltext";
+                case AssetType.LSLBytecode:
+                    return "application/vnd.ll.lslbyte";
+                case AssetType.TextureTGA:
+                case AssetType.ImageTGA:
+                    return "image/tga";
+                case AssetType.Bodypart:
+                    return "application/vnd.ll.bodypart";
+                case AssetType.TrashFolder:
+                    return "application/vnd.ll.trashfolder";
+                case AssetType.SnapshotFolder:
+                    return "application/vnd.ll.snapshotfolder";
+                case AssetType.LostAndFoundFolder:
+                    return "application/vnd.ll.lostandfoundfolder";
+                case AssetType.SoundWAV:
+                    return "audio/x-wav";
+                case AssetType.ImageJPEG:
+                    return "image/jpeg";
+                case AssetType.Animation:
+                    return "application/vnd.ll.animation";
+                case AssetType.Gesture:
+                    return "application/vnd.ll.gesture";
+                case AssetType.Simstate:
+                    return "application/x-metaverse-simstate";
+                case AssetType.FavoriteFolder:
+                    return "application/vnd.ll.favoritefolder";
+                case AssetType.Link:
+                    return "application/vnd.ll.link";
+                case AssetType.LinkFolder:
+                    return "application/vnd.ll.linkfolder";
+                case AssetType.CurrentOutfitFolder:
+                    return "application/vnd.ll.currentoutfitfolder";
+                case AssetType.OutfitFolder:
+                    return "application/vnd.ll.outfitfolder";
+                case AssetType.MyOutfitsFolder:
+                    return "application/vnd.ll.myoutfitsfolder";
+                case AssetType.InboxFolder:
+                    return "application/vnd.ll.inboxfolder";
+                case AssetType.Unknown:
+                default:
+                    return "application/octet-stream";
+            }
+        }
+        public static string SLInvTypeToContentType(int invType)
+        {
+            switch ((InventoryType)invType)
+            {
+                case InventoryType.Animation:
+                    return "application/vnd.ll.animation";
+                case InventoryType.CallingCard:
+                    return "application/vnd.ll.callingcard";
+                case InventoryType.Folder:
+                    return "application/vnd.ll.folder";
+                case InventoryType.Gesture:
+                    return "application/vnd.ll.gesture";
+                case InventoryType.Landmark:
+                    return "application/vnd.ll.landmark";
+                case InventoryType.LSL:
+                    return "application/vnd.ll.lsltext";
+                case InventoryType.Notecard:
+                    return "application/vnd.ll.notecard";
+                case InventoryType.Attachment:
+                case InventoryType.Object:
+                    return "application/vnd.ll.primitive";
+                case InventoryType.Sound:
+                    return "application/ogg";
+                case InventoryType.Snapshot:
+                case InventoryType.Texture:
+                    return "image/x-j2c";
+                case InventoryType.Wearable:
+                    return "application/vnd.ll.clothing";
+                default:
+                    return "application/octet-stream";
+            }
+        }
+        public static sbyte ContentTypeToSLAssetType(string contentType)
+        {
+            switch (contentType)
+            {
+                case "image/x-j2c":
+                case "image/jp2":
+                    return (sbyte)AssetType.Texture;
+                case "application/ogg":
+                    return (sbyte)AssetType.Sound;
+                case "application/vnd.ll.callingcard":
+                case "application/x-metaverse-callingcard":
+                    return (sbyte)AssetType.CallingCard;
+                case "application/vnd.ll.landmark":
+                case "application/x-metaverse-landmark":
+                    return (sbyte)AssetType.Landmark;
+                case "application/vnd.ll.clothing":
+                case "application/x-metaverse-clothing":
+                    return (sbyte)AssetType.Clothing;
+                case "application/vnd.ll.primitive":
+                case "application/x-metaverse-primitive":
+                    return (sbyte)AssetType.Object;
+                case "application/vnd.ll.notecard":
+                case "application/x-metaverse-notecard":
+                    return (sbyte)AssetType.Notecard;
+                case "application/vnd.ll.folder":
+                    return (sbyte)AssetType.Folder;
+                case "application/vnd.ll.rootfolder":
+                    return (sbyte)AssetType.RootFolder;
+                case "application/vnd.ll.lsltext":
+                case "application/x-metaverse-lsl":
+                    return (sbyte)AssetType.LSLText;
+                case "application/vnd.ll.lslbyte":
+                case "application/x-metaverse-lso":
+                    return (sbyte)AssetType.LSLBytecode;
+                case "image/tga":
+                    // Note that AssetType.TextureTGA will be converted to AssetType.ImageTGA
+                    return (sbyte)AssetType.ImageTGA;
+                case "application/vnd.ll.bodypart":
+                case "application/x-metaverse-bodypart":
+                    return (sbyte)AssetType.Bodypart;
+                case "application/vnd.ll.trashfolder":
+                    return (sbyte)AssetType.TrashFolder;
+                case "application/vnd.ll.snapshotfolder":
+                    return (sbyte)AssetType.SnapshotFolder;
+                case "application/vnd.ll.lostandfoundfolder":
+                    return (sbyte)AssetType.LostAndFoundFolder;
+                case "audio/x-wav":
+                    return (sbyte)AssetType.SoundWAV;
+                case "image/jpeg":
+                    return (sbyte)AssetType.ImageJPEG;
+                case "application/vnd.ll.animation":
+                case "application/x-metaverse-animation":
+                    return (sbyte)AssetType.Animation;
+                case "application/vnd.ll.gesture":
+                case "application/x-metaverse-gesture":
+                    return (sbyte)AssetType.Gesture;
+                case "application/x-metaverse-simstate":
+                    return (sbyte)AssetType.Simstate;
+                case "application/vnd.ll.favoritefolder":
+                    return (sbyte)AssetType.FavoriteFolder;
+                case "application/vnd.ll.link":
+                    return (sbyte)AssetType.Link;
+                case "application/vnd.ll.linkfolder":
+                    return (sbyte)AssetType.LinkFolder;
+                case "application/vnd.ll.currentoutfitfolder":
+                    return (sbyte)AssetType.CurrentOutfitFolder;
+                case "application/vnd.ll.outfitfolder":
+                    return (sbyte)AssetType.OutfitFolder;
+                case "application/vnd.ll.myoutfitsfolder":
+                    return (sbyte)AssetType.MyOutfitsFolder;
+                case "application/vnd.ll.inboxfolder":
+                    return (sbyte)AssetType.InboxFolder;
+                case "application/octet-stream":
+                default:
+                    return (sbyte)AssetType.Unknown;
+            }
+        }
+        public static sbyte ContentTypeToSLInvType(string contentType)
+        {
+            switch (contentType)
+            {
+                case "image/x-j2c":
+                case "image/jp2":
+                case "image/tga":
+                case "image/jpeg":
+                    return (sbyte)InventoryType.Texture;
+                case "application/ogg":
+                case "audio/x-wav":
+                    return (sbyte)InventoryType.Sound;
+                case "application/vnd.ll.callingcard":
+                case "application/x-metaverse-callingcard":
+                    return (sbyte)InventoryType.CallingCard;
+                case "application/vnd.ll.landmark":
+                case "application/x-metaverse-landmark":
+                    return (sbyte)InventoryType.Landmark;
+                case "application/vnd.ll.clothing":
+                case "application/x-metaverse-clothing":
+                case "application/vnd.ll.bodypart":
+                case "application/x-metaverse-bodypart":
+                    return (sbyte)InventoryType.Wearable;
+                case "application/vnd.ll.primitive":
+                case "application/x-metaverse-primitive":
+                    return (sbyte)InventoryType.Object;
+                case "application/vnd.ll.notecard":
+                case "application/x-metaverse-notecard":
+                    return (sbyte)InventoryType.Notecard;
+                case "application/vnd.ll.folder":
+                    return (sbyte)InventoryType.Folder;
+                case "application/vnd.ll.rootfolder":
+                    return (sbyte)InventoryType.RootCategory;
+                case "application/vnd.ll.lsltext":
+                case "application/x-metaverse-lsl":
+                case "application/vnd.ll.lslbyte":
+                case "application/x-metaverse-lso":
+                    return (sbyte)InventoryType.LSL;
+                case "application/vnd.ll.trashfolder":
+                case "application/vnd.ll.snapshotfolder":
+                case "application/vnd.ll.lostandfoundfolder":
+                    return (sbyte)InventoryType.Folder;
+                case "application/vnd.ll.animation":
+                case "application/x-metaverse-animation":
+                    return (sbyte)InventoryType.Animation;
+                case "application/vnd.ll.gesture":
+                case "application/x-metaverse-gesture":
+                    return (sbyte)InventoryType.Gesture;
+                case "application/x-metaverse-simstate":
+                    return (sbyte)InventoryType.Snapshot;
+                case "application/octet-stream":
+                default:
+                    return (sbyte)InventoryType.Unknown;
+            }
+        }
+        #endregion SL / file extension / content-type conversions
+        /// <summary>
+        /// Parse a notecard in Linden format to a string of ordinary text.
+        /// </summary>
+        /// <param name="rawInput"></param>
+        /// <returns></returns>
+        public static string ParseNotecardToString(string rawInput)
+        {
+            string[] output = ParseNotecardToList(rawInput).ToArray();
+//            foreach (string line in output)
+//                m_log.DebugFormat("[PARSE NOTECARD]: ParseNotecardToString got line {0}", line);
+            
+            return string.Join("\n", output);
+        }
+                
+        /// <summary>
+        /// Parse a notecard in Linden format to a list of ordinary lines.
+        /// </summary>
+        /// <param name="rawInput"></param>
+        /// <returns></returns>
+        public static List<string> ParseNotecardToList(string rawInput)
+        {
+            string[] input = rawInput.Replace("\r", "").Split('\n');
+            int idx = 0;
+            int level = 0;
+            List<string> output = new List<string>();
+            string[] words;
+            while (idx < input.Length)
+            {
+                if (input[idx] == "{")
+                {
+                    level++;
+                    idx++;
+                    continue;
+                }
+                if (input[idx]== "}")
+                {
+                    level--;
+                    idx++;
+                    continue;
+                }
+                switch (level)
+                {
+                case 0:
+                    words = input[idx].Split(' '); // Linden text ver
+                    // Notecards are created *really* empty. Treat that as "no text" (just like after saving an empty notecard)
+                    if (words.Length < 3)
+                        return output;
+                    int version = int.Parse(words[3]);
+                    if (version != 2)
+                        return output;
+                    break;
+                case 1:
+                    words = input[idx].Split(' ');
+                    if (words[0] == "LLEmbeddedItems")
+                        break;
+                    if (words[0] == "Text")
+                    {
+                        int len = int.Parse(words[2]);
+                        idx++;
+                        int count = -1;
+                        while (count < len)
+                        {
+                            // int l = input[idx].Length;
+                            string ln = input[idx];
+                            int need = len-count-1;
+                            if (ln.Length > need)
+                                ln = ln.Substring(0, need);
+//                            m_log.DebugFormat("[PARSE NOTECARD]: Adding line {0}", ln);
+                            output.Add(ln);
+                            count += ln.Length + 1;
+                            idx++;
+                        }
+                        return output;
+                    }
+                    break;
+                case 2:
+                    words = input[idx].Split(' '); // count
+                    if (words[0] == "count")
+                    {
+                        int c = int.Parse(words[1]);
+                        if (c > 0)
+                            return output;
+                        break;
+                    }
+                    break;
+                }
+                idx++;
+            }
+            
+            return output;
+        }
+    }
+}
+\ No newline at end of file
diff --git a/OpenSim/Framework/Serialization/External/UserProfileSerializer.cs b/OpenSim/Framework/Serialization/External/UserProfileSerializer.cs
index fb269b7..f50b49a 100644
--- a/OpenSim/Framework/Serialization/External/UserProfileSerializer.cs
+++ b/OpenSim/Framework/Serialization/External/UserProfileSerializer.cs
@@ -40,7 +40,7 @@ namespace OpenSim.Framework.Serialization.External
        public const int MAJOR_VERSION = 0;
        public const int MINOR_VERSION = 1;
        
-        public static string Serialize(UserProfileData profile)
+        public static string Serialize(UUID userID, string firstName, string lastName)
        {
            StringWriter sw = new StringWriter();
            XmlTextWriter xtw = new XmlTextWriter(sw);
@@ -51,9 +51,9 @@ namespace OpenSim.Framework.Serialization.External
            xtw.WriteAttributeString("major_version", MAJOR_VERSION.ToString());
            xtw.WriteAttributeString("minor_version", MINOR_VERSION.ToString());
                       
-            xtw.WriteElementString("name", profile.Name);
+            xtw.WriteElementString("name", firstName + " " + lastName);
-            xtw.WriteElementString("id", profile.ID.ToString());
+            xtw.WriteElementString("id", userID.ToString());
-            xtw.WriteElementString("about", profile.AboutText);
+            xtw.WriteElementString("about", "");
  
            // Not sure if we're storing this yet, need to take a look
 //            xtw.WriteElementString("Url", profile.Url);
diff --git a/OpenSim/Framework/Serialization/TarArchiveWriter.cs b/OpenSim/Framework/Serialization/TarArchiveWriter.cs
index 20d0f7e..0bd639f 100644
--- a/OpenSim/Framework/Serialization/TarArchiveWriter.cs
+++ b/OpenSim/Framework/Serialization/TarArchiveWriter.cs
@@ -208,7 +208,9 @@ namespace OpenSim.Framework.Serialization
                m_bw.Write(header);
    
                // Write out data
-                m_bw.Write(data);
+                // An IOException occurs if we try to write out an empty array in Mono 2.6
+                if (data.Length > 0)
+                    m_bw.Write(data);
    
                if (data.Length % 512 != 0)
                {
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index 214f936..a6e00c2 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -42,6 +42,7 @@ using Nwc.XmlRpc;
 using OpenMetaverse.StructuredData;
 using CoolHTTPListener = HttpServer.HttpListener;
 using HttpListener=System.Net.HttpListener;
+using LogPrio=HttpServer.LogPrio;
 namespace OpenSim.Framework.Servers.HttpServer
 {
@@ -202,16 +203,14 @@ namespace OpenSim.Framework.Servers.HttpServer
                if (!m_pollHandlers.ContainsKey(methodName))
                {
                    m_pollHandlers.Add(methodName,args);
-                    pollHandlerResult = true;
+                    pollHandlerResult = true;                    
-                    
                }
            }
            
            if (pollHandlerResult)
                return AddHTTPHandler(methodName, handler);
-            return false;
+            return false;            
-            
        }
        // Note that the agent string is provided simply to differentiate
@@ -296,7 +295,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                            headervals[headername] = req.Headers[headername];
                        }
    
-                        keysvals.Add("headers",headervals);
+                        keysvals.Add("headers", headervals);
                        keysvals.Add("querystringkeys", querystringkeys);
    
                        psEvArgs.Request(psreq.RequestID, keysvals);
@@ -311,7 +310,7 @@ namespace OpenSim.Framework.Servers.HttpServer
            }
            catch (Exception e)
            {
-                m_log.ErrorFormat("[BASE HTTP SERVER]: OnRequest() failed with {0} {1}", e.Message, e.StackTrace);
+                m_log.Error(string.Format("[BASE HTTP SERVER]: OnRequest() failed with "), e);
            }
        }
@@ -343,7 +342,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                //  the request can be passed through to the other handlers. This is a low
                //  probability event; if a request is matched it is normally expected to be
                //  handled
-                //m_log.Debug("[BASE HTTP SERVER]: Handling Request" + request.RawUrl);
+//                m_log.Debug("[BASE HTTP SERVER]: Handling request to " + request.RawUrl);
                IHttpAgentHandler agentHandler;
@@ -498,7 +497,8 @@ namespace OpenSim.Framework.Servers.HttpServer
                {
                    case null:
                    case "text/html":
-                        //m_log.Info("[Debug BASE HTTP SERVER]: found a text/html content type");
+//                        m_log.DebugFormat(
+//                            "[BASE HTTP SERVER]: Found a text/html content type for request {0}", request.RawUrl);
                        HandleHTTPRequest(request, response);
                        return;
@@ -526,10 +526,11 @@ namespace OpenSim.Framework.Servers.HttpServer
                            HandleLLSDRequests(request, response);
                            return;
                        }
-                        //m_log.Info("[Debug BASE HTTP SERVER]: Checking for HTTP Handler");
+                    
+//                        m_log.DebugFormat("[BASE HTTP SERVER]: Checking for HTTP Handler for request {0}", request.RawUrl);
                        if (DoWeHaveAHTTPHandler(request.RawUrl))
                        {
-                            //m_log.Info("[Debug BASE HTTP SERVER]: found HTTP Handler");
+//                            m_log.DebugFormat("[BASE HTTP SERVER]: Found HTTP Handler for request {0}", request.RawUrl);
                            HandleHTTPRequest(request, response);
                            return;
                        }
@@ -625,7 +626,7 @@ namespace OpenSim.Framework.Servers.HttpServer
        private bool TryGetHTTPHandler(string handlerKey, out GenericHTTPMethod HTTPHandler)
        {
-            //m_log.DebugFormat("[BASE HTTP HANDLER]: Looking for HTTP handler for {0}", handlerKey);
+//            m_log.DebugFormat("[BASE HTTP HANDLER]: Looking for HTTP handler for {0}", handlerKey);
            
            string bestMatch = null;
@@ -945,7 +946,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                }
                catch (IOException e)
                {
-                    m_log.DebugFormat("[BASE HTTP SERVER]: LLSD IOException {0}.", e);
+                    m_log.WarnFormat("[BASE HTTP SERVER]: LLSD IOException {0}.", e);
                }
                catch (SocketException e)
                {
@@ -1220,7 +1221,11 @@ namespace OpenSim.Framework.Servers.HttpServer
        }
        public void HandleHTTPRequest(OSHttpRequest request, OSHttpResponse response)
-        {
+        {            
+//            m_log.DebugFormat(
+//                "[BASE HTTP SERVER]: HandleHTTPRequest for request to {0}, method {1}", 
+//                request.RawUrl, request.HttpMethod);
+            
            switch (request.HttpMethod)
            {
                case "OPTIONS":
@@ -1235,6 +1240,8 @@ namespace OpenSim.Framework.Servers.HttpServer
        private void HandleContentVerbs(OSHttpRequest request, OSHttpResponse response)
        {
+//            m_log.DebugFormat("[BASE HTTP SERVER]: HandleContentVerbs for request to {0}", request.RawUrl);
+            
            // This is a test.  There's a workable alternative..  as this way sucks.
            // We'd like to put this into a text file parhaps that's easily editable.
            //
@@ -1275,13 +1282,15 @@ namespace OpenSim.Framework.Servers.HttpServer
            foreach (string queryname in querystringkeys)
            {
+//                m_log.DebugFormat(
+//                    "[BASE HTTP SERVER]: Got query paremeter {0}={1}", queryname, request.QueryString[queryname]);
                keysvals.Add(queryname, request.QueryString[queryname]);
                requestVars.Add(queryname, keysvals[queryname]);
            }
            foreach (string headername in rHeaders)
            {
-                //m_log.Warn("[HEADER]: " + headername + "=" + request.Headers[headername]);
+//                m_log.Debug("[BASE HTTP SERVER]: " + headername + "=" + request.Headers[headername]);
                headervals[headername] = request.Headers[headername];
            }
@@ -1290,15 +1299,16 @@ namespace OpenSim.Framework.Servers.HttpServer
                host = (string)headervals["Host"];
            }
-            keysvals.Add("headers",headervals);
+            keysvals.Add("headers", headervals);
            keysvals.Add("querystringkeys", querystringkeys);
            keysvals.Add("requestvars", requestVars);
+//            keysvals.Add("form", request.Form);
            if (keysvals.Contains("method"))
            {
-                //m_log.Warn("[HTTP]: Contains Method");
+//                m_log.Debug("[BASE HTTP SERVER]: Contains Method");
                string method = (string) keysvals["method"];
-                //m_log.Warn("[HTTP]: " + requestBody);
+//                m_log.Debug("[BASE HTTP SERVER]: " + requestBody);
                GenericHTTPMethod requestprocessor;
                bool foundHandler = TryGetHTTPHandler(method, out requestprocessor);
                if (foundHandler)
@@ -1310,13 +1320,12 @@ namespace OpenSim.Framework.Servers.HttpServer
                }
                else
                {
-                    //m_log.Warn("[HTTP]: Handler Not Found");
+//                    m_log.Warn("[BASE HTTP SERVER]: Handler Not Found");
                    SendHTML404(response, host);
                }
            }
            else
            {
                GenericHTTPMethod requestprocessor;
                bool foundHandler = TryGetHTTPHandlerPathBased(request.RawUrl, out requestprocessor);
                if (foundHandler)
@@ -1328,7 +1337,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                }
                else
                {
-                    //m_log.Warn("[HTTP]: Handler Not Found");
+//                    m_log.Warn("[BASE HTTP SERVER]: Handler Not Found2");
                    SendHTML404(response, host);
                }
            }
@@ -1376,8 +1385,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                    {
                        if (String.IsNullOrEmpty(bestMatch) || searchquery.Length > bestMatch.Length)
                        {
-                            // You have to specifically register for '/' and to get it, you must specificaly request it
+                            // You have to specifically register for '/' and to get it, you must specifically request it
-                            //
                            if (pattern == "/" && searchquery == "/" || pattern != "/")
                                bestMatch = pattern;
                        }
@@ -1572,7 +1580,6 @@ namespace OpenSim.Framework.Servers.HttpServer
        public void Start()
        {
-            m_log.Info("[BASE HTTP SERVER]: Starting up HTTP Server");
            StartHTTP();
        }
@@ -1580,7 +1587,6 @@ namespace OpenSim.Framework.Servers.HttpServer
        {
            try
            {
-                m_log.Debug("[BASE HTTP SERVER]: Spawned main thread OK");
                //m_httpListener = new HttpListener();
                NotSocketErrors = 0;
                if (!m_ssl)
@@ -1816,30 +1822,36 @@ namespace OpenSim.Framework.Servers.HttpServer
    /// <summary>
    /// Relays HttpServer log messages to our own logging mechanism.
    /// </summary>
-    /// There is also a UseTraceLogs line in this file that can be uncommented for more detailed log information
+    /// To use this you must uncomment the switch section
+    ///
+    /// You may also be able to get additional trace information from HttpServer if you uncomment the UseTraceLogs
+    /// property in StartHttp() for the HttpListener
    public class HttpServerLogWriter : ILogWriter
    {
-        //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
        public void Write(object source, LogPrio priority, string message)
        {
            /*
            switch (priority)
            {
-                case HttpServer.LogPrio.Debug:
+                case LogPrio.Trace:
-                    m_log.DebugFormat("[{0}]: {1}", source.ToString(), message);
+                    m_log.DebugFormat("[{0}]: {1}", source, message);
+                    break;                
+                case LogPrio.Debug:
+                    m_log.DebugFormat("[{0}]: {1}", source, message);
                    break;
-                case HttpServer.LogPrio.Error:
+                case LogPrio.Error:
-                    m_log.ErrorFormat("[{0}]: {1}", source.ToString(), message);
+                    m_log.ErrorFormat("[{0}]: {1}", source, message);
                    break;
-                case HttpServer.LogPrio.Info:
+                case LogPrio.Info:
-                    m_log.InfoFormat("[{0}]: {1}", source.ToString(), message);
+                    m_log.InfoFormat("[{0}]: {1}", source, message);
                    break;
-                case HttpServer.LogPrio.Warning:
+                case LogPrio.Warning:
-                    m_log.WarnFormat("[{0}]: {1}", source.ToString(), message);
+                    m_log.WarnFormat("[{0}]: {1}", source, message);
                    break;
-                case HttpServer.LogPrio.Fatal:
+                case LogPrio.Fatal:
-                    m_log.ErrorFormat("[{0}]: FATAL! - {1}", source.ToString(), message);
+                    m_log.ErrorFormat("[{0}]: FATAL! - {1}", source, message);
                    break;
                default:
                    break;
@@ -1849,4 +1861,4 @@ namespace OpenSim.Framework.Servers.HttpServer
            return;
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs
index d13408d..65b1eb5 100644
--- a/OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Framework.Servers.HttpServer
        bool AddAgentHandler(string agent, IHttpAgentHandler handler);
        
        /// <summary>
-        /// Add a handler for an HTTP request
+        /// Add a handler for an HTTP request.
        /// </summary>
        /// 
        /// This handler can actually be invoked either as 
@@ -66,6 +66,10 @@ namespace OpenSim.Framework.Servers.HttpServer
        /// or
        /// 
        /// http://localhost:9000/object/
+        ///
+        /// In addition, the handler invoked by the HTTP server for any request is the one when best matches the request
+        /// URI.  So if a handler for "/myapp/" is registered and a request for "/myapp/page" is received, then
+        /// the "/myapp/" handler is invoked if no "/myapp/page" handler exists.
        /// 
        /// <param name="methodName"></param>
        /// <param name="handler"></param>
@@ -73,7 +77,6 @@ namespace OpenSim.Framework.Servers.HttpServer
        /// true if the handler was successfully registered, false if a handler with the same name already existed.
        /// </returns>
        bool AddHTTPHandler(string methodName, GenericHTTPMethod handler);
         
        bool AddPollServiceHTTPHandler(string methodName, GenericHTTPMethod handler, PollServiceEventArgs args);
diff --git a/OpenSim/Framework/Servers/HttpServer/OSHttpRequest.cs b/OpenSim/Framework/Servers/HttpServer/OSHttpRequest.cs
index bcfb0a4..e354dfb 100644
--- a/OpenSim/Framework/Servers/HttpServer/OSHttpRequest.cs
+++ b/OpenSim/Framework/Servers/HttpServer/OSHttpRequest.cs
@@ -127,6 +127,11 @@ namespace OpenSim.Framework.Servers.HttpServer
        }
        private Hashtable _query;
+        /// <value>
+        /// POST request values, if applicable
+        /// </value>
+//        public Hashtable Form { get; private set; }
        public string RawUrl
        {
            get { return _request.Uri.AbsolutePath; }
@@ -228,6 +233,13 @@ namespace OpenSim.Framework.Servers.HttpServer
            {
                _log.ErrorFormat("[OSHttpRequest]: Error parsing querystring");
            }
+//            Form = new Hashtable();
+//            foreach (HttpInputItem item in req.Form)
+//            {
+//                _log.DebugFormat("[OSHttpRequest]: Got form item {0}={1}", item.Name, item.Value);
+//                Form.Add(item.Name, item.Value);
+//            }
        }
        public override string ToString()
diff --git a/OpenSim/Framework/Servers/HttpServer/SynchronousRestFormsRequester.cs b/OpenSim/Framework/Servers/HttpServer/SynchronousRestFormsRequester.cs
index 4543fd5..b0cf34d 100644
--- a/OpenSim/Framework/Servers/HttpServer/SynchronousRestFormsRequester.cs
+++ b/OpenSim/Framework/Servers/HttpServer/SynchronousRestFormsRequester.cs
@@ -81,7 +81,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                }
                catch (Exception e)
                {
-                    m_log.DebugFormat("[FORMS]: exception occured on sending request {0}", e.Message);
+                    m_log.DebugFormat("[FORMS]: exception occured on sending request to {0}: {1}", requestUrl, e.Message);
                }
                finally
                {
diff --git a/OpenSim/Framework/Servers/VersionInfo.cs b/OpenSim/Framework/Servers/VersionInfo.cs
index cf417d7..518f2ea 100644
--- a/OpenSim/Framework/Servers/VersionInfo.cs
+++ b/OpenSim/Framework/Servers/VersionInfo.cs
@@ -29,7 +29,7 @@ namespace OpenSim
 {
    public class VersionInfo
    {
-        private const string VERSION_NUMBER = "0.6.9CM";
+        private const string VERSION_NUMBER = "0.7CM";
        private const Flavour VERSION_FLAVOUR = Flavour.Dev;
        public enum Flavour
diff --git a/OpenSim/Framework/Tests/AssetBaseTest.cs b/OpenSim/Framework/Tests/AssetBaseTest.cs
index 18a3e01..6db1aa0 100644
--- a/OpenSim/Framework/Tests/AssetBaseTest.cs
+++ b/OpenSim/Framework/Tests/AssetBaseTest.cs
@@ -67,7 +67,7 @@ namespace OpenSim.Framework.Tests
        private void CheckContainsReferences(AssetType assetType, bool expected)
        {
-            AssetBase asset = new AssetBase(UUID.Zero, String.Empty, (sbyte)assetType);
+            AssetBase asset = new AssetBase(UUID.Zero, String.Empty, (sbyte)assetType, UUID.Zero.ToString());
            bool actual = asset.ContainsReferences;
            Assert.AreEqual(expected, actual, "Expected "+assetType+".ContainsReferences to be "+expected+" but was "+actual+".");
        }
diff --git a/OpenSim/Framework/UntrustedWebRequest.cs b/OpenSim/Framework/UntrustedWebRequest.cs
new file mode 100644
index 0000000..e6411cc
--- /dev/null
+++ b/OpenSim/Framework/UntrustedWebRequest.cs
@@ -0,0 +1,230 @@
+/*
+ * 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.Generic;
+using System.IO;
+using System.Net;
+using System.Net.Security;
+using System.Text;
+using log4net;
+namespace OpenSim.Framework
+{
+    /// <summary>
+    /// Used for requests to untrusted endpoints that may potentially be
+    /// malicious
+    /// </summary>
+    public static class UntrustedHttpWebRequest
+    {
+        /// <summary>Setting this to true will allow HTTP connections to localhost</summary>
+        private const bool DEBUG = true;
+        private static readonly ILog m_log =
+                LogManager.GetLogger(
+                System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ICollection<string> allowableSchemes = new List<string> { "http", "https" };
+        /// <summary>
+        /// Creates an HttpWebRequest that is hardened against malicious
+        /// endpoints after ensuring the given Uri is safe to retrieve
+        /// </summary>
+        /// <param name="uri">Web location to request</param>
+        /// <returns>A hardened HttpWebRequest if the uri was determined to be safe</returns>
+        /// <exception cref="ArgumentNullException">If uri is null</exception>
+        /// <exception cref="ArgumentException">If uri is unsafe</exception>
+        public static HttpWebRequest Create(Uri uri)
+        {
+            return Create(uri, DEBUG, 1000 * 5, 1000 * 20, 10);
+        }
+        /// <summary>
+        /// Creates an HttpWebRequest that is hardened against malicious
+        /// endpoints after ensuring the given Uri is safe to retrieve
+        /// </summary>
+        /// <param name="uri">Web location to request</param>
+        /// <param name="allowLoopback">True to allow connections to localhost, otherwise false</param>
+        /// <param name="readWriteTimeoutMS">Read write timeout, in milliseconds</param>
+        /// <param name="timeoutMS">Connection timeout, in milliseconds</param>
+        /// <param name="maximumRedirects">Maximum number of allowed redirects</param>
+        /// <returns>A hardened HttpWebRequest if the uri was determined to be safe</returns>
+        /// <exception cref="ArgumentNullException">If uri is null</exception>
+        /// <exception cref="ArgumentException">If uri is unsafe</exception>
+        public static HttpWebRequest Create(Uri uri, bool allowLoopback, int readWriteTimeoutMS, int timeoutMS, int maximumRedirects)
+        {
+            if (uri == null)
+                throw new ArgumentNullException("uri");
+            if (!IsUriAllowable(uri, allowLoopback))
+                throw new ArgumentException("Uri " + uri + " was rejected");
+            HttpWebRequest httpWebRequest = (HttpWebRequest)HttpWebRequest.Create(uri);
+            httpWebRequest.MaximumAutomaticRedirections = maximumRedirects;
+            httpWebRequest.ReadWriteTimeout = readWriteTimeoutMS;
+            httpWebRequest.Timeout = timeoutMS;
+            httpWebRequest.KeepAlive = false;
+            return httpWebRequest;
+        }
+        public static string PostToUntrustedUrl(Uri url, string data)
+        {
+            try
+            {
+                byte[] requestData = System.Text.Encoding.UTF8.GetBytes(data);
+                HttpWebRequest request = Create(url);
+                request.Method = "POST";
+                request.ContentLength = requestData.Length;
+                request.ContentType = "application/x-www-form-urlencoded";
+                using (Stream requestStream = request.GetRequestStream())
+                    requestStream.Write(requestData, 0, requestData.Length);
+                using (WebResponse response = request.GetResponse())
+                {
+                    using (Stream responseStream = response.GetResponseStream())
+                        return responseStream.GetStreamString();
+                }
+            }
+            catch (Exception ex)
+            {
+                m_log.Warn("POST to untrusted URL " + url + " failed: " + ex.Message);
+                return null;
+            }
+        }
+        public static string GetUntrustedUrl(Uri url)
+        {
+            try
+            {
+                HttpWebRequest request = Create(url);
+                using (WebResponse response = request.GetResponse())
+                {
+                    using (Stream responseStream = response.GetResponseStream())
+                        return responseStream.GetStreamString();
+                }
+            }
+            catch (Exception ex)
+            {
+                m_log.Warn("GET from untrusted URL " + url + " failed: " + ex.Message);
+                return null;
+            }
+        }
+        /// <summary>
+        /// Determines whether a URI is allowed based on scheme and host name.
+        /// No requireSSL check is done here
+        /// </summary>
+        /// <param name="allowLoopback">True to allow loopback addresses to be used</param>
+        /// <param name="uri">The URI to test for whether it should be allowed.</param>
+        /// <returns>
+        ///     <c>true</c> if [is URI allowable] [the specified URI]; otherwise, <c>false</c>.
+        /// </returns>
+        private static bool IsUriAllowable(Uri uri, bool allowLoopback)
+        {
+            if (!allowableSchemes.Contains(uri.Scheme))
+            {
+                m_log.WarnFormat("Rejecting URL {0} because it uses a disallowed scheme.", uri);
+                return false;
+            }
+            // Try to interpret the hostname as an IP address so we can test for internal
+            // IP address ranges.  Note that IP addresses can appear in many forms 
+            // (e.g. http://127.0.0.1, http://2130706433, http://0x0100007f, http://::1
+            // So we convert them to a canonical IPAddress instance, and test for all
+            // non-routable IP ranges: 10.*.*.*, 127.*.*.*, ::1
+            // Note that Uri.IsLoopback is very unreliable, not catching many of these variants.
+            IPAddress hostIPAddress;
+            if (IPAddress.TryParse(uri.DnsSafeHost, out hostIPAddress))
+            {
+                byte[] addressBytes = hostIPAddress.GetAddressBytes();
+                // The host is actually an IP address.
+                switch (hostIPAddress.AddressFamily)
+                {
+                    case System.Net.Sockets.AddressFamily.InterNetwork:
+                        if (!allowLoopback && (addressBytes[0] == 127 || addressBytes[0] == 10))
+                        {
+                            m_log.WarnFormat("Rejecting URL {0} because it is a loopback address.", uri);
+                            return false;
+                        }
+                        break;
+                    case System.Net.Sockets.AddressFamily.InterNetworkV6:
+                        if (!allowLoopback && IsIPv6Loopback(hostIPAddress))
+                        {
+                            m_log.WarnFormat("Rejecting URL {0} because it is a loopback address.", uri);
+                            return false;
+                        }
+                        break;
+                    default:
+                        m_log.WarnFormat("Rejecting URL {0} because it does not use an IPv4 or IPv6 address.", uri);
+                        return false;
+                }
+            }
+            else
+            {
+                // The host is given by name.  We require names to contain periods to
+                // help make sure it's not an internal address.
+                if (!allowLoopback && !uri.Host.Contains("."))
+                {
+                    m_log.WarnFormat("Rejecting URL {0} because it does not contain a period in the host name.", uri);
+                    return false;
+                }
+            }
+            return true;
+        }
+        /// <summary>
+        /// Determines whether an IP address is the IPv6 equivalent of "localhost/127.0.0.1".
+        /// </summary>
+        /// <param name="ip">The ip address to check.</param>
+        /// <returns>
+        ///     <c>true</c> if this is a loopback IP address; <c>false</c> otherwise.
+        /// </returns>
+        private static bool IsIPv6Loopback(IPAddress ip)
+        {
+            if (ip == null)
+                throw new ArgumentNullException("ip");
+            byte[] addressBytes = ip.GetAddressBytes();
+            for (int i = 0; i < addressBytes.Length - 1; i++)
+            {
+                if (addressBytes[i] != 0)
+                    return false;
+            }
+            if (addressBytes[addressBytes.Length - 1] != 1)
+                return false;
+            return true;
+        }
+    }
+}
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index 13a4b3f..c39fb6f 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -29,6 +29,7 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Data;
+using System.Diagnostics;
 using System.Globalization;
 using System.IO;
 using System.IO.Compression;
@@ -553,7 +554,7 @@ namespace OpenSim.Framework
            }
            catch (Exception e)
            {
-                m_log.ErrorFormat("[UTIL]: An error occurred while resolving {0}, {1}", dnsAddress, e);
+                m_log.WarnFormat("[UTIL]: An error occurred while resolving host name {0}, {1}", dnsAddress, e);
                // Still going to throw the exception on for now, since this was what was happening in the first place
                throw e;
@@ -1192,6 +1193,33 @@ namespace OpenSim.Framework
            return null;
        }
+        public static OSDMap GetOSDMap(string data)
+        {
+            OSDMap args = null;
+            try
+            {
+                OSD buffer;
+                // We should pay attention to the content-type, but let's assume we know it's Json
+                buffer = OSDParser.DeserializeJson(data);
+                if (buffer.Type == OSDType.Map)
+                {
+                    args = (OSDMap)buffer;
+                    return args;
+                }
+                else
+                {
+                    // uh?
+                    m_log.Debug(("[UTILS]: Got OSD of unexpected type " + buffer.Type.ToString()));
+                    return null;
+                }
+            }
+            catch (Exception ex)
+            {
+                m_log.Debug("[UTILS]: exception on GetOSDMap " + ex.Message);
+                return null;
+            }
+        }
        public static string[] Glob(string path)
        {
            string vol=String.Empty;
@@ -1416,6 +1444,7 @@ namespace OpenSim.Framework
        }
        #endregion FireAndForget Threading Pattern
        /// <summary>
        /// Environment.TickCount is an int but it counts all 32 bits so it goes positive
        /// and negative every 24.9 days. This trims down TickCount so it doesn't wrap
@@ -1440,5 +1469,21 @@ namespace OpenSim.Framework
            Int32 diff = EnvironmentTickCount() - prevValue;
            return (diff >= 0) ? diff : (diff + EnvironmentTickCountMask + 1);
        }
+        /// <summary>
+        /// Prints the call stack at any given point. Useful for debugging.
+        /// </summary>
+        public static void PrintCallStack()
+        {
+            StackTrace stackTrace = new StackTrace();           // get call stack
+            StackFrame[] stackFrames = stackTrace.GetFrames();  // get method calls (frames)
+            // write call stack method names
+            foreach (StackFrame stackFrame in stackFrames)
+            {
+                m_log.Debug(stackFrame.GetMethod().DeclaringType + "." + stackFrame.GetMethod().Name); // write method name
+            }
+        }
    }
 }
 \ No newline at end of file
diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs
new file mode 100644
index 0000000..94862a6
--- /dev/null
+++ b/OpenSim/Framework/WebUtil.cs
@@ -0,0 +1,366 @@
+/*
+ * 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.Generic;
+using System.Collections.Specialized;
+using System.IO;
+using System.Net;
+using System.Net.Security;
+using System.Reflection;
+using System.Text;
+using System.Web;
+using log4net;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenMetaverse.StructuredData;
+namespace OpenSim.Framework
+{
+    /// <summary>
+    /// Miscellaneous static methods and extension methods related to the web
+    /// </summary>
+    public static class WebUtil
+    {
+        private static readonly ILog m_log =
+                LogManager.GetLogger(
+                MethodBase.GetCurrentMethod().DeclaringType);
+        /// <summary>
+        /// Send LLSD to an HTTP client in application/llsd+json form
+        /// </summary>
+        /// <param name="response">HTTP response to send the data in</param>
+        /// <param name="body">LLSD to send to the client</param>
+        public static void SendJSONResponse(OSHttpResponse response, OSDMap body)
+        {
+            byte[] responseData = Encoding.UTF8.GetBytes(OSDParser.SerializeJsonString(body));
+            response.ContentEncoding = Encoding.UTF8;
+            response.ContentLength = responseData.Length;
+            response.ContentType = "application/llsd+json";
+            response.Body.Write(responseData, 0, responseData.Length);
+        }
+        /// <summary>
+        /// Send LLSD to an HTTP client in application/llsd+xml form
+        /// </summary>
+        /// <param name="response">HTTP response to send the data in</param>
+        /// <param name="body">LLSD to send to the client</param>
+        public static void SendXMLResponse(OSHttpResponse response, OSDMap body)
+        {
+            byte[] responseData = OSDParser.SerializeLLSDXmlBytes(body);
+            response.ContentEncoding = Encoding.UTF8;
+            response.ContentLength = responseData.Length;
+            response.ContentType = "application/llsd+xml";
+            response.Body.Write(responseData, 0, responseData.Length);
+        }
+        /// <summary>
+        /// Make a GET or GET-like request to a web service that returns LLSD
+        /// or JSON data
+        /// </summary>
+        public static OSDMap ServiceRequest(string url, string httpVerb)
+        {
+            string errorMessage;
+            try
+            {
+                HttpWebRequest request = (HttpWebRequest)HttpWebRequest.Create(url);
+                request.Method = httpVerb;
+                using (WebResponse response = request.GetResponse())
+                {
+                    using (Stream responseStream = response.GetResponseStream())
+                    {
+                        try
+                        {
+                            string responseStr = responseStream.GetStreamString();
+                            OSD responseOSD = OSDParser.Deserialize(responseStr);
+                            if (responseOSD.Type == OSDType.Map)
+                                return (OSDMap)responseOSD;
+                            else
+                                errorMessage = "Response format was invalid.";
+                        }
+                        catch
+                        {
+                            errorMessage = "Failed to parse the response.";
+                        }
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                m_log.Warn("GET from URL " + url + " failed: " + ex.Message);
+                errorMessage = ex.Message;
+            }
+            return new OSDMap { { "Message", OSD.FromString("Service request failed. " + errorMessage) } };
+        }
+        /// <summary>
+        /// POST URL-encoded form data to a web service that returns LLSD or
+        /// JSON data
+        /// </summary>
+        public static OSDMap PostToService(string url, NameValueCollection data)
+        {
+            string errorMessage;
+            try
+            {
+                string queryString = BuildQueryString(data);
+                byte[] requestData = System.Text.Encoding.UTF8.GetBytes(queryString);
+                HttpWebRequest request = (HttpWebRequest)HttpWebRequest.Create(url);
+                request.Method = "POST";
+                request.ContentLength = requestData.Length;
+                request.ContentType = "application/x-www-form-urlencoded";
+                using (Stream requestStream = request.GetRequestStream())
+                    requestStream.Write(requestData, 0, requestData.Length);
+                using (WebResponse response = request.GetResponse())
+                {
+                    using (Stream responseStream = response.GetResponseStream())
+                    {
+                        string responseStr = null;
+                        try
+                        {
+                            responseStr = responseStream.GetStreamString();
+                            OSD responseOSD = OSDParser.Deserialize(responseStr);
+                            if (responseOSD.Type == OSDType.Map)
+                                return (OSDMap)responseOSD;
+                            else
+                                errorMessage = "Response format was invalid.";
+                        }
+                        catch (Exception ex)
+                        {
+                            if (!String.IsNullOrEmpty(responseStr))
+                                errorMessage = "Failed to parse the response:\n" + responseStr;
+                            else
+                                errorMessage = "Failed to retrieve the response: " + ex.Message;
+                        }
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                m_log.Warn("POST to URL " + url + " failed: " + ex.Message);
+                errorMessage = ex.Message;
+            }
+            return new OSDMap { { "Message", OSD.FromString("Service request failed. " + errorMessage) } };
+        }
+        #region Uri
+        /// <summary>
+        /// Combines a Uri that can contain both a base Uri and relative path
+        /// with a second relative path fragment
+        /// </summary>
+        /// <param name="uri">Starting (base) Uri</param>
+        /// <param name="fragment">Relative path fragment to append to the end
+        /// of the Uri</param>
+        /// <returns>The combined Uri</returns>
+        /// <remarks>This is similar to the Uri constructor that takes a base
+        /// Uri and the relative path, except this method can append a relative
+        /// path fragment on to an existing relative path</remarks>
+        public static Uri Combine(this Uri uri, string fragment)
+        {
+            string fragment1 = uri.Fragment;
+            string fragment2 = fragment;
+            if (!fragment1.EndsWith("/"))
+                fragment1 = fragment1 + '/';
+            if (fragment2.StartsWith("/"))
+                fragment2 = fragment2.Substring(1);
+            return new Uri(uri, fragment1 + fragment2);
+        }
+        /// <summary>
+        /// Combines a Uri that can contain both a base Uri and relative path
+        /// with a second relative path fragment. If the fragment is absolute,
+        /// it will be returned without modification
+        /// </summary>
+        /// <param name="uri">Starting (base) Uri</param>
+        /// <param name="fragment">Relative path fragment to append to the end
+        /// of the Uri, or an absolute Uri to return unmodified</param>
+        /// <returns>The combined Uri</returns>
+        public static Uri Combine(this Uri uri, Uri fragment)
+        {
+            if (fragment.IsAbsoluteUri)
+                return fragment;
+            string fragment1 = uri.Fragment;
+            string fragment2 = fragment.ToString();
+            if (!fragment1.EndsWith("/"))
+                fragment1 = fragment1 + '/';
+            if (fragment2.StartsWith("/"))
+                fragment2 = fragment2.Substring(1);
+            return new Uri(uri, fragment1 + fragment2);
+        }
+        /// <summary>
+        /// Appends a query string to a Uri that may or may not have existing 
+        /// query parameters
+        /// </summary>
+        /// <param name="uri">Uri to append the query to</param>
+        /// <param name="query">Query string to append. Can either start with ?
+        /// or just containg key/value pairs</param>
+        /// <returns>String representation of the Uri with the query string
+        /// appended</returns>
+        public static string AppendQuery(this Uri uri, string query)
+        {
+            if (String.IsNullOrEmpty(query))
+                return uri.ToString();
+            if (query[0] == '?' || query[0] == '&')
+                query = query.Substring(1);
+            string uriStr = uri.ToString();
+            if (uriStr.Contains("?"))
+                return uriStr + '&' + query;
+            else
+                return uriStr + '?' + query;
+        }
+        #endregion Uri
+        #region NameValueCollection
+        /// <summary>
+        /// Convert a NameValueCollection into a query string. This is the
+        /// inverse of HttpUtility.ParseQueryString()
+        /// </summary>
+        /// <param name="parameters">Collection of key/value pairs to convert</param>
+        /// <returns>A query string with URL-escaped values</returns>
+        public static string BuildQueryString(NameValueCollection parameters)
+        {
+            List<string> items = new List<string>(parameters.Count);
+            foreach (string key in parameters.Keys)
+            {
+                string[] values = parameters.GetValues(key);
+                if (values != null)
+                {
+                    foreach (string value in values)
+                        items.Add(String.Concat(key, "=", HttpUtility.UrlEncode(value ?? String.Empty)));
+                }
+            }
+            return String.Join("&", items.ToArray());
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="collection"></param>
+        /// <param name="key"></param>
+        /// <returns></returns>
+        public static string GetOne(this NameValueCollection collection, string key)
+        {
+            string[] values = collection.GetValues(key);
+            if (values != null && values.Length > 0)
+                return values[0];
+            return null;
+        }
+        #endregion NameValueCollection
+        #region Stream
+        /// <summary>
+        /// Copies the contents of one stream to another, starting at the 
+        /// current position of each stream
+        /// </summary>
+        /// <param name="copyFrom">The stream to copy from, at the position 
+        /// where copying should begin</param>
+        /// <param name="copyTo">The stream to copy to, at the position where 
+        /// bytes should be written</param>
+        /// <param name="maximumBytesToCopy">The maximum bytes to copy</param>
+        /// <returns>The total number of bytes copied</returns>
+        /// <remarks>
+        /// Copying begins at the streams' current positions. The positions are
+        /// NOT reset after copying is complete.
+        /// </remarks>
+        public static int CopyTo(this Stream copyFrom, Stream copyTo, int maximumBytesToCopy)
+        {
+            byte[] buffer = new byte[4096];
+            int readBytes;
+            int totalCopiedBytes = 0;
+            while ((readBytes = copyFrom.Read(buffer, 0, Math.Min(4096, maximumBytesToCopy))) > 0)
+            {
+                int writeBytes = Math.Min(maximumBytesToCopy, readBytes);
+                copyTo.Write(buffer, 0, writeBytes);
+                totalCopiedBytes += writeBytes;
+                maximumBytesToCopy -= writeBytes;
+            }
+            return totalCopiedBytes;
+        }
+        /// <summary>
+        /// Converts an entire stream to a string, regardless of current stream
+        /// position
+        /// </summary>
+        /// <param name="stream">The stream to convert to a string</param>
+        /// <returns></returns>
+        /// <remarks>When this method is done, the stream position will be 
+        /// reset to its previous position before this method was called</remarks>
+        public static string GetStreamString(this Stream stream)
+        {
+            string value = null;
+            if (stream != null && stream.CanRead)
+            {
+                long rewindPos = -1;
+                if (stream.CanSeek)
+                {
+                    rewindPos = stream.Position;
+                    stream.Seek(0, SeekOrigin.Begin);
+                }
+                StreamReader reader = new StreamReader(stream);
+                value = reader.ReadToEnd();
+                if (rewindPos >= 0)
+                    stream.Seek(rewindPos, SeekOrigin.Begin);
+            }
+            return value;
+        }
+        #endregion Stream
+    }
+}
diff --git a/OpenSim/Framework/sLLVector3.cs b/OpenSim/Framework/sLLVector3.cs
deleted file mode 100644
index 49940c4..0000000
--- a/OpenSim/Framework/sLLVector3.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * 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
-{
-    [Serializable]
-    public class sLLVector3
-    {
-        public float x = 0;
-        public float y = 0;
-        public float z = 0;
-        public sLLVector3()
-        {
-        }
-        public sLLVector3(Vector3 v)
-        {
-            x = v.X;
-            y = v.Y;
-            z = v.Z;
-        }
-    }
-}
-\ No newline at end of file