122 files changed, 0 insertions, 12868 deletions
diff --git a/Common/OpenGrid.Framework.Communications.OGS1/GridCommsManager.cs b/Common/OpenGrid.Framework.Communications.OGS1/GridCommsManager.cs
deleted file mode 100644
index 563eaf7..0000000
--- a/Common/OpenGrid.Framework.Communications.OGS1/GridCommsManager.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using OpenSim.Framework.Types;
-using OpenGrid.Framework.Communications;
-namespace OpenGrid.Framework.Communications.OGS1
-{
-    public class GridCommsManager : CommunicationsManager
-    {
-        private OGS1GridServices gridInterComms = new OGS1GridServices();
-        public GridCommsManager(NetworkServersInfo serversInfo) :base(serversInfo)
-        {
-            GridServer = gridInterComms;
-            InterRegion = gridInterComms;
-            UserServer = new OGSUserServices();
-        }
-    }
-}
diff --git a/Common/OpenGrid.Framework.Communications.OGS1/OGS1GridServices.cs b/Common/OpenGrid.Framework.Communications.OGS1/OGS1GridServices.cs
deleted file mode 100644
index db64f0c..0000000
--- a/Common/OpenGrid.Framework.Communications.OGS1/OGS1GridServices.cs
+++ /dev/null
@@ -1,248 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Collections;
-using System.Text;
-using System.Runtime.Remoting;
-using System.Runtime.Remoting.Channels;
-using System.Runtime.Remoting.Channels.Tcp;
-using OpenSim.Servers;
-using OpenSim.Framework;
-using OpenSim.Framework.Types;
-using OpenGrid.Framework.Communications;
-using Nwc.XmlRpc;
-using libsecondlife;
-namespace OpenGrid.Framework.Communications.OGS1
-{
-    public class OGS1GridServices : IGridServices, IInterRegionCommunications
-    {
-        public Dictionary<ulong, RegionCommsListener> listeners = new Dictionary<ulong, RegionCommsListener>();
-        public GridInfo grid;
-        public BaseHttpServer httpListener;
-        private bool initialised = false;
-        public RegionCommsListener RegisterRegion(RegionInfo regionInfo, GridInfo gridInfo)
-        {
-            Hashtable GridParams = new Hashtable();
-            grid = gridInfo;
-            // Login / Authentication
-            GridParams["authkey"] = gridInfo.GridServerSendKey;
-            GridParams["UUID"] = regionInfo.SimUUID.ToStringHyphenated();
-            GridParams["sim_ip"] = regionInfo.CommsExternalAddress;
-            GridParams["sim_port"] = regionInfo.CommsIPListenPort.ToString();
-            // Package into an XMLRPC Request
-            ArrayList SendParams = new ArrayList(); 
-            SendParams.Add(GridParams);
-            // Send Request
-            XmlRpcRequest GridReq = new XmlRpcRequest("simulator_login", SendParams);
-            XmlRpcResponse GridResp = GridReq.Send(gridInfo.GridServerURI, 3000);
-            Hashtable GridRespData = (Hashtable)GridResp.Value;
-            Hashtable griddatahash = GridRespData;
-            // Process Response
-            if (GridRespData.ContainsKey("error"))
-            {
-                string errorstring = (string)GridRespData["error"];
-                OpenSim.Framework.Console.MainLog.Instance.Error("Unable to connect to grid: " + errorstring);
-                return null;
-            }  
-            if (!this.listeners.ContainsKey(regionInfo.RegionHandle))
-            {
-               // initialised = true;
-                httpListener = new BaseHttpServer(regionInfo.CommsIPListenPort);
-                httpListener.AddXmlRPCHandler("expect_user", this.ExpectUser);
-                httpListener.Start();
-            }
-            // Initialise the background listeners
-            listeners[regionInfo.RegionHandle] = new RegionCommsListener();
-            return listeners[regionInfo.RegionHandle];
-        }
-        public List<RegionInfo> RequestNeighbours(RegionInfo regionInfo)
-        {
-            Hashtable respData = MapBlockQuery((int)regionInfo.RegionLocX - 1, (int)regionInfo.RegionLocY - 1, (int)regionInfo.RegionLocX + 1, (int)regionInfo.RegionLocY + 1);
-            List<RegionInfo> neighbours = new List<RegionInfo>();
-            foreach (Hashtable n in (Hashtable)respData.Values)
-            {
-                RegionInfo neighbour = new RegionInfo();
-                //OGS1
-                neighbour.RegionHandle = (ulong)n["regionhandle"];
-                neighbour.RegionLocX = (uint)n["x"];
-                neighbour.RegionLocY = (uint)n["y"];
-                neighbour.RegionName = (string)n["name"];
-                //OGS1+
-                neighbour.CommsIPListenAddr = (string)n["sim_ip"];
-                neighbour.CommsIPListenPort = (int)n["sim_port"];
-                neighbour.CommsExternalAddress = (string)n["sim_uri"];
-                neighbour.SimUUID = (string)n["uuid"];
-                neighbours.Add(neighbour);
-            }
-            return neighbours;
-        }
-        public RegionInfo RequestNeighbourInfo(ulong regionHandle)
-        {
-            OpenSim.Framework.Console.MainLog.Instance.Warn("Unimplemented - RequestNeighbourInfo()");
-            return null;
-        }
-        public List<MapBlockData> RequestNeighbourMapBlocks(int minX, int minY, int maxX, int maxY)
-        {
-            Hashtable respData = MapBlockQuery(minX, minY, maxX, maxY);
-            List<MapBlockData> neighbours = new List<MapBlockData>();
-            foreach (Hashtable n in (Hashtable)respData.Values)
-            {
-                MapBlockData neighbour = new MapBlockData();
-                neighbour.X = (ushort)n["x"];
-                neighbour.Y = (ushort)n["y"];
-                neighbour.Name = (string)n["name"];
-                neighbour.Access = (byte)n["access"];
-                neighbour.RegionFlags = (uint)n["region-flags"];
-                neighbour.WaterHeight = (byte)n["water-height"];
-                neighbour.MapImageId = (string)n["map-image-id"];
-                neighbours.Add(neighbour);
-            }
-            return neighbours;
-        }
-        /// <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>
-        private Hashtable MapBlockQuery(int minX, int minY, int maxX, int maxY)
-        {
-            Hashtable param = new Hashtable();
-            param["xmin"] = minX;
-            param["ymin"] = minY;
-            param["xmax"] = maxX;
-            param["ymax"] = maxY;
-            IList parameters = new ArrayList();
-            parameters.Add(param);
-            XmlRpcRequest req = new XmlRpcRequest("map_block", parameters);
-            XmlRpcResponse resp = req.Send(grid.GridServerURI, 3000);
-            Hashtable respData = (Hashtable)resp.Value;
-            return respData;
-        }
-        // Grid Request Processing
-        public XmlRpcResponse ExpectUser(XmlRpcRequest request)
-        {
-            Hashtable requestData = (Hashtable)request.Params[0];
-            AgentCircuitData agentData = new AgentCircuitData();
-            agentData.SessionID = new LLUUID((string)requestData["session_id"]);
-            agentData.SecureSessionID = new LLUUID((string)requestData["secure_session_id"]);
-            agentData.firstname = (string)requestData["firstname"];
-            agentData.lastname = (string)requestData["lastname"];
-            agentData.AgentID = new LLUUID((string)requestData["agent_id"]);
-            agentData.circuitcode = Convert.ToUInt32(requestData["circuit_code"]);
-            if (requestData.ContainsKey("child_agent") && requestData["child_agent"].Equals("1"))
-            {
-                agentData.child = true;
-            }
-            else
-            {
-                agentData.startpos = new LLVector3(Convert.ToUInt32(requestData["startpos_x"]), Convert.ToUInt32(requestData["startpos_y"]), Convert.ToUInt32(requestData["startpos_z"]));
-                agentData.child = false;
-            }
-            if (listeners.ContainsKey((ulong)requestData["regionhandle"]))
-            {
-                this.listeners[(ulong)requestData["regionhandle"]].TriggerExpectUser((ulong)requestData["regionhandle"], agentData);
-            }
-            else
-            {
-                OpenSim.Framework.Console.MainLog.Instance.Error("ExpectUser() - Unknown region " + ((ulong)requestData["regionhandle"]).ToString());
-            }
-            return new XmlRpcResponse();
-        }
-        #region InterRegion Comms
-        private void StartRemoting()
-        {
-            TcpChannel ch = new TcpChannel(8895);
-            ChannelServices.RegisterChannel(ch);
-            WellKnownServiceTypeEntry wellType = new WellKnownServiceTypeEntry( Type.GetType("OGS1InterRegionRemoting"), "InterRegions", WellKnownObjectMode.Singleton);
-            RemotingConfiguration.RegisterWellKnownServiceType(wellType);
-            InterRegionSingleton.Instance.OnArrival += this.IncomingArrival;
-            InterRegionSingleton.Instance.OnChildAgent += this.IncomingChildAgent;
-        }
-        #region Methods called by regions in this instance
-        public bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData)
-        {
-            if (this.listeners.ContainsKey(regionHandle))
-            {
-                this.listeners[regionHandle].TriggerExpectUser(regionHandle, agentData);
-                return true;
-            }
-            //TODO need to see if we know about where this region is and use .net remoting 
-            // to inform it. 
-            return false;
-        }
-        public bool ExpectAvatarCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position)
-        {
-            if (this.listeners.ContainsKey(regionHandle))
-            {
-                this.listeners[regionHandle].TriggerExpectAvatarCrossing(regionHandle, agentID, position);
-                return true;
-            }
-            //TODO need to see if we know about where this region is and use .net remoting 
-            // to inform it. 
-            return false;
-        }
-        #endregion
-        #region Methods triggered by calls from external instances
-        public bool IncomingChildAgent(ulong regionHandle, AgentCircuitData agentData)
-        {
-            if (this.listeners.ContainsKey(regionHandle))
-            {
-                this.listeners[regionHandle].TriggerExpectUser(regionHandle, agentData);
-                return true;
-            }
-            return false;
-        }
-        public bool IncomingArrival(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position)
-        {
-            if (this.listeners.ContainsKey(regionHandle))
-            {
-                this.listeners[regionHandle].TriggerExpectAvatarCrossing(regionHandle, agentID, position);
-                return true;
-            }
-            return false;
-        }
-        #endregion
-        #endregion
-    }
-}
diff --git a/Common/OpenGrid.Framework.Communications.OGS1/OGSInterSimComms.cs b/Common/OpenGrid.Framework.Communications.OGS1/OGSInterSimComms.cs
deleted file mode 100644
index 3d74e2f..0000000
--- a/Common/OpenGrid.Framework.Communications.OGS1/OGSInterSimComms.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using OpenSim.Framework.Types;
-using OpenGrid.Framework.Communications;
-namespace OpenGrid.Framework.Communications.OGS1
-{
-    public delegate bool InformRegionChild(ulong regionHandle, AgentCircuitData agentData);
-    public delegate bool ExpectArrival(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position);
-    public sealed class InterRegionSingleton
-    {
-        static readonly InterRegionSingleton instance = new InterRegionSingleton();
-        public event InformRegionChild OnChildAgent;
-        public event ExpectArrival OnArrival;
-        static InterRegionSingleton()
-        {
-        }
-        InterRegionSingleton()
-        {
-        }
-        public static InterRegionSingleton Instance
-        {
-            get
-            {
-                return instance;
-            }
-        }
-        public bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData)
-        {
-            if (OnChildAgent != null)
-            {
-                return OnChildAgent(regionHandle, agentData);
-            }
-            return false;
-        }
-        public bool ExpectAvatarCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position)
-        {
-            if (OnArrival != null)
-            {
-                return OnArrival(regionHandle, agentID, position);
-            }
-            return false;
-        }
-    }
-    public class OGS1InterRegionRemoting : MarshalByRefObject
-    {
-        public OGS1InterRegionRemoting()
-        {
-        }
-        public bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData)
-        {
-            return InterRegionSingleton.Instance.InformRegionOfChildAgent(regionHandle, agentData);
-        }
-        public bool ExpectAvatarCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position)
-        {
-            return InterRegionSingleton.Instance.ExpectAvatarCrossing(regionHandle, agentID, position);
-        }
-    }
-}
diff --git a/Common/OpenGrid.Framework.Communications.OGS1/OGSUserServices.cs b/Common/OpenGrid.Framework.Communications.OGS1/OGSUserServices.cs
deleted file mode 100644
index 1667e6b..0000000
--- a/Common/OpenGrid.Framework.Communications.OGS1/OGSUserServices.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using OpenGrid.Framework.Communications;
-using OpenGrid.Framework.Data;
-using libsecondlife;
-namespace OpenGrid.Framework.Communications.OGS1
-{
-    public class OGSUserServices :IUserServices
-    {
-        public UserProfileData GetUserProfile(string firstName, string lastName)
-        {
-            return null;
-        }
-        public UserProfileData GetUserProfile(string name)
-        {
-            return null;
-        }
-        public UserProfileData GetUserProfile(LLUUID avatarID)
-        {
-            return null;
-        }
-    }
-}
diff --git a/Common/OpenGrid.Framework.Communications.OGS1/OpenGrid.Framework.Communications.OGS1.csproj b/Common/OpenGrid.Framework.Communications.OGS1/OpenGrid.Framework.Communications.OGS1.csproj
deleted file mode 100644
index 804ddba..0000000
--- a/Common/OpenGrid.Framework.Communications.OGS1/OpenGrid.Framework.Communications.OGS1.csproj
+++ /dev/null
@@ -1,144 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{17442AF1-0000-0000-0000-000000000000}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon></ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>OpenGrid.Framework.Communications.OGS1</AssemblyName>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenGrid.Framework.Communications.OGS1</RootNamespace>
-    <StartupObject></StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <DocumentationFile></DocumentationFile>
-    <DebugSymbols>True</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <Optimize>False</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <RemoveIntegerChecks>False</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile></DocumentationFile>
-    <DebugSymbols>False</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <Optimize>True</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <RemoveIntegerChecks>False</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="libsecondlife.dll" >
-      <HintPath>..\..\bin\libsecondlife.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System" >
-      <HintPath>System.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Data" >
-      <HintPath>System.Data.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Runtime.Remoting" >
-      <HintPath>System.Runtime.Remoting.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Xml" >
-      <HintPath>System.Xml.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\OpenGrid.Framework.Communications\OpenGrid.Framework.Communications.csproj">
-      <Name>OpenGrid.Framework.Communications</Name>
-      <Project>{683344D5-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-                        <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj">
-      <Name>OpenGrid.Framework.Data</Name>
-      <Project>{62CDF671-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-                        <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj">
-      <Name>OpenSim.Framework</Name>
-      <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-                        <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
-      <Name>OpenSim.Framework.Console</Name>
-      <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-                        <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\OpenSim.Servers\OpenSim.Servers.csproj">
-      <Name>OpenSim.Servers</Name>
-      <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-                        <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\XmlRpcCS\XMLRPC.csproj">
-      <Name>XMLRPC</Name>
-      <Project>{8E81D43C-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-                        <Private>False</Private>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="GridCommsManager.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="OGS1GridServices.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="OGSInterSimComms.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="OGSUserServices.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
diff --git a/Common/OpenGrid.Framework.Communications.OGS1/Properties/AssemblyInfo.cs b/Common/OpenGrid.Framework.Communications.OGS1/Properties/AssemblyInfo.cs
deleted file mode 100644
index 0c6f965..0000000
--- a/Common/OpenGrid.Framework.Communications.OGS1/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("OpenGrid.Framework.Communications.OGS1")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("OpenGrid.Framework.Communications.OGS1")]
-[assembly: AssemblyCopyright("Copyright ©  2007")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("a8b2b39b-c83b-41e2-b0b5-7ccfc1fddae7")]
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Revision and Build Numbers 
-// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Common/OpenGrid.Framework.Communications/CommunicationsManager.cs b/Common/OpenGrid.Framework.Communications/CommunicationsManager.cs
deleted file mode 100644
index 8d8a647..0000000
--- a/Common/OpenGrid.Framework.Communications/CommunicationsManager.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Text;
-using OpenSim.Framework;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-using libsecondlife;
-namespace OpenGrid.Framework.Communications
-{
- 
-    public class CommunicationsManager
-    {
-        public IUserServices UserServer;
-        public IGridServices GridServer;
-        public IInterRegionCommunications InterRegion;
-        public CommunicationsManager(NetworkServersInfo serversInfo)
-        {
-            
-        }
-    }
-}
diff --git a/Common/OpenGrid.Framework.Communications/IGridServices.cs b/Common/OpenGrid.Framework.Communications/IGridServices.cs
deleted file mode 100644
index d3b7c07..0000000
--- a/Common/OpenGrid.Framework.Communications/IGridServices.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using OpenSim.Framework.Types;
-using OpenSim.Framework;
-namespace OpenGrid.Framework.Communications
-{
-    public class GridInfo
-    {
-        public string GridServerURI = "http://grid.deepgrid.com:8001/"; // Temporarily hardcoded.
-        public string GridServerSendKey = "badger";
-        public string GridServerRecvKey = "badger";
-    }
-    public interface IGridServices
-    {
-        RegionCommsListener RegisterRegion(RegionInfo regionInfo, GridInfo gridInfo);
-        List<RegionInfo> RequestNeighbours(RegionInfo regionInfo);
-        RegionInfo RequestNeighbourInfo(ulong regionHandle);
-        List<MapBlockData> RequestNeighbourMapBlocks(int minX, int minY, int maxX, int maxY);
-    }
-}
diff --git a/Common/OpenGrid.Framework.Communications/IInterRegionCommunications.cs b/Common/OpenGrid.Framework.Communications/IInterRegionCommunications.cs
deleted file mode 100644
index 4cb8a38..0000000
--- a/Common/OpenGrid.Framework.Communications/IInterRegionCommunications.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using OpenSim.Framework.Types;
-using OpenSim.Framework;
-namespace OpenGrid.Framework.Communications
-{
-    public  interface IInterRegionCommunications
-    {
-         bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData);
-         bool ExpectAvatarCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position); 
-    }
-}
diff --git a/Common/OpenGrid.Framework.Communications/IUserServices.cs b/Common/OpenGrid.Framework.Communications/IUserServices.cs
deleted file mode 100644
index 3d8e791..0000000
--- a/Common/OpenGrid.Framework.Communications/IUserServices.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-using OpenGrid.Framework.Data;
-namespace OpenGrid.Framework.Communications
-{
-    public interface IUserServices
-    {
-        UserProfileData GetUserProfile(string firstName, string lastName);
-        UserProfileData GetUserProfile(string name);
-        UserProfileData GetUserProfile(LLUUID avatarID);
-        
-    }
-}
diff --git a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj
deleted file mode 100644
index 9a9568c..0000000
--- a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj
+++ /dev/null
@@ -1,112 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{683344D5-0000-0000-0000-000000000000}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon></ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>OpenGrid.Framework.Communications</AssemblyName>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenGrid.Framework.Communications</RootNamespace>
-    <StartupObject></StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <DocumentationFile></DocumentationFile>
-    <DebugSymbols>True</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <Optimize>False</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <RemoveIntegerChecks>False</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile></DocumentationFile>
-    <DebugSymbols>False</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <Optimize>True</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <RemoveIntegerChecks>False</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="libsecondlife.dll" >
-      <HintPath>..\..\bin\libsecondlife.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System" >
-      <HintPath>System.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Xml" >
-      <HintPath>System.Xml.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj">
-      <Name>OpenGrid.Framework.Data</Name>
-      <Project>{62CDF671-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-                        <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj">
-      <Name>OpenSim.Framework</Name>
-      <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-                        <Private>False</Private>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="CommunicationsManager.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="IGridServices.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="IInterRegionCommunications.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="IUserServices.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
diff --git a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build
deleted file mode 100644
index 392220b..0000000
--- a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" ?>
-<project name="OpenGrid.Framework.Communications" default="build">
-    <target name="build">
-        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
-        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
-        <copy todir="${project::get-base-directory()}/${build.dir}">
-            <fileset basedir="${project::get-base-directory()}">
-            </fileset>
-        </copy>
-        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
-            <resources prefix="OpenGrid.Framework.Communications" dynamicprefix="true" >
-            </resources>
-            <sources failonempty="true">
-                <include name="CommunicationsManager.cs" />
-                <include name="IGridServices.cs" />
-                <include name="IInterRegionCommunications.cs" />
-                <include name="IUserServices.cs" />
-                <include name="Properties/AssemblyInfo.cs" />
-            </sources>
-            <references basedir="${project::get-base-directory()}">
-                <lib>
-                    <include name="${project::get-base-directory()}" />
-                    <include name="${project::get-base-directory()}/${build.dir}" />
-                </lib>
-                <include name="../../bin/libsecondlife.dll" />
-                <include name="../../bin/OpenGrid.Framework.Data.dll" />
-                <include name="../../bin/OpenSim.Framework.dll" />
-                <include name="System.dll" />
-                <include name="System.Xml.dll" />
-            </references>
-        </csc>
-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
-        <mkdir dir="${project::get-base-directory()}/../../bin/"/>
-        <copy todir="${project::get-base-directory()}/../../bin/">
-            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
-                <include name="*.dll"/>
-                <include name="*.exe"/>
-            </fileset>
-        </copy>
-    </target>
-    <target name="clean">
-        <delete dir="${bin.dir}" failonerror="false" />
-        <delete dir="${obj.dir}" failonerror="false" />
-    </target>
-    <target name="doc" description="Creates documentation.">
-    </target>
-</project>
diff --git a/Common/OpenGrid.Framework.Communications/Properties/AssemblyInfo.cs b/Common/OpenGrid.Framework.Communications/Properties/AssemblyInfo.cs
deleted file mode 100644
index 83e7dd4..0000000
--- a/Common/OpenGrid.Framework.Communications/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("OpenGrid.Framework.Communications")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("OpenGrid.Framework.Communications")]
-[assembly: AssemblyCopyright("Copyright ©  2007")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("13e7c396-78a9-4a5c-baf2-6f980ea75d95")]
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Revision and Build Numbers 
-// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Common/OpenGrid.Framework.Data.DB4o/DB4oGridData.cs b/Common/OpenGrid.Framework.Data.DB4o/DB4oGridData.cs
deleted file mode 100644
index 0e73ab2..0000000
--- a/Common/OpenGrid.Framework.Data.DB4o/DB4oGridData.cs
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using OpenGrid.Framework.Data;
-using libsecondlife;
-namespace OpenGrid.Framework.Data.DB4o
-{
-    /// <summary>
-    /// A grid server storage mechanism employing the DB4o database system
-    /// </summary>
-    class DB4oGridData : IGridData
-    {
-        /// <summary>
-        /// The database manager object
-        /// </summary>
-        DB4oGridManager manager;
-        /// <summary>
-        /// Called when the plugin is first loaded (as constructors are not called)
-        /// </summary>
-        public void Initialise() {
-             manager = new DB4oGridManager("gridserver.yap");
-        }
-        /// <summary>
-        /// Returns a list of regions within the specified ranges
-        /// </summary>
-        /// <param name="a">minimum X coordinate</param>
-        /// <param name="b">minimum Y coordinate</param>
-        /// <param name="c">maximum X coordinate</param>
-        /// <param name="d">maximum Y coordinate</param>
-        /// <returns>An array of region profiles</returns>
-        public SimProfileData[] GetProfilesInRange(uint a, uint b, uint c, uint d)
-        {
-            return null;
-        }
-        /// <summary>
-        /// Returns a region located at the specified regionHandle (warning multiple regions may occupy the one spot, first found is returned)
-        /// </summary>
-        /// <param name="handle">The handle to search for</param>
-        /// <returns>A region profile</returns>
-        public SimProfileData GetProfileByHandle(ulong handle) {
-            lock (manager.simProfiles)
-            {
-                foreach (LLUUID UUID in manager.simProfiles.Keys)
-                {
-                    if (manager.simProfiles[UUID].regionHandle == handle)
-                    {
-                        return manager.simProfiles[UUID];
-                    }
-                }
-            }
-            throw new Exception("Unable to find profile with handle (" + handle.ToString() + ")");
-        }
-        /// <summary>
-        /// Returns a specific region
-        /// </summary>
-        /// <param name="uuid">The region ID code</param>
-        /// <returns>A region profile</returns>
-        public SimProfileData GetProfileByLLUUID(LLUUID uuid)
-        {
-            lock (manager.simProfiles)
-            {
-                if (manager.simProfiles.ContainsKey(uuid))
-                    return manager.simProfiles[uuid];
-            }
-            throw new Exception("Unable to find profile with UUID (" + uuid.ToStringHyphenated() + ")");
-        }
-        /// <summary>
-        /// Adds a new specified region to the database
-        /// </summary>
-        /// <param name="profile">The profile to add</param>
-        /// <returns>A dataresponse enum indicating success</returns>
-        public DataResponse AddProfile(SimProfileData profile)
-        {
-            lock (manager.simProfiles)
-            {
-                if (manager.AddRow(profile))
-                {
-                    return DataResponse.RESPONSE_OK;
-                }
-                else
-                {
-                    return DataResponse.RESPONSE_ERROR;
-                }
-            }
-        }
-        /// <summary>
-        /// Authenticates a new region using the shared secrets. NOT SECURE.
-        /// </summary>
-        /// <param name="uuid">The UUID the region is authenticating with</param>
-        /// <param name="handle">The location the region is logging into (unused in Db4o)</param>
-        /// <param name="key">The shared secret</param>
-        /// <returns>Authenticated?</returns>
-        public bool AuthenticateSim(LLUUID uuid, ulong handle, string key) {
-            if (manager.simProfiles[uuid].regionRecvKey == key)
-                return true;
-            return false;
-        }
-        /// <summary>
-        /// Shuts down the database
-        /// </summary>
-        public void Close()
-        {
-            manager = null;
-        }
-        /// <summary>
-        /// Returns the providers name
-        /// </summary>
-        /// <returns>The name of the storage system</returns>
-        public string getName()
-        {
-            return "DB4o Grid Provider";
-        }
-        /// <summary>
-        /// Returns the providers version
-        /// </summary>
-        /// <returns>The version of the storage system</returns>
-        public string getVersion()
-        {
-            return "0.1";
-        }
-        public ReservationData GetReservationAtPoint(uint x, uint y)
-        {
-            return null;
-        }
-    }
-}
diff --git a/Common/OpenGrid.Framework.Data.DB4o/DB4oManager.cs b/Common/OpenGrid.Framework.Data.DB4o/DB4oManager.cs
deleted file mode 100644
index 356a49c..0000000
--- a/Common/OpenGrid.Framework.Data.DB4o/DB4oManager.cs
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Db4objects.Db4o;
-using OpenGrid.Framework.Data;
-using libsecondlife;
-namespace OpenGrid.Framework.Data.DB4o
-{
-    /// <summary>
-    /// A Database manager for Db4o
-    /// </summary>
-    class DB4oGridManager
-    {
-        /// <summary>
-        /// A list of the current regions connected (in-memory cache)
-        /// </summary>
-        public Dictionary<LLUUID, SimProfileData> simProfiles = new Dictionary<LLUUID, SimProfileData>();
-        /// <summary>
-        /// Database File Name
-        /// </summary>
-        string dbfl;
-        /// <summary>
-        /// Creates a new grid storage manager
-        /// </summary>
-        /// <param name="db4odb">Filename to the database file</param>
-        public DB4oGridManager(string db4odb)
-        {
-            dbfl = db4odb;
-            IObjectContainer database;
-            database = Db4oFactory.OpenFile(dbfl);
-            IObjectSet result = database.Get(typeof(SimProfileData));
-            // Loads the file into the in-memory cache
-            foreach(SimProfileData row in result) {
-                simProfiles.Add(row.UUID, row);
-            }
-            database.Close();
-        }
-        /// <summary>
-        /// Adds a new profile to the database (Warning: Probably slow.)
-        /// </summary>
-        /// <param name="row">The profile to add</param>
-        /// <returns>Successful?</returns>
-        public bool AddRow(SimProfileData row)
-        {
-            if (simProfiles.ContainsKey(row.UUID))
-            {
-                simProfiles[row.UUID] = row;
-            }
-            else
-            {
-                simProfiles.Add(row.UUID, row);
-            }
-            try
-            {
-                IObjectContainer database;
-                database = Db4oFactory.OpenFile(dbfl);
-                database.Set(row);
-                database.Close();
-                return true;
-            }
-            catch (Exception e)
-            {
-                return false;
-            }
-        }
-    }
-    /// <summary>
-    /// A manager for the DB4o database (user profiles)
-    /// </summary>
-    class DB4oUserManager
-    {
-        /// <summary>
-        /// A list of the user profiles (in memory cache)
-        /// </summary>
-        public Dictionary<LLUUID, UserProfileData> userProfiles = new Dictionary<LLUUID, UserProfileData>();
-        /// <summary>
-        /// Database filename
-        /// </summary>
-        string dbfl;
-        /// <summary>
-        /// Initialises a new DB manager
-        /// </summary>
-        /// <param name="db4odb">The filename to the database</param>
-        public DB4oUserManager(string db4odb)
-        {
-            dbfl = db4odb;
-            IObjectContainer database;
-            database = Db4oFactory.OpenFile(dbfl);
-            // Load to cache
-            IObjectSet result = database.Get(typeof(UserProfileData));
-            foreach (UserProfileData row in result)
-            {
-                userProfiles.Add(row.UUID, row);
-            }
-            database.Close();
-        }
-        /// <summary>
-        /// Adds a new profile to the database (Warning: Probably slow.)
-        /// </summary>
-        /// <param name="row">The profile to add</param>
-        /// <returns>Successful?</returns>
-        public bool AddRow(UserProfileData row)
-        { 
-            if (userProfiles.ContainsKey(row.UUID))
-            {
-                userProfiles[row.UUID] = row;
-            }
-            else
-            {
-                userProfiles.Add(row.UUID, row);
-            }
-            try
-            {
-                IObjectContainer database;
-                database = Db4oFactory.OpenFile(dbfl);
-                database.Set(row);
-                database.Close();
-                return true;
-            }
-            catch (Exception e)
-            {
-                return false;
-            }
-        }
-    }
-}
diff --git a/Common/OpenGrid.Framework.Data.DB4o/DB4oUserData.cs b/Common/OpenGrid.Framework.Data.DB4o/DB4oUserData.cs
deleted file mode 100644
index 315f48d..0000000
--- a/Common/OpenGrid.Framework.Data.DB4o/DB4oUserData.cs
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using OpenGrid.Framework.Data;
-using libsecondlife;
-namespace OpenGrid.Framework.Data.DB4o
-{
-    /// <summary>
-    /// A User storage interface for the DB4o database system
-    /// </summary>
-    public class DB4oUserData : IUserData
-    {
-        /// <summary>
-        /// The database manager
-        /// </summary>
-        DB4oUserManager manager;
-        /// <summary>
-        /// Artificial constructor called upon plugin load
-        /// </summary>
-        public void Initialise()
-        {
-            manager = new DB4oUserManager("userprofiles.yap");
-        }
-        /// <summary>
-        /// Loads a specified user profile from a UUID
-        /// </summary>
-        /// <param name="uuid">The users UUID</param>
-        /// <returns>A user profile</returns>
-        public UserProfileData getUserByUUID(LLUUID uuid)
-        {
-            if(manager.userProfiles.ContainsKey(uuid))
-                return manager.userProfiles[uuid];
-            return null;
-        }
-        /// <summary>
-        /// Returns a user by searching for its name
-        /// </summary>
-        /// <param name="name">The users account name</param>
-        /// <returns>A matching users profile</returns>
-        public UserProfileData getUserByName(string name)
-        {
-            return getUserByName(name.Split(' ')[0], name.Split(' ')[1]);
-        }
-        /// <summary>
-        /// Returns a user by searching for its name
-        /// </summary>
-        /// <param name="fname">The first part of the users account name</param>
-        /// <param name="lname">The second part of the users account name</param>
-        /// <returns>A matching users profile</returns>
-        public UserProfileData getUserByName(string fname, string lname)
-        {
-            foreach (UserProfileData profile in manager.userProfiles.Values)
-            {
-                if (profile.username == fname && profile.surname == lname)
-                    return profile;
-            }
-            return null;
-        }
-        /// <summary>
-        /// Returns a user by UUID direct
-        /// </summary>
-        /// <param name="uuid">The users account ID</param>
-        /// <returns>A matching users profile</returns>
-        public UserAgentData getAgentByUUID(LLUUID uuid)
-        {   
-            try
-            {
-                return getUserByUUID(uuid).currentAgent;
-            }
-            catch (Exception e)
-            {
-                return null;
-            }
-        }
-        /// <summary>
-        /// Returns a session by account name
-        /// </summary>
-        /// <param name="name">The account name</param>
-        /// <returns>The users session agent</returns>
-        public UserAgentData getAgentByName(string name)
-        {
-            return getAgentByName(name.Split(' ')[0], name.Split(' ')[1]);
-        }
-        /// <summary>
-        /// Returns a session by account name
-        /// </summary>
-        /// <param name="fname">The first part of the users account name</param>
-        /// <param name="lname">The second part of the users account name</param>
-        /// <returns>A user agent</returns>
-        public UserAgentData getAgentByName(string fname, string lname)
-        {
-            try
-            {
-                return getUserByName(fname,lname).currentAgent;
-            }
-            catch (Exception e)
-            {
-                return null;
-            }
-        }
-        /// <summary>
-        /// Creates a new user profile
-        /// </summary>
-        /// <param name="user">The profile to add to the database</param>
-        public void addNewUserProfile(UserProfileData user)
-        {
-            try
-            {
-                manager.AddRow(user);
-            }
-            catch (Exception e)
-            {
-                Console.WriteLine(e.ToString());
-            }
-        }
-        /// <summary>
-        /// Creates a new user agent
-        /// </summary>
-        /// <param name="agent">The agent to add to the database</param>
-        public void addNewUserAgent(UserAgentData agent)
-        {
-            // Do nothing. yet.
-        }
-        /// <summary>
-        /// Transfers money between two user accounts
-        /// </summary>
-        /// <param name="from">Starting account</param>
-        /// <param name="to">End account</param>
-        /// <param name="amount">The amount to move</param>
-        /// <returns>Success?</returns>
-        public bool moneyTransferRequest(LLUUID from, LLUUID to, uint amount)
-        {
-            return true;
-        }
-        /// <summary>
-        /// Transfers inventory between two accounts
-        /// </summary>
-        /// <remarks>Move to inventory server</remarks>
-        /// <param name="from">Senders account</param>
-        /// <param name="to">Recievers account</param>
-        /// <param name="item">Inventory item</param>
-        /// <returns>Success?</returns>
-        public bool inventoryTransferRequest(LLUUID from, LLUUID to, LLUUID item)
-        {
-            return true;
-        }
-        /// <summary>
-        /// Returns the name of the storage provider
-        /// </summary>
-        /// <returns>Storage provider name</returns>
-        public string getName()
-        {
-            return "DB4o Userdata";
-        }
-        /// <summary>
-        /// Returns the version of the storage provider
-        /// </summary>
-        /// <returns>Storage provider version</returns>
-        public string getVersion()
-        {
-            return "0.1";
-        }
-    }
-}
diff --git a/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj b/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj
deleted file mode 100644
index d2d6140..0000000
--- a/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj
+++ /dev/null
@@ -1,111 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{39BD9497-0000-0000-0000-000000000000}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon></ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>OpenGrid.Framework.Data.DB4o</AssemblyName>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenGrid.Framework.Data.DB4o</RootNamespace>
-    <StartupObject></StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <DocumentationFile></DocumentationFile>
-    <DebugSymbols>True</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <Optimize>False</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <RemoveIntegerChecks>False</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile></DocumentationFile>
-    <DebugSymbols>False</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <Optimize>True</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <RemoveIntegerChecks>False</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Db4objects.Db4o.dll" >
-      <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="libsecondlife.dll" >
-      <HintPath>..\..\bin\libsecondlife.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System" >
-      <HintPath>System.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Data" >
-      <HintPath>System.Data.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Xml" >
-      <HintPath>System.Xml.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj">
-      <Name>OpenGrid.Framework.Data</Name>
-      <Project>{62CDF671-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-                        <Private>False</Private>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="DB4oGridData.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="DB4oManager.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="DB4oUserData.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
diff --git a/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.mine b/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.mine
deleted file mode 100644
index 82d4f5f..0000000
--- a/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.mine
+++ /dev/null
@@ -1,111 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{39BD9497-0000-0000-0000-000000000000}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon></ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>OpenGrid.Framework.Data.DB4o</AssemblyName>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenGrid.Framework.Data.DB4o</RootNamespace>
-    <StartupObject></StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <DocumentationFile></DocumentationFile>
-    <DebugSymbols>True</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <Optimize>False</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <RemoveIntegerChecks>False</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile></DocumentationFile>
-    <DebugSymbols>False</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <Optimize>True</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <RemoveIntegerChecks>False</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" >
-      <HintPath>System.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Xml" >
-      <HintPath>System.Xml.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Data" >
-      <HintPath>System.Data.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="libsecondlife.dll" >
-      <HintPath>..\..\bin\libsecondlife.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Db4objects.Db4o.dll" >
-      <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj">
-      <Name>OpenGrid.Framework.Data</Name>
-      <Project>{62CDF671-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-                        <Private>False</Private>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="DB4oGridData.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="DB4oManager.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="DB4oUserData.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
diff --git a/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.r858 b/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.r858
deleted file mode 100644
index d6dd03d..0000000
--- a/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.r858
+++ /dev/null
@@ -1,111 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{BC0F052F-0000-0000-0000-000000000000}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon></ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>OpenGrid.Framework.Data.DB4o</AssemblyName>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenGrid.Framework.Data.DB4o</RootNamespace>
-    <StartupObject></StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile></DocumentationFile>
-    <DebugSymbols>False</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <Optimize>True</Optimize>
-    <OutputPath>../../bin/</OutputPath>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <RemoveIntegerChecks>False</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <DocumentationFile></DocumentationFile>
-    <DebugSymbols>True</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <Optimize>False</Optimize>
-    <OutputPath>../../bin/</OutputPath>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <RemoveIntegerChecks>False</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" >
-      <HintPath>System.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Xml" >
-      <HintPath>System.Xml.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Data" >
-      <HintPath>System.Data.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="libsecondlife.dll" >
-      <HintPath>..\..\bin\libsecondlife.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Db4objects.Db4o.dll" >
-      <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj">
-      <Name>OpenGrid.Framework.Data</Name>
-      <Project>{12DD8EB8-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-                        <Private>False</Private>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="DB4oGridData.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="DB4oManager.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="DB4oUserData.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Properties/AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
diff --git a/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.r921 b/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.r921
deleted file mode 100644
index 3b783ca..0000000
--- a/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.r921
+++ /dev/null
@@ -1,111 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{39BD9497-0000-0000-0000-000000000000}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon></ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>OpenGrid.Framework.Data.DB4o</AssemblyName>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenGrid.Framework.Data.DB4o</RootNamespace>
-    <StartupObject></StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <DocumentationFile></DocumentationFile>
-    <DebugSymbols>True</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <Optimize>False</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <RemoveIntegerChecks>False</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile></DocumentationFile>
-    <DebugSymbols>False</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <Optimize>True</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <RemoveIntegerChecks>False</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" >
-      <HintPath>System.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Xml" >
-      <HintPath>System.Xml.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Data" >
-      <HintPath>System.Data.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="libsecondlife.dll" >
-      <HintPath>..\..\bin\libsecondlife.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Db4objects.Db4o.dll" >
-      <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj">
-      <Name>OpenGrid.Framework.Data</Name>
-      <Project>{62CDF671-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-                        <Private>False</Private>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="DB4oUserData.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="DB4oManager.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="DB4oGridData.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
diff --git a/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build b/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build
deleted file mode 100644
index d82d751..0000000
--- a/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" ?>
-<project name="OpenGrid.Framework.Data.DB4o" default="build">
-    <target name="build">
-        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
-        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
-        <copy todir="${project::get-base-directory()}/${build.dir}">
-            <fileset basedir="${project::get-base-directory()}">
-            </fileset>
-        </copy>
-        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
-            <resources prefix="OpenGrid.Framework.Data.DB4o" dynamicprefix="true" >
-            </resources>
-            <sources failonempty="true">
-                <include name="DB4oGridData.cs" />
-                <include name="DB4oManager.cs" />
-                <include name="DB4oUserData.cs" />
-                <include name="Properties/AssemblyInfo.cs" />
-            </sources>
-            <references basedir="${project::get-base-directory()}">
-                <lib>
-                    <include name="${project::get-base-directory()}" />
-                    <include name="${project::get-base-directory()}/${build.dir}" />
-                </lib>
-                <include name="../../bin/Db4objects.Db4o.dll" />
-                <include name="../../bin/libsecondlife.dll" />
-                <include name="../../bin/OpenGrid.Framework.Data.dll" />
-                <include name="System.dll" />
-                <include name="System.Data.dll" />
-                <include name="System.Xml.dll" />
-            </references>
-        </csc>
-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
-        <mkdir dir="${project::get-base-directory()}/../../bin/"/>
-        <copy todir="${project::get-base-directory()}/../../bin/">
-            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
-                <include name="*.dll"/>
-                <include name="*.exe"/>
-            </fileset>
-        </copy>
-    </target>
-    <target name="clean">
-        <delete dir="${bin.dir}" failonerror="false" />
-        <delete dir="${obj.dir}" failonerror="false" />
-    </target>
-    <target name="doc" description="Creates documentation.">
-    </target>
-</project>
diff --git a/Common/OpenGrid.Framework.Data.DB4o/Properties/AssemblyInfo.cs b/Common/OpenGrid.Framework.Data.DB4o/Properties/AssemblyInfo.cs
deleted file mode 100644
index dc4a9a1..0000000
--- a/Common/OpenGrid.Framework.Data.DB4o/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("OpenGrid.Framework.Data.DB4o")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("OpenGrid.Framework.Data.DB4o")]
-[assembly: AssemblyCopyright("Copyright ©  2007")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("57991e15-79da-41b7-aa06-2e6b49165a63")]
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Revision and Build Numbers 
-// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Common/OpenGrid.Framework.Data/GridData.cs b/Common/OpenGrid.Framework.Data/GridData.cs
deleted file mode 100644
index b2cce78..0000000
--- a/Common/OpenGrid.Framework.Data/GridData.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-namespace OpenGrid.Framework.Data
-{
-    public enum DataResponse
-    {
-        RESPONSE_OK,
-        RESPONSE_AUTHREQUIRED,
-        RESPONSE_INVALIDCREDENTIALS,
-        RESPONSE_ERROR
-    }
-    /// <summary>
-    /// A standard grid interface
-    /// </summary>
-    public interface IGridData
-    {
-        /// <summary>
-        /// Returns a sim profile from a regionHandle
-        /// </summary>
-        /// <param name="regionHandle">A 64bit Region Handle</param>
-        /// <returns>A simprofile</returns>
-        SimProfileData GetProfileByHandle(ulong regionHandle);
-        /// <summary>
-        /// Returns a sim profile from a UUID
-        /// </summary>
-        /// <param name="UUID">A 128bit UUID</param>
-        /// <returns>A sim profile</returns>
-        SimProfileData GetProfileByLLUUID(libsecondlife.LLUUID UUID);
-        /// <summary>
-        /// Returns all profiles within the specified range
-        /// </summary>
-        /// <param name="Xmin">Minimum sim coordinate (X)</param>
-        /// <param name="Ymin">Minimum sim coordinate (Y)</param>
-        /// <param name="Xmax">Maximum sim coordinate (X)</param>
-        /// <param name="Ymin">Maximum sim coordinate (Y)</param>
-        /// <returns>An array containing all the sim profiles in the specified range</returns>
-        SimProfileData[] GetProfilesInRange(uint Xmin, uint Ymin, uint Xmax, uint Ymax);
-        /// <summary>
-        /// Authenticates a sim by use of it's recv key. 
-        /// WARNING: Insecure
-        /// </summary>
-        /// <param name="UUID">The UUID sent by the sim</param>
-        /// <param name="regionHandle">The regionhandle sent by the sim</param>
-        /// <param name="simrecvkey">The recieving key sent by the sim</param>
-        /// <returns>Whether the sim has been authenticated</returns>
-        bool AuthenticateSim(libsecondlife.LLUUID UUID, ulong regionHandle, string simrecvkey);
-        /// <summary>
-        /// Initialises the interface
-        /// </summary>
-        void Initialise();
-        /// <summary>
-        /// Closes the interface
-        /// </summary>
-        void Close();
-        /// <summary>
-        /// The plugin being loaded
-        /// </summary>
-        /// <returns>A string containing the plugin name</returns>
-        string getName();
-        /// <summary>
-        /// The plugins version
-        /// </summary>
-        /// <returns>A string containing the plugin version</returns>
-        string getVersion();
-        /// <summary>
-        /// Adds a new profile to the database
-        /// </summary>
-        /// <param name="profile">The profile to add</param>
-        /// <returns>RESPONSE_OK if successful, error if not.</returns>
-        DataResponse AddProfile(SimProfileData profile);
-        ReservationData GetReservationAtPoint(uint x, uint y);
-    }
-}
diff --git a/Common/OpenGrid.Framework.Data/ILogData.cs b/Common/OpenGrid.Framework.Data/ILogData.cs
deleted file mode 100644
index 2ac0bfe..0000000
--- a/Common/OpenGrid.Framework.Data/ILogData.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-namespace OpenGrid.Framework.Data
-{
-    /// <summary>
-    /// The severity of an individual log message
-    /// </summary>
-    public enum LogSeverity : int
-    {
-        /// <summary>
-        /// Critical: systems failure
-        /// </summary>
-        CRITICAL = 1,
-        /// <summary>
-        /// Major: warning prior to systems failure
-        /// </summary>
-        MAJOR = 2,
-        /// <summary>
-        /// Medium: an individual non-critical task failed
-        /// </summary>
-        MEDIUM = 3,
-        /// <summary>
-        /// Low: Informational warning
-        /// </summary>
-        LOW = 4,
-        /// <summary>
-        /// Info: Information
-        /// </summary>
-        INFO = 5,
-        /// <summary>
-        /// Verbose: Debug Information
-        /// </summary>
-        VERBOSE = 6
-    }
-    /// <summary>
-    /// An interface to a LogData storage system
-    /// </summary>
-    public interface ILogData
-    {
-        void saveLog(string serverDaemon, string target, string methodCall, string arguments, int priority,string logMessage);
-        /// <summary>
-        /// Initialises the interface
-        /// </summary>
-        void Initialise();
-        /// <summary>
-        /// Closes the interface
-        /// </summary>
-        void Close();
-        /// <summary>
-        /// The plugin being loaded
-        /// </summary>
-        /// <returns>A string containing the plugin name</returns>
-        string getName();
-        /// <summary>
-        /// The plugins version
-        /// </summary>
-        /// <returns>A string containing the plugin version</returns>
-        string getVersion();
-    }
-}
diff --git a/Common/OpenGrid.Framework.Data/IniConfig.cs b/Common/OpenGrid.Framework.Data/IniConfig.cs
deleted file mode 100644
index d17afac..0000000
--- a/Common/OpenGrid.Framework.Data/IniConfig.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.IO;
-using System.Text.RegularExpressions;
-/* 
- Taken from public code listing at by Alex Pinsker
- http://alexpinsker.blogspot.com/2005/12/reading-ini-file-from-c_113432097333021549.html
- */
-namespace OpenGrid.Framework.Data
-{
-    /// <summary>
-    /// Parse settings from ini-like files
-    /// </summary>
-    public class IniFile
-    {
-        static IniFile()
-        {
-            _iniKeyValuePatternRegex = new Regex(
-                @"((\s)*(?<Key>([^\=^\s^\n]+))[\s^\n]*
-                # key part (surrounding whitespace stripped)
-                \=
-                (\s)*(?<Value>([^\n^\s]+(\n){0,1})))
-                # value part (surrounding whitespace stripped)
-                ",
-                RegexOptions.IgnorePatternWhitespace |
-                RegexOptions.Compiled |
-                RegexOptions.CultureInvariant);
-        }
-        static private Regex _iniKeyValuePatternRegex;
-        public IniFile(string iniFileName)
-        {
-            _iniFileName = iniFileName;
-        }
-        public string ParseFileReadValue(string key)
-        {
-            using (StreamReader reader =
-                  new StreamReader(_iniFileName))
-            {
-                do
-                {
-                    string line = reader.ReadLine();
-                    Match match =
-                        _iniKeyValuePatternRegex.Match(line);
-                    if (match.Success)
-                    {
-                        string currentKey =
-                                match.Groups["Key"].Value as string;
-                        if (currentKey != null &&
-                       currentKey.Trim().CompareTo(key) == 0)
-                        {
-                            string value =
-                              match.Groups["Value"].Value as string;
-                            return value;
-                        }
-                    }
-                }
-                while (reader.Peek() != -1);
-            }
-            return null;
-        }
-        public string IniFileName
-        {
-            get { return _iniFileName; }
-        }    private string _iniFileName;
-    }
-}
diff --git a/Common/OpenGrid.Framework.Data/InventoryData.cs b/Common/OpenGrid.Framework.Data/InventoryData.cs
deleted file mode 100644
index 12f559b..0000000
--- a/Common/OpenGrid.Framework.Data/InventoryData.cs
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-namespace OpenGrid.Framework.Data
-{
-    /// <summary>
-    /// Inventory Item - contains all the properties associated with an individual inventory piece.
-    /// </summary>
-    public class InventoryItemBase
-    {
-        /// <summary>
-        /// A UUID containing the ID for the inventory item itself
-        /// </summary>
-        public LLUUID inventoryID;
-        /// <summary>
-        /// The UUID of the associated asset on the asset server
-        /// </summary>
-        public LLUUID assetID;
-        /// <summary>
-        /// This is an enumerated value determining the type of asset (eg Notecard, Sound, Object, etc)
-        /// </summary>
-        public int type;
-        /// <summary>
-        /// The folder this item is contained in (NULL_KEY = Inventory Root)
-        /// </summary>
-        public LLUUID parentFolderID;
-        /// <summary>
-        /// The owner of this inventory item
-        /// </summary>
-        public LLUUID avatarID;
-        /// <summary>
-        /// The name of the inventory item (must be less than 64 characters)
-        /// </summary>
-        public string inventoryName;
-        /// <summary>
-        /// The description of the inventory item (must be less than 64 characters)
-        /// </summary>
-        public string inventoryDescription;
-        /// <summary>
-        /// A mask containing the permissions for the next owner (cannot be enforced)
-        /// </summary>
-        public uint inventoryNextPermissions;
-        /// <summary>
-        /// A mask containing permissions for the current owner (cannot be enforced)
-        /// </summary>
-        public uint inventoryCurrentPermissions;
-    }
-    /// <summary>
-    /// A Class for folders which contain users inventory
-    /// </summary>
-    public class InventoryFolderBase
-    {
-        /// <summary>
-        /// The name of the folder (64 characters or less)
-        /// </summary>
-        public string name;
-        /// <summary>
-        /// The agent who's inventory this is contained by
-        /// </summary>
-        public LLUUID agentID;
-        /// <summary>
-        /// The folder this folder is contained in (NULL_KEY for root)
-        /// </summary>
-        public LLUUID parentID;
-        /// <summary>
-        /// The UUID for this folder
-        /// </summary>
-        public LLUUID folderID;
-    }
-    /// <summary>
-    /// An interface for accessing inventory data from a storage server
-    /// </summary>
-    public interface IInventoryData
-    {
-        /// <summary>
-        /// Initialises the interface
-        /// </summary>
-        void Initialise();
-        /// <summary>
-        /// Closes the interface
-        /// </summary>
-        void Close();
-        /// <summary>
-        /// The plugin being loaded
-        /// </summary>
-        /// <returns>A string containing the plugin name</returns>
-        string getName();
-        /// <summary>
-        /// The plugins version
-        /// </summary>
-        /// <returns>A string containing the plugin version</returns>
-        string getVersion();
-        /// <summary>
-        /// Returns a list of inventory items contained within the specified folder
-        /// </summary>
-        /// <param name="folderID">The UUID of the target folder</param>
-        /// <returns>A List of InventoryItemBase items</returns>
-        List<InventoryItemBase> getInventoryInFolder(LLUUID folderID);
-        /// <summary>
-        /// Returns a list of folders in the users inventory root.
-        /// </summary>
-        /// <param name="user">The UUID of the user who is having inventory being returned</param>
-        /// <returns>A list of folders</returns>
-        List<InventoryFolderBase> getUserRootFolders(LLUUID user);
-        /// <summary>
-        /// Returns a list of inventory folders contained in the folder 'parentID'
-        /// </summary>
-        /// <param name="parentID">The folder to get subfolders for</param>
-        /// <returns>A list of inventory folders</returns>
-        List<InventoryFolderBase> getInventoryFolders(LLUUID parentID);
-        /// <summary>
-        /// Returns an inventory item by its UUID
-        /// </summary>
-        /// <param name="item">The UUID of the item to be returned</param>
-        /// <returns>A class containing item information</returns>
-        InventoryItemBase getInventoryItem(LLUUID item);
-        /// <summary>
-        /// Returns a specified inventory folder by its UUID
-        /// </summary>
-        /// <param name="folder">The UUID of the folder to be returned</param>
-        /// <returns>A class containing folder information</returns>
-        InventoryFolderBase getInventoryFolder(LLUUID folder);
-        /// <summary>
-        /// Creates a new inventory item based on item
-        /// </summary>
-        /// <param name="item">The item to be created</param>
-        void addInventoryItem(InventoryItemBase item);
-        /// <summary>
-        /// Updates an inventory item with item (updates based on ID)
-        /// </summary>
-        /// <param name="item">The updated item</param>
-        void updateInventoryItem(InventoryItemBase item);
-        /// <summary>
-        /// Adds a new folder specified by folder
-        /// </summary>
-        /// <param name="folder">The inventory folder</param>
-        void addInventoryFolder(InventoryFolderBase folder);
-        /// <summary>
-        /// Updates a folder based on its ID with folder
-        /// </summary>
-        /// <param name="folder">The inventory folder</param>
-        void updateInventoryFolder(InventoryFolderBase folder);
-    }
-}
diff --git a/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj b/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj
deleted file mode 100644
index 048722a..0000000
--- a/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj
+++ /dev/null
@@ -1,116 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{62CDF671-0000-0000-0000-000000000000}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon></ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>OpenGrid.Framework.Data</AssemblyName>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenGrid.Framework.Data</RootNamespace>
-    <StartupObject></StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <DocumentationFile></DocumentationFile>
-    <DebugSymbols>True</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <Optimize>False</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <RemoveIntegerChecks>False</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile></DocumentationFile>
-    <DebugSymbols>False</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <Optimize>True</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <RemoveIntegerChecks>False</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="libsecondlife.dll" >
-      <HintPath>..\..\bin\libsecondlife.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System" >
-      <HintPath>System.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Data" >
-      <HintPath>System.Data.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Xml" >
-      <HintPath>System.Xml.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="GridData.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ILogData.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="IniConfig.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="InventoryData.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ReservationData.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="SimProfileData.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="UserData.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="UserProfileData.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
diff --git a/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.mine b/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.mine
deleted file mode 100644
index a572204..0000000
--- a/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.mine
+++ /dev/null
@@ -1,113 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{62CDF671-0000-0000-0000-000000000000}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon></ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>OpenGrid.Framework.Data</AssemblyName>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenGrid.Framework.Data</RootNamespace>
-    <StartupObject></StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <DocumentationFile></DocumentationFile>
-    <DebugSymbols>True</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <Optimize>False</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <RemoveIntegerChecks>False</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile></DocumentationFile>
-    <DebugSymbols>False</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <Optimize>True</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <RemoveIntegerChecks>False</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" >
-      <HintPath>System.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Xml" >
-      <HintPath>System.Xml.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Data" >
-      <HintPath>System.Data.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="libsecondlife.dll" >
-      <HintPath>..\..\bin\libsecondlife.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="GridData.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ILogData.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="IniConfig.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="InventoryData.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="SimProfileData.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="UserData.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="UserProfileData.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
diff --git a/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.r858 b/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.r858
deleted file mode 100644
index 3b6d24d..0000000
--- a/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.r858
+++ /dev/null
@@ -1,110 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{12DD8EB8-0000-0000-0000-000000000000}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon></ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>OpenGrid.Framework.Data</AssemblyName>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenGrid.Framework.Data</RootNamespace>
-    <StartupObject></StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile></DocumentationFile>
-    <DebugSymbols>False</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <Optimize>True</Optimize>
-    <OutputPath>../../bin/</OutputPath>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <RemoveIntegerChecks>False</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <DocumentationFile></DocumentationFile>
-    <DebugSymbols>True</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <Optimize>False</Optimize>
-    <OutputPath>../../bin/</OutputPath>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <RemoveIntegerChecks>False</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" >
-      <HintPath>System.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Xml" >
-      <HintPath>System.Xml.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Data" >
-      <HintPath>System.Data.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="libsecondlife.dll" >
-      <HintPath>..\..\bin\libsecondlife.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="GridData.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ILogData.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="IniConfig.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="SimProfileData.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="UserData.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="UserProfileData.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Properties/AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
diff --git a/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.r921 b/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.r921
deleted file mode 100644
index 990cd16..0000000
--- a/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.r921
+++ /dev/null
@@ -1,113 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{62CDF671-0000-0000-0000-000000000000}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon></ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>OpenGrid.Framework.Data</AssemblyName>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenGrid.Framework.Data</RootNamespace>
-    <StartupObject></StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <DocumentationFile></DocumentationFile>
-    <DebugSymbols>True</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <Optimize>False</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <RemoveIntegerChecks>False</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile></DocumentationFile>
-    <DebugSymbols>False</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <Optimize>True</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <RemoveIntegerChecks>False</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" >
-      <HintPath>System.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Xml" >
-      <HintPath>System.Xml.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Data" >
-      <HintPath>System.Data.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="libsecondlife.dll" >
-      <HintPath>..\..\bin\libsecondlife.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="GridData.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="SimProfileData.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ILogData.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="IniConfig.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="InventoryData.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="UserData.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="UserProfileData.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
diff --git a/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build b/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build
deleted file mode 100644
index 764e871..0000000
--- a/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" ?>
-<project name="OpenGrid.Framework.Data" default="build">
-    <target name="build">
-        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
-        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
-        <copy todir="${project::get-base-directory()}/${build.dir}">
-            <fileset basedir="${project::get-base-directory()}">
-            </fileset>
-        </copy>
-        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
-            <resources prefix="OpenGrid.Framework.Data" dynamicprefix="true" >
-            </resources>
-            <sources failonempty="true">
-                <include name="GridData.cs" />
-                <include name="ILogData.cs" />
-                <include name="IniConfig.cs" />
-                <include name="InventoryData.cs" />
-                <include name="ReservationData.cs" />
-                <include name="SimProfileData.cs" />
-                <include name="UserData.cs" />
-                <include name="UserProfileData.cs" />
-                <include name="Properties/AssemblyInfo.cs" />
-            </sources>
-            <references basedir="${project::get-base-directory()}">
-                <lib>
-                    <include name="${project::get-base-directory()}" />
-                    <include name="${project::get-base-directory()}/${build.dir}" />
-                </lib>
-                <include name="../../bin/libsecondlife.dll" />
-                <include name="System.dll" />
-                <include name="System.Data.dll" />
-                <include name="System.Xml.dll" />
-            </references>
-        </csc>
-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
-        <mkdir dir="${project::get-base-directory()}/../../bin/"/>
-        <copy todir="${project::get-base-directory()}/../../bin/">
-            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
-                <include name="*.dll"/>
-                <include name="*.exe"/>
-            </fileset>
-        </copy>
-    </target>
-    <target name="clean">
-        <delete dir="${bin.dir}" failonerror="false" />
-        <delete dir="${obj.dir}" failonerror="false" />
-    </target>
-    <target name="doc" description="Creates documentation.">
-    </target>
-</project>
diff --git a/Common/OpenGrid.Framework.Data/Properties/AssemblyInfo.cs b/Common/OpenGrid.Framework.Data/Properties/AssemblyInfo.cs
deleted file mode 100644
index 1446673..0000000
--- a/Common/OpenGrid.Framework.Data/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("OpenGrid.Framework.Data")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("OpenGrid.Framework.Data")]
-[assembly: AssemblyCopyright("Copyright ©  2007")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("3a711c34-b0c0-4264-b0fe-f366eabf9d7b")]
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Revision and Build Numbers 
-// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Common/OpenGrid.Framework.Data/ReservationData.cs b/Common/OpenGrid.Framework.Data/ReservationData.cs
deleted file mode 100644
index 89c6105..0000000
--- a/Common/OpenGrid.Framework.Data/ReservationData.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-namespace OpenGrid.Framework.Data
-{
-    public class ReservationData
-    {
-        public LLUUID userUUID = new LLUUID();
-        public int reservationMinX = 0;
-        public int reservationMinY = 0;
-        public int reservationMaxX = 65536;
-        public int reservationMaxY = 65536;
-        
-        public string reservationName = "";
-        public string reservationCompany = "";
-        public bool status = true;
-        public string gridSendKey = "";
-        public string gridRecvKey = "";
-    }
-}
diff --git a/Common/OpenGrid.Framework.Data/SimProfileData.cs b/Common/OpenGrid.Framework.Data/SimProfileData.cs
deleted file mode 100644
index a3e7cb7..0000000
--- a/Common/OpenGrid.Framework.Data/SimProfileData.cs
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-namespace OpenGrid.Framework.Data
-{
-    /// <summary>
-    /// A class which contains information known to the grid server about a region
-    /// </summary>
-    public class SimProfileData
-    {
-        /// <summary>
-        /// The name of the region
-        /// </summary>
-        public string regionName = "";
-        /// <summary>
-        /// A 64-bit number combining map position into a (mostly) unique ID
-        /// </summary>
-        public ulong regionHandle;
-        /// <summary>
-        /// OGS/OpenSim Specific ID for a region
-        /// </summary>
-        public libsecondlife.LLUUID UUID;
-        /// <summary>
-        /// Coordinates of the region
-        /// </summary>
-        public uint regionLocX;
-        public uint regionLocY;
-        public uint regionLocZ; // Reserved (round-robin, layers, etc)
-        /// <summary>
-        /// Authentication secrets
-        /// </summary>
-        /// <remarks>Not very secure, needs improvement.</remarks>
-        public string regionSendKey = "";
-        public string regionRecvKey = "";
-        public string regionSecret = "";
-        /// <summary>
-        /// Whether the region is online
-        /// </summary>
-        public bool regionOnline;
-        /// <summary>
-        /// Information about the server that the region is currently hosted on
-        /// </summary>
-        public string serverIP = "";
-        public uint serverPort;
-        public string serverURI = "";
-        /// <summary>
-        /// Set of optional overrides. Can be used to create non-eulicidean spaces.
-        /// </summary>
-        public ulong regionNorthOverrideHandle;
-        public ulong regionSouthOverrideHandle;
-        public ulong regionEastOverrideHandle;
-        public ulong regionWestOverrideHandle;
-        /// <summary>
-        /// Optional: URI Location of the region database
-        /// </summary>
-        /// <remarks>Used for floating sim pools where the region data is not nessecarily coupled to a specific server</remarks>
-        public string regionDataURI = "";
-        /// <summary>
-        /// Region Asset Details
-        /// </summary>
-        public string regionAssetURI = "";
-        public string regionAssetSendKey = "";
-        public string regionAssetRecvKey = "";
-        /// <summary>
-        /// Region Userserver Details
-        /// </summary>
-        public string regionUserURI = "";
-        public string regionUserSendKey = "";
-        public string regionUserRecvKey = "";
-        /// <summary>
-        /// Region Map Texture Asset
-        /// </summary>
-        public libsecondlife.LLUUID regionMapTextureID = new libsecondlife.LLUUID("00000000-0000-0000-9999-000000000006");
-    }
-}
diff --git a/Common/OpenGrid.Framework.Data/UserData.cs b/Common/OpenGrid.Framework.Data/UserData.cs
deleted file mode 100644
index c2d5a72..0000000
--- a/Common/OpenGrid.Framework.Data/UserData.cs
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-namespace OpenGrid.Framework.Data
-{
-    /// <summary>
-    /// An interface for connecting to user storage servers.
-    /// </summary>
-    public interface IUserData
-    {
-        /// <summary>
-        /// Returns a user profile from a database via their UUID
-        /// </summary>
-        /// <param name="user">The accounts UUID</param>
-        /// <returns>The user data profile</returns>
-        UserProfileData getUserByUUID(LLUUID user);
-        /// <summary>
-        /// Returns a users profile by searching their username
-        /// </summary>
-        /// <param name="name">The users username</param>
-        /// <returns>The user data profile</returns>
-        UserProfileData getUserByName(string name);
-        /// <summary>
-        /// Returns a users profile by searching their username parts
-        /// </summary>
-        /// <param name="fname">Account firstname</param>
-        /// <param name="lname">Account lastname</param>
-        /// <returns>The user data profile</returns>
-        UserProfileData getUserByName(string fname, string lname);
-        /// <summary>
-        /// Returns the current agent for a user searching by it's UUID
-        /// </summary>
-        /// <param name="user">The users UUID</param>
-        /// <returns>The current agent session</returns>
-        UserAgentData getAgentByUUID(LLUUID user);
-        /// <summary>
-        /// Returns the current session agent for a user searching by username
-        /// </summary>
-        /// <param name="name">The users account name</param>
-        /// <returns>The current agent session</returns>
-        UserAgentData getAgentByName(string name);
-        /// <summary>
-        /// Returns the current session agent for a user searching by username parts
-        /// </summary>
-        /// <param name="fname">The users first account name</param>
-        /// <param name="lname">The users account surname</param>
-        /// <returns>The current agent session</returns>
-        UserAgentData getAgentByName(string fname, string lname);
-        /// <summary>
-        /// Adds a new User profile to the database 
-        /// </summary>
-        /// <param name="user">UserProfile to add</param>
-        void addNewUserProfile(UserProfileData user);
-        /// <summary>
-        /// Adds a new agent to the database
-        /// </summary>
-        /// <param name="agent">The agent to add</param>
-        void addNewUserAgent(UserAgentData agent);
-        /// <summary>
-        /// Attempts to move currency units between accounts (NOT RELIABLE / TRUSTWORTHY. DONT TRY RUN YOUR OWN CURRENCY EXCHANGE WITH REAL VALUES)
-        /// </summary>
-        /// <param name="from">The account to transfer from</param>
-        /// <param name="to">The account to transfer to</param>
-        /// <param name="amount">The amount to transfer</param>
-        /// <returns>Successful?</returns>
-        bool moneyTransferRequest(LLUUID from, LLUUID to, uint amount);
-        /// <summary>
-        /// Attempts to move inventory between accounts, if inventory is copyable it will be copied into the target account.
-        /// </summary>
-        /// <param name="from">User to transfer from</param>
-        /// <param name="to">User to transfer to</param>
-        /// <param name="inventory">Specified inventory item</param>
-        /// <returns>Successful?</returns>
-        bool inventoryTransferRequest(LLUUID from, LLUUID to, LLUUID inventory);
-        /// <summary>
-        /// Returns the plugin version
-        /// </summary>
-        /// <returns>Plugin version in MAJOR.MINOR.REVISION.BUILD format</returns>
-        string getVersion();
-        /// <summary>
-        /// Returns the plugin name
-        /// </summary>
-        /// <returns>Plugin name, eg MySQL User Provider</returns>
-        string getName();
-        /// <summary>
-        /// Initialises the plugin (artificial constructor)
-        /// </summary>
-        void Initialise();
-    }
-}
diff --git a/Common/OpenGrid.Framework.Data/UserProfileData.cs b/Common/OpenGrid.Framework.Data/UserProfileData.cs
deleted file mode 100644
index 82633e1..0000000
--- a/Common/OpenGrid.Framework.Data/UserProfileData.cs
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-namespace OpenGrid.Framework.Data
-{
-    /// <summary>
-    /// Information about a particular user known to the userserver
-    /// </summary>
-    public class UserProfileData
-    {
-        /// <summary>
-        /// The ID value for this user
-        /// </summary>
-        public LLUUID UUID;
-        /// <summary>
-        /// The first component of a users account name
-        /// </summary>
-        public string username;
-        /// <summary>
-        /// The second component of a users account name
-        /// </summary>
-        public string surname;
-        /// <summary>
-        /// A salted hash containing the users password, in the format md5(md5(password) + ":" + salt)
-        /// </summary>
-        /// <remarks>This is double MD5'd because the client sends an unsalted MD5 to the loginserver</remarks>
-        public string passwordHash;
-        /// <summary>
-        /// The salt used for the users hash, should be 32 bytes or longer
-        /// </summary>
-        public string passwordSalt;
-        /// <summary>
-        /// The regionhandle of the users preffered home region. If multiple sims occupy the same spot, the grid may decide which region the user logs into
-        /// </summary>
-        public ulong homeRegion;
-        /// <summary>
-        /// The coordinates inside the region of the home location
-        /// </summary>
-        public LLVector3 homeLocation;
-        /// <summary>
-        /// Where the user will be looking when they rez.
-        /// </summary>
-        public LLVector3 homeLookAt;
-        /// <summary>
-        /// A UNIX Timestamp (seconds since epoch) for the users creation
-        /// </summary>
-        public int created;
-        /// <summary>
-        /// A UNIX Timestamp for the users last login date / time
-        /// </summary>
-        public int lastLogin;
-        /// <summary>
-        /// A URI to the users inventory server, used for foreigners and large grids
-        /// </summary>
-        public string userInventoryURI;
-        /// <summary>
-        /// A URI to the users asset server, used for foreigners and large grids.
-        /// </summary>
-        public string userAssetURI;
-        /// <summary>
-        /// A uint mask containing the "I can do" fields of the users profile
-        /// </summary>
-        public uint profileCanDoMask;
-        /// <summary>
-        /// A uint mask containing the "I want to do" part of the users profile
-        /// </summary>
-        public uint profileWantDoMask; // Profile window "I want to" mask
-        /// <summary>
-        /// The about text listed in a users profile.
-        /// </summary>
-        public string profileAboutText;
-        /// <summary>
-        /// The first life about text listed in a users profile
-        /// </summary>
-        public string profileFirstText;
-        /// <summary>
-        /// The profile image for an avatar stored on the asset server
-        /// </summary>
-        public LLUUID profileImage;
-        /// <summary>
-        /// The profile image for the users first life tab
-        /// </summary>
-        public LLUUID profileFirstImage;
-        /// <summary>
-        /// The users last registered agent (filled in on the user server)
-        /// </summary>
-        public UserAgentData currentAgent;
-    }
-    /// <summary>
-    /// Information about a users session
-    /// </summary>
-    public class UserAgentData
-    {
-        /// <summary>
-        /// The UUID of the users avatar (not the agent!)
-        /// </summary>
-        public LLUUID UUID;
-        /// <summary>
-        /// The IP address of the user
-        /// </summary>
-        public string agentIP;
-        /// <summary>
-        /// The port of the user
-        /// </summary>
-        public uint agentPort;
-        /// <summary>
-        /// Is the user online?
-        /// </summary>
-        public bool agentOnline;
-        /// <summary>
-        /// The session ID for the user (also the agent ID)
-        /// </summary>
-        public LLUUID sessionID;
-        /// <summary>
-        /// The "secure" session ID for the user
-        /// </summary>
-        /// <remarks>Not very secure. Dont rely on it for anything more than Linden Lab does.</remarks>
-        public LLUUID secureSessionID;
-        /// <summary>
-        /// The region the user logged into initially
-        /// </summary>
-        public LLUUID regionID;
-        /// <summary>
-        /// A unix timestamp from when the user logged in
-        /// </summary>
-        public int loginTime;
-        /// <summary>
-        /// When this agent expired and logged out, 0 if still online
-        /// </summary>
-        public int logoutTime;
-        /// <summary>
-        /// Current region the user is logged into
-        /// </summary>
-        public LLUUID currentRegion;
-        /// <summary>
-        /// Region handle of the current region the user is in
-        /// </summary>
-        public ulong currentHandle;
-        /// <summary>
-        /// The position of the user within the region
-        /// </summary>
-        public LLVector3 currentPos;
-    }
-}
diff --git a/Common/OpenGrid.Framework.UserManager/LoginResponse.cs b/Common/OpenGrid.Framework.UserManager/LoginResponse.cs
deleted file mode 100644
index 514ebef..0000000
--- a/Common/OpenGrid.Framework.UserManager/LoginResponse.cs
+++ /dev/null
@@ -1,645 +0,0 @@
-using System;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Threading;
-using System.Collections;
-using System.Xml;
-using libsecondlife;
-using OpenSim.Framework.Utilities;
-using OpenSim.Framework.Interfaces;
-using Nwc.XmlRpc;
-namespace OpenGrid.Framework.UserManagement
-{
-    /// <summary>
-    /// A temp class to handle login response.
-    /// Should make use of UserProfileManager where possible.
-    /// </summary>
-    public class LoginResponse
-    {
-        private Hashtable loginFlagsHash;
-        private Hashtable globalTexturesHash;
-        private Hashtable loginError;
-        private Hashtable eventCategoriesHash;
-        private Hashtable uiConfigHash;
-        private Hashtable classifiedCategoriesHash;
-        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 UserInfo userProfile;
-        private LLUUID agentID;
-        private LLUUID sessionID;
-        private LLUUID secureSessionID;
-        // Login Flags
-        private string dst;
-        private string stipendSinceLogin;
-        private string gendered;
-        private string everLoggedIn;
-        private string login;
-        private int simPort;
-        private string simAddress;
-        private string agentAccess;
-        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;
-        public LoginResponse()
-        {
-            this.loginFlags = new ArrayList();
-            this.globalTextures = new ArrayList();
-            this.eventCategories = new ArrayList();
-            this.uiConfig = new ArrayList();
-            this.classifiedCategories = new ArrayList();
-            this.loginError = new Hashtable();
-            this.eventCategoriesHash = new Hashtable();
-            this.classifiedCategoriesHash = new Hashtable();
-            this.uiConfigHash = new Hashtable();
-            this.defaultXmlRpcResponse = new XmlRpcResponse();
-            this.userProfile = new UserInfo();
-            this.inventoryRoot = new ArrayList();
-            this.initialOutfit = new ArrayList();
-            this.agentInventory = new ArrayList();
-            this.xmlRpcResponse = new XmlRpcResponse();
-            this.defaultXmlRpcResponse = new XmlRpcResponse();
-            this.SetDefaultValues();
-        } // LoginServer
-        public void SetDefaultValues()
-        {
-                this.DST = "N";
-                this.StipendSinceLogin = "N";
-                this.Gendered = "Y";
-                this.EverLoggedIn = "Y";
-                this.login = "false";
-                this.firstname = "Test";
-                this.lastname = "User";
-                this.agentAccess = "M";
-                this.startLocation = "last";
-                this.allowFirstLife = "Y";
-                this.SunTexture = "cce0f112-878f-4586-a2e2-a8f104bba271";
-                this.CloudTexture = "fc4b9f0b-d008-45c6-96a4-01dd947ac621";
-                this.MoonTexture = "fc4b9f0b-d008-45c6-96a4-01dd947ac621";
-                this.ErrorMessage = "You have entered an invalid name/password combination.  Check Caps/lock.";
-                this.ErrorReason = "key";
-                this.welcomeMessage = "Welcome to OpenSim!";
-                this.seedCapability = "";
-                this.home = "{'region_handle':[r" + (997 * 256).ToString() + ",r" + (996 * 256).ToString() + "], 'position':[r" + this.userProfile.homepos.X.ToString() + ",r" + this.userProfile.homepos.Y.ToString() + ",r" + this.userProfile.homepos.Z.ToString() + "], 'look_at':[r" + this.userProfile.homelookat.X.ToString() + ",r" + this.userProfile.homelookat.Y.ToString() + ",r" + this.userProfile.homelookat.Z.ToString() + "]}";
-                this.lookAt = "[r0.99949799999999999756,r0.03166859999999999814,r0]";
-                this.RegionX = (uint)255232;
-                this.RegionY = (uint)254976;
-                // Classifieds;
-                this.AddClassifiedCategory((Int32)1, "Shopping");
-                this.AddClassifiedCategory((Int32)2, "Land Rental");
-                this.AddClassifiedCategory((Int32)3, "Property Rental");
-                this.AddClassifiedCategory((Int32)4, "Special Attraction");
-                this.AddClassifiedCategory((Int32)5, "New Products");
-                this.AddClassifiedCategory((Int32)6, "Employment");
-                this.AddClassifiedCategory((Int32)7, "Wanted");
-                this.AddClassifiedCategory((Int32)8, "Service");
-                this.AddClassifiedCategory((Int32)9, "Personal");
-                
-                this.SessionID = LLUUID.Random();
-                this.SecureSessionID = LLUUID.Random();
-                this.AgentID = LLUUID.Random();
-                Hashtable InitialOutfitHash = new Hashtable();
-                InitialOutfitHash["folder_name"] = "Nightclub Female";
-                InitialOutfitHash["gender"] = "female";
-                this.initialOutfit.Add(InitialOutfitHash);
-          
-        } // SetDefaultValues
-        #region Login Failure Methods
-        public XmlRpcResponse GenerateFailureResponse(string reason, string message, string login)
-        {
-            // Overwrite any default values;
-            this.xmlRpcResponse = new XmlRpcResponse();
-            // Ensure Login Failed message/reason;
-            this.ErrorMessage = message;
-            this.ErrorReason = reason;
-            this.loginError["reason"] = this.ErrorReason;
-            this.loginError["message"] = this.ErrorMessage;
-            this.loginError["login"] = login;
-            this.xmlRpcResponse.Value = this.loginError;
-            return (this.xmlRpcResponse);
-        } // GenerateResponse
-        public XmlRpcResponse CreateFailedResponse()
-        {
-            return (this.CreateLoginFailedResponse());
-        } // CreateErrorConnectingToGridResponse()
-        public XmlRpcResponse CreateLoginFailedResponse()
-        {
-            return (this.GenerateFailureResponse("key", "Could not authenticate your avatar. Please check your username and password, and check the grid if problems persist.", "false"));
-        } // LoginFailedResponse
-        public XmlRpcResponse CreateAlreadyLoggedInResponse()
-        {
-            return (this.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", "false"));
-        } // CreateAlreadyLoggedInResponse()
-        public XmlRpcResponse CreateDeadRegionResponse()
-        {
-            return (this.GenerateFailureResponse("key", "The region you are attempting to log into is not responding. Please select another region and try again.", "false"));
-        }
-         public XmlRpcResponse CreateGridErrorResponse()
-        {
-            return (this.GenerateFailureResponse("key", "Error connecting to grid. Could not percieve credentials from login XML.", "false"));
-        }
-        
-        #endregion
-        public XmlRpcResponse ToXmlRpcResponse()
-        {
-            try
-            {
-                Hashtable responseData = new Hashtable();
-                this.loginFlagsHash = new Hashtable();
-                this.loginFlagsHash["daylight_savings"] = this.DST;
-                this.loginFlagsHash["stipend_since_login"] = this.StipendSinceLogin;
-                this.loginFlagsHash["gendered"] = this.Gendered;
-                this.loginFlagsHash["ever_logged_in"] = this.EverLoggedIn;
-                this.loginFlags.Add(this.loginFlagsHash);
-                responseData["first_name"] = this.Firstname;
-                responseData["last_name"] = this.Lastname;
-                responseData["agent_access"] = this.agentAccess;
-                this.globalTexturesHash = new Hashtable();
-                this.globalTexturesHash["sun_texture_id"] = this.SunTexture;
-                this.globalTexturesHash["cloud_texture_id"] = this.CloudTexture;
-                this.globalTexturesHash["moon_texture_id"] = this.MoonTexture;
-                this.globalTextures.Add(this.globalTexturesHash);
-                this.eventCategories.Add(this.eventCategoriesHash);
-                this.AddToUIConfig("allow_first_life", this.allowFirstLife);
-                this.uiConfig.Add(this.uiConfigHash);
-                responseData["sim_port"] =(Int32) this.SimPort;
-                responseData["sim_ip"] = this.SimAddress;
-                responseData["agent_id"] = this.AgentID.ToStringHyphenated();
-                responseData["session_id"] = this.SessionID.ToStringHyphenated();
-                responseData["secure_session_id"] = this.SecureSessionID.ToStringHyphenated();
-                responseData["circuit_code"] = this.CircuitCode;
-                responseData["seconds_since_epoch"] = (Int32)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;
-                responseData["login-flags"] = this.loginFlags;
-                responseData["global-textures"] = this.globalTextures;
-                responseData["seed_capability"] = this.seedCapability;
-                responseData["event_categories"] = this.eventCategories;
-                responseData["event_notifications"] = new ArrayList(); // todo
-                responseData["classified_categories"] = this.classifiedCategories;
-                responseData["ui-config"] = this.uiConfig;
-                responseData["inventory-skeleton"] = this.agentInventory;
-                responseData["inventory-skel-lib"] = new ArrayList(); // todo
-                responseData["inventory-root"] = this.inventoryRoot;
-                responseData["gestures"] = new ArrayList(); // todo
-                responseData["inventory-lib-owner"] = new ArrayList(); // todo
-                responseData["initial-outfit"] = this.initialOutfit;
-                responseData["start_location"] = this.startLocation;
-                responseData["seed_capability"] = this.seedCapability;
-                responseData["home"] = this.home;
-                responseData["look_at"] = this.lookAt;
-                responseData["message"] = this.welcomeMessage;
-                responseData["region_x"] = (Int32)this.RegionX * 256;
-                responseData["region_y"] = (Int32)this.RegionY * 256;
-                //responseData["inventory-lib-root"] = new ArrayList(); // todo
-                //responseData["buddy-list"] = new ArrayList(); // todo
-                responseData["login"] = "true";
-                this.xmlRpcResponse.Value = responseData;
-                return (this.xmlRpcResponse);
-            }
-            catch (Exception e)
-            {
-                OpenSim.Framework.Console.MainLog.Instance.WriteLine(
-                    OpenSim.Framework.Console.LogPriority.LOW,
-                    "LoginResponse: Error creating XML-RPC Response: " + e.Message
-                );
-                return (this.GenerateFailureResponse("Internal Error", "Error generating Login Response", "false"));
-            }
-        } // ToXmlRpcResponse
-        public void SetEventCategories(string category, string value)
-        {
-            this.eventCategoriesHash[category] = value;
-        } // SetEventCategories
-        public void AddToUIConfig(string itemName, string item)
-        {
-            this.uiConfigHash[itemName] = item;
-        } // SetUIConfig
-        public void AddClassifiedCategory(Int32 ID, string categoryName)
-        {
-            this.classifiedCategoriesHash["category_name"] = categoryName;
-            this.classifiedCategoriesHash["category_id"] = ID;
-            this.classifiedCategories.Add(this.classifiedCategoriesHash);
-            // this.classifiedCategoriesHash.Clear();
-        } // SetClassifiedCategory
-        #region Properties
-        public string Login
-        {
-            get
-            {
-                return this.login;
-            }
-            set
-            {
-                this.login = value;
-            }
-        } // Login
-        public string DST
-        {
-            get
-            {
-                return this.dst;
-            }
-            set
-            {
-                this.dst = value;
-            }
-        } // DST
-        public string StipendSinceLogin
-        {
-            get
-            {
-                return this.stipendSinceLogin;
-            }
-            set
-            {
-                this.stipendSinceLogin = value;
-            }
-        } // StipendSinceLogin
-        public string Gendered
-        {
-            get
-            {
-                return this.gendered;
-            }
-            set
-            {
-                this.gendered = value;
-            }
-        } // Gendered
-        public string EverLoggedIn
-        {
-            get
-            {
-                return this.everLoggedIn;
-            }
-            set
-            {
-                this.everLoggedIn = value;
-            }
-        } // EverLoggedIn
-        public int SimPort
-        {
-            get
-            {
-                return this.simPort;
-            }
-            set
-            {
-                this.simPort = value;
-            }
-        } // SimPort
-        public string SimAddress
-        {
-            get
-            {
-                return this.simAddress;
-            }
-            set
-            {
-                this.simAddress = value;
-            }
-        } // SimAddress
-        public LLUUID AgentID
-        {
-            get
-            {
-                return this.agentID;
-            }
-            set
-            {
-                this.agentID = value;
-            }
-        } // AgentID
-        public LLUUID SessionID
-        {
-            get
-            {
-                return this.sessionID;
-            }
-            set
-            {
-                this.sessionID = value;
-            }
-        } // SessionID
-        public LLUUID SecureSessionID
-        {
-            get
-            {
-                return this.secureSessionID;
-            }
-            set
-            {
-                this.secureSessionID = value;
-            }
-        } // SecureSessionID
-        public Int32 CircuitCode
-        {
-            get
-            {
-                return this.circuitCode;
-            }
-            set
-            {
-                this.circuitCode = value;
-            }
-        } // CircuitCode
-        public uint RegionX
-        {
-            get
-            {
-                return this.regionX;
-            }
-            set
-            {
-                this.regionX = value;
-            }
-        } // RegionX
-        public uint RegionY
-        {
-            get
-            {
-                return this.regionY;
-            }
-            set
-            {
-                this.regionY = value;
-            }
-        } // RegionY
-        public string SunTexture
-        {
-            get
-            {
-                return this.sunTexture;
-            }
-            set
-            {
-                this.sunTexture = value;
-            }
-        } // SunTexture
-        public string CloudTexture
-        {
-            get
-            {
-                return this.cloudTexture;
-            }
-            set
-            {
-                this.cloudTexture = value;
-            }
-        } // CloudTexture
-        public string MoonTexture
-        {
-            get
-            {
-                return this.moonTexture;
-            }
-            set
-            {
-                this.moonTexture = value;
-            }
-        } // MoonTexture
-        public string Firstname
-        {
-            get
-            {
-                return this.firstname;
-            }
-            set
-            {
-                this.firstname = value;
-            }
-        } // Firstname
-        public string Lastname
-        {
-            get
-            {
-                return this.lastname;
-            }
-            set
-            {
-                this.lastname = value;
-            }
-        } // Lastname
-        public string AgentAccess
-        {
-            get
-            {
-                return this.agentAccess;
-            }
-            set
-            {
-                this.agentAccess = value;
-            }
-        }
-        public string StartLocation
-        {
-            get
-            {
-                return this.startLocation;
-            }
-            set
-            {
-                this.startLocation = value;
-            }
-        } // StartLocation
-        public string LookAt
-        {
-            get
-            {
-                return this.lookAt;
-            }
-            set
-            {
-                this.lookAt = value;
-            }
-        }
-        public string SeedCapability
-        {
-            get
-            {
-                return this.seedCapability;
-            }
-            set
-            {
-                this.seedCapability = value;
-            }
-        } // SeedCapability
-        public string ErrorReason
-        {
-            get
-            {
-                return this.errorReason;
-            }
-            set
-            {
-                this.errorReason = value;
-            }
-        } // ErrorReason
-        public string ErrorMessage
-        {
-            get
-            {
-                return this.errorMessage;
-            }
-            set
-            {
-                this.errorMessage = value;
-            }
-        } // ErrorMessage
-        public ArrayList InventoryRoot
-        {
-            get
-            {
-                return this.inventoryRoot;
-            }
-            set
-            {
-                this.inventoryRoot = value;
-            }
-        }
-        public ArrayList InventorySkeleton
-        {
-            get
-            {
-                return this.agentInventory;
-            }
-            set
-            {
-                this.agentInventory = value;
-            }
-        }
-        public string Home
-        {
-            get
-            {
-                return this.home;
-            }
-            set
-            {
-                this.home = value;
-            }
-        }
-        public string Message
-        {
-            get
-            {
-                return this.welcomeMessage;
-            }
-            set
-            {
-                this.welcomeMessage = value;
-            }
-        }
-        #endregion
-        public class UserInfo
-        {
-            public string firstname;
-            public string lastname;
-            public ulong homeregionhandle;
-            public LLVector3 homepos;
-            public LLVector3 homelookat;
-        }
-    }
-}
diff --git a/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.csproj b/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.csproj
deleted file mode 100644
index 9a3cdba..0000000
--- a/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.csproj
+++ /dev/null
@@ -1,125 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{DA9A7391-0000-0000-0000-000000000000}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon></ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>OpenGrid.Framework.UserManagement</AssemblyName>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenGrid.Framework.UserManagement</RootNamespace>
-    <StartupObject></StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <DocumentationFile></DocumentationFile>
-    <DebugSymbols>True</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <Optimize>False</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <RemoveIntegerChecks>False</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile></DocumentationFile>
-    <DebugSymbols>False</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <Optimize>True</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <RemoveIntegerChecks>False</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Db4objects.Db4o.dll" >
-      <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="libsecondlife.dll" >
-      <HintPath>..\..\bin\libsecondlife.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="OpenSim.Framework" >
-      <HintPath>OpenSim.Framework.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="OpenSim.Framework.Console" >
-      <HintPath>OpenSim.Framework.Console.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="OpenSim.GenericConfig.Xml" >
-      <HintPath>OpenSim.GenericConfig.Xml.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="OpenSim.Servers" >
-      <HintPath>OpenSim.Servers.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System" >
-      <HintPath>System.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Data" >
-      <HintPath>System.Data.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Xml" >
-      <HintPath>System.Xml.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="XMLRPC" >
-      <HintPath>XMLRPC.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj">
-      <Name>OpenGrid.Framework.Data</Name>
-      <Project>{62CDF671-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-                        <Private>False</Private>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="LoginResponse.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="UserManagerBase.cs">
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
diff --git a/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.csproj.user b/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.csproj.user
deleted file mode 100644
index ae8a33c..0000000
--- a/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ReferencePath>E:\work\oslauth\sim\branches\Sugilite\bin\</ReferencePath>
-    <LastOpenVersion>8.0.50727</LastOpenVersion>
-    <ProjectView>ProjectFiles</ProjectView>
-    <ProjectTrust>0</ProjectTrust>
-  </PropertyGroup>
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
-</Project>
diff --git a/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.dll.build b/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.dll.build
deleted file mode 100644
index 9dc2383..0000000
--- a/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.dll.build
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" ?>
-<project name="OpenGrid.Framework.UserManagement" default="build">
-    <target name="build">
-        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
-        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
-        <copy todir="${project::get-base-directory()}/${build.dir}">
-            <fileset basedir="${project::get-base-directory()}">
-            </fileset>
-        </copy>
-        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
-            <resources prefix="OpenGrid.Framework.UserManagement" dynamicprefix="true" >
-            </resources>
-            <sources failonempty="true">
-                <include name="LoginResponse.cs" />
-                <include name="UserManagerBase.cs" />
-            </sources>
-            <references basedir="${project::get-base-directory()}">
-                <lib>
-                    <include name="${project::get-base-directory()}" />
-                    <include name="${project::get-base-directory()}/${build.dir}" />
-                </lib>
-                <include name="../../bin/Db4objects.Db4o.dll" />
-                <include name="../../bin/libsecondlife.dll" />
-                <include name="../../bin/OpenGrid.Framework.Data.dll" />
-                <include name="../../bin/OpenSim.Framework.dll" />
-                <include name="../../bin/OpenSim.Framework.Console.dll" />
-                <include name="../../bin/OpenSim.GenericConfig.Xml.dll" />
-                <include name="../../bin/OpenSim.Servers.dll" />
-                <include name="System.dll" />
-                <include name="System.Data.dll" />
-                <include name="System.Xml.dll" />
-                <include name="../../bin/XMLRPC.dll" />
-            </references>
-        </csc>
-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
-        <mkdir dir="${project::get-base-directory()}/../../bin/"/>
-        <copy todir="${project::get-base-directory()}/../../bin/">
-            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
-                <include name="*.dll"/>
-                <include name="*.exe"/>
-            </fileset>
-        </copy>
-    </target>
-    <target name="clean">
-        <delete dir="${bin.dir}" failonerror="false" />
-        <delete dir="${obj.dir}" failonerror="false" />
-    </target>
-    <target name="doc" description="Creates documentation.">
-    </target>
-</project>
diff --git a/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManager.csproj b/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManager.csproj
deleted file mode 100644
index 43f56a4..0000000
--- a/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManager.csproj
+++ /dev/null
@@ -1,122 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{D1D78B8D-0000-0000-0000-000000000000}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon></ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>OpenGrid.Framework.UserManager</AssemblyName>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenGrid.Framework.UserManager</RootNamespace>
-    <StartupObject></StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <DocumentationFile></DocumentationFile>
-    <DebugSymbols>True</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <Optimize>False</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <RemoveIntegerChecks>False</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile></DocumentationFile>
-    <DebugSymbols>False</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <Optimize>True</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <RemoveIntegerChecks>False</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Db4objects.Db4o.dll" >
-      <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="libsecondlife.dll" >
-      <HintPath>..\..\bin\libsecondlife.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="OpenSim.Framework" >
-      <HintPath>OpenSim.Framework.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="OpenSim.Framework.Console" >
-      <HintPath>OpenSim.Framework.Console.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="OpenSim.GenericConfig.Xml" >
-      <HintPath>OpenSim.GenericConfig.Xml.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="OpenSim.Servers" >
-      <HintPath>OpenSim.Servers.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System" >
-      <HintPath>System.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Data" >
-      <HintPath>System.Data.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Xml" >
-      <HintPath>System.Xml.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="XMLRPC" >
-      <HintPath>XMLRPC.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj">
-      <Name>OpenGrid.Framework.Data</Name>
-      <Project>{62CDF671-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-                        <Private>False</Private>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="UserManagerBase.cs">
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
diff --git a/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManager.csproj.user b/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManager.csproj.user
deleted file mode 100644
index 5941547..0000000
--- a/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManager.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\Sugilite\bin\</ReferencePath>
-    <LastOpenVersion>8.0.50727</LastOpenVersion>
-    <ProjectView>ProjectFiles</ProjectView>
-    <ProjectTrust>0</ProjectTrust>
-  </PropertyGroup>
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
-</Project>
diff --git a/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManager.dll.build b/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManager.dll.build
deleted file mode 100644
index 81a87f5..0000000
--- a/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManager.dll.build
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" ?>
-<project name="OpenGrid.Framework.UserManager" default="build">
-    <target name="build">
-        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
-        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
-        <copy todir="${project::get-base-directory()}/${build.dir}">
-            <fileset basedir="${project::get-base-directory()}">
-            </fileset>
-        </copy>
-        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
-            <resources prefix="OpenGrid.Framework.UserManager" dynamicprefix="true" >
-            </resources>
-            <sources failonempty="true">
-                <include name="UserManagerBase.cs" />
-            </sources>
-            <references basedir="${project::get-base-directory()}">
-                <lib>
-                    <include name="${project::get-base-directory()}" />
-                    <include name="${project::get-base-directory()}/${build.dir}" />
-                </lib>
-                <include name="../../bin/Db4objects.Db4o.dll" />
-                <include name="../../bin/libsecondlife.dll" />
-                <include name="../../bin/OpenGrid.Framework.Data.dll" />
-                <include name="../../bin/OpenSim.Framework.dll" />
-                <include name="../../bin/OpenSim.Framework.Console.dll" />
-                <include name="../../bin/OpenSim.GenericConfig.Xml.dll" />
-                <include name="../../bin/OpenSim.Servers.dll" />
-                <include name="System.dll" />
-                <include name="System.Data.dll" />
-                <include name="System.Xml.dll" />
-                <include name="../../bin/XMLRPC.dll" />
-            </references>
-        </csc>
-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
-        <mkdir dir="${project::get-base-directory()}/../../bin/"/>
-        <copy todir="${project::get-base-directory()}/../../bin/">
-            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
-                <include name="*.dll"/>
-                <include name="*.exe"/>
-            </fileset>
-        </copy>
-    </target>
-    <target name="clean">
-        <delete dir="${bin.dir}" failonerror="false" />
-        <delete dir="${obj.dir}" failonerror="false" />
-    </target>
-    <target name="doc" description="Creates documentation.">
-    </target>
-</project>
diff --git a/Common/OpenGrid.Framework.UserManager/UserManagerBase.cs b/Common/OpenGrid.Framework.UserManager/UserManagerBase.cs
deleted file mode 100644
index 01fbf3a..0000000
--- a/Common/OpenGrid.Framework.UserManager/UserManagerBase.cs
+++ /dev/null
@@ -1,641 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Text;
-using OpenGrid.Framework.Data;
-using libsecondlife;
-using System.Reflection;
-using System.Xml;
-using Nwc.XmlRpc;
-using OpenSim.Framework.Sims;
-using OpenSim.Framework.Inventory;
-using OpenSim.Framework.Utilities;
-using System.Security.Cryptography;
-namespace OpenGrid.Framework.UserManagement
-{
-    public class UserManagerBase
-    {
-        public OpenSim.Framework.Interfaces.UserConfig _config;
-        Dictionary<string, IUserData> _plugins = new Dictionary<string, IUserData>();
-        /// <summary>
-        /// Adds a new user server plugin - user servers will be requested in the order they were loaded.
-        /// </summary>
-        /// <param name="FileName">The filename to the user server plugin DLL</param>
-        public void AddPlugin(string FileName)
-        {
-            OpenSim.Framework.Console.MainLog.Instance.Verbose( "Userstorage: Attempting to load " + FileName);
-            Assembly pluginAssembly = Assembly.LoadFrom(FileName);
-            OpenSim.Framework.Console.MainLog.Instance.Verbose( "Userstorage: Found " + pluginAssembly.GetTypes().Length + " interfaces.");
-            foreach (Type pluginType in pluginAssembly.GetTypes())
-            {
-                if (!pluginType.IsAbstract)
-                {
-                    Type typeInterface = pluginType.GetInterface("IUserData", true);
-                    if (typeInterface != null)
-                    {
-                        IUserData plug = (IUserData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
-                        plug.Initialise();
-                        this._plugins.Add(plug.getName(), plug);
-                        OpenSim.Framework.Console.MainLog.Instance.Verbose( "Userstorage: Added IUserData Interface");
-                    }
-                    typeInterface = null;
-                }
-            }
-            pluginAssembly = null;
-        }
-        #region Get UserProfile 
-        /// <summary>
-        /// Loads a user profile from a database by UUID
-        /// </summary>
-        /// <param name="uuid">The target UUID</param>
-        /// <returns>A user profile</returns>
-        public UserProfileData getUserProfile(LLUUID uuid)
-        {
-            foreach (KeyValuePair<string, IUserData> plugin in _plugins)
-            {
-                try
-                {
-                    UserProfileData profile = plugin.Value.getUserByUUID(uuid);
-                    profile.currentAgent = getUserAgent(profile.UUID);
-                    return profile;
-                }
-                catch (Exception e)
-                {
-                    OpenSim.Framework.Console.MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
-                }
-            }
-            return null;
-        }
-        /// <summary>
-        /// Loads a user profile by name
-        /// </summary>
-        /// <param name="name">The target name</param>
-        /// <returns>A user profile</returns>
-        public UserProfileData getUserProfile(string name)
-        {
-            foreach (KeyValuePair<string, IUserData> plugin in _plugins)
-            {
-                try
-                {
-                    UserProfileData profile = plugin.Value.getUserByName(name);
-                    profile.currentAgent = getUserAgent(profile.UUID);
-                    return profile;
-                }
-                catch (Exception e)
-                {
-                    OpenSim.Framework.Console.MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
-                }
-            }
-            return null;
-        }
-        /// <summary>
-        /// Loads a user profile by name
-        /// </summary>
-        /// <param name="fname">First name</param>
-        /// <param name="lname">Last name</param>
-        /// <returns>A user profile</returns>
-        public UserProfileData getUserProfile(string fname, string lname)
-        {
-            foreach (KeyValuePair<string, IUserData> plugin in _plugins)
-            {
-                try
-                {
-                    UserProfileData profile = plugin.Value.getUserByName(fname,lname);
-                    try
-                    {
-                        profile.currentAgent = getUserAgent(profile.UUID);
-                    }
-                    catch (Exception e)
-                    {
-                        // Ignore
-                    }
-                    return profile;
-                }
-                catch (Exception e)
-                {
-                    OpenSim.Framework.Console.MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
-                }
-            }
-            return null;
-        }
-        #endregion
-        #region Get UserAgent
-        /// <summary>
-        /// Loads a user agent by uuid (not called directly)
-        /// </summary>
-        /// <param name="uuid">The agents UUID</param>
-        /// <returns>Agent profiles</returns>
-        public UserAgentData getUserAgent(LLUUID uuid)
-        {
-            foreach (KeyValuePair<string, IUserData> plugin in _plugins)
-            {
-                try
-                {
-                    return plugin.Value.getAgentByUUID(uuid);
-                }
-                catch (Exception e)
-                {
-                    OpenSim.Framework.Console.MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
-                }
-            }
-            return null;
-        }
-        /// <summary>
-        /// Loads a user agent by name (not called directly)
-        /// </summary>
-        /// <param name="name">The agents name</param>
-        /// <returns>A user agent</returns>
-        public UserAgentData getUserAgent(string name)
-        {
-            foreach (KeyValuePair<string, IUserData> plugin in _plugins)
-            {
-                try
-                {
-                    return plugin.Value.getAgentByName(name);
-                }
-                catch (Exception e)
-                {
-                    OpenSim.Framework.Console.MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
-                }
-            }
-            return null;
-        }
-        /// <summary>
-        /// Loads a user agent by name (not called directly)
-        /// </summary>
-        /// <param name="fname">The agents firstname</param>
-        /// <param name="lname">The agents lastname</param>
-        /// <returns>A user agent</returns>
-        public UserAgentData getUserAgent(string fname, string lname)
-        {
-            foreach (KeyValuePair<string, IUserData> plugin in _plugins)
-            {
-                try
-                {
-                    return plugin.Value.getAgentByName(fname,lname);
-                }
-                catch (Exception e)
-                {
-                    OpenSim.Framework.Console.MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
-                }
-            }
-            return null;
-        }
-        #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(ref UserProfileData profile, XmlRpcRequest request)
-        {
-            Hashtable requestData = (Hashtable)request.Params[0];
-            UserAgentData agent = new UserAgentData();
-            // User connection
-            agent.agentIP = "";
-            agent.agentOnline = true;
-            agent.agentPort = 0;
-            // 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 LLUUID(randDataSS, 0);
-            agent.sessionID = new LLUUID(randDataS, 0);
-            // Profile UUID
-            agent.UUID = profile.UUID;
-            // Current position (from Home)
-            agent.currentHandle = profile.homeRegion;
-            agent.currentPos = profile.homeLocation;
-            // If user specified additional start, use that
-            if (requestData.ContainsKey("start"))
-            {
-                string startLoc = ((string)requestData["start"]).Trim();
-                if (!(startLoc == "last" || startLoc == "home"))
-                {
-                    // Format: uri:Ahern&162&213&34
-                    try
-                    {
-                        string[] parts = startLoc.Remove(0, 4).Split('&');
-                        string region = parts[0];
-                        ////////////////////////////////////////////////////
-                        //SimProfile SimInfo = new SimProfile();
-                        //SimInfo = SimInfo.LoadFromGrid(theUser.currentAgent.currentHandle, _config.GridServerURL, _config.GridSendKey, _config.GridRecvKey);
-                    }
-                    catch (Exception e)
-                    {
-                    }
-                }
-            }
-            // What time did the user login?
-            agent.loginTime = Util.UnixTimeSinceEpoch();
-            agent.logoutTime = 0;
-            // Current location
-            agent.regionID = new LLUUID(); // Fill in later
-            agent.currentRegion = new LLUUID();      // Fill in later
-            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)
-        {
-            // Saves the agent to database
-            return true;
-        }
-        #endregion
-        /// <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(ref UserProfileData profile, string password)
-        {
-            OpenSim.Framework.Console.MainLog.Instance.Verbose(
-                "Authenticating " + profile.username + " " + profile.surname);
-            password = password.Remove(0, 3); //remove $1$
-            string s = Util.Md5Hash(password + ":" + profile.passwordSalt);
-            return profile.passwordHash.Equals(s.ToString(), StringComparison.InvariantCultureIgnoreCase);
-        }
-        #region Xml Response
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="firstname"></param>
-        /// <param name="lastname"></param>
-        /// <returns></returns>
-        public virtual UserProfileData GetTheUser(string firstname, string lastname)
-        {
-            return getUserProfile(firstname, lastname);
-        }
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <returns></returns>
-        public virtual string GetMessage()
-        {
-            return _config.DefaultStartupMsg;
-        }
-        /// <summary>
-        /// Customises the login response and fills in missing values.
-        /// </summary>
-        /// <param name="response">The existing response</param>
-        /// <param name="theUser">The user profile</param>
-        public virtual void CustomiseResponse(ref LoginResponse response, ref UserProfileData theUser)
-        {
-       
-        }
-        /// <summary>
-        /// Main user login function
-        /// </summary>
-        /// <param name="request">The XMLRPC request</param>
-        /// <returns>The response to send</returns>
-        public XmlRpcResponse XmlRpcLoginMethod(XmlRpcRequest request)
-        {
-            XmlRpcResponse response = new XmlRpcResponse();
-            Hashtable requestData = (Hashtable)request.Params[0];
-            bool GoodXML = (requestData.Contains("first") && requestData.Contains("last") && requestData.Contains("passwd"));
-            bool GoodLogin = false;
-            string firstname = "";
-            string lastname = "";
-            string passwd = "";
-            UserProfileData TheUser;
-            LoginResponse logResponse = new LoginResponse();
-            if (GoodXML)
-            {
-                firstname = (string)requestData["first"];
-                lastname = (string)requestData["last"];
-                passwd = (string)requestData["passwd"];
-                TheUser = GetTheUser(firstname, lastname);
-                if (TheUser == null)
-                    return logResponse.CreateLoginFailedResponse();
-                GoodLogin = AuthenticateUser(ref TheUser, passwd);
-            }
-            else
-            {
-                return logResponse.CreateGridErrorResponse();
-            }
-            if (!GoodLogin)
-            {
-                return logResponse.CreateLoginFailedResponse();
-            }
-            else
-            {
-                // If we already have a session...
-                if (TheUser.currentAgent != null && TheUser.currentAgent.agentOnline)
-                {
-                    // Reject the login
-                    return logResponse.CreateAlreadyLoggedInResponse();
-                }
-                // Otherwise...
-                // Create a new agent session
-                CreateAgent(ref TheUser, request);
-                try
-                {
-                    LLUUID AgentID = TheUser.UUID;
-                    // Inventory Library Section
-                    ArrayList AgentInventoryArray = new ArrayList();
-                    Hashtable TempHash;
-                    AgentInventory Library = new AgentInventory();
-                    Library.CreateRootFolder(AgentID, true);
-                    foreach (InventoryFolder InvFolder in Library.InventoryFolders.Values)
-                    {
-                        TempHash = new Hashtable();
-                        TempHash["name"] = InvFolder.FolderName;
-                        TempHash["parent_id"] = InvFolder.ParentID.ToStringHyphenated();
-                        TempHash["version"] = (Int32)InvFolder.Version;
-                        TempHash["type_default"] = (Int32)InvFolder.DefaultType;
-                        TempHash["folder_id"] = InvFolder.FolderID.ToStringHyphenated();
-                        AgentInventoryArray.Add(TempHash);
-                    }
-                    Hashtable InventoryRootHash = new Hashtable();
-                    InventoryRootHash["folder_id"] = Library.InventoryRoot.FolderID.ToStringHyphenated();
-                    ArrayList InventoryRoot = new ArrayList();
-                    InventoryRoot.Add(InventoryRootHash);
-                    // Circuit Code
-                    uint circode = (uint)(Util.RandomClass.Next());
-                    logResponse.Lastname = TheUser.surname;
-                    logResponse.Firstname = TheUser.username;
-                    logResponse.AgentID = AgentID.ToStringHyphenated();
-                    logResponse.SessionID = TheUser.currentAgent.sessionID.ToStringHyphenated();
-                    logResponse.SecureSessionID = TheUser.currentAgent.secureSessionID.ToStringHyphenated();
-                    logResponse.InventoryRoot = InventoryRoot;
-                    logResponse.InventorySkeleton = AgentInventoryArray;
-                    logResponse.CircuitCode = (Int32)circode;
-                    logResponse.RegionX = 0; //overwritten
-                    logResponse.RegionY = 0; //overwritten
-                    logResponse.Home = "!!null temporary value {home}!!";   // Overwritten
-                    //logResponse.LookAt = "\n[r" + TheUser.homeLookAt.X.ToString() + ",r" + TheUser.homeLookAt.Y.ToString() + ",r" + TheUser.homeLookAt.Z.ToString() + "]\n";
-                    logResponse.SimAddress = "127.0.0.1"; //overwritten
-                    logResponse.SimPort = 0; //overwritten
-                    logResponse.Message = this.GetMessage();
-                    
-                    try
-                    {
-                        this.CustomiseResponse(ref logResponse, ref TheUser);
-                    }
-                    catch (Exception e)
-                    {
-                        Console.WriteLine(e.ToString());
-                        return logResponse.CreateDeadRegionResponse();
-                    }
-                    CommitAgent(ref TheUser);
-                    return logResponse.ToXmlRpcResponse();
-                }
-                catch (Exception E)
-                {
-                    Console.WriteLine(E.ToString());
-                }
-                //}
-            }
-            return response;
-        }
-        #endregion
-        /// <summary>
-        /// Deletes an active agent session
-        /// </summary>
-        /// <param name="request">The request</param>
-        /// <param name="path">The path (eg /bork/narf/test)</param>
-        /// <param name="param">Parameters sent</param>
-        /// <returns>Success "OK" else error</returns>
-        public string RestDeleteUserSessionMethod(string request, string path, string param)
-        {
-            // TODO! Important!
-            return "OK";
-        }
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="user"></param>
-        public void AddUserProfile(string firstName, string lastName, string pass, uint regX, uint regY)
-        {
-            UserProfileData user = new UserProfileData();
-            user.homeLocation = new LLVector3(128, 128, 100);
-            user.UUID = LLUUID.Random();
-            user.username = firstName;
-            user.surname = lastName;
-            user.passwordHash = pass;
-            user.passwordSalt = "";
-            user.created = Util.UnixTimeSinceEpoch();
-            user.homeLookAt = new LLVector3(100, 100, 100);
-            user.homeRegion = Util.UIntsToLong((regX * 256), (regY * 256));
-            foreach (KeyValuePair<string, IUserData> plugin in _plugins)
-            {
-                try
-                {
-                    plugin.Value.addNewUserProfile(user);
-                }
-                catch (Exception e)
-                {
-                    OpenSim.Framework.Console.MainLog.Instance.Verbose("Unable to add user via " + plugin.Key + "(" + e.ToString() + ")");
-                }
-            }
-        }
-        /// <summary>
-        /// Returns an error message that the user could not be found in the database
-        /// </summary>
-        /// <returns>XML string consisting of a error element containing individual error(s)</returns>
-        public string CreateUnknownUserErrorResponse()
-        {
-            System.IO.StringWriter sw = new System.IO.StringWriter();
-            XmlTextWriter xw = new XmlTextWriter(sw);
-            // Header
-            xw.Formatting = Formatting.Indented;
-            xw.WriteStartDocument();
-            xw.WriteDocType("error", null, null, null);
-            xw.WriteComment("An error occured");
-            xw.WriteStartElement("error");
-            // User
-            xw.WriteElementString("unknownuser", "Unable to find a user with that name");
-            // Footer
-            xw.WriteEndElement();
-            xw.Flush();
-            xw.Close();
-            return sw.ToString();
-        }
-        /// <summary>
-        /// Converts a user profile to an XML element which can be returned
-        /// </summary>
-        /// <param name="profile">The user profile</param>
-        /// <returns>A string containing an XML Document of the user profile</returns>
-        public string ProfileToXml(UserProfileData profile)
-        {
-            System.IO.StringWriter sw = new System.IO.StringWriter();
-            XmlTextWriter xw = new XmlTextWriter(sw);
-            // Header
-            xw.Formatting = Formatting.Indented;
-            xw.WriteStartDocument();
-            xw.WriteDocType("userprofile", null, null, null);
-            xw.WriteComment("Found user profiles matching the request");
-            xw.WriteStartElement("users");
-            // User
-            xw.WriteStartElement("user");
-            // Account information
-            xw.WriteAttributeString("firstname", profile.username);
-            xw.WriteAttributeString("lastname", profile.surname);
-            xw.WriteAttributeString("uuid", profile.UUID.ToStringHyphenated());
-            // Server Information
-            xw.WriteAttributeString("server_inventory", profile.userInventoryURI);
-            xw.WriteAttributeString("server_asset", profile.userAssetURI);
-            // Profile Information
-            xw.WriteAttributeString("profile_about", profile.profileAboutText);
-            xw.WriteAttributeString("profile_firstlife_about", profile.profileFirstText);
-            xw.WriteAttributeString("profile_firstlife_image", profile.profileFirstImage.ToStringHyphenated());
-            xw.WriteAttributeString("profile_can_do", profile.profileCanDoMask.ToString());
-            xw.WriteAttributeString("profile_want_do", profile.profileWantDoMask.ToString());
-            xw.WriteAttributeString("profile_image", profile.profileImage.ToStringHyphenated());
-            xw.WriteAttributeString("profile_created",profile.created.ToString());
-            xw.WriteAttributeString("profile_lastlogin",profile.lastLogin.ToString());
-            // Home region information
-            xw.WriteAttributeString("home_coordinates", profile.homeLocation.ToString());
-            xw.WriteAttributeString("home_region", profile.homeRegion.ToString());
-            xw.WriteAttributeString("home_look", profile.homeLookAt.ToString());
-            xw.WriteEndElement();
-            // Footer
-            xw.WriteEndElement();
-            xw.Flush();
-            xw.Close();
-            return sw.ToString();
-        }
-        #region REST Methods 
-        //should most likely move out of here and into the grid's userserver sub class
-        public string RestGetUserMethodName(string request, string path, string param)
-        {
-            UserProfileData userProfile = getUserProfile(param.Trim());
-            if (userProfile == null)
-            {
-                return CreateUnknownUserErrorResponse();
-            }
-            return ProfileToXml(userProfile);
-        }
-        public string RestGetUserMethodUUID(string request, string path, string param)
-        {
-            UserProfileData userProfile = getUserProfile(new LLUUID(param));
-            if (userProfile == null)
-            {
-                return CreateUnknownUserErrorResponse();
-            }
-            return ProfileToXml(userProfile);
-        }
-        #endregion
-    }
-}
diff --git a/Common/OpenSim.Framework.Console/AssemblyInfo.cs b/Common/OpenSim.Framework.Console/AssemblyInfo.cs
deleted file mode 100644
index 8f715d2..0000000
--- a/Common/OpenSim.Framework.Console/AssemblyInfo.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-// Information about this assembly is defined by the following
-// attributes.
-//
-// change them to the information which is associated with the assembly
-// you compile.
-[assembly: AssemblyTitle("ServerConsole")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("ServerConsole")]
-[assembly: AssemblyCopyright("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-// This sets the default COM visibility of types in the assembly to invisible.
-// If you need to expose a type to COM, use [ComVisible(true)] on that type.
-[assembly: ComVisible(false)]
-// The assembly version has following format :
-//
-// Major.Minor.Build.Revision
-//
-// You can specify all values by your own or you can build default build and revision
-// numbers with the '*' character (the default):
-[assembly: AssemblyVersion("1.0.*")]
diff --git a/Common/OpenSim.Framework.Console/ConsoleCallbacksBase.cs b/Common/OpenSim.Framework.Console/ConsoleCallbacksBase.cs
deleted file mode 100644
index e3847be..0000000
--- a/Common/OpenSim.Framework.Console/ConsoleCallbacksBase.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-namespace OpenSim.Framework.Console
-{    
-    public interface conscmd_callback
-    {
-        void RunCmd(string cmd, string[] cmdparams);
-        void Show(string ShowWhat);
-    }
-}
diff --git a/Common/OpenSim.Framework.Console/LogBase.cs b/Common/OpenSim.Framework.Console/LogBase.cs
deleted file mode 100644
index 1a92d8e..0000000
--- a/Common/OpenSim.Framework.Console/LogBase.cs
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.IO;
-namespace OpenSim.Framework.Console
-{
-    public enum LogPriority : int
-    {
-        CRITICAL,
-        HIGH,
-        MEDIUM,
-        NORMAL,
-        LOW,
-        VERBOSE,
-        EXTRAVERBOSE
-    }
-    public class LogBase
-    {
-        StreamWriter Log;
-        public conscmd_callback cmdparser;
-        public string componentname;
-        private bool m_silent;
-        public LogBase(string LogFile, string componentname, conscmd_callback cmdparser, bool silent )
-        {
-            this.componentname = componentname;
-            this.cmdparser = cmdparser;
-            this.m_silent = silent;
-            System.Console.WriteLine("ServerConsole.cs - creating new local console");
-            
-            if( String.IsNullOrEmpty( LogFile ) )
-            {
-                LogFile = componentname + ".log";
-            }
-            
-            System.Console.WriteLine("Logs will be saved to current directory in " + LogFile);
-            Log = File.AppendText(LogFile);
-            Log.WriteLine("========================================================================");
-            Log.WriteLine(componentname + " Started at " + DateTime.Now.ToString());
-        }
-        public void Close()
-        {
-            Log.WriteLine("Shutdown at " + DateTime.Now.ToString());
-            Log.Close();
-        }
-        public void Write(string format, params object[] args)
-        {
-            Notice(format,args);
-            return;
-        }
-         
-        public void WriteLine(LogPriority importance, string format, params object[] args)
-        {
-            Log.WriteLine(format, args);
-            Log.Flush();
-            if (!m_silent)
-            {
-                System.Console.WriteLine(format, args);
-            }
-            return;
-        }
-        public void Warn(string format, params object[] args)
-        {
-            WriteNewLine(ConsoleColor.Yellow, format, args);
-            return;
-        }
-        public void Notice(string format, params object[] args)
-        {
-            WriteNewLine(ConsoleColor.White, format, args);
-            return;
-        }
-        public void Error(string format, params object[] args)
-        {
-            WriteNewLine(ConsoleColor.Red, format, args);
-            return;
-        }
-        public void Verbose(string format, params object[] args)
-        {
-            WriteNewLine(ConsoleColor.Gray, format, args);
-            return;
-        }
-        public void Status(string format, params object[] args)
-        {
-            WriteNewLine(ConsoleColor.Blue, format, args);
-            return;
-        }
-        private void WriteNewLine(System.ConsoleColor color, string format, params object[] args)
-        {
-            Log.WriteLine(format, args);
-            Log.Flush();
-            if (!m_silent)
-            {
-                try
-                {
-                    System.Console.ForegroundColor = color;
-                    System.Console.WriteLine(format, args);
-                    System.Console.ResetColor();
-                }
-                catch (System.ArgumentNullException)
-                {
-                    // Some older systems dont support coloured text.
-                    System.Console.WriteLine(format, args);
-                }
-            }
-            return;
-        }
-        public string ReadLine()
-        {
-            string TempStr = System.Console.ReadLine();
-            Log.WriteLine(TempStr);
-            return TempStr;
-        }
-        public int Read()
-        {
-            int TempInt = System.Console.Read();
-            Log.Write((char)TempInt);
-            return TempInt;
-        }
-        // Displays a prompt and waits for the user to enter a string, then returns that string
-        // Done with no echo and suitable for passwords
-        public string PasswdPrompt(string prompt)
-        {
-            // FIXME: Needs to be better abstracted
-            Log.WriteLine(prompt);
-            this.Write(prompt);
-            ConsoleColor oldfg = System.Console.ForegroundColor;
-            System.Console.ForegroundColor = System.Console.BackgroundColor;
-            string temp = System.Console.ReadLine();
-            System.Console.ForegroundColor = oldfg;
-            return temp;
-        }
-        // Displays a command prompt and waits for the user to enter a string, then returns that string
-        public string CmdPrompt(string prompt)
-        {
-            this.Write(String.Format("{0}: ", prompt));
-            return this.ReadLine();
-        }
-        // Displays a command prompt and returns a default value if the user simply presses enter
-        public string CmdPrompt(string prompt, string defaultresponse)
-        {
-            string temp = CmdPrompt(String.Format( "{0} [{1}]", prompt, defaultresponse ));
-            if (temp == "")
-            {
-                return defaultresponse;
-            }
-            else
-            {
-                return temp;
-            }
-        }
-        // Displays a command prompt and returns a default value, user may only enter 1 of 2 options
-        public string CmdPrompt(string prompt, string defaultresponse, string OptionA, string OptionB)
-        {
-            bool itisdone = false;
-            string temp = CmdPrompt(prompt, defaultresponse);
-            while (itisdone == false)
-            {
-                if ((temp == OptionA) || (temp == OptionB))
-                {
-                    itisdone = true;
-                }
-                else
-                {
-                    Notice("Valid options are " + OptionA + " or " + OptionB);
-                    temp = CmdPrompt(prompt, defaultresponse);
-                }
-            }
-            return temp;
-        }
-        // Runs a command with a number of parameters
-        public Object RunCmd(string Cmd, string[] cmdparams)
-        {
-            cmdparser.RunCmd(Cmd, cmdparams);
-            return null;
-        }
-        // Shows data about something
-        public void ShowCommands(string ShowWhat)
-        {
-            cmdparser.Show(ShowWhat);
-        }
-        public void MainLogPrompt()
-        {
-            string[] tempstrarray;
-            string tempstr = this.CmdPrompt(this.componentname + "# ");
-            tempstrarray = tempstr.Split(' ');
-            string cmd = tempstrarray[0];
-            Array.Reverse(tempstrarray);
-            Array.Resize<string>(ref tempstrarray, tempstrarray.Length - 1);
-            Array.Reverse(tempstrarray);
-            string[] cmdparams = (string[])tempstrarray;
-            RunCmd(cmd, cmdparams);
-        }
-    }
-}
diff --git a/Common/OpenSim.Framework.Console/MainLog.cs b/Common/OpenSim.Framework.Console/MainLog.cs
deleted file mode 100644
index d7f945e..0000000
--- a/Common/OpenSim.Framework.Console/MainLog.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-namespace OpenSim.Framework.Console
-{
-        public class MainLog {
-                
-                private static LogBase instance;
-                
-                public static LogBase Instance 
-                {
-                        get 
-                        {
-                                return instance;
-                        }
-                        set
-                        {
-                                instance = value;
-                        }
-                }
-    }
-}
diff --git a/Common/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj b/Common/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj
deleted file mode 100644
index af6c396..0000000
--- a/Common/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj
+++ /dev/null
@@ -1,89 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{A7CD0630-0000-0000-0000-000000000000}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon></ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>OpenSim.Framework.Console</AssemblyName>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenSim.Framework.Console</RootNamespace>
-    <StartupObject></StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <DocumentationFile></DocumentationFile>
-    <DebugSymbols>True</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <Optimize>False</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <RemoveIntegerChecks>False</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile></DocumentationFile>
-    <DebugSymbols>False</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <Optimize>True</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <RemoveIntegerChecks>False</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" >
-      <HintPath>System.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ConsoleCallbacksBase.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LogBase.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="MainLog.cs">
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
diff --git a/Common/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build b/Common/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build
deleted file mode 100644
index 7ebdba1..0000000
--- a/Common/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" ?>
-<project name="OpenSim.Framework.Console" default="build">
-    <target name="build">
-        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
-        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
-        <copy todir="${project::get-base-directory()}/${build.dir}">
-            <fileset basedir="${project::get-base-directory()}">
-            </fileset>
-        </copy>
-        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
-            <resources prefix="OpenSim.Framework.Console" dynamicprefix="true" >
-            </resources>
-            <sources failonempty="true">
-                <include name="AssemblyInfo.cs" />
-                <include name="ConsoleCallbacksBase.cs" />
-                <include name="LogBase.cs" />
-                <include name="MainLog.cs" />
-            </sources>
-            <references basedir="${project::get-base-directory()}">
-                <lib>
-                    <include name="${project::get-base-directory()}" />
-                    <include name="${project::get-base-directory()}/${build.dir}" />
-                </lib>
-                <include name="System.dll" />
-            </references>
-        </csc>
-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
-        <mkdir dir="${project::get-base-directory()}/../../bin/"/>
-        <copy todir="${project::get-base-directory()}/../../bin/">
-            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
-                <include name="*.dll"/>
-                <include name="*.exe"/>
-            </fileset>
-        </copy>
-    </target>
-    <target name="clean">
-        <delete dir="${bin.dir}" failonerror="false" />
-        <delete dir="${obj.dir}" failonerror="false" />
-    </target>
-    <target name="doc" description="Creates documentation.">
-    </target>
-</project>
diff --git a/Common/OpenSim.Framework/AgentInventory.cs b/Common/OpenSim.Framework/AgentInventory.cs
deleted file mode 100644
index fbf4d23..0000000
--- a/Common/OpenSim.Framework/AgentInventory.cs
+++ /dev/null
@@ -1,267 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-using libsecondlife.Packets;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Utilities;
-namespace OpenSim.Framework.Inventory
-{
-    public class AgentInventory
-    {
-        //Holds the local copy of Inventory info for a agent
-        public Dictionary<LLUUID, InventoryFolder> InventoryFolders;
-        public Dictionary<LLUUID, InventoryItem> InventoryItems;
-        public InventoryFolder InventoryRoot;
-        public int LastCached;  //maybe used by opensim app, time this was last stored/compared to user server
-        public LLUUID AgentID;
-        public AvatarWearable[] Wearables;
-        public AgentInventory()
-        {
-            InventoryFolders = new Dictionary<LLUUID, InventoryFolder>();
-            InventoryItems = new Dictionary<LLUUID, InventoryItem>();
-            this.Initialise();
-        }
-        public virtual void Initialise()
-        {
-            Wearables = new AvatarWearable[13]; //should be 12 of these
-            for (int i = 0; i < 13; i++)
-            {
-                Wearables[i] = new AvatarWearable();
-            }
-      
-        }
-        public bool CreateNewFolder(LLUUID folderID, ushort type)
-        {
-            InventoryFolder Folder = new InventoryFolder();
-            Folder.FolderID = folderID;
-            Folder.OwnerID = this.AgentID;
-            Folder.DefaultType = type;
-            this.InventoryFolders.Add(Folder.FolderID, Folder);
-            return (true);
-        }
-        public void CreateRootFolder(LLUUID newAgentID, bool createTextures)
-        {
-            this.AgentID = newAgentID;
-            InventoryRoot = new InventoryFolder();
-            InventoryRoot.FolderID = LLUUID.Random();
-            InventoryRoot.ParentID = new LLUUID();
-            InventoryRoot.Version = 1;
-            InventoryRoot.DefaultType = 8;
-            InventoryRoot.OwnerID = this.AgentID;
-            InventoryRoot.FolderName = "My Inventory";
-            InventoryFolders.Add(InventoryRoot.FolderID, InventoryRoot);
-            InventoryRoot.OwnerID = this.AgentID;
-            if (createTextures)
-            {
-                this.CreateNewFolder(LLUUID.Random(), 0, "Textures", InventoryRoot.FolderID);
-            }
-        }
-        public bool CreateNewFolder(LLUUID folderID, ushort type, string folderName)
-        {
-            InventoryFolder Folder = new InventoryFolder();
-            Folder.FolderID = folderID;
-            Folder.OwnerID = this.AgentID;
-            Folder.DefaultType = type;
-            Folder.FolderName = folderName;
-            this.InventoryFolders.Add(Folder.FolderID, Folder);
-            return (true);
-        }
-        public bool CreateNewFolder(LLUUID folderID, ushort type, string folderName, LLUUID parent)
-        {
-            if (!this.InventoryFolders.ContainsKey(folderID))
-            {
-                System.Console.WriteLine("creating new folder called " + folderName + " in agents inventory");
-                InventoryFolder Folder = new InventoryFolder();
-                Folder.FolderID = folderID;
-                Folder.OwnerID = this.AgentID;
-                Folder.DefaultType = type;
-                Folder.FolderName = folderName;
-                Folder.ParentID = parent;
-                this.InventoryFolders.Add(Folder.FolderID, Folder);
-            }
-            return (true);
-        }
-        public bool HasFolder(LLUUID folderID)
-        {
-            if (this.InventoryFolders.ContainsKey(folderID))
-            {
-                return true;
-            }
-            return false;
-        }
-        public LLUUID GetFolderID(string folderName)
-        {
-            foreach (InventoryFolder inv in this.InventoryFolders.Values)
-            {
-                if (inv.FolderName == folderName)
-                {
-                    return inv.FolderID;
-                }
-            }
-            return LLUUID.Zero;
-        }
-        public bool UpdateItemAsset(LLUUID itemID, AssetBase asset)
-        {
-            if(this.InventoryItems.ContainsKey(itemID))
-            {
-                InventoryItem Item = this.InventoryItems[itemID];
-                Item.AssetID = asset.FullID;
-                System.Console.WriteLine("updated inventory item " + itemID.ToStringHyphenated() + " so it now is set to asset " + asset.FullID.ToStringHyphenated());
-                //TODO need to update the rest of the info
-            }
-            return true;
-        }
-        public bool UpdateItemDetails(LLUUID itemID, UpdateInventoryItemPacket.InventoryDataBlock packet)
-        {
-            System.Console.WriteLine("updating inventory item details");
-            if (this.InventoryItems.ContainsKey(itemID))
-            {
-                System.Console.WriteLine("changing name to "+ Util.FieldToString(packet.Name));
-                InventoryItem Item = this.InventoryItems[itemID];
-                Item.Name = Util.FieldToString(packet.Name);
-                System.Console.WriteLine("updated inventory item " + itemID.ToStringHyphenated());
-                //TODO need to update the rest of the info
-            }
-            return true;
-        }
-        public LLUUID AddToInventory(LLUUID folderID, AssetBase asset)
-        {
-            if (this.InventoryFolders.ContainsKey(folderID))
-            {
-                LLUUID NewItemID = LLUUID.Random();
-                InventoryItem Item = new InventoryItem();
-                Item.FolderID = folderID;
-                Item.OwnerID = AgentID;
-                Item.AssetID = asset.FullID;
-                Item.ItemID = NewItemID;
-                Item.Type = asset.Type;
-                Item.Name = asset.Name;
-                Item.Description = asset.Description;
-                Item.InvType = asset.InvType;
-                this.InventoryItems.Add(Item.ItemID, Item);
-                InventoryFolder Folder = InventoryFolders[Item.FolderID];
-                Folder.Items.Add(Item);
-                return (Item.ItemID);
-            }
-            else
-            {
-                return (null);
-            }
-        }
-        public bool DeleteFromInventory(LLUUID itemID)
-        {
-            bool res = false;
-            if (this.InventoryItems.ContainsKey(itemID))
-            {
-                InventoryItem item = this.InventoryItems[itemID];
-                this.InventoryItems.Remove(itemID);
-                foreach (InventoryFolder fold in InventoryFolders.Values)
-                {
-                    if (fold.Items.Contains(item))
-                    {
-                        fold.Items.Remove(item);
-                        break;
-                    }
-                }
-                res = true;
-                
-            }
-            return res;
-        }
-    }
-    public class InventoryFolder
-    {
-        public List<InventoryItem> Items;
-        //public List<InventoryFolder> Subfolders;
-        public LLUUID FolderID;
-        public LLUUID OwnerID;
-        public LLUUID ParentID = LLUUID.Zero;
-        public string FolderName;
-        public ushort DefaultType;
-        public ushort Version;
-        public InventoryFolder()
-        {
-            Items = new List<InventoryItem>();
-            //Subfolders = new List<InventoryFolder>();
-        }
-    }
-    public class InventoryItem
-    {
-        public LLUUID FolderID;
-        public LLUUID OwnerID;
-        public LLUUID ItemID;
-        public LLUUID AssetID;
-        public LLUUID CreatorID;
-        public sbyte InvType;
-        public sbyte Type;
-        public string Name ="";
-        public string Description;
-        public InventoryItem()
-        {
-            this.CreatorID = LLUUID.Zero;
-        }
-        public string ExportString()
-        {
-            string typ = "notecard";
-            string result = "";
-            result += "\tinv_object\t0\n\t{\n";
-            result += "\t\tobj_id\t%s\n";
-            result +=  "\t\tparent_id\t"+ ItemID.ToString() +"\n";
-            result += "\t\ttype\t"+ typ +"\n";
-            result += "\t\tname\t" + Name+"|\n";
-            result += "\t}\n";
-            return result;
-        }
-    }
-}
diff --git a/Common/OpenSim.Framework/AuthenticateSessionBase.cs b/Common/OpenSim.Framework/AuthenticateSessionBase.cs
deleted file mode 100644
index 73dd3e2..0000000
--- a/Common/OpenSim.Framework/AuthenticateSessionBase.cs
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-namespace OpenSim.Framework
-{
-    public class AuthenticateSessionsBase
-    {
-        public Dictionary<uint, AgentCircuitData> AgentCircuits = new Dictionary<uint, AgentCircuitData>();
-        public AuthenticateSessionsBase()
-        {
-        }
-        public virtual AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitcode)
-        {
-            AgentCircuitData validcircuit = null;
-            if (this.AgentCircuits.ContainsKey(circuitcode))
-            {
-                validcircuit = this.AgentCircuits[circuitcode];
-            }
-            AuthenticateResponse user = new AuthenticateResponse();
-            if (validcircuit == null)
-            {
-                //don't have this circuit code in our list
-                user.Authorised = false;
-                return (user);
-            }
-            if ((sessionID == validcircuit.SessionID) && (agentID == validcircuit.AgentID))
-            {
-                user.Authorised = true;
-                user.LoginInfo = new Login();
-                user.LoginInfo.Agent = agentID;
-                user.LoginInfo.Session = sessionID;
-                user.LoginInfo.SecureSession = validcircuit.SecureSessionID;
-                user.LoginInfo.First = validcircuit.firstname;
-                user.LoginInfo.Last = validcircuit.lastname;
-                user.LoginInfo.InventoryFolder = validcircuit.InventoryFolder;
-                user.LoginInfo.BaseFolder = validcircuit.BaseFolder;
-            }
-            else
-            {
-                // Invalid
-                user.Authorised = false;
-            }
-            return (user);
-        }
-        public virtual void AddNewCircuit(uint circuitCode, AgentCircuitData agentData)
-        {
-            if (this.AgentCircuits.ContainsKey(circuitCode))
-            {
-                this.AgentCircuits[circuitCode] = agentData;
-            }
-            else
-            {
-                this.AgentCircuits.Add(circuitCode, agentData);
-            }
-        }
-        public LLVector3 GetPosition(uint circuitCode)
-        {
-            LLVector3 vec = new LLVector3();
-            if (this.AgentCircuits.ContainsKey(circuitCode))
-            {
-                vec = this.AgentCircuits[circuitCode].startpos;
-            }
-            return vec;
-        }
-        public void UpdateAgentData(AgentCircuitData agentData)
-        {
-            if (this.AgentCircuits.ContainsKey((uint)agentData.circuitcode))
-            {
-                this.AgentCircuits[(uint)agentData.circuitcode].firstname = agentData.firstname;
-                this.AgentCircuits[(uint)agentData.circuitcode].lastname = agentData.lastname;
-                this.AgentCircuits[(uint)agentData.circuitcode].startpos = agentData.startpos;
-               // Console.WriteLine("update user start pos is " + agentData.startpos.X + " , " + agentData.startpos.Y + " , " + agentData.startpos.Z);
-            }
-        }
-        public void UpdateAgentChildStatus(uint circuitcode, bool childstatus)
-        {
-            if (this.AgentCircuits.ContainsKey(circuitcode))
-            {
-                this.AgentCircuits[circuitcode].child = childstatus;
-            }
-        }
-        public bool GetAgentChildStatus(uint circuitcode)
-        {
-            if (this.AgentCircuits.ContainsKey(circuitcode))
-            {
-                return this.AgentCircuits[circuitcode].child;
-            }
-            return false;
-        }
-    }
-}
-\ No newline at end of file
diff --git a/Common/OpenSim.Framework/BlockingQueue.cs b/Common/OpenSim.Framework/BlockingQueue.cs
deleted file mode 100644
index 667b8d8..0000000
--- a/Common/OpenSim.Framework/BlockingQueue.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Threading;
-using System.Collections.Generic;
-using System.Text;
-namespace OpenSim.Framework.Utilities
-{
-    public class BlockingQueue<T>
-    {
-        private Queue<T> _queue = new Queue<T>();
-        private object _queueSync = new object();
-        public void Enqueue(T value)
-        {
-            lock (_queueSync)
-            {
-                _queue.Enqueue(value);
-                Monitor.Pulse(_queueSync);
-            }
-        }
-        public T Dequeue()
-        {
-            lock (_queueSync)
-            {
-                if (_queue.Count < 1)
-                    Monitor.Wait(_queueSync);
-                return _queue.Dequeue();
-            }
-        }
-    }
-}
diff --git a/Common/OpenSim.Framework/IRegionCommsListener.cs b/Common/OpenSim.Framework/IRegionCommsListener.cs
deleted file mode 100644
index 0e80941..0000000
--- a/Common/OpenSim.Framework/IRegionCommsListener.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-namespace OpenSim.Framework
-{
-    public delegate void ExpectUserDelegate(ulong regionHandle, AgentCircuitData agent);
-    public delegate void UpdateNeighbours(List<RegionInfo> neighbours);
-    public delegate void AgentCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position);
-    public interface IRegionCommsListener
-    {
-        event ExpectUserDelegate OnExpectUser;
-        event GenericCall2 OnExpectChildAgent;
-        event AgentCrossing OnAvatarCrossingIntoRegion;
-        event UpdateNeighbours OnNeighboursUpdate;
-    }
-}
diff --git a/Common/OpenSim.Framework/Interfaces/AuthenticateResponse.cs b/Common/OpenSim.Framework/Interfaces/AuthenticateResponse.cs
deleted file mode 100644
index 462e2c5..0000000
--- a/Common/OpenSim.Framework/Interfaces/AuthenticateResponse.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Net;
-using System.Net.Sockets;
-using System.IO;
-using libsecondlife;
-using OpenSim;
-using OpenSim.Framework.Types;
-namespace OpenSim.Framework.Interfaces
-{
-    public class AuthenticateResponse
-    {
-        public bool Authorised;
-        public Login LoginInfo;
-        public AuthenticateResponse()
-        {
-        }
-    }
-}
diff --git a/Common/OpenSim.Framework/Interfaces/Config/IGenericConfig.cs b/Common/OpenSim.Framework/Interfaces/Config/IGenericConfig.cs
deleted file mode 100644
index 13980fe..0000000
--- a/Common/OpenSim.Framework/Interfaces/Config/IGenericConfig.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-namespace OpenSim.Framework.Interfaces
-{
-    public interface IGenericConfig
-    {
-        void LoadData();
-        string GetAttribute(string attributeName);
-        bool SetAttribute(string attributeName, string attributeValue);
-        void Commit();
-        void Close();
-    }
-}
diff --git a/Common/OpenSim.Framework/Interfaces/Config/IGridConfig.cs b/Common/OpenSim.Framework/Interfaces/Config/IGridConfig.cs
deleted file mode 100644
index 0fafe1a..0000000
--- a/Common/OpenSim.Framework/Interfaces/Config/IGridConfig.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.IO;
-using libsecondlife;
-//using OpenSim.world;
-namespace OpenSim.Framework.Interfaces
-{
-    /// <summary>
-    /// </summary>
-    public abstract class GridConfig
-    {
-        public string GridOwner;
-        public string DefaultStartupMsg;
-        public string DefaultAssetServer;
-        public string AssetSendKey;
-        public string AssetRecvKey;
-        public string DefaultUserServer;
-        public string UserSendKey;
-        public string UserRecvKey;
-        public string SimSendKey;
-        public string SimRecvKey;
-        public abstract void InitConfig();
-    }
-    public interface IGridConfig
-    {
-        GridConfig GetConfigObject();
-    }
-}
diff --git a/Common/OpenSim.Framework/Interfaces/Config/IUserConfig.cs b/Common/OpenSim.Framework/Interfaces/Config/IUserConfig.cs
deleted file mode 100644
index 2f4b340..0000000
--- a/Common/OpenSim.Framework/Interfaces/Config/IUserConfig.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.IO;
-using libsecondlife;
-//using OpenSim.world;
-namespace OpenSim.Framework.Interfaces
-{
-    /// <summary>
-    /// </summary>
-    public abstract class UserConfig
-    {
-        public string DefaultStartupMsg;
-        public string GridServerURL;
-        public string GridSendKey;
-        public string GridRecvKey;
-        public abstract void InitConfig();
-    }
-    public interface IUserConfig
-    {
-        UserConfig GetConfigObject();
-    }
-}
diff --git a/Common/OpenSim.Framework/Interfaces/IAssetServer.cs b/Common/OpenSim.Framework/Interfaces/IAssetServer.cs
deleted file mode 100644
index 826392d..0000000
--- a/Common/OpenSim.Framework/Interfaces/IAssetServer.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Net;
-using System.Net.Sockets;
-using System.IO;
-using System.Threading;
-using libsecondlife;
-using OpenSim.Framework.Types;
-namespace OpenSim.Framework.Interfaces
-{
-    /// <summary>
-    /// Description of IAssetServer.
-    /// </summary>
-    public interface IAssetServer
-    {
-        void SetReceiver(IAssetReceiver receiver);
-        void RequestAsset(LLUUID assetID, bool isTexture);
-        void UpdateAsset(AssetBase asset);
-        void UploadNewAsset(AssetBase asset);
-        void SetServerInfo(string ServerUrl, string ServerKey);
-        void Close();
-    }
-    // could change to delegate?
-    public interface IAssetReceiver
-    {
-        void AssetReceived(AssetBase asset, bool IsTexture);
-        void AssetNotFound(AssetBase asset);
-    }
-    public interface IAssetPlugin
-    {
-        IAssetServer GetAssetServer();
-    }
-    public struct ARequest
-    {
-        public LLUUID AssetID;
-        public bool IsTexture;
-    }
-}
diff --git a/Common/OpenSim.Framework/Interfaces/IClientAPI.cs b/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
deleted file mode 100644
index 009648c..0000000
--- a/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using OpenSim.Framework.Inventory;
-using libsecondlife;
-using libsecondlife.Packets;
-using OpenSim.Framework.Types;
-namespace OpenSim.Framework.Interfaces
-{
-    public delegate void ChatFromViewer(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID);
-    public delegate void RezObject(AssetBase primAsset, LLVector3 pos);
-    public delegate void ModifyTerrain(float height, float seconds, byte size, byte action, float north, float west);
-    public delegate void SetAppearance(byte[] texture, AgentSetAppearancePacket.VisualParamBlock[] visualParam);
-    public delegate void StartAnim(LLUUID animID, int seq);
-    public delegate void LinkObjects(uint parent, List<uint> children);
-    public delegate void RequestMapBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY);
-    public delegate void TeleportLocationRequest(IClientAPI remoteClient, ulong regionHandle, LLVector3 position, LLVector3 lookAt, uint flags);
-    public delegate void GenericCall(IClientAPI remoteClient);
-    public delegate void GenericCall2();
-    public delegate void GenericCall3(Packet packet); // really don't want to be passing packets in these events, so this is very temporary.
-    public delegate void GenericCall4(Packet packet, IClientAPI remoteClient);
-    public delegate void GenericCall5(IClientAPI remoteClient, bool status);
-    public delegate void GenericCall6(LLUUID uid);
-    public delegate void UpdateShape(uint localID, ObjectShapePacket.ObjectDataBlock shapeBlock);
-    public delegate void ObjectSelect(uint localID, IClientAPI remoteClient);
-    public delegate void UpdatePrimFlags(uint localID, Packet packet, IClientAPI remoteClient);
-    public delegate void UpdatePrimTexture(uint localID, byte[] texture, IClientAPI remoteClient);
-    public delegate void UpdateVector(uint localID, LLVector3 pos, IClientAPI remoteClient);
-    public delegate void UpdatePrimRotation(uint localID, LLQuaternion rot, IClientAPI remoteClient);
-    public delegate void StatusChange(bool status);
-    public delegate void NewAvatar(IClientAPI remoteClient, LLUUID agentID, bool status);
-    public delegate void UpdateAgent(IClientAPI remoteClient, uint flags, LLQuaternion bodyRotation);
-    public delegate void MoveObject(LLUUID objectID, LLVector3 offset, LLVector3 grapPos, IClientAPI remoteClient);
-    public delegate void ParcelPropertiesRequest(int start_x, int start_y, int end_x, int end_y, int sequence_id, bool snap_selection, IClientAPI remote_client);
-    public delegate void ParcelDivideRequest(int west, int south, int east, int north, IClientAPI remote_client);
-    public delegate void ParcelJoinRequest(int west, int south, int east, int north, IClientAPI remote_client);
-    public delegate void ParcelPropertiesUpdateRequest(ParcelPropertiesUpdatePacket packet, IClientAPI remote_client); // NOTETOSELFremove the packet part
-    public delegate void EstateOwnerMessageRequest(EstateOwnerMessagePacket packet, IClientAPI remote_client);
-    public interface IClientAPI
-    {
-        event ChatFromViewer OnChatFromViewer;
-        event RezObject OnRezObject;
-        event ModifyTerrain OnModifyTerrain;
-        event SetAppearance OnSetAppearance;
-        event StartAnim OnStartAnim;
-        event LinkObjects OnLinkObjects;
-        event RequestMapBlocks OnRequestMapBlocks;
-        event TeleportLocationRequest OnTeleportLocationRequest;
-        event GenericCall4 OnDeRezObject;
-        event GenericCall OnRegionHandShakeReply;
-        event GenericCall OnRequestWearables;
-        event GenericCall2 OnCompleteMovementToRegion;
-        event UpdateAgent OnAgentUpdate;
-        event GenericCall OnRequestAvatarsData;
-        event GenericCall4 OnAddPrim;
-        event UpdateVector OnGrapObject;
-        event ObjectSelect OnDeGrapObject;
-        event MoveObject OnGrapUpdate;
-        event UpdateShape OnUpdatePrimShape;
-        event ObjectSelect OnObjectSelect;
-        event UpdatePrimFlags OnUpdatePrimFlags;
-        event UpdatePrimTexture OnUpdatePrimTexture;
-        event UpdateVector OnUpdatePrimPosition;
-        event UpdatePrimRotation OnUpdatePrimRotation;
-        event UpdateVector OnUpdatePrimScale;
-        event StatusChange OnChildAgentStatus;
-        event GenericCall2 OnStopMovement;
-        event NewAvatar OnNewAvatar;
-        event GenericCall6 OnRemoveAvatar;
-        event ParcelPropertiesRequest OnParcelPropertiesRequest;
-        event ParcelDivideRequest OnParcelDivideRequest;
-        event ParcelJoinRequest OnParcelJoinRequest;
-        event ParcelPropertiesUpdateRequest OnParcelPropertiesUpdateRequest;
-        event EstateOwnerMessageRequest OnEstateOwnerMessage;
-        LLVector3 StartPos
-        {
-            get;
-            set;
-        }
-        LLUUID AgentId
-        {
-            get;
-        }
-        string FirstName
-        {
-            get;
-        }
-        string LastName
-        {
-            get;
-        }
-        void OutPacket(Packet newPack);
-        void SendWearables(AvatarWearable[] wearables);
-        void SendRegionHandshake(RegionInfo regionInfo);
-        void SendChatMessage(string message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID);
-        void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID);
-        void SendLayerData(float[] map);
-        void SendLayerData(int px, int py, float[] map);
-        void MoveAgentIntoRegion(RegionInfo regInfo, LLVector3 pos, LLVector3 look);
-        void InformClientOfNeighbour(ulong neighbourHandle, System.Net.IPAddress neighbourIP, ushort neighbourPort);
-        AgentCircuitData RequestClientInfo();
-        void CrossRegion(ulong newRegionHandle, LLVector3 pos, LLVector3 lookAt, System.Net.IPAddress newRegionIP, ushort newRegionPort);
-        void SendMapBlock(List<MapBlockData> mapBlocks);
-        void SendLocalTeleport(LLVector3 position, LLVector3 lookAt, uint flags);
-        void SendRegionTeleport(ulong regionHandle, byte simAccess, string ipAddress, ushort ipPort, uint locationID, uint flags);
-        void SendTeleportCancel();
-        void SendTeleportLocationStart();
-        void SendMoneyBalance(LLUUID transaction, bool success, byte[] description, int balance);
-        void SendAvatarData(ulong regionHandle, string firstName, string lastName, LLUUID avatarID, uint avatarLocalID, LLVector3 Pos, byte[] textureEntry);
-        void SendAvatarTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, LLVector3 velocity);
-        void AttachObject(uint localID, LLQuaternion rotation, byte attachPoint);
-        void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimData primData, LLVector3 pos, LLQuaternion rotation, LLUUID textureID , uint flags);
-        void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimData primData, LLVector3 pos, LLUUID textureID, uint flags);
-        void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, LLQuaternion rotation);
-    }
-}
diff --git a/Common/OpenSim.Framework/Interfaces/ILocalStorage.cs b/Common/OpenSim.Framework/Interfaces/ILocalStorage.cs
deleted file mode 100644
index 4987d10..0000000
--- a/Common/OpenSim.Framework/Interfaces/ILocalStorage.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using libsecondlife;
-using OpenSim.Framework.Types;
-namespace OpenSim.Framework.Interfaces
-{
-    /// <summary>
-    /// ILocalStorage. Really hacked together right now needs cleaning up
-    /// </summary>
-    public interface ILocalStorage
-    {
-        void Initialise(string datastore);
-        void StorePrim(PrimData prim);
-        void RemovePrim(LLUUID primID);
-        void LoadPrimitives(ILocalStorageReceiver receiver);
-        float[] LoadWorld();
-        void SaveMap(float[] heightmap);
-        void SaveParcels(ParcelData[] parcels);
-        void SaveParcel(ParcelData parcel);
-        void RemoveParcel(ParcelData parcel);
-        void RemoveAllParcels();
-        void LoadParcels(ILocalStorageParcelReceiver recv);
-        void ShutDown();
-    }
-    public interface ILocalStorageReceiver
-    {
-        void PrimFromStorage(PrimData prim);
-    }
-    public interface ILocalStorageParcelReceiver
-    {
-        void ParcelFromStorage(ParcelData data);
-        void NoParcelDataFromStorage();
-    }
-}
diff --git a/Common/OpenSim.Framework/Interfaces/IUserServer.cs b/Common/OpenSim.Framework/Interfaces/IUserServer.cs
deleted file mode 100644
index c6e2223..0000000
--- a/Common/OpenSim.Framework/Interfaces/IUserServer.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using OpenSim.Framework.Inventory;
-using libsecondlife;
-namespace OpenSim.Framework.Interfaces
-{
-    public interface IUserServer
-    {
-        AgentInventory RequestAgentsInventory(LLUUID agentID);
-        void SetServerInfo(string ServerUrl, string SendKey, string RecvKey);
-        bool UpdateAgentsInventory(LLUUID agentID, AgentInventory inventory);
-    }
-}
diff --git a/Common/OpenSim.Framework/Interfaces/IWorld.cs b/Common/OpenSim.Framework/Interfaces/IWorld.cs
deleted file mode 100644
index 4857417..0000000
--- a/Common/OpenSim.Framework/Interfaces/IWorld.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-using OpenSim.Framework.Types;
-namespace OpenSim.Framework.Interfaces
-{
-    public interface IWorld
-    {
-        void AddNewClient(IClientAPI remoteClient, LLUUID agentID, bool child);
-        void RemoveClient(LLUUID agentID);
-        
-        RegionInfo RegionInfo { get; }
-        object SyncRoot { get; }
-        uint NextLocalId { get; }
-    }
-}
diff --git a/Common/OpenSim.Framework/Interfaces/Scripting/IScriptAPI.cs b/Common/OpenSim.Framework/Interfaces/Scripting/IScriptAPI.cs
deleted file mode 100644
index 0c1627b..0000000
--- a/Common/OpenSim.Framework/Interfaces/Scripting/IScriptAPI.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using OpenSim.Framework.Types;
-using libsecondlife;
-namespace OpenSim.Framework.Interfaces
-{
-    public interface IScriptAPI
-    {
-        LLVector3 GetEntityPosition(uint localID);
-        void SetEntityPosition(uint localID, float x, float y, float z);
-        uint GetRandomAvatarID();
-    }
-}
diff --git a/Common/OpenSim.Framework/Interfaces/Scripting/IScriptEngine.cs b/Common/OpenSim.Framework/Interfaces/Scripting/IScriptEngine.cs
deleted file mode 100644
index ca50be0..0000000
--- a/Common/OpenSim.Framework/Interfaces/Scripting/IScriptEngine.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-namespace OpenSim.Framework.Interfaces
-{
-    public interface IScriptEngine
-    {
-        bool Init(IScriptAPI api);
-        string GetName();
-        void LoadScript(string script, string scriptName, uint entityID);
-        void OnFrame();
-    }
-}
diff --git a/Common/OpenSim.Framework/LLSDHelpers.cs b/Common/OpenSim.Framework/LLSDHelpers.cs
deleted file mode 100644
index 051520c..0000000
--- a/Common/OpenSim.Framework/LLSDHelpers.cs
+++ /dev/null
@@ -1,246 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Text;
-using System.IO;
-using System.Xml;
-using libsecondlife;
-namespace OpenSim.Framework
-{
-    public class LLSDHelpers
-    {
-        public static string SerialiseLLSDReply(object obj)
-        {
-            StringWriter sw = new StringWriter();
-            XmlTextWriter writer = new XmlTextWriter(sw);
-            writer.Formatting = Formatting.None;
-            writer.WriteStartElement(String.Empty, "llsd", String.Empty);
-            LLSDHelpers.SerializeLLSDType(writer, obj);
-            writer.WriteEndElement();
-            writer.Close();
-            return sw.ToString();
-        }
-        public static void SerializeLLSDType(XmlTextWriter writer, object obj)
-        {
-            Type myType = obj.GetType();
-            LLSDType[] llsdattributes = (LLSDType[])myType.GetCustomAttributes(typeof(LLSDType), false);
-            if (llsdattributes.Length > 0)
-            {
-                switch (llsdattributes[0].ObjectType)
-                {
-                    case "MAP":
-                        writer.WriteStartElement(String.Empty, "map", String.Empty);
-                        System.Reflection.FieldInfo[] fields = myType.GetFields();
-                        for (int i = 0; i < fields.Length; i++)
-                        {
-                            object fieldValue = fields[i].GetValue(obj);
-                            LLSDType[] fieldAttributes = (LLSDType[])fieldValue.GetType().GetCustomAttributes(typeof(LLSDType), false);
-                            if (fieldAttributes.Length > 0)
-                            {
-                                writer.WriteStartElement(String.Empty, "key", String.Empty);
-                                writer.WriteString(fields[i].Name);
-                                writer.WriteEndElement();
-                                SerializeLLSDType(writer, fieldValue);
-                            }
-                            else
-                            {
-                                //Console.WriteLine("LLSD field name" + fields[i].Name + " , " + fields[i].GetValue(obj).GetType());
-                                writer.WriteStartElement(String.Empty, "key", String.Empty);
-                                writer.WriteString(fields[i].Name);
-                                writer.WriteEndElement();
-                                LLSD.LLSDWriteOne(writer, fieldValue);
-                            }
-                        }
-                        writer.WriteEndElement();
-                        break;
-                    case "ARRAY":
-                        // LLSDArray arrayObject = obj as LLSDArray;
-                        // ArrayList a = arrayObject.Array;
-                        ArrayList a = (ArrayList)obj.GetType().GetField("Array").GetValue(obj);
-                        writer.WriteStartElement(String.Empty, "array", String.Empty);
-                        foreach (object item in a)
-                        {
-                            SerializeLLSDType(writer, item);
-                        }
-                        writer.WriteEndElement();
-                        break;
-                }
-            }
-            else
-            {
-                LLSD.LLSDWriteOne(writer, obj);
-            }
-        }
-        public static object DeserialiseLLSDMap(Hashtable llsd, object obj)
-        {
-            Type myType = obj.GetType();
-            LLSDType[] llsdattributes = (LLSDType[])myType.GetCustomAttributes(typeof(LLSDType), false);
-            if (llsdattributes.Length > 0)
-            {
-                switch (llsdattributes[0].ObjectType)
-                {
-                    case "MAP":
-                        IDictionaryEnumerator enumerator = llsd.GetEnumerator();
-                        while (enumerator.MoveNext())
-                        {
-                            System.Reflection.FieldInfo field = myType.GetField((string)enumerator.Key);
-                            if (field != null)
-                            {
-                                if (enumerator.Value is Hashtable)
-                                {
-                                    object fieldValue = field.GetValue(obj);
-                                    DeserialiseLLSDMap((Hashtable) enumerator.Value, fieldValue);
-                                }
-                                else if (enumerator.Value is ArrayList)
-                                {
-                                    object fieldValue = field.GetValue(obj);
-                                    fieldValue.GetType().GetField("Array").SetValue(fieldValue, enumerator.Value);
-                                    //TODO
-                                    // the LLSD map/array types in the array need to be deserialised
-                                    // but first we need to know the right class to deserialise them into. 
-                                }
-                                else
-                                {
-                                    field.SetValue(obj, enumerator.Value);
-                                }
-                            }
-                        }
-                        break;
-                }
-            }
-            return obj;
-        }
-    }
-    [LLSDType("MAP")]
-    public class LLSDMapLayerResponse
-    {
-        public LLSDMapRequest AgentData = new LLSDMapRequest();
-        public LLSDArray LayerData = new LLSDArray();
-        public LLSDMapLayerResponse()
-        {
-        }
-    }
-    [LLSDType("MAP")]
-    public class LLSDCapsDetails
-    {
-        public string MapLayer = "";
-        public string NewFileAgentInventory = "";
-        //public string EventQueueGet = "";
-        public LLSDCapsDetails()
-        {
-        }
-    }
-    [LLSDType("MAP")]
-    public class LLSDMapLayer
-    {
-        public int Left = 0;
-        public int Right = 0;
-        public int Top = 0;
-        public int Bottom = 0;
-        public LLUUID ImageID = LLUUID.Zero;
-        public LLSDMapLayer()
-        {
-           
-        }
-    }
-    [LLSDType("ARRAY")]
-    public class LLSDArray
-    {
-        public ArrayList Array = new ArrayList();
-        public LLSDArray()
-        {
-        }
-    }
-    [LLSDType("MAP")]
-    public class LLSDMapRequest
-    {
-        public int Flags = 0;
-        public LLSDMapRequest()
-        {
-        }
-    }
-    [LLSDType("MAP")]
-    public class LLSDUploadReply
-    {
-        public string new_asset = "";
-        public LLUUID new_inventory_item = LLUUID.Zero;
-        public string state = "";
-        public LLSDUploadReply()
-        {
-        }
-    }
-    [LLSDType("MAP")]
-    public class LLSDCapEvent
-    {
-        public int id = 0;
-        public LLSDArray events = new LLSDArray();
-        public LLSDCapEvent()
-        {
-        }
-    }
-    [LLSDType("MAP")]
-    public class LLSDEmpty
-    {
-        public LLSDEmpty()
-        {
-        }
-    }
-    [LLSDType("MAP")]
-    public class LLSDTest
-    {
-        public int Test1 = 20;
-        public int Test2 = 10;
-        public LLSDTest()
-        {
-        }
-    }
-    [AttributeUsage(AttributeTargets.Class)]
-    public class LLSDType : Attribute
-    {
-        private string myType;
-        public LLSDType(string type)
-        {
-            myType = type;
-        }
-        public string ObjectType
-        {
-            get
-            {
-                return myType;
-            }
-        }
-    }
-}
diff --git a/Common/OpenSim.Framework/Logger.cs b/Common/OpenSim.Framework/Logger.cs
deleted file mode 100644
index e7eaa03..0000000
--- a/Common/OpenSim.Framework/Logger.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-namespace OpenSim.Framework
-{
-    public class Logger
-    {
-        public static Logger Instance = new Logger( false );
-     
-        public delegate void LoggerMethodDelegate();
-        private delegate bool LoggerDelegate( LoggerMethodDelegate whatToDo );
-        
-        private LoggerDelegate m_delegate;
-        
-        public Logger( bool log )
-        {
-            if( log )
-            {
-                m_delegate = CatchAndLog;
-            }
-            else
-            {
-                m_delegate = DontCatch;
-            }
-        }
-        
-        public bool Wrap( LoggerMethodDelegate whatToDo )
-        {
-            return m_delegate( whatToDo );
-        }
-        private bool CatchAndLog(LoggerMethodDelegate whatToDo)
-        {
-            try
-            {
-                whatToDo();
-                return true;
-            }
-            catch(Exception e)
-            {
-                System.Console.WriteLine( "Exception logged!!! Woah!!!!" );
-                return false;
-            }
-        }
-        private bool DontCatch(LoggerMethodDelegate whatToDo)
-        {
-            whatToDo();
-            return true;
-        }
-        public class LoggerExample
-        {
-            public void TryWrap()
-            {
-                // This will log and ignore
-                Logger log = new Logger(true);
-                log.Wrap(delegate()
-                             {
-                                 Int16.Parse("waa!");
-                             });
-                // This will throw;            
-                try
-                {
-                    log = new Logger(false);
-                    log.Wrap(delegate()
-                                 {
-                                     Int16.Parse("waa!");
-                                 });
-                }
-                catch
-                {
-                    System.Console.WriteLine("Example barfed!");
-                }
-            }
-        }
-    }              
-}
diff --git a/Common/OpenSim.Framework/LoginService.cs b/Common/OpenSim.Framework/LoginService.cs
deleted file mode 100644
index f14754f..0000000
--- a/Common/OpenSim.Framework/LoginService.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Text;
-using Nwc.XmlRpc;
-using libsecondlife;
-namespace OpenSim.Framework.Grid
-{
-    public abstract class LoginService
-    {
-    }
-}
-\ No newline at end of file
diff --git a/Common/OpenSim.Framework/OpenSim.Framework.csproj b/Common/OpenSim.Framework/OpenSim.Framework.csproj
deleted file mode 100644
index 7ebe0ee..0000000
--- a/Common/OpenSim.Framework/OpenSim.Framework.csproj
+++ /dev/null
@@ -1,222 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{8ACA2445-0000-0000-0000-000000000000}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>
-    </ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>OpenSim.Framework</AssemblyName>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>
-    </AppDesignerFolder>
-    <RootNamespace>OpenSim.Framework</RootNamespace>
-    <StartupObject>
-    </StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>True</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <Optimize>False</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <RemoveIntegerChecks>False</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn>
-    </NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>False</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <Optimize>True</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <RemoveIntegerChecks>False</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn>
-    </NoWarn>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Db4objects.Db4o.dll">
-      <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="libsecondlife.dll">
-      <HintPath>..\..\bin\libsecondlife.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System">
-      <HintPath>System.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Xml">
-      <HintPath>System.Xml.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
-      <Name>OpenSim.Framework.Console</Name>
-      <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\XmlRpcCS\XMLRPC.csproj">
-      <Name>XMLRPC</Name>
-      <Project>{8E81D43C-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AgentInventory.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="AuthenticateSessionBase.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="BlockingQueue.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="IRegionCommsListener.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LLSDHelpers.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Logger.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LoginService.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="RegionCommsListener.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Remoting.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="SimProfile.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="UserProfile.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Util.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Interfaces\AuthenticateResponse.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Interfaces\IAssetServer.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Interfaces\IClientAPI.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Interfaces\ILocalStorage.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Interfaces\IUserServer.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Interfaces\IWorld.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Interfaces\Config\IGenericConfig.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Interfaces\Config\IGridConfig.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Interfaces\Config\IUserConfig.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Interfaces\Scripting\IScriptAPI.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Interfaces\Scripting\IScriptEngine.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Types\AgentCiruitData.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Types\AgentWearable.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Types\AssetBase.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Types\AssetLandmark.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Types\AssetStorage.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Types\EstateSettings.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Types\Login.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Types\MapBlockData.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Types\NeighbourInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Types\NetworkServersInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Types\ParcelData.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Types\PrimData.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Types\RegionHandle.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Types\RegionInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
-\ No newline at end of file
diff --git a/Common/OpenSim.Framework/OpenSim.Framework.dll.build b/Common/OpenSim.Framework/OpenSim.Framework.dll.build
deleted file mode 100644
index afe1aea..0000000
--- a/Common/OpenSim.Framework/OpenSim.Framework.dll.build
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" ?>
-<project name="OpenSim.Framework" default="build">
-    <target name="build">
-        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
-        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
-        <copy todir="${project::get-base-directory()}/${build.dir}">
-            <fileset basedir="${project::get-base-directory()}">
-            </fileset>
-        </copy>
-        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
-            <resources prefix="OpenSim.Framework" dynamicprefix="true" >
-            </resources>
-            <sources failonempty="true">
-                <include name="AgentInventory.cs" />
-                <include name="AuthenticateSessionBase.cs" />
-                <include name="BlockingQueue.cs" />
-                <include name="IRegionCommsListener.cs" />
-                <include name="LLSDHelpers.cs" />
-                <include name="Logger.cs" />
-                <include name="LoginService.cs" />
-                <include name="RegionCommsListener.cs" />
-                <include name="Remoting.cs" />
-                <include name="SimProfile.cs" />
-                <include name="UserProfile.cs" />
-                <include name="UserProfileManager.cs" />
-                <include name="UserProfileManagerBase.cs" />
-                <include name="Util.cs" />
-                <include name="Interfaces/AuthenticateResponse.cs" />
-                <include name="Interfaces/IAssetServer.cs" />
-                <include name="Interfaces/IClientAPI.cs" />
-                <include name="Interfaces/ILocalStorage.cs" />
-                <include name="Interfaces/IUserServer.cs" />
-                <include name="Interfaces/IWorld.cs" />
-                <include name="Interfaces/Config/IGenericConfig.cs" />
-                <include name="Interfaces/Config/IGridConfig.cs" />
-                <include name="Interfaces/Config/IUserConfig.cs" />
-                <include name="Interfaces/Scripting/IScriptAPI.cs" />
-                <include name="Interfaces/Scripting/IScriptEngine.cs" />
-                <include name="Properties/AssemblyInfo.cs" />
-                <include name="Types/AgentCiruitData.cs" />
-                <include name="Types/AgentWearable.cs" />
-                <include name="Types/AssetBase.cs" />
-                <include name="Types/AssetLandmark.cs" />
-                <include name="Types/AssetStorage.cs" />
-                <include name="Types/EstateSettings.cs" />
-                <include name="Types/Login.cs" />
-                <include name="Types/MapBlockData.cs" />
-                <include name="Types/NeighbourInfo.cs" />
-                <include name="Types/NetworkServersInfo.cs" />
-                <include name="Types/ParcelData.cs" />
-                <include name="Types/PrimData.cs" />
-                <include name="Types/RegionHandle.cs" />
-                <include name="Types/RegionInfo.cs" />
-            </sources>
-            <references basedir="${project::get-base-directory()}">
-                <lib>
-                    <include name="${project::get-base-directory()}" />
-                    <include name="${project::get-base-directory()}/${build.dir}" />
-                </lib>
-                <include name="../../bin/Db4objects.Db4o.dll" />
-                <include name="../../bin/libsecondlife.dll" />
-                <include name="../../bin/OpenSim.Framework.Console.dll" />
-                <include name="System.dll" />
-                <include name="System.Xml.dll" />
-                <include name="../../bin/XMLRPC.dll" />
-            </references>
-        </csc>
-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
-        <mkdir dir="${project::get-base-directory()}/../../bin/"/>
-        <copy todir="${project::get-base-directory()}/../../bin/">
-            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
-                <include name="*.dll"/>
-                <include name="*.exe"/>
-            </fileset>
-        </copy>
-    </target>
-    <target name="clean">
-        <delete dir="${bin.dir}" failonerror="false" />
-        <delete dir="${obj.dir}" failonerror="false" />
-    </target>
-    <target name="doc" description="Creates documentation.">
-    </target>
-</project>
diff --git a/Common/OpenSim.Framework/Properties/AssemblyInfo.cs b/Common/OpenSim.Framework/Properties/AssemblyInfo.cs
deleted file mode 100644
index 86f5cdb..0000000
--- a/Common/OpenSim.Framework/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("OpenSim.FrameWork")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("OpenSim.FrameWork")]
-[assembly: AssemblyCopyright("Copyright ©  2007")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("a08e20c7-f191-4137-b1f0-9291408fa521")]
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Common/OpenSim.Framework/RegionCommsListener.cs b/Common/OpenSim.Framework/RegionCommsListener.cs
deleted file mode 100644
index bba928f..0000000
--- a/Common/OpenSim.Framework/RegionCommsListener.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-namespace OpenSim.Framework
-{
-    public class RegionCommsListener :IRegionCommsListener
-    {
-        public event ExpectUserDelegate OnExpectUser;
-        public event GenericCall2 OnExpectChildAgent;
-        public event AgentCrossing OnAvatarCrossingIntoRegion;
-        public event UpdateNeighbours OnNeighboursUpdate;
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="agent"></param>
-        /// <returns></returns>
-        public virtual bool TriggerExpectUser(ulong regionHandle, AgentCircuitData  agent)
-        {
-            if(OnExpectUser != null)
-            {
-                OnExpectUser(regionHandle, agent);
-                return true;
-            }
-            return false;
-        }
-        public virtual bool TriggerExpectAvatarCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position)
-        {
-            if (OnAvatarCrossingIntoRegion != null)
-            {
-                OnAvatarCrossingIntoRegion(regionHandle, agentID, position);
-                return true;
-            }
-            return false;
-        }
-    }
-}
diff --git a/Common/OpenSim.Framework/Remoting.cs b/Common/OpenSim.Framework/Remoting.cs
deleted file mode 100644
index e6fdf70..0000000
--- a/Common/OpenSim.Framework/Remoting.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Security.Cryptography;
-namespace OpenSim.Framework
-{
-    /// <summary>
-    /// NEEDS AUDIT.
-    /// </summary>
-    /// <remarks>
-    /// Suggested implementation
-    /// <para>Store two digests for each foreign host. A local copy of the local hash using the local challenge (when issued), and a local copy of the remote hash using the remote challenge.</para>
-    /// <para>When sending data to the foreign host - run 'Sign' on the data and affix the returned byte[] to the message.</para>
-    /// <para>When recieving data from the foreign host - run 'Authenticate' against the data and the attached byte[].</para>
-    /// <para>Both hosts should be performing these operations for this to be effective.</para>
-    /// </remarks>
-    class RemoteDigest
-    {
-        private byte[] currentHash;
-        private byte[] secret;
-        private SHA512Managed SHA512;
-        /// <summary>
-        /// Initialises a new RemoteDigest authentication mechanism
-        /// </summary>
-        /// <remarks>Needs an audit by a cryptographic professional - was not "roll your own"'d by choice but rather a serious lack of decent authentication mechanisms in .NET remoting</remarks>
-        /// <param name="sharedSecret">The shared secret between systems (for inter-sim, this is provided in encrypted form during connection, for grid this is input manually in setup)</param>
-        /// <param name="salt">Binary salt - some common value - to be decided what</param>
-        /// <param name="challenge">The challenge key provided by the third party</param>
-        public RemoteDigest(string sharedSecret, byte[] salt, string challenge)
-        {
-            SHA512 = new SHA512Managed();
-            Rfc2898DeriveBytes RFC2898 = new Rfc2898DeriveBytes(sharedSecret,salt);
-            secret = RFC2898.GetBytes(512);
-            ASCIIEncoding ASCII = new ASCIIEncoding();
-            currentHash = SHA512.ComputeHash(AppendArrays(secret, ASCII.GetBytes(challenge)));
-        }
-        /// <summary>
-        /// Authenticates a piece of incoming data against the local digest. Upon successful authentication, digest string is incremented.
-        /// </summary>
-        /// <param name="data">The incoming data</param>
-        /// <param name="digest">The remote digest</param>
-        /// <returns></returns>
-        public bool Authenticate(byte[] data, byte[] digest)
-        {
-            byte[] newHash = SHA512.ComputeHash(AppendArrays(AppendArrays(currentHash, secret), data));
-            if (digest == newHash)
-            {
-                currentHash = newHash;
-                return true;
-            }
-            else
-            {
-                throw new Exception("Hash comparison failed. Key resync required.");
-            }
-        }
-        /// <summary>
-        /// Signs a new bit of data with the current hash. Returns a byte array which should be affixed to the message.
-        /// Signing a piece of data will automatically increment the hash - if you sign data and do not send it, the 
-        /// hashes will get out of sync and throw an exception when validation is attempted.
-        /// </summary>
-        /// <param name="data">The outgoing data</param>
-        /// <returns>The local digest</returns>
-        public byte[] Sign(byte[] data)
-        {
-            currentHash = SHA512.ComputeHash(AppendArrays(AppendArrays(currentHash, secret), data));
-            return currentHash;
-        }
-        /// <summary>
-        /// Generates a new challenge string to be issued to a foreign host. Challenges are 1024-bit (effective strength of less than 512-bits) messages generated using the Crytographic Random Number Generator.
-        /// </summary>
-        /// <returns>A 128-character hexadecimal string containing the challenge.</returns>
-        public static string GenerateChallenge()
-        {
-            RNGCryptoServiceProvider RNG = new RNGCryptoServiceProvider();
-            byte[] bytes = new byte[64];
-            RNG.GetBytes(bytes);
-            StringBuilder sb = new StringBuilder(bytes.Length * 2);
-            foreach (byte b in bytes)
-            {
-                sb.AppendFormat("{0:x2}", b);
-            }
-            return sb.ToString();
-        }
-        /// <summary>
-        /// Helper function, merges two byte arrays
-        /// </summary>
-        /// <remarks>Sourced from MSDN Forum</remarks>
-        /// <param name="a">A</param>
-        /// <param name="b">B</param>
-        /// <returns>C</returns>
-        private byte[] AppendArrays(byte[] a, byte[] b)
-        {
-            byte[] c = new byte[a.Length + b.Length];
-            Buffer.BlockCopy(a, 0, c, 0, a.Length);
-            Buffer.BlockCopy(b, 0, c, a.Length, b.Length);
-            return c;
-        }
-    }
-}
diff --git a/Common/OpenSim.Framework/SimProfile.cs b/Common/OpenSim.Framework/SimProfile.cs
deleted file mode 100644
index cfa5e50..0000000
--- a/Common/OpenSim.Framework/SimProfile.cs
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Collections;
-using System.Xml;
-using System.Text;
-using libsecondlife;
-using Nwc.XmlRpc;
-namespace OpenSim.Framework.Sims
-{
-    public class SimProfile
-    {
-        public LLUUID UUID;
-        public ulong regionhandle;
-        public string regionname;
-        public string sim_ip;
-        public uint sim_port;
-        public string caps_url;
-        public uint RegionLocX;
-        public uint RegionLocY;
-        public string sendkey;
-        public string recvkey;
-        public bool online;
-        public SimProfile LoadFromGrid(ulong region_handle, string GridURL, string SendKey, string RecvKey)
-        {
-            try
-            {
-                Hashtable GridReqParams = new Hashtable();
-                GridReqParams["region_handle"] = region_handle.ToString();
-                GridReqParams["authkey"] = SendKey;
-                ArrayList SendParams = new ArrayList();
-                SendParams.Add(GridReqParams);
-                XmlRpcRequest GridReq = new XmlRpcRequest("simulator_login", SendParams);
-                XmlRpcResponse GridResp = GridReq.Send(GridURL, 3000);
-                Hashtable RespData = (Hashtable)GridResp.Value;
-                this.UUID = new LLUUID((string)RespData["UUID"]);
-                this.regionhandle = Helpers.UIntsToLong(((uint)Convert.ToUInt32(RespData["region_locx"]) * 256), ((uint)Convert.ToUInt32(RespData["region_locy"]) * 256));
-                this.regionname = (string)RespData["regionname"];
-                this.sim_ip = (string)RespData["sim_ip"];
-                this.sim_port = (uint)Convert.ToUInt16(RespData["sim_port"]);
-                this.caps_url = "http://" + ((string)RespData["sim_ip"]) + ":" + (string)RespData["sim_port"] + "/";
-                this.RegionLocX = (uint)Convert.ToUInt32(RespData["region_locx"]);
-                this.RegionLocY = (uint)Convert.ToUInt32(RespData["region_locy"]);
-                this.sendkey = SendKey;
-                this.recvkey = RecvKey;
-            }
-            catch (Exception e)
-            {
-                System.Console.WriteLine(e.ToString());
-            }
-            return this;
-        }
-        public SimProfile LoadFromGrid(LLUUID UUID, string GridURL, string SendKey, string RecvKey)
-        {
-            try
-            {
-                Hashtable GridReqParams = new Hashtable();
-                GridReqParams["UUID"] = UUID.ToString();
-                GridReqParams["authkey"] = SendKey;
-                ArrayList SendParams = new ArrayList();
-                SendParams.Add(GridReqParams);
-                XmlRpcRequest GridReq = new XmlRpcRequest("simulator_login", SendParams);
-                XmlRpcResponse GridResp = GridReq.Send(GridURL, 3000);
-                Hashtable RespData = (Hashtable)GridResp.Value;
-                this.UUID = new LLUUID((string)RespData["UUID"]);
-                this.regionhandle = Helpers.UIntsToLong(((uint)Convert.ToUInt32(RespData["region_locx"]) * 256), ((uint)Convert.ToUInt32(RespData["region_locy"]) * 256));
-                this.regionname = (string)RespData["regionname"];
-                this.sim_ip = (string)RespData["sim_ip"];
-                this.sim_port = (uint)Convert.ToUInt16(RespData["sim_port"]);
-                this.caps_url = "http://" + ((string)RespData["sim_ip"]) + ":" + (string)RespData["sim_port"] + "/";
-                this.RegionLocX = (uint)Convert.ToUInt32(RespData["region_locx"]);
-                this.RegionLocY = (uint)Convert.ToUInt32(RespData["region_locy"]);
-                this.sendkey = SendKey;
-                this.recvkey = RecvKey;
-            }
-            catch (Exception e)
-            {
-                System.Console.WriteLine(e.ToString());
-            }
-            return this;
-        }
-        public SimProfile()
-        {
-        }
-    }
-}
diff --git a/Common/OpenSim.Framework/Types/AgentCiruitData.cs b/Common/OpenSim.Framework/Types/AgentCiruitData.cs
deleted file mode 100644
index a650343..0000000
--- a/Common/OpenSim.Framework/Types/AgentCiruitData.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-namespace OpenSim.Framework.Types
-{
-    public class AgentCircuitData
-    {
-        public AgentCircuitData() { }
-        public LLUUID AgentID;
-        public LLUUID SessionID;
-        public LLUUID SecureSessionID;
-        public LLVector3 startpos;
-        public string firstname;
-        public string lastname;
-        public uint circuitcode;
-        public bool child;
-        public LLUUID InventoryFolder;
-        public LLUUID BaseFolder;
-        public string CapsPath = ""; 
-    }
-}
diff --git a/Common/OpenSim.Framework/Types/AgentWearable.cs b/Common/OpenSim.Framework/Types/AgentWearable.cs
deleted file mode 100644
index 4c93da7..0000000
--- a/Common/OpenSim.Framework/Types/AgentWearable.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-namespace OpenSim.Framework.Types
-{
-    public class AvatarWearable
-    {
-        public LLUUID AssetID = new LLUUID("00000000-0000-0000-0000-000000000000");
-        public LLUUID ItemID = new LLUUID("00000000-0000-0000-0000-000000000000");
-        public AvatarWearable()
-        {
-        }
-        public static AvatarWearable[] DefaultWearables
-        {
-            get
-            {
-                AvatarWearable[] defaultWearables =  new AvatarWearable[13]; //should be 13 of these
-                for (int i = 0; i < 13; i++)
-                {
-                    defaultWearables[i] = new AvatarWearable();
-                }
-                defaultWearables[0].AssetID = new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73");
-                defaultWearables[0].ItemID = LLUUID.Random();
-                return defaultWearables;
-            }
-        }
-    }
-}
diff --git a/Common/OpenSim.Framework/Types/AssetBase.cs b/Common/OpenSim.Framework/Types/AssetBase.cs
deleted file mode 100644
index 86586a6..0000000
--- a/Common/OpenSim.Framework/Types/AssetBase.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-namespace OpenSim.Framework.Types
-{
-    public class AssetBase
-    {
-        public byte[] Data;
-        public LLUUID FullID;
-        public sbyte Type;
-        public sbyte InvType;
-        public string Name;
-        public string Description;
-        public AssetBase()
-        {
-        }
-    }
-}
diff --git a/Common/OpenSim.Framework/Types/AssetLandmark.cs b/Common/OpenSim.Framework/Types/AssetLandmark.cs
deleted file mode 100644
index 8a10b70..0000000
--- a/Common/OpenSim.Framework/Types/AssetLandmark.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-namespace OpenSim.Framework.Types
-{
-    public class AssetLandmark : AssetBase
-    {
-        public int Version;
-        public LLVector3 Position;
-        public LLUUID RegionID;
-        public AssetLandmark(AssetBase a)
-        {
-            this.Data = a.Data;
-            this.FullID = a.FullID;
-            this.Type = a.Type;
-            this.InvType = a.InvType;
-            this.Name = a.Name;
-            this.Description = a.Description;
-            InternData();
-        }
-        private void InternData()
-        {
-            string temp = System.Text.Encoding.UTF8.GetString(Data).Trim(); 
-            string[] parts = temp.Split('\n');
-            int.TryParse(parts[0].Substring(17, 1), out Version);
-            LLUUID.TryParse(parts[1].Substring(10, 36), out RegionID);
-            LLVector3.TryParse(parts[2].Substring(11, parts[2].Length - 11), out Position);
-        }
-    }
-}
diff --git a/Common/OpenSim.Framework/Types/AssetStorage.cs b/Common/OpenSim.Framework/Types/AssetStorage.cs
deleted file mode 100644
index 8cac23a..0000000
--- a/Common/OpenSim.Framework/Types/AssetStorage.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-namespace OpenSim.Framework.Types
-{
-        public class AssetStorage
-        {
-                public AssetStorage() {
-                }
-                public AssetStorage(LLUUID assetUUID) {
-                        UUID=assetUUID;
-                }
-                public byte[] Data;
-                public sbyte Type;
-                public string Name;
-                public LLUUID UUID;
-        }
-}
diff --git a/Common/OpenSim.Framework/Types/EstateSettings.cs b/Common/OpenSim.Framework/Types/EstateSettings.cs
deleted file mode 100644
index 778c893..0000000
--- a/Common/OpenSim.Framework/Types/EstateSettings.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-namespace OpenSim.Framework.Types
-{
-    public class EstateSettings
-    {
-        //Settings to this island
-        public float billableFactor = (float)0.0;
-        public uint estateID = 0;
-        public uint parentEstateID = 0;
-        public byte maxAgents = 40;
-        public float objectBonusFactor = (float)1.0;
-        public int redirectGridX = 0; //??
-        public int redirectGridY = 0; //??
-        public libsecondlife.Simulator.RegionFlags regionFlags = libsecondlife.Simulator.RegionFlags.None; //Booleam values of various region settings
-        public libsecondlife.Simulator.SimAccess simAccess = libsecondlife.Simulator.SimAccess.Mature; //Is sim PG, Mature, etc? Mature by default.
-        public float sunHour = 0;
-        public float terrainRaiseLimit = 0;
-        public float terrainLowerLimit = 0;
-        public bool useFixedSun = false;
-        public int pricePerMeter = 1;
-        public ushort regionWaterHeight = 20;
-        public bool regionAllowTerraform = true;
-        // Region Information
-        // Low resolution 'base' textures. No longer used.
-        public LLUUID terrainBase0 = new LLUUID("b8d3965a-ad78-bf43-699b-bff8eca6c975"); // Default
-        public LLUUID terrainBase1 = new LLUUID("abb783e6-3e93-26c0-248a-247666855da3"); // Default
-        public LLUUID terrainBase2 = new LLUUID("179cdabd-398a-9b6b-1391-4dc333ba321f"); // Default
-        public LLUUID terrainBase3 = new LLUUID("beb169c7-11ea-fff2-efe5-0f24dc881df2"); // Default
-        // Higher resolution terrain textures
-        public LLUUID terrainDetail0 = new LLUUID("00000000-0000-0000-0000-000000000000");
-        public LLUUID terrainDetail1 = new LLUUID("00000000-0000-0000-0000-000000000000");
-        public LLUUID terrainDetail2 = new LLUUID("00000000-0000-0000-0000-000000000000");
-        public LLUUID terrainDetail3 = new LLUUID("00000000-0000-0000-0000-000000000000");
-        // First quad - each point is bilinearly interpolated at each meter of terrain
-        public float terrainStartHeight0 = 10.0f;      
-        public float terrainStartHeight1 = 10.0f;      
-        public float terrainStartHeight2 = 10.0f;       
-        public float terrainStartHeight3 = 10.0f;       
-        // Second quad - also bilinearly interpolated.
-        // Terrain texturing is done that:
-        // 0..3 (0 = base0, 3 = base3) = (terrain[x,y] - start[x,y]) / range[x,y]
-        public float terrainHeightRange0 = 60.0f; //00
-        public float terrainHeightRange1 = 60.0f; //01
-        public float terrainHeightRange2 = 60.0f; //10
-        public float terrainHeightRange3 = 60.0f; //11
-        // Terrain Default (Must be in F32 Format!)
-        public string terrainFile = "default.r32";
-        public double terrainMultiplier = 60.0;
-        public float waterHeight = (float)20.0;
-        public LLUUID terrainImageID = LLUUID.Zero; // the assetID that is the current Map image for this region
-    }
-}
diff --git a/Common/OpenSim.Framework/Types/Login.cs b/Common/OpenSim.Framework/Types/Login.cs
deleted file mode 100644
index 3180a16..0000000
--- a/Common/OpenSim.Framework/Types/Login.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-namespace OpenSim.Framework.Types
-{
-    public class Login
-    {
-        public string First = "Test";
-        public string Last = "User";
-        public LLUUID Agent;
-        public LLUUID Session;
-        public LLUUID SecureSession = LLUUID.Zero;
-        public LLUUID InventoryFolder;
-        public LLUUID BaseFolder;
-        public uint CircuitCode;
-        public string CapsPath ="";
-        public Login()
-        {
-        }
-    }
-}
diff --git a/Common/OpenSim.Framework/Types/MapBlockData.cs b/Common/OpenSim.Framework/Types/MapBlockData.cs
deleted file mode 100644
index 2e6f56e..0000000
--- a/Common/OpenSim.Framework/Types/MapBlockData.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-namespace OpenSim.Framework.Types
-{
-    public class MapBlockData
-    {
-        public uint Flags;
-        public ushort X;
-        public ushort Y;
-        public byte Agents;
-        public byte Access;
-        public byte WaterHeight;
-        public LLUUID MapImageId;
-        public String Name;
-        public uint RegionFlags;
-        public MapBlockData()
-        {
-        }
-    }
-}
diff --git a/Common/OpenSim.Framework/Types/NeighbourInfo.cs b/Common/OpenSim.Framework/Types/NeighbourInfo.cs
deleted file mode 100644
index 310fd1c..0000000
--- a/Common/OpenSim.Framework/Types/NeighbourInfo.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Utilities;
-using OpenSim.Framework.Console;
-using libsecondlife;
-namespace OpenSim.Framework.Types
-{
-    public class NeighbourInfo
-    {
-        public NeighbourInfo()
-        {
-        }
-        public ulong regionhandle;
-        public uint RegionLocX;
-        public uint RegionLocY;
-        public string sim_ip;
-        public uint sim_port;
-    }
-}
diff --git a/Common/OpenSim.Framework/Types/NetworkServersInfo.cs b/Common/OpenSim.Framework/Types/NetworkServersInfo.cs
deleted file mode 100644
index 73d7811..0000000
--- a/Common/OpenSim.Framework/Types/NetworkServersInfo.cs
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using OpenSim.Framework.Interfaces;
-namespace OpenSim.Framework.Types
-{
-    public class NetworkServersInfo
-    {
-        public string AssetURL = "http://127.0.0.1:8003/";
-        public string AssetSendKey = "";
-        public string GridURL = "";
-        public string GridSendKey = "";
-        public string GridRecvKey = "";
-        public string UserURL = "";
-        public string UserSendKey = "";
-        public string UserRecvKey = "";
-        public bool isSandbox;
-        public uint DefaultHomeLocX = 0;
-        public uint DefaultHomeLocY = 0;
-        public int HttpListenerPort = 9000;
-        public int RemotingListenerPort = 8895;
-        public void InitConfig(bool sandboxMode, IGenericConfig configData)
-        {
-            this.isSandbox = sandboxMode;
-            try
-            {
-                string attri = "";
-                attri = "";
-                attri = configData.GetAttribute("HttpListenerPort");
-                if (attri == "")
-                {
-                    string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Http Listener Port", "9000");
-                    configData.SetAttribute("HttpListenerPort", location);
-                    this.HttpListenerPort = Convert.ToInt32(location);
-                }
-                else
-                {
-                    this.HttpListenerPort = Convert.ToInt32(attri);
-                }
-                attri = "";
-                attri = configData.GetAttribute("RemotingListenerPort");
-                if (attri == "")
-                {
-                    string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Remoting Listener Port", "8895");
-                    configData.SetAttribute("RemotingListenerPort", location);
-                    this.RemotingListenerPort = Convert.ToInt32(location);
-                }
-                else
-                {
-                    this.RemotingListenerPort = Convert.ToInt32(attri);
-                }
-                if (sandboxMode)
-                {
-                    // default home location X
-                    attri = "";
-                    attri = configData.GetAttribute("DefaultLocationX");
-                    if (attri == "")
-                    {
-                        string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Default Home Location X", "1000");
-                        configData.SetAttribute("DefaultLocationX", location);
-                        this.DefaultHomeLocX = (uint)Convert.ToUInt32(location);
-                    }
-                    else
-                    {
-                        this.DefaultHomeLocX = (uint)Convert.ToUInt32(attri);
-                    }
-                    // default home location Y
-                    attri = "";
-                    attri = configData.GetAttribute("DefaultLocationY");
-                    if (attri == "")
-                    {
-                        string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Default Home Location Y", "1000");
-                        configData.SetAttribute("DefaultLocationY", location);
-                        this.DefaultHomeLocY = (uint)Convert.ToUInt32(location);
-                    }
-                    else
-                    {
-                        this.DefaultHomeLocY = (uint)Convert.ToUInt32(attri);
-                    }
-                }
-                if (!isSandbox)
-                {
-                    //Grid Server 
-                    attri = "";
-                    attri = configData.GetAttribute("GridServerURL");
-                    if (attri == "")
-                    {
-                        this.GridURL = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid server URL", "http://127.0.0.1:8001/");
-                        configData.SetAttribute("GridServerURL", this.GridURL);
-                    }
-                    else
-                    {
-                        this.GridURL = attri;
-                    }
-                    //Grid Send Key
-                    attri = "";
-                    attri = configData.GetAttribute("GridSendKey");
-                    if (attri == "")
-                    {
-                        this.GridSendKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to send to grid server", "null");
-                        configData.SetAttribute("GridSendKey", this.GridSendKey);
-                    }
-                    else
-                    {
-                        this.GridSendKey = attri;
-                    }
-                    //Grid Receive Key
-                    attri = "";
-                    attri = configData.GetAttribute("GridRecvKey");
-                    if (attri == "")
-                    {
-                        this.GridRecvKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to expect from grid server", "null");
-                        configData.SetAttribute("GridRecvKey", this.GridRecvKey);
-                    }
-                    else
-                    {
-                        this.GridRecvKey = attri;
-                    }
-                    attri = "";
-                    attri = configData.GetAttribute("AssetServerURL");
-                    if (attri == "")
-                    {
-                        this.AssetURL = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Asset server URL", "http://127.0.0.1:8003/");
-                        configData.SetAttribute("AssetServerURL", this.GridURL);
-                    }
-                    else
-                    {
-                        this.AssetURL = attri;
-                    }
-                }
-                configData.Commit();
-            }
-            catch (Exception e)
-            {
-                OpenSim.Framework.Console.MainLog.Instance.Warn("Config.cs:InitConfig() - Exception occured");
-                OpenSim.Framework.Console.MainLog.Instance.Warn(e.ToString());
-            }
-        }
-    }
-}
diff --git a/Common/OpenSim.Framework/Types/ParcelData.cs b/Common/OpenSim.Framework/Types/ParcelData.cs
deleted file mode 100644
index 40f128a..0000000
--- a/Common/OpenSim.Framework/Types/ParcelData.cs
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-namespace OpenSim.Framework.Types
-{
-    
-        public class ParcelData
-        {
-            public byte[] parcelBitmapByteArray = new byte[512];
-            public string parcelName = "";
-            public string parcelDesc = "";
-            public LLUUID ownerID = new LLUUID();
-            public bool isGroupOwned = false;
-            public LLVector3 AABBMin = new LLVector3();
-            public LLVector3 AABBMax = new LLVector3();
-            public int area = 0;
-            public uint auctionID = 0; //Unemplemented. If set to 0, not being auctioned
-            public LLUUID authBuyerID = new LLUUID(); //Unemplemented. Authorized Buyer's UUID
-            public libsecondlife.Parcel.ParcelCategory category = new libsecondlife.Parcel.ParcelCategory(); //Unemplemented. Parcel's chosen category
-            public int claimDate = 0; //Unemplemented
-            public int claimPrice = 0; //Unemplemented
-            public LLUUID groupID = new LLUUID(); //Unemplemented
-            public int groupPrims = 0; //Unemplemented
-            public int salePrice = 0; //Unemeplemented. Parcels price.
-            public libsecondlife.Parcel.ParcelStatus parcelStatus = libsecondlife.Parcel.ParcelStatus.None;
-            public libsecondlife.Parcel.ParcelFlags parcelFlags = libsecondlife.Parcel.ParcelFlags.None;
-            public byte landingType = 0;
-            public byte mediaAutoScale = 0;
-            public LLUUID mediaID = LLUUID.Zero;
-            public int localID = 0;
-            public LLUUID globalID = new LLUUID();
-            public string mediaURL = "";
-            public string musicURL = "";
-            public float passHours = 0;
-            public int passPrice = 0;
-            public LLUUID snapshotID = LLUUID.Zero;
-            public LLVector3 userLocation = new LLVector3();
-            public LLVector3 userLookAt = new LLVector3();
-            public ParcelData()
-            {
-                globalID = LLUUID.Random();
-            }
-            public ParcelData Copy()
-            {
-                ParcelData parcelData = new ParcelData();
-                parcelData.AABBMax = this.AABBMax;
-                parcelData.AABBMin = this.AABBMin;
-                parcelData.area = this.area;
-                parcelData.auctionID = this.auctionID;
-                parcelData.authBuyerID = this.authBuyerID;
-                parcelData.category = this.category;
-                parcelData.claimDate = this.claimDate;
-                parcelData.claimPrice = this.claimPrice;
-                parcelData.globalID = this.globalID;
-                parcelData.groupID = this.groupID;
-                parcelData.groupPrims = this.groupPrims;
-                parcelData.isGroupOwned = this.isGroupOwned;
-                parcelData.localID = this.localID;
-                parcelData.landingType = this.landingType;
-                parcelData.mediaAutoScale = this.mediaAutoScale;
-                parcelData.mediaID = this.mediaID;
-                parcelData.mediaURL = this.mediaURL;
-                parcelData.musicURL = this.musicURL;
-                parcelData.ownerID = this.ownerID;
-                parcelData.parcelBitmapByteArray = (byte[])this.parcelBitmapByteArray.Clone();
-                parcelData.parcelDesc = this.parcelDesc;
-                parcelData.parcelFlags = this.parcelFlags;
-                parcelData.parcelName = this.parcelName;
-                parcelData.parcelStatus = this.parcelStatus;
-                parcelData.passHours = this.passHours;
-                parcelData.passPrice = this.passPrice;
-                parcelData.salePrice = this.salePrice;
-                parcelData.snapshotID = this.snapshotID;
-                parcelData.userLocation = this.userLocation;
-                parcelData.userLookAt = this.userLookAt;
-                return parcelData;
-           
-            }
-        }
-    
-}
diff --git a/Common/OpenSim.Framework/Types/PrimData.cs b/Common/OpenSim.Framework/Types/PrimData.cs
deleted file mode 100644
index f84ae3e..0000000
--- a/Common/OpenSim.Framework/Types/PrimData.cs
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-namespace OpenSim.Framework.Types
-{
-    public class PrimData
-    {
-        private const uint FULL_MASK_PERMISSIONS = 2147483647;
-        public LLUUID OwnerID;
-        public byte PCode;
-        public ushort PathBegin;
-        public ushort PathEnd;
-        public byte PathScaleX;
-        public byte PathScaleY;
-        public byte PathShearX;
-        public byte PathShearY;
-        public sbyte PathSkew;
-        public ushort ProfileBegin;
-        public ushort ProfileEnd;
-        public LLVector3 Scale;
-        public byte PathCurve;
-        public byte ProfileCurve;
-        public uint ParentID = 0;
-        public ushort ProfileHollow;
-        public sbyte PathRadiusOffset;
-        public byte PathRevolutions;
-        public sbyte PathTaperX;
-        public sbyte PathTaperY;
-        public sbyte PathTwist;
-        public sbyte PathTwistBegin;
-        public byte[] TextureEntry; // a LL textureEntry in byte[] format
-        public Int32 CreationDate;
-        public uint OwnerMask = FULL_MASK_PERMISSIONS;
-        public uint NextOwnerMask = FULL_MASK_PERMISSIONS;
-        public uint GroupMask = FULL_MASK_PERMISSIONS;
-        public uint EveryoneMask = FULL_MASK_PERMISSIONS;
-        public uint BaseMask = FULL_MASK_PERMISSIONS;
-        //following only used during prim storage
-        public LLVector3 Position;
-        public LLQuaternion Rotation = new LLQuaternion(0, 1, 0, 0);
-        public uint LocalID;
-        public LLUUID FullID;
-        public PrimData()
-        {
-        }
-        public PrimData(byte[] data)
-        {
-            int i = 0;
-            this.OwnerID = new LLUUID(data, i); i += 16;
-            this.PCode = data[i++];
-            this.PathBegin = (ushort)(data[i++] + (data[i++] << 8));
-            this.PathEnd = (ushort)(data[i++] + (data[i++] << 8));
-            this.PathScaleX = data[i++];
-            this.PathScaleY = data[i++];
-            this.PathShearX = data[i++];
-            this.PathShearY = data[i++];
-            this.PathSkew = (sbyte)data[i++];
-            this.ProfileBegin = (ushort)(data[i++] + (data[i++] << 8));
-            this.ProfileEnd = (ushort)(data[i++] + (data[i++] << 8));
-            this.Scale = new LLVector3(data, i); i += 12;
-            this.PathCurve = data[i++];
-            this.ProfileCurve = data[i++];
-            this.ParentID = (uint)(data[i++] + (data[i++] << 8) + (data[i++] << 16) + (data[i++] << 24));
-            this.ProfileHollow = (ushort)(data[i++] + (data[i++] << 8));
-            this.PathRadiusOffset = (sbyte)data[i++];
-            this.PathRevolutions = data[i++];
-            this.PathTaperX = (sbyte)data[i++];
-            this.PathTaperY = (sbyte)data[i++];
-            this.PathTwist = (sbyte)data[i++];
-            this.PathTwistBegin = (sbyte)data[i++];
-            ushort length = (ushort)(data[i++] + (data[i++] << 8));
-            this.TextureEntry = new byte[length];
-            Array.Copy(data, i, TextureEntry, 0, length); i += length;
-            this.CreationDate = (Int32)(data[i++] + (data[i++] << 8) + (data[i++] << 16) + (data[i++] << 24));
-            this.OwnerMask = (uint)(data[i++] + (data[i++] << 8) + (data[i++] << 16) + (data[i++] << 24));
-            this.NextOwnerMask = (uint)(data[i++] + (data[i++] << 8) + (data[i++] << 16) + (data[i++] << 24));
-            this.GroupMask = (uint)(data[i++] + (data[i++] << 8) + (data[i++] << 16) + (data[i++] << 24));
-            this.EveryoneMask = (uint)(data[i++] + (data[i++] << 8) + (data[i++] << 16) + (data[i++] << 24));
-            this.BaseMask = (uint)(data[i++] + (data[i++] << 8) + (data[i++] << 16) + (data[i++] << 24));
-            this.Position = new LLVector3(data, i); i += 12;
-            this.Rotation = new LLQuaternion(data, i, true); i += 12;
-            this.LocalID = (uint)(data[i++] + (data[i++] << 8) + (data[i++] << 16) + (data[i++] << 24));
-            this.FullID = new LLUUID(data, i); i += 16;
-        }
-        public byte[] ToBytes()
-        {
-            int i = 0;
-            byte[] bytes = new byte[126 + TextureEntry.Length];
-            Array.Copy(OwnerID.GetBytes(), 0, bytes, i, 16); i += 16;
-            bytes[i++] = this.PCode;
-            bytes[i++] = (byte)(this.PathBegin % 256);
-            bytes[i++] = (byte)((this.PathBegin >> 8) % 256);
-            bytes[i++] = (byte)(this.PathEnd % 256);
-            bytes[i++] = (byte)((this.PathEnd >> 8) % 256);
-            bytes[i++] = this.PathScaleX;
-            bytes[i++] = this.PathScaleY;
-            bytes[i++] = this.PathShearX;
-            bytes[i++] = this.PathShearY;
-            bytes[i++] = (byte)this.PathSkew;
-            bytes[i++] = (byte)(this.ProfileBegin % 256);
-            bytes[i++] = (byte)((this.ProfileBegin >> 8) % 256);
-            bytes[i++] = (byte)(this.ProfileEnd % 256);
-            bytes[i++] = (byte)((this.ProfileEnd >> 8) % 256);
-            Array.Copy(Scale.GetBytes(), 0, bytes, i, 12); i += 12;
-            bytes[i++] = this.PathCurve;
-            bytes[i++] = this.ProfileCurve;
-            bytes[i++] = (byte)(ParentID % 256);
-            bytes[i++] = (byte)((ParentID >> 8) % 256);
-            bytes[i++] = (byte)((ParentID >> 16) % 256);
-            bytes[i++] = (byte)((ParentID >> 24) % 256);
-            bytes[i++] = (byte)(this.ProfileHollow % 256);
-            bytes[i++] = (byte)((this.ProfileHollow >> 8) % 256);
-            bytes[i++] = ((byte)this.PathRadiusOffset);
-            bytes[i++] = this.PathRevolutions;
-            bytes[i++] = ((byte)this.PathTaperX);
-            bytes[i++] = ((byte)this.PathTaperY);
-            bytes[i++] = ((byte)this.PathTwist);
-            bytes[i++] = ((byte)this.PathTwistBegin);
-            bytes[i++] = (byte)(TextureEntry.Length % 256);
-            bytes[i++] = (byte)((TextureEntry.Length >> 8) % 256);
-            Array.Copy(TextureEntry, 0, bytes, i, TextureEntry.Length); i += TextureEntry.Length;
-            bytes[i++] = (byte)(this.CreationDate % 256);
-            bytes[i++] = (byte)((this.CreationDate >> 8) % 256);
-            bytes[i++] = (byte)((this.CreationDate >> 16) % 256);
-            bytes[i++] = (byte)((this.CreationDate >> 24) % 256);
-            bytes[i++] = (byte)(this.OwnerMask % 256);
-            bytes[i++] = (byte)((this.OwnerMask >> 8) % 256);
-            bytes[i++] = (byte)((this.OwnerMask >> 16) % 256);
-            bytes[i++] = (byte)((this.OwnerMask >> 24) % 256);
-            bytes[i++] = (byte)(this.NextOwnerMask % 256);
-            bytes[i++] = (byte)((this.NextOwnerMask >> 8) % 256);
-            bytes[i++] = (byte)((this.NextOwnerMask >> 16) % 256);
-            bytes[i++] = (byte)((this.NextOwnerMask >> 24) % 256);
-            bytes[i++] = (byte)(this.GroupMask % 256);
-            bytes[i++] = (byte)((this.GroupMask >> 8) % 256);
-            bytes[i++] = (byte)((this.GroupMask >> 16) % 256);
-            bytes[i++] = (byte)((this.GroupMask >> 24) % 256);
-            bytes[i++] = (byte)(this.EveryoneMask % 256);
-            bytes[i++] = (byte)((this.EveryoneMask >> 8) % 256);
-            bytes[i++] = (byte)((this.EveryoneMask >> 16) % 256);
-            bytes[i++] = (byte)((this.EveryoneMask >> 24) % 256);
-            bytes[i++] = (byte)(this.BaseMask % 256);
-            bytes[i++] = (byte)((this.BaseMask >> 8) % 256);
-            bytes[i++] = (byte)((this.BaseMask >> 16) % 256);
-            bytes[i++] = (byte)((this.BaseMask >> 24) % 256);
-            Array.Copy(this.Position.GetBytes(), 0, bytes, i, 12); i += 12;
-            if (this.Rotation == new LLQuaternion(0, 0, 0, 0))
-            {
-                this.Rotation = new LLQuaternion(0, 1, 0, 0);
-            }
-            Array.Copy(this.Rotation.GetBytes(), 0, bytes, i, 12); i += 12;
-            bytes[i++] = (byte)(this.LocalID % 256);
-            bytes[i++] = (byte)((this.LocalID >> 8) % 256);
-            bytes[i++] = (byte)((this.LocalID >> 16) % 256);
-            bytes[i++] = (byte)((this.LocalID >> 24) % 256);
-            Array.Copy(FullID.GetBytes(), 0, bytes, i, 16); i += 16;
-            return bytes;
-        }
-        public static PrimData DefaultCube()
-        {
-            PrimData primData = new PrimData();
-            primData.CreationDate = (Int32)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;
-            primData.FullID = LLUUID.Random();
-            primData.Scale = new LLVector3(0.5f, 0.5f, 0.5f);
-            primData.Rotation = new LLQuaternion(0, 0, 0, 1);
-            primData.PCode = 9;
-            primData.ParentID = 0;
-            primData.PathBegin = 0;
-            primData.PathEnd = 0;
-            primData.PathScaleX = 0;
-            primData.PathScaleY = 0;
-            primData.PathShearX = 0;
-            primData.PathShearY = 0;
-            primData.PathSkew = 0;
-            primData.ProfileBegin = 0;
-            primData.ProfileEnd = 0;
-            primData.PathCurve = 16;
-            primData.ProfileCurve = 1;
-            primData.ProfileHollow = 0;
-            primData.PathRadiusOffset = 0;
-            primData.PathRevolutions = 0;
-            primData.PathTaperX = 0;
-            primData.PathTaperY = 0;
-            primData.PathTwist = 0;
-            primData.PathTwistBegin = 0;
-            return primData;
-        }
-    }
-}
diff --git a/Common/OpenSim.Framework/Types/RegionHandle.cs b/Common/OpenSim.Framework/Types/RegionHandle.cs
deleted file mode 100644
index 1271d04..0000000
--- a/Common/OpenSim.Framework/Types/RegionHandle.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Net;
-namespace OpenSim.Framework.Types
-{
-    /// <summary>
-    /// A class for manipulating RegionHandle coordinates
-    /// </summary>
-    class RegionHandle
-    {
-        private UInt64 handle;
-        /// <summary>
-        /// Initialises a new grid-aware RegionHandle
-        /// </summary>
-        /// <param name="ip">IP Address of the Grid Server for this region</param>
-        /// <param name="x">Grid X Coordinate</param>
-        /// <param name="y">Grid Y Coordinate</param>
-        public RegionHandle(string ip, short x, short y)
-        {
-            IPAddress addr = IPAddress.Parse(ip);
-            long baseHandle = addr.Address;
-            // Split the IP address in half
-            short a = (short)((baseHandle << 16) & 0xFFFF);
-            short b = (short)((baseHandle <<  0) & 0xFFFF);
-            // Raise the bounds a little
-            uint nx = (uint)x;
-            uint ny = (uint)y;
-            // Multiply grid coords to get region coords
-            nx *= 256;
-            ny *= 256;
-            // Stuff the IP address in too
-            nx = (uint)a << 16;
-            ny = (uint)b << 16;
-            handle = ((UInt64)nx << 32) | (uint)ny;
-        }
-        /// <summary>
-        /// Initialises a new RegionHandle that is not inter-grid aware
-        /// </summary>
-        /// <param name="x">Grid X Coordinate</param>
-        /// <param name="y">Grid Y Coordinate</param>
-        public RegionHandle(uint x, uint y)
-        {
-            handle = ((x * 256) << 32) | (y * 256);
-        }
-        /// <summary>
-        /// Initialises a new RegionHandle from an existing value
-        /// </summary>
-        /// <param name="Region">A U64 RegionHandle</param>
-        public RegionHandle(UInt64 Region)
-        {
-            handle = Region;
-        }
-        /// <summary>
-        /// Returns the Grid Masked RegionHandle - For use in Teleport packets and other packets where sending the grid IP address may be handy.
-        /// </summary>
-        /// <remarks>Do not use for SimulatorEnable packets. The client will choke.</remarks>
-        /// <returns>Region Handle including IP Address encoding</returns>
-        public UInt64 getTeleportHandle()
-        {
-            return handle;
-        }
-        /// <summary>
-        /// Returns a RegionHandle which may be used for SimulatorEnable packets. Removes the IP address encoding and returns the lower bounds.
-        /// </summary>
-        /// <returns>A U64 RegionHandle for use in SimulatorEnable packets.</returns>
-        public UInt64 getNeighbourHandle()
-        {
-            UInt64 mask = 0x0000FFFF0000FFFF;
-            return handle | mask;
-        }
-        /// <summary>
-        /// Returns the IP Address of the GridServer from a Grid-Encoded RegionHandle
-        /// </summary>
-        /// <returns>Grid Server IP Address</returns>
-        public IPAddress getGridIP()
-        {
-            uint a = (uint)((handle >> 16) & 0xFFFF);
-            uint b = (uint)((handle >> 48) & 0xFFFF);
-            return new IPAddress((long)(a << 16) | (long)b);
-        }
-        /// <summary>
-        /// Returns the X Coordinate from a Grid-Encoded RegionHandle
-        /// </summary>
-        /// <returns>X Coordinate</returns>
-        public uint getGridX()
-        {
-            uint x = (uint)((handle >> 32) & 0xFFFF);
-            return x;
-        }
-        /// <summary>
-        /// Returns the Y Coordinate from a Grid-Encoded RegionHandle
-        /// </summary>
-        /// <returns>Y Coordinate</returns>
-        public uint getGridY()
-        {
-            uint y = (uint)((handle >> 0) & 0xFFFF);
-            return y;
-        }
-    }
-}
diff --git a/Common/OpenSim.Framework/Types/RegionInfo.cs b/Common/OpenSim.Framework/Types/RegionInfo.cs
deleted file mode 100644
index 48e6922..0000000
--- a/Common/OpenSim.Framework/Types/RegionInfo.cs
+++ /dev/null
@@ -1,304 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Globalization;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Utilities;
-using OpenSim.Framework.Console;
-using libsecondlife;
-namespace OpenSim.Framework.Types
-{
-    public class RegionInfo
-    {
-        public LLUUID SimUUID = new LLUUID();
-        public string RegionName = "";
-        public uint RegionLocX = 0;
-        public uint RegionLocY = 0;
-        public ulong RegionHandle = 0;
-        public string DataStore = "";
-        public bool isSandbox = false;
-        public LLUUID MasterAvatarAssignedUUID = new LLUUID();
-        public string MasterAvatarFirstName = "";
-        public string MasterAvatarLastName = "";
-        public string MasterAvatarSandboxPassword = "";
-        /// <summary>
-        /// Port used for listening (TCP and UDP)
-        /// </summary>
-        /// <remarks>Seperate TCP and UDP</remarks>
-        public int CommsIPListenPort = 0;
-        /// <summary>
-        /// Address used for internal listening (default: 0.0.0.0?)
-        /// </summary>
-        public string CommsIPListenAddr = "";
-        /// <summary>
-        /// Address used for external addressing (DNS or IP)
-        /// </summary>
-        public string CommsExternalAddress = "";
-        public EstateSettings estateSettings;
-        public RegionInfo()
-        {
-            estateSettings = new EstateSettings();
-        }
-        public void InitConfig(bool sandboxMode, IGenericConfig configData)
-        {
-            this.isSandbox = sandboxMode;
-            try
-            {
-                // Sim UUID
-                string attri = "";
-                attri = configData.GetAttribute("SimUUID");
-                if (attri == "")
-                {
-                    this.SimUUID = LLUUID.Random();
-                    configData.SetAttribute("SimUUID", this.SimUUID.ToString());
-                }
-                else
-                {
-                    this.SimUUID = new LLUUID(attri);
-                }
-                // Sim name
-                attri = "";
-                attri = configData.GetAttribute("SimName");
-                if (attri == "")
-                {
-                    this.RegionName = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Name", "OpenSim test");
-                    configData.SetAttribute("SimName", this.RegionName);
-                }
-                else
-                {
-                    this.RegionName = attri;
-                }
-                // Sim/Grid location X
-                attri = "";
-                attri = configData.GetAttribute("SimLocationX");
-                if (attri == "")
-                {
-                    string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid Location X", "997");
-                    configData.SetAttribute("SimLocationX", location);
-                    this.RegionLocX = (uint)Convert.ToUInt32(location);
-                }
-                else
-                {
-                    this.RegionLocX = (uint)Convert.ToUInt32(attri);
-                }
-                // Sim/Grid location Y
-                attri = "";
-                attri = configData.GetAttribute("SimLocationY");
-                if (attri == "")
-                {
-                    string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid Location Y", "996");
-                    configData.SetAttribute("SimLocationY", location);
-                    this.RegionLocY = (uint)Convert.ToUInt32(location);
-                }
-                else
-                {
-                    this.RegionLocY = (uint)Convert.ToUInt32(attri);
-                }
-                // Local storage datastore
-                attri = "";
-                attri = configData.GetAttribute("Datastore");
-                if (attri == "")
-                {
-                    string datastore = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Filename for local storage", "localworld.yap");
-                    configData.SetAttribute("Datastore", datastore);
-                    this.DataStore = datastore;
-                }
-                else
-                {
-                    this.DataStore = attri;
-                }
-                //Sim Listen Port
-                attri = "";
-                attri = configData.GetAttribute("SimListenPort");
-                if (attri == "")
-                {
-                    string port = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("UDP port for client connections", "9000");
-                    configData.SetAttribute("SimListenPort", port);
-                    this.CommsIPListenPort = Convert.ToInt32(port);
-                }
-                else
-                {
-                    this.CommsIPListenPort = Convert.ToInt32(attri);
-                }
-                //Sim Listen Address
-                attri = "";
-                attri = configData.GetAttribute("SimListenAddress");
-                if (attri == "")
-                {
-                    this.CommsIPListenAddr = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("IP Address to listen on for client connections", "0.0.0.0");
-                    configData.SetAttribute("SimListenAddress", this.CommsIPListenAddr);
-                }
-                else
-                {
-                    // Probably belongs elsewhere, but oh well.
-                    if (attri.Trim().StartsWith("SYSTEMIP"))
-                    {
-                        string localhostname = System.Net.Dns.GetHostName();
-                        System.Net.IPAddress[] ips = System.Net.Dns.GetHostAddresses(localhostname);
-                        try
-                        {
-                            this.CommsIPListenAddr = "0.0.0.0"; // Incase a IPv4 address isnt found
-                            foreach (System.Net.IPAddress ip in ips)
-                            {
-                                if (ip.AddressFamily.ToString() == System.Net.Sockets.ProtocolFamily.InterNetwork.ToString())
-                                {
-                                    this.CommsIPListenAddr = ip.ToString();
-                                    break;
-                                }
-                            }
-                        }
-                        catch (Exception e)
-                        {
-                            e.ToString();
-                            this.CommsIPListenAddr = "0.0.0.0"; // Use the default if we fail
-                        }
-                    }
-                    else
-                    {
-                        this.CommsIPListenAddr = attri;
-                    }
-                }
-                // Sim External Address
-                attri = "";
-                attri = configData.GetAttribute("SimExternalAddress");
-                if (attri == "")
-                {
-                    this.CommsExternalAddress = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("IP or DNS address to send external clients to", "localhost");
-                    configData.SetAttribute("SimExternalAddress", this.CommsExternalAddress);
-                }
-                else
-                {
-                    this.CommsExternalAddress = attri;
-                }
-                attri = "";
-                attri = configData.GetAttribute("TerrainFile");
-                if (attri == "")
-                {
-                    this.estateSettings.terrainFile = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("GENERAL SETTING: Default Terrain File", "default.r32");
-                    configData.SetAttribute("TerrainFile", this.estateSettings.terrainFile);
-                }
-                else
-                {
-                    this.estateSettings.terrainFile = attri;
-                }
-                attri = "";
-                attri = configData.GetAttribute("TerrainMultiplier");
-                if (attri == "")
-                {
-                    string re = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("GENERAL SETTING: Terrain Height Multiplier", "60.0");
-                    this.estateSettings.terrainMultiplier = Convert.ToDouble(re, CultureInfo.InvariantCulture);
-                    configData.SetAttribute("TerrainMultiplier", this.estateSettings.terrainMultiplier.ToString());
-                }
-                else
-                {
-                    this.estateSettings.terrainMultiplier = Convert.ToDouble(attri);
-                }
-                attri = "";
-                attri = configData.GetAttribute("MasterAvatarFirstName");
-                if (attri == "")
-                {
-                    this.MasterAvatarFirstName = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("First name of Master Avatar (Land and Region Owner)", "Test");
-                    configData.SetAttribute("MasterAvatarFirstName", this.MasterAvatarFirstName);
-                }
-                else
-                {
-                    this.MasterAvatarFirstName = attri;
-                }
-                attri = "";
-                attri = configData.GetAttribute("MasterAvatarLastName");
-                if (attri == "")
-                {
-                    this.MasterAvatarLastName = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Last name of Master Avatar (Land and Region Owner)", "User");
-                    configData.SetAttribute("MasterAvatarLastName", this.MasterAvatarLastName);
-                }
-                else
-                {
-                    this.MasterAvatarLastName = attri;
-                }
-                if (isSandbox) //Sandbox Mode Specific Settings
-                {
-                    attri = "";
-                    attri = configData.GetAttribute("MasterAvatarSandboxPassword");
-                    if (attri == "")
-                    {
-                        this.MasterAvatarSandboxPassword = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Password of Master Avatar (Needed for sandbox mode account creation only)", "test");
-                        //Should I store this?
-                        configData.SetAttribute("MasterAvatarSandboxPassword", this.MasterAvatarSandboxPassword);
-                    }
-                    else
-                    {
-                        this.MasterAvatarSandboxPassword = attri;
-                    }
-                }
-                this.RegionHandle = Util.UIntsToLong((RegionLocX * 256), (RegionLocY * 256));
-               
-                configData.Commit();
-            }
-            catch (Exception e)
-            {
-                OpenSim.Framework.Console.MainLog.Instance.Warn("Config.cs:InitConfig() - Exception occured");
-                OpenSim.Framework.Console.MainLog.Instance.Warn(e.ToString());
-            }
-            OpenSim.Framework.Console.MainLog.Instance.Verbose("Sim settings loaded:");
-            OpenSim.Framework.Console.MainLog.Instance.Verbose( "UUID: " + this.SimUUID.ToStringHyphenated());
-            OpenSim.Framework.Console.MainLog.Instance.Verbose( "Name: " + this.RegionName);
-            OpenSim.Framework.Console.MainLog.Instance.Verbose( "Region Location: [" + this.RegionLocX.ToString() + "," + this.RegionLocY + "]");
-            OpenSim.Framework.Console.MainLog.Instance.Verbose( "Region Handle: " + this.RegionHandle.ToString());
-            OpenSim.Framework.Console.MainLog.Instance.Verbose( "Listening on IP: " + this.CommsIPListenAddr + ":" + this.CommsIPListenPort);
-            OpenSim.Framework.Console.MainLog.Instance.Verbose( "Sandbox Mode? " + isSandbox.ToString());
-  
-        }
-    }
-}
diff --git a/Common/OpenSim.Framework/UserProfile.cs b/Common/OpenSim.Framework/UserProfile.cs
deleted file mode 100644
index 04ff20b..0000000
--- a/Common/OpenSim.Framework/UserProfile.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-using OpenSim.Framework.Inventory;
-using System.Security.Cryptography;
-namespace OpenSim.Framework.User
-{
-    public class UserProfile
-    {
-        public string firstname;
-        public string lastname;
-        public ulong homeregionhandle;
-        public LLVector3 homepos;
-        public LLVector3 homelookat;
-        public bool IsGridGod = false;
-        public bool IsLocal = true;     // will be used in future for visitors from foreign grids
-        public string AssetURL;
-        public string MD5passwd;
-        public LLUUID CurrentSessionID;
-        public LLUUID CurrentSecureSessionID;
-        public LLUUID UUID;
-        public Dictionary<LLUUID, uint> Circuits = new Dictionary<LLUUID, uint>();      // tracks circuit codes
-        public AgentInventory Inventory;
-        public UserProfile()
-        {
-            Circuits = new Dictionary<LLUUID, uint>();
-            Inventory = new AgentInventory();
-            homeregionhandle = Helpers.UIntsToLong((997 * 256), (996 * 256));
-            homepos = new LLVector3();
-            homelookat = new LLVector3();
-        }
-        public void InitSessionData()
-        {
-            RNGCryptoServiceProvider rand = new RNGCryptoServiceProvider();
-            byte[] randDataS = new byte[16];
-            byte[] randDataSS = new byte[16];
-            rand.GetBytes(randDataS);
-            rand.GetBytes(randDataSS);
-            CurrentSecureSessionID = new LLUUID(randDataSS,0);
-            CurrentSessionID = new LLUUID(randDataS,0);
-            
-        }
-        public void AddSimCircuit(uint circuitCode, LLUUID regionUUID)
-        {
-            if (this.Circuits.ContainsKey(regionUUID) == false)
-                this.Circuits.Add(regionUUID, circuitCode);
-        }
-    }
-}
diff --git a/Common/OpenSim.Framework/Util.cs b/Common/OpenSim.Framework/Util.cs
deleted file mode 100644
index 8c34c9b..0000000
--- a/Common/OpenSim.Framework/Util.cs
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Security.Cryptography;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-using libsecondlife.Packets;
-namespace OpenSim.Framework.Utilities
-{
-    public class Util
-    {
-        private static Random randomClass = new Random();
-        private static uint nextXferID = 5000;
-        private static object XferLock = new object();
-        public static ulong UIntsToLong(uint X, uint Y)
-        {
-            return Helpers.UIntsToLong(X, Y);
-        }
-        public static Random RandomClass
-        {
-            get
-            {
-                return randomClass;
-            }
-        }
-        public static uint GetNextXferID()
-        {
-            uint id = 0;
-            lock(XferLock)
-            {
-                id = nextXferID;
-                nextXferID++;
-            }
-            return id;
-        }
-        public static int UnixTimeSinceEpoch()
-        {
-            TimeSpan t = (DateTime.UtcNow - new DateTime(1970, 1, 1));
-            int timestamp = (int)t.TotalSeconds;
-            return timestamp;
-        }
-        public static string Md5Hash(string pass)
-        {
-            MD5 md5 = MD5CryptoServiceProvider.Create();
-            byte[] dataMd5 = md5.ComputeHash(Encoding.Default.GetBytes(pass));
-            StringBuilder sb = new StringBuilder();
-            for (int i = 0; i < dataMd5.Length; i++)
-                sb.AppendFormat("{0:x2}", dataMd5[i]);
-            return sb.ToString();
-        }
-        public static string GetRandomCapsPath()
-        {
-            LLUUID caps = LLUUID.Random();
-            string capsPath = caps.ToStringHyphenated();
-            capsPath = capsPath.Remove(capsPath.Length - 4, 4);
-            return capsPath;
-        }
-        //public static int fast_distance2d(int x, int y)
-        //{
-        //    x = System.Math.Abs(x);
-        //    y = System.Math.Abs(y);
-        //    int min = System.Math.Min(x, y);
-        //    return (x + y - (min >> 1) - (min >> 2) + (min >> 4));
-        //}
-        public static string FieldToString(byte[] bytes)
-        {
-            return FieldToString(bytes, String.Empty);
-        }
-        /// <summary>
-        /// Convert a variable length field (byte array) to a string, with a
-        /// field name prepended to each line of the output
-        /// </summary>
-        /// <remarks>If the byte array has unprintable characters in it, a 
-        /// hex dump will be put in the string instead</remarks>
-        /// <param name="bytes">The byte array to convert to a string</param>
-        /// <param name="fieldName">A field name to prepend to each line of output</param>
-        /// <returns>An ASCII string or a string containing a hex dump, minus 
-        /// the null terminator</returns>
-        public static string FieldToString(byte[] bytes, string fieldName)
-        {
-            // Check for a common case
-            if (bytes.Length == 0) return String.Empty;
-            StringBuilder output = new StringBuilder();
-            bool printable = true;
-            for (int i = 0; i < bytes.Length; ++i)
-            {
-                // Check if there are any unprintable characters in the array
-                if ((bytes[i] < 0x20 || bytes[i] > 0x7E) && bytes[i] != 0x09
-                    && bytes[i] != 0x0D && bytes[i] != 0x0A && bytes[i] != 0x00)
-                {
-                    printable = false;
-                    break;
-                }
-            }
-            if (printable)
-            {
-                if (fieldName.Length > 0)
-                {
-                    output.Append(fieldName);
-                    output.Append(": ");
-                }
-                if (bytes[bytes.Length - 1] == 0x00)
-                    output.Append(UTF8Encoding.UTF8.GetString(bytes, 0, bytes.Length - 1));
-                else
-                    output.Append(UTF8Encoding.UTF8.GetString(bytes));
-            }
-            else
-            {
-                for (int i = 0; i < bytes.Length; i += 16)
-                {
-                    if (i != 0)
-                        output.Append(Environment.NewLine);
-                    if (fieldName.Length > 0)
-                    {
-                        output.Append(fieldName);
-                        output.Append(": ");
-                    }
-                    for (int j = 0; j < 16; j++)
-                    {
-                        if ((i + j) < bytes.Length)
-                            output.Append(String.Format("{0:X2} ", bytes[i + j]));
-                        else
-                            output.Append("   ");
-                    }
-                    for (int j = 0; j < 16 && (i + j) < bytes.Length; j++)
-                    {
-                        if (bytes[i + j] >= 0x20 && bytes[i + j] < 0x7E)
-                            output.Append((char)bytes[i + j]);
-                        else
-                            output.Append(".");
-                    }
-                }
-            }
-            return output.ToString();
-        }
-        public Util()
-        {
-        }
-    }
-}
diff --git a/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj b/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj
deleted file mode 100644
index df68722..0000000
--- a/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj
+++ /dev/null
@@ -1,93 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{E88EF749-0000-0000-0000-000000000000}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon></ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>OpenSim.GenericConfig.Xml</AssemblyName>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenSim.GenericConfig.Xml</RootNamespace>
-    <StartupObject></StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <DocumentationFile></DocumentationFile>
-    <DebugSymbols>True</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <Optimize>False</Optimize>
-    <OutputPath>..\..\..\bin\</OutputPath>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <RemoveIntegerChecks>False</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile></DocumentationFile>
-    <DebugSymbols>False</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <Optimize>True</Optimize>
-    <OutputPath>..\..\..\bin\</OutputPath>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <RemoveIntegerChecks>False</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" >
-      <HintPath>System.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Xml" >
-      <HintPath>System.Xml.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\OpenSim.Framework\OpenSim.Framework.csproj">
-      <Name>OpenSim.Framework</Name>
-      <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-                        <Private>False</Private>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="XmlConfig.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
diff --git a/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build b/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build
deleted file mode 100644
index 075ea7f..0000000
--- a/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" ?>
-<project name="OpenSim.GenericConfig.Xml" default="build">
-    <target name="build">
-        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
-        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
-        <copy todir="${project::get-base-directory()}/${build.dir}">
-            <fileset basedir="${project::get-base-directory()}">
-            </fileset>
-        </copy>
-        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
-            <resources prefix="OpenSim.GenericConfig.Xml" dynamicprefix="true" >
-            </resources>
-            <sources failonempty="true">
-                <include name="XmlConfig.cs" />
-                <include name="Properties/AssemblyInfo.cs" />
-            </sources>
-            <references basedir="${project::get-base-directory()}">
-                <lib>
-                    <include name="${project::get-base-directory()}" />
-                    <include name="${project::get-base-directory()}/${build.dir}" />
-                </lib>
-                <include name="../../../bin/OpenSim.Framework.dll" />
-                <include name="System.dll" />
-                <include name="System.Xml.dll" />
-            </references>
-        </csc>
-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" />
-        <mkdir dir="${project::get-base-directory()}/../../../bin/"/>
-        <copy todir="${project::get-base-directory()}/../../../bin/">
-            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
-                <include name="*.dll"/>
-                <include name="*.exe"/>
-            </fileset>
-        </copy>
-    </target>
-    <target name="clean">
-        <delete dir="${bin.dir}" failonerror="false" />
-        <delete dir="${obj.dir}" failonerror="false" />
-    </target>
-    <target name="doc" description="Creates documentation.">
-    </target>
-</project>
diff --git a/Common/OpenSim.GenericConfig/Xml/Properties/AssemblyInfo.cs b/Common/OpenSim.GenericConfig/Xml/Properties/AssemblyInfo.cs
deleted file mode 100644
index de5f48d..0000000
--- a/Common/OpenSim.GenericConfig/Xml/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("OpenSim.GenericConfig")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("OpenSim.GenericConfig")]
-[assembly: AssemblyCopyright("Copyright ©  2007")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("285a3047-f165-46c8-8767-b51428738a09")]
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Revision and Build Numbers 
-// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Common/OpenSim.GenericConfig/Xml/XmlConfig.cs b/Common/OpenSim.GenericConfig/Xml/XmlConfig.cs
deleted file mode 100644
index c526aec..0000000
--- a/Common/OpenSim.GenericConfig/Xml/XmlConfig.cs
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Xml;
-using OpenSim.Framework.Interfaces;
-namespace OpenSim.GenericConfig
-{
-    public class XmlConfig : IGenericConfig
-    {
-        private XmlDocument doc;
-        private XmlNode rootNode;
-        private XmlNode configNode;
-        private string fileName;
-        private bool createdFile = false;
-        public XmlConfig(string filename)
-        {
-            fileName = filename;
-        }
-        public void LoadData()
-        {
-            doc = new XmlDocument();
-            if (System.IO.File.Exists(fileName))
-            {
-                XmlTextReader reader = new XmlTextReader(fileName);
-                reader.WhitespaceHandling = WhitespaceHandling.None;
-                doc.Load(reader);
-                reader.Close();
-            }
-            else
-            {
-                createdFile = true;
-                rootNode = doc.CreateNode(XmlNodeType.Element, "Root", "");
-                doc.AppendChild(rootNode);
-                configNode = doc.CreateNode(XmlNodeType.Element, "Config", "");
-                rootNode.AppendChild(configNode);
-            }
-            rootNode = doc.FirstChild;
-            if (rootNode.Name != "Root")
-                throw new Exception("Error: Invalid .xml File. Missing <Root>");
-            configNode = rootNode.FirstChild;
-            if (configNode.Name != "Config")
-                throw new Exception("Error: Invalid .xml File. <Root> first child should be <Config>");
-            if (createdFile)
-            {
-                this.Commit();
-            }
-        }
-        public string GetAttribute(string attributeName)
-        {
-            string result = "";
-            if (configNode.Attributes[attributeName] != null)
-            {
-                result = ((XmlAttribute)configNode.Attributes.GetNamedItem(attributeName)).Value;
-            }
-            return result;
-        }
-        public bool SetAttribute(string attributeName, string attributeValue)
-        {
-            if (configNode.Attributes[attributeName] != null)
-            {
-                ((XmlAttribute)configNode.Attributes.GetNamedItem(attributeName)).Value = attributeValue;
-            }
-            else
-            {
-                XmlAttribute attri;
-                attri = doc.CreateAttribute(attributeName);
-                attri.Value = attributeValue;
-                configNode.Attributes.Append(attri);
-            }
-            return true;
-        }
-        public void Commit()
-        {
-            doc.Save(fileName);
-        }
-        public void Close()
-        {
-            configNode = null;
-            rootNode = null;
-            doc = null;
-        }
-    }
-}
diff --git a/Common/OpenSim.Servers/BaseHttpServer.cs b/Common/OpenSim.Servers/BaseHttpServer.cs
deleted file mode 100644
index e55e33c..0000000
--- a/Common/OpenSim.Servers/BaseHttpServer.cs
+++ /dev/null
@@ -1,312 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Net;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Threading;
-//using OpenSim.CAPS;
-using Nwc.XmlRpc;
-using System.Collections;
-using OpenSim.Framework.Console;
-namespace OpenSim.Servers
-{
-    public class BaseHttpServer
-    {
-        protected class RestMethodEntry
-        {
-            private string m_path;
-            public string Path
-            {
-                get { return m_path; }
-            }
-            private RestMethod m_restMethod;
-            public RestMethod RestMethod
-            {
-                get { return m_restMethod; }
-            }
-            public RestMethodEntry(string path, RestMethod restMethod)
-            {
-                m_path = path;
-                m_restMethod = restMethod;
-            }
-        }
-        protected Thread m_workerThread;
-        protected HttpListener m_httpListener;
-        protected Dictionary<string, RestMethodEntry> m_restHandlers = new Dictionary<string, RestMethodEntry>();
-        protected Dictionary<string, XmlRpcMethod> m_rpcHandlers = new Dictionary<string, XmlRpcMethod>();
-        protected int m_port;
-        protected bool firstcaps = true;
-        public BaseHttpServer(int port)
-        {
-            m_port = port;
-        }
-        public bool AddRestHandler(string method, string path, RestMethod handler)
-        {
-           //Console.WriteLine("adding new REST handler for path " + path);
-            string methodKey = String.Format("{0}: {1}", method, path);
-            if (!this.m_restHandlers.ContainsKey(methodKey))
-            {
-                this.m_restHandlers.Add(methodKey, new RestMethodEntry(path, handler));
-                return true;
-            }
-            //must already have a handler for that path so return false
-            return false;
-        }
-        public bool RemoveRestHandler(string method, string path)
-        {
-            string methodKey = String.Format("{0}: {1}", method, path);
-            if (this.m_restHandlers.ContainsKey(methodKey))
-            {
-                this.m_restHandlers.Remove(methodKey);
-                return true;
-            }
-            return false;
-        }
-        public bool AddXmlRPCHandler(string method, XmlRpcMethod handler)
-        {
-            if (!this.m_rpcHandlers.ContainsKey(method))
-            {
-                this.m_rpcHandlers.Add(method, handler);
-                return true;
-            }
-            //must already have a handler for that path so return false
-            return false;
-        }
-        protected virtual string ProcessXMLRPCMethod(string methodName, XmlRpcRequest request)
-        {
-            XmlRpcResponse response;
-            XmlRpcMethod method;
-            if (this.m_rpcHandlers.TryGetValue(methodName, out method))
-            {
-                response = method(request);
-            }
-            else
-            {
-                response = new XmlRpcResponse();
-                Hashtable unknownMethodError = new Hashtable();
-                unknownMethodError["reason"] = "XmlRequest"; ;
-                unknownMethodError["message"] = "Unknown Rpc request";
-                unknownMethodError["login"] = "false";
-                response.Value = unknownMethodError;
-            }
-            return XmlRpcResponseSerializer.Singleton.Serialize(response);
-        }
-        protected virtual string ParseREST(string request, string path, string method)
-        {
-            string response;
-            string requestKey = String.Format("{0}: {1}", method, path);
-            string bestMatch = String.Empty;
-            foreach (string currentKey in m_restHandlers.Keys)
-            {
-                if (requestKey.StartsWith(currentKey))
-                {
-                    if (currentKey.Length > bestMatch.Length)
-                    {
-                        bestMatch = currentKey;
-                    }
-                }
-            }
-            RestMethodEntry restMethodEntry;
-            if (m_restHandlers.TryGetValue(bestMatch, out restMethodEntry))
-            {
-                RestMethod restMethod = restMethodEntry.RestMethod;
-                string param = path.Substring(restMethodEntry.Path.Length);
-                response = restMethod(request, path, param);
-            }
-            else
-            {
-                response = String.Empty;
-            }
-            return response;
-        }
-        protected virtual string ParseLLSDXML(string requestBody)
-        {
-            // dummy function for now - IMPLEMENT ME!
-            Console.WriteLine("LLSD request "+requestBody);
-            string resp = "";
-            if (firstcaps)
-            {
-                resp = "<llsd><map><key>MapLayer</key><string>http://127.0.0.1:9000/CAPS/</string></map></llsd>";
-                firstcaps = false;
-            }
-            return resp;
-        }
-        protected virtual string ParseXMLRPC(string requestBody)
-        {
-            string responseString = String.Empty;
-            try
-            {
-                XmlRpcRequest request = (XmlRpcRequest)(new XmlRpcRequestDeserializer()).Deserialize(requestBody);
-                string methodName = request.MethodName;
-                responseString = ProcessXMLRPCMethod(methodName, request);
-            }
-            catch (Exception e)
-            {
-                Console.WriteLine(e.ToString());
-            }
-            return responseString;
-        }
-        public virtual void HandleRequest(Object stateinfo)
-        {
-            try
-            {
-                HttpListenerContext context = (HttpListenerContext)stateinfo;
-                HttpListenerRequest request = context.Request;
-                HttpListenerResponse response = context.Response;
-                response.KeepAlive = false;
-                response.SendChunked = false;
-                System.IO.Stream body = request.InputStream;
-                System.Text.Encoding encoding = System.Text.Encoding.UTF8;
-                System.IO.StreamReader reader = new System.IO.StreamReader(body, encoding);
-                string requestBody = reader.ReadToEnd();
-                body.Close();
-                reader.Close();
-                //Console.WriteLine(request.HttpMethod + " " + request.RawUrl + " Http/" + request.ProtocolVersion.ToString() + " content type: " + request.ContentType);
-                //Console.WriteLine(requestBody);
-                string responseString = "";
-               // Console.WriteLine("new request " + request.ContentType +" at "+ request.RawUrl);
-                switch (request.ContentType)
-                {
-                    case "text/xml":
-                        // must be XML-RPC, so pass to the XML-RPC parser
-                        responseString = ParseXMLRPC(requestBody);
-                        responseString = Regex.Replace(responseString, "utf-16", "utf-8");
-                        response.AddHeader("Content-type", "text/xml");
-                        break;
-                    case "application/xml":
-                        // probably LLSD we hope, otherwise it should be ignored by the parser
-                       // responseString = ParseLLSDXML(requestBody);
-                        responseString = ParseREST(requestBody, request.RawUrl, request.HttpMethod);
-                        response.AddHeader("Content-type", "application/xml");
-                        break;
-                    case "application/octet-stream":
-                        // probably LLSD we hope, otherwise it should be ignored by the parser
-                        // responseString = ParseLLSDXML(requestBody);
-                        responseString = ParseREST(requestBody, request.RawUrl, request.HttpMethod);
-                        response.AddHeader("Content-type", "application/xml");
-                        break;
-                    case "application/x-www-form-urlencoded":
-                        // a form data POST so send to the REST parser
-                        responseString = ParseREST(requestBody, request.RawUrl, request.HttpMethod);
-                        response.AddHeader("Content-type", "text/html");
-                        break;
-                    case null:
-                        // must be REST or invalid crap, so pass to the REST parser
-                        responseString = ParseREST(requestBody, request.RawUrl, request.HttpMethod);
-                        response.AddHeader("Content-type", "text/html");
-                        break;
-                }
-                byte[] buffer = System.Text.Encoding.UTF8.GetBytes(responseString);
-                System.IO.Stream output = response.OutputStream;
-                response.SendChunked = false;
-                response.ContentLength64 = buffer.Length;
-                output.Write(buffer, 0, buffer.Length);
-                output.Close();
-            }
-            catch (Exception e)
-            {
-                Console.WriteLine(e.ToString());
-            }
-        }
-        public void Start()
-        {
-            OpenSim.Framework.Console.MainLog.Instance.WriteLine(LogPriority.LOW, "BaseHttpServer.cs: Starting up HTTP Server");
-            m_workerThread = new Thread(new ThreadStart(StartHTTP));
-            m_workerThread.IsBackground = true;
-            m_workerThread.Start();
-        }
-        private void StartHTTP()
-        {
-            try
-            {
-                OpenSim.Framework.Console.MainLog.Instance.WriteLine(LogPriority.LOW, "BaseHttpServer.cs: StartHTTP() - Spawned main thread OK");
-                m_httpListener = new HttpListener();
-                m_httpListener.Prefixes.Add("http://+:" + m_port + "/");
-                m_httpListener.Start();
-                HttpListenerContext context;
-                while (true)
-                {
-                    context = m_httpListener.GetContext();
-                    ThreadPool.QueueUserWorkItem(new WaitCallback(HandleRequest), context);
-                }
-            }
-            catch (Exception e)
-            {
-                OpenSim.Framework.Console.MainLog.Instance.WriteLine(LogPriority.MEDIUM, e.Message);
-            }
-        }
-    }
-}
diff --git a/Common/OpenSim.Servers/CheckSumServer.cs b/Common/OpenSim.Servers/CheckSumServer.cs
deleted file mode 100644
index a359205..0000000
--- a/Common/OpenSim.Servers/CheckSumServer.cs
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Text;
-using System.IO;
-using System.Threading;
-using System.Net;
-using System.Net.Sockets;
-using System.Timers;
-using System.Reflection;
-using System.Collections;
-using System.Collections.Generic;
-using libsecondlife;
-using libsecondlife.Packets;
-using OpenSim.Framework.Console;
-namespace OpenSim.Servers
-{
-/*    public class CheckSumServer : UDPServerBase
-    {
-        //protected ConsoleBase m_log;
-        public CheckSumServer(int port)
-            : base(port)
-        {
-        }
-        protected override void OnReceivedData(IAsyncResult result)
-        {
-            ipeSender = new IPEndPoint(IPAddress.Any, 0);
-            epSender = (EndPoint)ipeSender;
-            Packet packet = null;
-            int numBytes = Server.EndReceiveFrom(result, ref epSender);
-            int packetEnd = numBytes - 1;
-            packet = Packet.BuildPacket(RecvBuffer, ref packetEnd, ZeroBuffer);
-            if (packet.Type == PacketType.SecuredTemplateChecksumRequest)
-            {
-                SecuredTemplateChecksumRequestPacket checksum = (SecuredTemplateChecksumRequestPacket)packet;
-                TemplateChecksumReplyPacket checkreply = new TemplateChecksumReplyPacket();
-                checkreply.DataBlock.Checksum = 3220703154;//180572585;
-                checkreply.DataBlock.Flags = 0;
-                checkreply.DataBlock.MajorVersion = 1;
-                checkreply.DataBlock.MinorVersion = 15;
-                checkreply.DataBlock.PatchVersion = 0;
-                checkreply.DataBlock.ServerVersion = 0;
-                checkreply.TokenBlock.Token = checksum.TokenBlock.Token;
-                this.SendPacket(checkreply, epSender);
-                /*
-                //if we wanted to echo the the checksum/ version from the client (so that any client worked)
-                SecuredTemplateChecksumRequestPacket checkrequest = new SecuredTemplateChecksumRequestPacket();
-                checkrequest.TokenBlock.Token = checksum.TokenBlock.Token;
-                this.SendPacket(checkrequest, epSender);
-                
-            }
-            else if (packet.Type == PacketType.TemplateChecksumReply)
-            {
-                //echo back the client checksum reply (Hegemon's method)
-                TemplateChecksumReplyPacket checksum2 = (TemplateChecksumReplyPacket)packet;
-                TemplateChecksumReplyPacket checkreply2 = new TemplateChecksumReplyPacket();
-                checkreply2.DataBlock.Checksum = checksum2.DataBlock.Checksum;
-                checkreply2.DataBlock.Flags = checksum2.DataBlock.Flags;
-                checkreply2.DataBlock.MajorVersion = checksum2.DataBlock.MajorVersion;
-                checkreply2.DataBlock.MinorVersion = checksum2.DataBlock.MinorVersion;
-                checkreply2.DataBlock.PatchVersion = checksum2.DataBlock.PatchVersion;
-                checkreply2.DataBlock.ServerVersion = checksum2.DataBlock.ServerVersion;
-                checkreply2.TokenBlock.Token = checksum2.TokenBlock.Token;
-                this.SendPacket(checkreply2, epSender);
-            }
-            else
-            {
-            }
-            Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null);
-        }
-        private void SendPacket(Packet Pack, EndPoint endp)
-        {
-            if (!Pack.Header.Resent)
-            {
-                Pack.Header.Sequence = 1;
-            }
-            byte[] ZeroOutBuffer = new byte[4096];
-            byte[] sendbuffer;
-            sendbuffer = Pack.ToBytes();
-            try
-            {
-                if (Pack.Header.Zerocoded)
-                {
-                    int packetsize = Helpers.ZeroEncode(sendbuffer, sendbuffer.Length, ZeroOutBuffer);
-                    this.SendPackTo(ZeroOutBuffer, packetsize, SocketFlags.None, endp);
-                }
-                else
-                {
-                    this.SendPackTo(sendbuffer, sendbuffer.Length, SocketFlags.None, endp);
-                }
-            }
-            catch (Exception)
-            {
-                OpenSim.Framework.Console.MainLog.Instance.Warn("OpenSimClient.cs:ProcessOutPacket() - WARNING: Socket exception occurred on connection ");
-            }
-        }
-        private void SendPackTo(byte[] buffer, int size, SocketFlags flags, EndPoint endp)
-        {
-            this.Server.SendTo(buffer, size, flags, endp);
-        }
- * 
-    }*/
-}
-\ No newline at end of file
diff --git a/Common/OpenSim.Servers/IRestHandler.cs b/Common/OpenSim.Servers/IRestHandler.cs
deleted file mode 100644
index 3aa508c..0000000
--- a/Common/OpenSim.Servers/IRestHandler.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-namespace OpenSim.Servers
-{
-    public delegate string RestMethod( string request, string path, string param );
-}
diff --git a/Common/OpenSim.Servers/OpenSim.Servers.csproj b/Common/OpenSim.Servers/OpenSim.Servers.csproj
deleted file mode 100644
index 6e8eba7..0000000
--- a/Common/OpenSim.Servers/OpenSim.Servers.csproj
+++ /dev/null
@@ -1,125 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{8BB20F0A-0000-0000-0000-000000000000}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>
-    </ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>OpenSim.Servers</AssemblyName>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>
-    </AppDesignerFolder>
-    <RootNamespace>OpenSim.Servers</RootNamespace>
-    <StartupObject>
-    </StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>True</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <Optimize>False</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <RemoveIntegerChecks>False</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn>
-    </NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>False</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <Optimize>True</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <RemoveIntegerChecks>False</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn>
-    </NoWarn>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="libsecondlife.dll">
-      <HintPath>..\..\bin\libsecondlife.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System">
-      <HintPath>System.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Xml">
-      <HintPath>System.Xml.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj">
-      <Name>OpenSim.Framework</Name>
-      <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
-      <Name>OpenSim.Framework.Console</Name>
-      <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\XmlRpcCS\XMLRPC.csproj">
-      <Name>XMLRPC</Name>
-      <Project>{8E81D43C-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="BaseHttpServer.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="CheckSumServer.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="IRestHandler.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="UDPServerBase.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="XmlRpcMethod.cs">
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
-\ No newline at end of file
diff --git a/Common/OpenSim.Servers/OpenSim.Servers.dll.build b/Common/OpenSim.Servers/OpenSim.Servers.dll.build
deleted file mode 100644
index 4103e73..0000000
--- a/Common/OpenSim.Servers/OpenSim.Servers.dll.build
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" ?>
-<project name="OpenSim.Servers" default="build">
-    <target name="build">
-        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
-        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
-        <copy todir="${project::get-base-directory()}/${build.dir}">
-            <fileset basedir="${project::get-base-directory()}">
-            </fileset>
-        </copy>
-        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
-            <resources prefix="OpenSim.Servers" dynamicprefix="true" >
-            </resources>
-            <sources failonempty="true">
-                <include name="BaseHttpServer.cs" />
-                <include name="CheckSumServer.cs" />
-                <include name="IRestHandler.cs" />
-                <include name="LocalUserProfileManager.cs" />
-                <include name="LoginResponse.cs" />
-                <include name="LoginServer.cs" />
-                <include name="UDPServerBase.cs" />
-                <include name="XmlRpcMethod.cs" />
-            </sources>
-            <references basedir="${project::get-base-directory()}">
-                <lib>
-                    <include name="${project::get-base-directory()}" />
-                    <include name="${project::get-base-directory()}/${build.dir}" />
-                </lib>
-                <include name="../../bin/libsecondlife.dll" />
-                <include name="../../bin/OpenSim.Framework.dll" />
-                <include name="../../bin/OpenSim.Framework.Console.dll" />
-                <include name="System.dll" />
-                <include name="System.Xml.dll" />
-                <include name="../../bin/XMLRPC.dll" />
-            </references>
-        </csc>
-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
-        <mkdir dir="${project::get-base-directory()}/../../bin/"/>
-        <copy todir="${project::get-base-directory()}/../../bin/">
-            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
-                <include name="*.dll"/>
-                <include name="*.exe"/>
-            </fileset>
-        </copy>
-    </target>
-    <target name="clean">
-        <delete dir="${bin.dir}" failonerror="false" />
-        <delete dir="${obj.dir}" failonerror="false" />
-    </target>
-    <target name="doc" description="Creates documentation.">
-    </target>
-</project>
diff --git a/Common/OpenSim.Servers/UDPServerBase.cs b/Common/OpenSim.Servers/UDPServerBase.cs
deleted file mode 100644
index b472c97..0000000
--- a/Common/OpenSim.Servers/UDPServerBase.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Text;
-using System.IO;
-using System.Threading;
-using System.Net;
-using System.Net.Sockets;
-using System.Timers;
-using System.Reflection;
-using System.Collections;
-using System.Collections.Generic;
-using libsecondlife;
-using libsecondlife.Packets;
-namespace OpenSim.Servers
-{
-    public class UDPServerBase
-    {
-        public Socket Server;
-        protected IPEndPoint ServerIncoming;
-        protected byte[] RecvBuffer = new byte[4096];
-        protected byte[] ZeroBuffer = new byte[8192];
-        protected IPEndPoint ipeSender;
-        protected EndPoint epSender;
-        protected AsyncCallback ReceivedData;
-        protected int listenPort;
-        public UDPServerBase(int port)
-        {
-            listenPort = port;
-        }
-        protected virtual void OnReceivedData(IAsyncResult result)
-        {
-            ipeSender = new IPEndPoint(IPAddress.Any, 0);
-            epSender = (EndPoint)ipeSender;
-            Packet packet = null;
-            int numBytes = Server.EndReceiveFrom(result, ref epSender);
-            int packetEnd = numBytes - 1;
-            packet = Packet.BuildPacket(RecvBuffer, ref packetEnd, ZeroBuffer);
-            Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null);
-        }
-        protected virtual void AddNewClient(Packet packet)
-        {
-        }
-        public virtual void ServerListener()
-        {
-            ServerIncoming = new IPEndPoint(IPAddress.Any, listenPort);
-            Server = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
-            Server.Bind(ServerIncoming);
-            ipeSender = new IPEndPoint(IPAddress.Any, 0);
-            epSender = (EndPoint)ipeSender;
-            ReceivedData = new AsyncCallback(this.OnReceivedData);
-            Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null);
-        }
-        public virtual void SendPacketTo(byte[] buffer, int size, SocketFlags flags, uint circuitcode)
-        {
-        }
-    }
-}
diff --git a/Common/OpenSim.Servers/XmlRpcMethod.cs b/Common/OpenSim.Servers/XmlRpcMethod.cs
deleted file mode 100644
index 05cbf2e..0000000
--- a/Common/OpenSim.Servers/XmlRpcMethod.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using Nwc.XmlRpc;
-namespace OpenSim.Servers
-{
-    public delegate XmlRpcResponse XmlRpcMethod( XmlRpcRequest request );    
-}
diff --git a/Common/XmlRpcCS/Logger.cs b/Common/XmlRpcCS/Logger.cs
deleted file mode 100644
index ebf804b..0000000
--- a/Common/XmlRpcCS/Logger.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-namespace Nwc.XmlRpc
-{
-    using System;
-    /// <summary>Define levels of logging.</summary><remarks> This duplicates
-    /// similar enumerations in System.Diagnostics.EventLogEntryType. The 
-    /// duplication was merited because .NET Compact Framework lacked the EventLogEntryType enum.</remarks>
-    public enum LogLevel
-    {
-        /// <summary>Information level, log entry for informational reasons only.</summary>
-        Information,
-        /// <summary>Warning level, indicates a possible problem.</summary>
-        Warning,
-        /// <summary>Error level, implies a significant problem.</summary>
-        Error
-    }
-    ///<summary>
-    ///Logging singleton with swappable output delegate.
-    ///</summary>
-    ///<remarks>
-    ///This singleton provides a centralized log. The actual WriteEntry calls are passed
-    ///off to a delegate however. Having a delegate do the actual logginh allows you to
-    ///implement different logging mechanism and have them take effect throughout the system.
-    ///</remarks>
-    public class Logger
-    {
-        ///<summary>Delegate definition for logging.</summary>
-        ///<param name="message">The message <c>String</c> to log.</param>
-        ///<param name="level">The <c>LogLevel</c> of your message.</param>
-        public delegate void LoggerDelegate(String message, LogLevel level);
-        ///<summary>The LoggerDelegate that will recieve WriteEntry requests.</summary>
-        static public LoggerDelegate Delegate = null;
-        ///<summary>
-        ///Method logging events are sent to.
-        ///</summary>
-        ///<param name="message">The message <c>String</c> to log.</param>
-        ///<param name="level">The <c>LogLevel</c> of your message.</param>
-        static public void WriteEntry(String message, LogLevel level)
-        {
-            if (Delegate != null)
-                Delegate(message, level);
-        }
-    }
-}
diff --git a/Common/XmlRpcCS/SimpleHttpRequest.cs b/Common/XmlRpcCS/SimpleHttpRequest.cs
deleted file mode 100644
index e5326c3..0000000
--- a/Common/XmlRpcCS/SimpleHttpRequest.cs
+++ /dev/null
@@ -1,204 +0,0 @@
-namespace Nwc.XmlRpc
-{
-    using System;
-    using System.IO;
-    using System.Net.Sockets;
-    using System.Collections;
-    ///<summary>Very basic HTTP request handler.</summary>
-    ///<remarks>This class is designed to accept a TcpClient and treat it as an HTTP request.
-    /// It will do some basic header parsing and manage the input and output streams associated
-    /// with the request.</remarks>
-    public class SimpleHttpRequest
-    {
-        private String _httpMethod = null;
-        private String _protocol;
-        private String _filePathFile = null;
-        private String _filePathDir = null;
-        private String __filePath;
-        private TcpClient _client;
-        private StreamReader _input;
-        private StreamWriter _output;
-        private Hashtable _headers;
-        /// <summary>A constructor which accepts the TcpClient.</summary>
-        /// <remarks>It creates the associated input and output streams, determines the request type,
-        /// and parses the remaining HTTP header.</remarks>
-        /// <param name="client">The <c>TcpClient</c> associated with the HTTP connection.</param>
-        public SimpleHttpRequest(TcpClient client)
-        {
-            _client = client;
-            _output = new StreamWriter(client.GetStream());
-            _input = new StreamReader(client.GetStream());
-            GetRequestMethod();
-            GetRequestHeaders();
-        }
-        /// <summary>The output <c>StreamWriter</c> associated with the request.</summary>
-        public StreamWriter Output
-        {
-            get { return _output; }
-        }
-        /// <summary>The input <c>StreamReader</c> associated with the request.</summary>
-        public StreamReader Input
-        {
-            get { return _input; }
-        }
-        /// <summary>The <c>TcpClient</c> with the request.</summary>
-        public TcpClient Client
-        {
-            get { return _client; }
-        }
-        private String _filePath
-        {
-            get { return __filePath; }
-            set
-            {
-                __filePath = value;
-                _filePathDir = null;
-                _filePathFile = null;
-            }
-        }
-        /// <summary>The type of HTTP request (i.e. PUT, GET, etc.).</summary>
-        public String HttpMethod
-        {
-            get { return _httpMethod; }
-        }
-        /// <summary>The level of the HTTP protocol.</summary>
-        public String Protocol
-        {
-            get { return _protocol; }
-        }
-        /// <summary>The "path" which is part of any HTTP request.</summary>
-        public String FilePath
-        {
-            get { return _filePath; }
-        }
-        /// <summary>The file portion of the "path" which is part of any HTTP request.</summary>
-        public String FilePathFile
-        {
-            get
-            {
-                if (_filePathFile != null)
-                    return _filePathFile;
-                int i = FilePath.LastIndexOf("/");
-                if (i == -1)
-                    return "";
-                i++;
-                _filePathFile = FilePath.Substring(i, FilePath.Length - i);
-                return _filePathFile;
-            }
-        }
-        /// <summary>The directory portion of the "path" which is part of any HTTP request.</summary>
-        public String FilePathDir
-        {
-            get
-            {
-                if (_filePathDir != null)
-                    return _filePathDir;
-                int i = FilePath.LastIndexOf("/");
-                if (i == -1)
-                    return "";
-                i++;
-                _filePathDir = FilePath.Substring(0, i);
-                return _filePathDir;
-            }
-        }
-        private void GetRequestMethod()
-        {
-            string req = _input.ReadLine();
-            if (req == null)
-                throw new ApplicationException("Void request.");
-            if (0 == String.Compare("GET ", req.Substring(0, 4), true))
-                _httpMethod = "GET";
-            else if (0 == String.Compare("POST ", req.Substring(0, 5), true))
-                _httpMethod = "POST";
-            else
-                throw new InvalidOperationException("Unrecognized method in query: " + req);
-            req = req.TrimEnd();
-            int idx = req.IndexOf(' ') + 1;
-            if (idx >= req.Length)
-                throw new ApplicationException("What do you want?");
-            string page_protocol = req.Substring(idx);
-            int idx2 = page_protocol.IndexOf(' ');
-            if (idx2 == -1)
-                idx2 = page_protocol.Length;
-            _filePath = page_protocol.Substring(0, idx2).Trim();
-            _protocol = page_protocol.Substring(idx2).Trim();
-        }
-        private void GetRequestHeaders()
-        {
-            String line;
-            int idx;
-            _headers = new Hashtable();
-            while ((line = _input.ReadLine()) != "")
-            {
-                if (line == null)
-                {
-                    break;
-                }
-                idx = line.IndexOf(':');
-                if (idx == -1 || idx == line.Length - 1)
-                {
-                    Logger.WriteEntry("Malformed header line: " + line, LogLevel.Information);
-                    continue;
-                }
-                String key = line.Substring(0, idx);
-                String value = line.Substring(idx + 1);
-                try
-                {
-                    _headers.Add(key, value);
-                }
-                catch (Exception)
-                {
-                    Logger.WriteEntry("Duplicate header key in line: " + line, LogLevel.Information);
-                }
-            }
-        }
-        /// <summary>
-        /// Format the object contents into a useful string representation.
-        /// </summary>
-        ///<returns><c>String</c> representation of the <c>SimpleHttpRequest</c> as the <i>HttpMethod FilePath Protocol</i>.</returns>
-        override public String ToString()
-        {
-            return HttpMethod + " " + FilePath + " " + Protocol;
-        }
-        /// <summary>
-        /// Close the <c>SimpleHttpRequest</c>. This flushes and closes all associated io streams.
-        /// </summary>
-        public void Close()
-        {
-            _output.Flush();
-            _output.Close();
-            _input.Close();
-            _client.Close();
-        }
-    }
-}
diff --git a/Common/XmlRpcCS/XMLRPC.csproj b/Common/XmlRpcCS/XMLRPC.csproj
deleted file mode 100644
index 61f8be0..0000000
--- a/Common/XmlRpcCS/XMLRPC.csproj
+++ /dev/null
@@ -1,138 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{8E81D43C-0000-0000-0000-000000000000}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon></ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>XMLRPC</AssemblyName>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>XMLRPC</RootNamespace>
-    <StartupObject></StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <DocumentationFile></DocumentationFile>
-    <DebugSymbols>True</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <Optimize>False</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <RemoveIntegerChecks>False</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile></DocumentationFile>
-    <DebugSymbols>False</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <Optimize>True</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <RemoveIntegerChecks>False</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" >
-      <HintPath>System.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Xml" >
-      <HintPath>System.Xml.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Logger.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="SimpleHttpRequest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="XmlRpcBoxcarRequest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="XmlRpcClientProxy.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="XmlRpcDeserializer.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="XmlRpcErrorCodes.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="XmlRpcException.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="XmlRpcExposedAttribute.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="XmlRpcRequest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="XmlRpcRequestDeserializer.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="XmlRpcRequestSerializer.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="XmlRpcResponder.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="XmlRpcResponse.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="XmlRpcResponseDeserializer.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="XmlRpcResponseSerializer.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="XmlRpcSerializer.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="XmlRpcServer.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="XmlRpcSystemObject.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="XmlRpcXmlTokens.cs">
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
diff --git a/Common/XmlRpcCS/XMLRPC.dll.build b/Common/XmlRpcCS/XMLRPC.dll.build
deleted file mode 100644
index 2eabfcd..0000000
--- a/Common/XmlRpcCS/XMLRPC.dll.build
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" ?>
-<project name="XMLRPC" default="build">
-    <target name="build">
-        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
-        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
-        <copy todir="${project::get-base-directory()}/${build.dir}">
-            <fileset basedir="${project::get-base-directory()}">
-            </fileset>
-        </copy>
-        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
-            <resources prefix="XMLRPC" dynamicprefix="true" >
-            </resources>
-            <sources failonempty="true">
-                <include name="Logger.cs" />
-                <include name="SimpleHttpRequest.cs" />
-                <include name="XmlRpcBoxcarRequest.cs" />
-                <include name="XmlRpcClientProxy.cs" />
-                <include name="XmlRpcDeserializer.cs" />
-                <include name="XmlRpcErrorCodes.cs" />
-                <include name="XmlRpcException.cs" />
-                <include name="XmlRpcExposedAttribute.cs" />
-                <include name="XmlRpcRequest.cs" />
-                <include name="XmlRpcRequestDeserializer.cs" />
-                <include name="XmlRpcRequestSerializer.cs" />
-                <include name="XmlRpcResponder.cs" />
-                <include name="XmlRpcResponse.cs" />
-                <include name="XmlRpcResponseDeserializer.cs" />
-                <include name="XmlRpcResponseSerializer.cs" />
-                <include name="XmlRpcSerializer.cs" />
-                <include name="XmlRpcServer.cs" />
-                <include name="XmlRpcSystemObject.cs" />
-                <include name="XmlRpcXmlTokens.cs" />
-            </sources>
-            <references basedir="${project::get-base-directory()}">
-                <lib>
-                    <include name="${project::get-base-directory()}" />
-                    <include name="${project::get-base-directory()}/${build.dir}" />
-                </lib>
-                <include name="System.dll" />
-                <include name="System.Xml.dll" />
-            </references>
-        </csc>
-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
-        <mkdir dir="${project::get-base-directory()}/../../bin/"/>
-        <copy todir="${project::get-base-directory()}/../../bin/">
-            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
-                <include name="*.dll"/>
-                <include name="*.exe"/>
-            </fileset>
-        </copy>
-    </target>
-    <target name="clean">
-        <delete dir="${bin.dir}" failonerror="false" />
-        <delete dir="${obj.dir}" failonerror="false" />
-    </target>
-    <target name="doc" description="Creates documentation.">
-    </target>
-</project>
diff --git a/Common/XmlRpcCS/XmlRpcBoxcarRequest.cs b/Common/XmlRpcCS/XmlRpcBoxcarRequest.cs
deleted file mode 100644
index f87f7a5..0000000
--- a/Common/XmlRpcCS/XmlRpcBoxcarRequest.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-namespace Nwc.XmlRpc
-{
-  using System;
-  using System.Collections;
-  using System.IO;
-  using System.Xml;
-  using System.Net;
-  using System.Text;
-  using System.Reflection;
-  /// <summary>Class that collects individual <c>XmlRpcRequest</c> objects and submits them as a <i>boxcarred</i> request.</summary>
-  /// <remarks>A boxcared request is when a number of request are collected before being sent via XML-RPC, and then are sent via
-  /// a single HTTP connection. This results in a speed up from reduced connection time.  The results are then retuned collectively
-  /// as well.
-  ///</remarks>
-  /// <seealso cref="XmlRpcRequest"/>
-  public class XmlRpcBoxcarRequest : XmlRpcRequest
-  {
-    /// <summary>ArrayList to collect the requests to boxcar.</summary>
-    public IList Requests = new ArrayList();
-    /// <summary>Basic constructor.</summary>
-    public XmlRpcBoxcarRequest()
-      {
-      }
-    /// <summary>Returns the <c>String</c> "system.multiCall" which is the server method that handles boxcars.</summary>
-    public override String MethodName
-      {
-        get { return  "system.multiCall";  }
-      }
-    /// <summary>The <c>ArrayList</c> of boxcarred <paramref>Requests</paramref> as properly formed parameters.</summary>
-    public override IList Params
-      {
-        get {
-          _params.Clear();
-          ArrayList reqArray = new ArrayList();
-          foreach (XmlRpcRequest request in Requests)
-            {
-              Hashtable requestEntry = new Hashtable();
-              requestEntry.Add(XmlRpcXmlTokens.METHOD_NAME, request.MethodName);
-              requestEntry.Add(XmlRpcXmlTokens.PARAMS, request.Params);
-              reqArray.Add(requestEntry);
-            }
-          _params.Add(reqArray);
-          return _params;
-        }
-      }
-  }
-}
diff --git a/Common/XmlRpcCS/XmlRpcClientProxy.cs b/Common/XmlRpcCS/XmlRpcClientProxy.cs
deleted file mode 100644
index f52273a..0000000
--- a/Common/XmlRpcCS/XmlRpcClientProxy.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-namespace Nwc.XmlRpc
-{
-  using System;
-  using System.Runtime.Remoting.Proxies;
-  using System.Runtime.Remoting.Messaging;
-  /// <summary>This class provides support for creating local proxies of XML-RPC remote objects</summary>
-  /// <remarks>
-  /// To create a local proxy you need to create a local C# interface and then, via <i>createProxy</i>
-  /// associate that interface with a remote object at a given URL.
-  /// </remarks>
-public class XmlRpcClientProxy : RealProxy
-{
-  private String _remoteObjectName;
-  private String _url;
-  private XmlRpcRequest _client = new XmlRpcRequest();
-  /// <summary>Factory method to create proxies.</summary>
-  /// <remarks>
-  /// To create a local proxy you need to create a local C# interface with methods that mirror those of the server object.
-  /// Next, pass that interface into <c>createProxy</c> along with the object name and URL of the remote object and 
-  /// cast the resulting object to the specifice interface.
-  /// </remarks>
-  /// <param name="remoteObjectName"><c>String</c> The name of the remote object.</param>
-  /// <param name="url"><c>String</c> The URL of the remote object.</param>
-  /// <param name="anInterface"><c>Type</c> The typeof() of a C# interface.</param>
-  /// <returns><c>Object</c> A proxy for your specified interface. Cast to appropriate type.</returns>
-  public static Object createProxy(String remoteObjectName, String url, Type anInterface)
-    {
-      return new XmlRpcClientProxy(remoteObjectName, url, anInterface).GetTransparentProxy();
-    }
-  private XmlRpcClientProxy(String remoteObjectName, String url, Type t) : base(t)
-    {
-      _remoteObjectName = remoteObjectName;
-      _url = url;
-    }
-  /// <summary>The local method dispatcher - do not invoke.</summary>
-  override public IMessage Invoke(IMessage msg)
-    {
-      IMethodCallMessage methodMessage = (IMethodCallMessage)msg;
-      _client.MethodName = _remoteObjectName + "." + methodMessage.MethodName;
-      _client.Params.Clear();
-      foreach (Object o in methodMessage.Args)
-        _client.Params.Add(o);
-      try
-        {
-          Object ret = _client.Invoke(_url);
-          return new ReturnMessage(ret,null,0,
-                                   methodMessage.LogicalCallContext, methodMessage);
-        }
-      catch (Exception e)
-        {
-          return new ReturnMessage(e, methodMessage);
-        }
-    }
-}
-}
diff --git a/Common/XmlRpcCS/XmlRpcDeserializer.cs b/Common/XmlRpcCS/XmlRpcDeserializer.cs
deleted file mode 100644
index bd736c0..0000000
--- a/Common/XmlRpcCS/XmlRpcDeserializer.cs
+++ /dev/null
@@ -1,195 +0,0 @@
-namespace Nwc.XmlRpc
-{
-    using System;
-    using System.Collections;
-    using System.IO;
-    using System.Xml;
-    using System.Globalization;
-    /// <summary>Parser context, we maintain contexts in a stack to avoiding recursion. </summary>
-    struct Context
-    {
-        public String Name;
-        public Object Container;
-    }
-    /// <summary>Basic XML-RPC data deserializer.</summary>
-    /// <remarks>Uses <c>XmlTextReader</c> to parse the XML data. This level of the class 
-    /// only handles the tokens common to both Requests and Responses. This class is not useful in and of itself
-    /// but is designed to be subclassed.</remarks>
-    public class XmlRpcDeserializer : XmlRpcXmlTokens
-    {
-        private static DateTimeFormatInfo _dateFormat = new DateTimeFormatInfo();
-        private Object _container;
-        private Stack _containerStack;
-        /// <summary>Protected reference to last text.</summary>
-        protected String _text;
-        /// <summary>Protected reference to last deserialized value.</summary>
-        protected Object _value;
-        /// <summary>Protected reference to last name field.</summary>
-        protected String _name;
-        /// <summary>Basic constructor.</summary>
-        public XmlRpcDeserializer()
-        {
-            Reset();
-            _dateFormat.FullDateTimePattern = ISO_DATETIME;
-        }
-        /// <summary>Static method that parses XML data into a response using the Singleton.</summary>
-        /// <param name="xmlData"><c>StreamReader</c> containing an XML-RPC response.</param>
-        /// <returns><c>Object</c> object resulting from the deserialization.</returns>
-        virtual public Object Deserialize(TextReader xmlData)
-        {
-            return null;
-        }
-        /// <summary>Protected method to parse a node in an XML-RPC XML stream.</summary>
-        /// <remarks>Method deals with elements common to all XML-RPC data, subclasses of 
-        /// this object deal with request/response spefic elements.</remarks>
-        /// <param name="reader"><c>XmlTextReader</c> of the in progress parsing data stream.</param>
-        protected void DeserializeNode(XmlTextReader reader)
-        {
-            switch (reader.NodeType)
-            {
-                case XmlNodeType.Element:
-                    if (Logger.Delegate != null)
-                        Logger.WriteEntry("START " + reader.Name, LogLevel.Information);
-                    switch (reader.Name)
-                    {
-                        case VALUE:
-                            _value = null;
-                            _text = null;
-                            break;
-                        case STRUCT:
-                            PushContext();
-                            _container = new Hashtable();
-                            break;
-                        case ARRAY:
-                            PushContext();
-                            _container = new ArrayList();
-                            break;
-                    }
-                    break;
-                case XmlNodeType.EndElement:
-                    if (Logger.Delegate != null)
-                        Logger.WriteEntry("END " + reader.Name, LogLevel.Information);
-                    switch (reader.Name)
-                    {
-                        case BASE64:
-                            _value = Convert.FromBase64String(_text);
-                            break;
-                        case BOOLEAN:
-                            int val = Int16.Parse(_text);
-                            if (val == 0)
-                                _value = false;
-                            else if (val == 1)
-                                _value = true;
-                            break;
-                        case STRING:
-                            _value = _text;
-                            break;
-                        case DOUBLE:
-                            _value = Double.Parse(_text);
-                            break;
-                        case INT:
-                        case ALT_INT:
-                            _value = Int32.Parse(_text);
-                            break;
-                        case DATETIME:
-#if __MONO__
-                    _value = DateParse(_text);
-#else
-                            _value = DateTime.ParseExact(_text, "F", _dateFormat);
-#endif
-                            break;
-                        case NAME:
-                            _name = _text;
-                            break;
-                        case VALUE:
-                            if (_value == null)
-                                _value = _text; // some kits don't use <string> tag, they just do <value>
-                            if ((_container != null) && (_container is IList)) // in an array?  If so add value to it.
-                                ((IList)_container).Add(_value);
-                            break;
-                        case MEMBER:
-                            if ((_container != null) && (_container is IDictionary)) // in an struct?  If so add value to it.
-                                ((IDictionary)_container).Add(_name, _value);
-                            break;
-                        case ARRAY:
-                        case STRUCT:
-                            _value = _container;
-                            PopContext();
-                            break;
-                    }
-                    break;
-                case XmlNodeType.Text:
-                    if (Logger.Delegate != null)
-                        Logger.WriteEntry("Text " + reader.Value, LogLevel.Information);
-                    _text = reader.Value;
-                    break;
-                default:
-                    break;
-            }
-        }
-        /// <summary>Static method that parses XML in a <c>String</c> into a 
-        /// request using the Singleton.</summary>
-        /// <param name="xmlData"><c>String</c> containing an XML-RPC request.</param>
-        /// <returns><c>XmlRpcRequest</c> object resulting from the parse.</returns>
-        public Object Deserialize(String xmlData)
-        {
-            StringReader sr = new StringReader(xmlData);
-            return Deserialize(sr);
-        }
-        /// <summary>Pop a Context of the stack, an Array or Struct has closed.</summary>
-        private void PopContext()
-        {
-            Context c = (Context)_containerStack.Pop();
-            _container = c.Container;
-            _name = c.Name;
-        }
-        /// <summary>Push a Context on the stack, an Array or Struct has opened.</summary>
-        private void PushContext()
-        {
-            Context context;
-            context.Container = _container;
-            context.Name = _name;
-            _containerStack.Push(context);
-        }
-        /// <summary>Reset the internal state of the deserializer.</summary>
-        protected void Reset()
-        {
-            _text = null;
-            _value = null;
-            _name = null;
-            _container = null;
-            _containerStack = new Stack();
-        }
-#if __MONO__
-    private DateTime DateParse(String str)
-      {
-        int year = Int32.Parse(str.Substring(0,4));
-        int month = Int32.Parse(str.Substring(4,2));
-        int day = Int32.Parse(str.Substring(6,2));
-        int hour = Int32.Parse(str.Substring(9,2));
-        int min = Int32.Parse(str.Substring(12,2));
-        int sec = Int32.Parse(str.Substring(15,2));
-        return new DateTime(year,month,day,hour,min,sec);
-      }
-#endif
-    }
-}
diff --git a/Common/XmlRpcCS/XmlRpcErrorCodes.cs b/Common/XmlRpcCS/XmlRpcErrorCodes.cs
deleted file mode 100644
index 6dec57d..0000000
--- a/Common/XmlRpcCS/XmlRpcErrorCodes.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-namespace Nwc.XmlRpc
-{
-    using System;
-    /// <summary>Standard XML-RPC error codes.</summary>
-    public class XmlRpcErrorCodes
-    {
-        /// <summary></summary>
-        public const int PARSE_ERROR_MALFORMED = -32700;
-        /// <summary></summary>
-        public const String PARSE_ERROR_MALFORMED_MSG = "Parse Error, not well formed";
-        /// <summary></summary>
-        public const int PARSE_ERROR_ENCODING = -32701;
-        /// <summary></summary>
-        public const String PARSE_ERROR_ENCODING_MSG = "Parse Error, unsupported encoding";
-        //
-        // -32702 ---> parse error. invalid character for encoding
-        // -32600 ---> server error. invalid xml-rpc. not conforming to spec.
-        //
-        /// <summary></summary>
-        public const int SERVER_ERROR_METHOD = -32601;
-        /// <summary></summary>
-        public const String SERVER_ERROR_METHOD_MSG = "Server Error, requested method not found";
-        /// <summary></summary>
-        public const int SERVER_ERROR_PARAMS = -32602;
-        /// <summary></summary>
-        public const String SERVER_ERROR_PARAMS_MSG = "Server Error, invalid method parameters";
-        //
-        // -32603 ---> server error. internal xml-rpc error
-        //
-        /// <summary></summary>
-        public const int APPLICATION_ERROR = -32500;
-        /// <summary></summary>
-        public const String APPLICATION_ERROR_MSG = "Application Error";
-        //
-        // -32400 ---> system error
-        //
-        /// <summary></summary>
-        public const int TRANSPORT_ERROR = -32300;
-        /// <summary></summary>
-        public const String TRANSPORT_ERROR_MSG = "Transport Layer Error";
-    }
-}
diff --git a/Common/XmlRpcCS/XmlRpcException.cs b/Common/XmlRpcCS/XmlRpcException.cs
deleted file mode 100644
index fd1f4ae..0000000
--- a/Common/XmlRpcCS/XmlRpcException.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-namespace Nwc.XmlRpc
-{
-    using System;
-    /// <summary>An XML-RPC Exception.</summary>
-    /// <remarks>Maps a C# exception to an XML-RPC fault. Normal exceptions
-    /// include a message so this adds the code needed by XML-RPC.</remarks>
-    public class XmlRpcException : Exception
-    {
-        private int _code;
-        /// <summary>Instantiate an <c>XmlRpcException</c> with a code and message.</summary>
-        /// <param name="code"><c>Int</c> faultCode associated with this exception.</param>
-        /// <param name="message"><c>String</c> faultMessage associated with this exception.</param>
-        public XmlRpcException(int code, String message)
-            : base(message)
-        {
-            _code = code;
-        }
-        /// <summary>The value of the faults message, i.e. the faultString.</summary>
-        public String FaultString
-        {
-            get { return Message; }
-        }
-        /// <summary>The value of the faults code, i.e. the faultCode.</summary>
-        public int FaultCode
-        {
-            get { return _code; }
-        }
-        /// <summary>Format the message to include the code.</summary>
-        override public String ToString()
-        {
-            return "Code: " + FaultCode + " Message: " + base.ToString();
-        }
-    }
-}
diff --git a/Common/XmlRpcCS/XmlRpcExposedAttribute.cs b/Common/XmlRpcCS/XmlRpcExposedAttribute.cs
deleted file mode 100644
index 67b27ae..0000000
--- a/Common/XmlRpcCS/XmlRpcExposedAttribute.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-namespace Nwc.XmlRpc
-{
-    using System;
-    using System.Reflection;
-    /// <summary>
-    /// Simple tagging attribute to indicate participation is XML-RPC exposure.
-    /// </summary>
-    /// <remarks>
-    /// If present at the class level it indicates that this class does explicitly 
-    /// expose methods. If present at the method level it denotes that the method
-    /// is exposed.
-    /// </remarks>
-    [AttributeUsage(
-          AttributeTargets.Class | AttributeTargets.Method,
-          AllowMultiple = false,
-          Inherited = true
-      )]
-    public class XmlRpcExposedAttribute : Attribute
-    {
-        /// <summary>Check if <paramref>obj</paramref> is an object utilizing the XML-RPC exposed Attribute.</summary>
-        /// <param name="obj"><c>Object</c> of a class or method to check for attribute.</param>
-        /// <returns><c>Boolean</c> true if attribute present.</returns>
-        public static Boolean ExposedObject(Object obj)
-        {
-            return IsExposed(obj.GetType());
-        }
-        /// <summary>Check if <paramref>obj</paramref>.<paramref>methodName</paramref> is an XML-RPC exposed method.</summary>
-        /// <remarks>A method is considered to be exposed if it exists and, either, the object does not use the XmlRpcExposed attribute,
-        /// or the object does use the XmlRpcExposed attribute and the method has the XmlRpcExposed attribute as well.</remarks>
-        /// <returns><c>Boolean</c> true if the  method is exposed.</returns>
-        public static Boolean ExposedMethod(Object obj, String methodName)
-        {
-            Type type = obj.GetType();
-            MethodInfo method = type.GetMethod(methodName);
-            if (method == null)
-                throw new MissingMethodException("Method " + methodName + " not found.");
-            if (!IsExposed(type))
-                return true;
-            return IsExposed(method);
-        }
-        /// <summary>Check if <paramref>mi</paramref> is XML-RPC exposed.</summary>
-        /// <param name="mi"><c>MemberInfo</c> of a class or method to check for attribute.</param>
-        /// <returns><c>Boolean</c> true if attribute present.</returns>
-        public static Boolean IsExposed(MemberInfo mi)
-        {
-            foreach (Attribute attr in mi.GetCustomAttributes(true))
-            {
-                if (attr is XmlRpcExposedAttribute)
-                    return true;
-            }
-            return false;
-        }
-    }
-}
diff --git a/Common/XmlRpcCS/XmlRpcRequest.cs b/Common/XmlRpcCS/XmlRpcRequest.cs
deleted file mode 100644
index 18d2182..0000000
--- a/Common/XmlRpcCS/XmlRpcRequest.cs
+++ /dev/null
@@ -1,150 +0,0 @@
-namespace Nwc.XmlRpc
-{
-    using System;
-    using System.Collections;
-    using System.IO;
-    using System.Xml;
-    using System.Net;
-    using System.Text;
-    using System.Reflection;
-    using System.Net.Security;
-    using System.Security.Cryptography.X509Certificates;
-    internal class AcceptAllCertificatePolicy : ICertificatePolicy
-    {
-        public AcceptAllCertificatePolicy()
-        {
-        }
-        public bool CheckValidationResult(ServicePoint sPoint,
-            System.Security.Cryptography.X509Certificates.X509Certificate cert,
-            WebRequest wRequest, int certProb)
-        {
-            // Always accept
-            return true;
-        }
-    }
-    /// <summary>Class supporting the request side of an XML-RPC transaction.</summary>
-    public class XmlRpcRequest
-    {
-        private String _methodName = null;
-        private Encoding _encoding = new ASCIIEncoding();
-        private XmlRpcRequestSerializer _serializer = new XmlRpcRequestSerializer();
-        private XmlRpcResponseDeserializer _deserializer = new XmlRpcResponseDeserializer();
-        /// <summary><c>ArrayList</c> containing the parameters.</summary>
-        protected IList _params = null;
-        /// <summary>Instantiate an <c>XmlRpcRequest</c></summary>
-        public XmlRpcRequest()
-        {
-            _params = new ArrayList();
-        }
-        /// <summary>Instantiate an <c>XmlRpcRequest</c> for a specified method and parameters.</summary>
-        /// <param name="methodName"><c>String</c> designating the <i>object.method</i> on the server the request
-        /// should be directed to.</param>
-        /// <param name="parameters"><c>ArrayList</c> of XML-RPC type parameters to invoke the request with.</param>
-        public XmlRpcRequest(String methodName, IList parameters)
-        {
-            MethodName = methodName;
-            _params = parameters;
-        }
-        /// <summary><c>ArrayList</c> conntaining the parameters for the request.</summary>
-        public virtual IList Params
-        {
-            get { return _params; }
-        }
-        /// <summary><c>String</c> conntaining the method name, both object and method, that the request will be sent to.</summary>
-        public virtual String MethodName
-        {
-            get { return _methodName; }
-            set { _methodName = value; }
-        }
-        /// <summary><c>String</c> object name portion of the method name.</summary>
-        public String MethodNameObject
-        {
-            get
-            {
-                int index = MethodName.IndexOf(".");
-                if (index == -1)
-                    return MethodName;
-                return MethodName.Substring(0, index);
-            }
-        }
-        /// <summary><c>String</c> method name portion of the object.method name.</summary>
-        public String MethodNameMethod
-        {
-            get
-            {
-                int index = MethodName.IndexOf(".");
-                if (index == -1)
-                    return MethodName;
-                return MethodName.Substring(index + 1, MethodName.Length - index - 1);
-            }
-        }
-        /// <summary>Invoke this request on the server.</summary>
-        /// <param name="url"><c>String</c> The url of the XML-RPC server.</param>
-        /// <returns><c>Object</c> The value returned from the method invocation on the server.</returns>
-        /// <exception cref="XmlRpcException">If an exception generated on the server side.</exception>
-        public Object Invoke(String url)
-        {
-            XmlRpcResponse res = Send(url, 10000);
-            if (res.IsFault)
-                throw new XmlRpcException(res.FaultCode, res.FaultString);
-            return res.Value;
-        }
-        /// <summary>Send the request to the server.</summary>
-        /// <param name="url"><c>String</c> The url of the XML-RPC server.</param>
-        /// <param name="timeout">Milliseconds before the connection times out.</param>
-        /// <returns><c>XmlRpcResponse</c> The response generated.</returns>
-        public XmlRpcResponse Send(String url, int timeout)
-        {
-            // Override SSL authentication mechanisms
-            ServicePointManager.CertificatePolicy = new AcceptAllCertificatePolicy();
-            HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url);
-            if (request == null)
-                throw new XmlRpcException(XmlRpcErrorCodes.TRANSPORT_ERROR,
-                              XmlRpcErrorCodes.TRANSPORT_ERROR_MSG + ": Could not create request with " + url);
-            request.Method = "POST";
-            request.ContentType = "text/xml";
-            request.AllowWriteStreamBuffering = true;
-            request.Timeout = timeout;
-            Stream stream = request.GetRequestStream();
-            XmlTextWriter xml = new XmlTextWriter(stream, _encoding);
-            _serializer.Serialize(xml, this);
-            xml.Flush();
-            xml.Close();
-            HttpWebResponse response = (HttpWebResponse)request.GetResponse();
-            StreamReader input = new StreamReader(response.GetResponseStream());
-            XmlRpcResponse resp = (XmlRpcResponse)_deserializer.Deserialize(input);
-            input.Close();
-            response.Close();
-            return resp;
-        }
-        /// <summary>Produce <c>String</c> representation of the object.</summary>
-        /// <returns><c>String</c> representation of the object.</returns>
-        override public String ToString()
-        {
-            return _serializer.Serialize(this);
-        }
-    }
-}
diff --git a/Common/XmlRpcCS/XmlRpcRequestDeserializer.cs b/Common/XmlRpcCS/XmlRpcRequestDeserializer.cs
deleted file mode 100644
index 0770b7e..0000000
--- a/Common/XmlRpcCS/XmlRpcRequestDeserializer.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-namespace Nwc.XmlRpc
-{
-    using System;
-    using System.Collections;
-    using System.Diagnostics;
-    using System.IO;
-    using System.Xml;
-    /// <summary>Class to deserialize XML data representing a request.</summary>
-    public class XmlRpcRequestDeserializer : XmlRpcDeserializer
-    {
-        static private XmlRpcRequestDeserializer _singleton;
-        /// <summary>A static singleton instance of this deserializer.</summary>
-        [Obsolete("This object is now thread safe, just use an instance.", false)]
-        static public XmlRpcRequestDeserializer Singleton
-        {
-            get
-            {
-                if (_singleton == null)
-                    _singleton = new XmlRpcRequestDeserializer();
-                return _singleton;
-            }
-        }
-        /// <summary>Static method that parses XML data into a request using the Singleton.</summary>
-        /// <param name="xmlData"><c>StreamReader</c> containing an XML-RPC request.</param>
-        /// <returns><c>XmlRpcRequest</c> object resulting from the parse.</returns>
-        override public Object Deserialize(TextReader xmlData)
-        {
-            XmlTextReader reader = new XmlTextReader(xmlData);
-            XmlRpcRequest request = new XmlRpcRequest();
-            bool done = false;
-            lock (this)
-            {
-                Reset();
-                while (!done && reader.Read())
-                {
-                    DeserializeNode(reader); // Parent parse...
-                    switch (reader.NodeType)
-                    {
-                        case XmlNodeType.EndElement:
-                            switch (reader.Name)
-                            {
-                                case METHOD_NAME:
-                                    request.MethodName = _text;
-                                    break;
-                                case METHOD_CALL:
-                                    done = true;
-                                    break;
-                                case PARAM:
-                                    request.Params.Add(_value);
-                                    _text = null;
-                                    break;
-                            }
-                            break;
-                    }
-                }
-            }
-            return request;
-        }
-    }
-}
diff --git a/Common/XmlRpcCS/XmlRpcRequestSerializer.cs b/Common/XmlRpcCS/XmlRpcRequestSerializer.cs
deleted file mode 100644
index 8099bdb..0000000
--- a/Common/XmlRpcCS/XmlRpcRequestSerializer.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-namespace Nwc.XmlRpc
-{
-    using System;
-    using System.Collections;
-    using System.Xml;
-    using System.IO;
-    /// <summary>Class responsible for serializing an XML-RPC request.</summary>
-    /// <remarks>This class handles the request envelope, depending on <c>XmlRpcSerializer</c>
-    /// to serialize the payload.</remarks>
-    /// <seealso cref="XmlRpcSerializer"/>
-    public class XmlRpcRequestSerializer : XmlRpcSerializer
-    {
-        static private XmlRpcRequestSerializer _singleton;
-        /// <summary>A static singleton instance of this deserializer.</summary>
-        static public XmlRpcRequestSerializer Singleton
-        {
-            get
-            {
-                if (_singleton == null)
-                    _singleton = new XmlRpcRequestSerializer();
-                return _singleton;
-            }
-        }
-        /// <summary>Serialize the <c>XmlRpcRequest</c> to the output stream.</summary>
-        /// <param name="output">An <c>XmlTextWriter</c> stream to write data to.</param>
-        /// <param name="obj">An <c>XmlRpcRequest</c> to serialize.</param>
-        /// <seealso cref="XmlRpcRequest"/>
-        override public void Serialize(XmlTextWriter output, Object obj)
-        {
-            XmlRpcRequest request = (XmlRpcRequest)obj;
-            output.WriteStartDocument();
-            output.WriteStartElement(METHOD_CALL);
-            output.WriteElementString(METHOD_NAME, request.MethodName);
-            output.WriteStartElement(PARAMS);
-            foreach (Object param in request.Params)
-            {
-                output.WriteStartElement(PARAM);
-                output.WriteStartElement(VALUE);
-                SerializeObject(output, param);
-                output.WriteEndElement();
-                output.WriteEndElement();
-            }
-            output.WriteEndElement();
-            output.WriteEndElement();
-        }
-    }
-}
diff --git a/Common/XmlRpcCS/XmlRpcResponder.cs b/Common/XmlRpcCS/XmlRpcResponder.cs
deleted file mode 100644
index 0412568..0000000
--- a/Common/XmlRpcCS/XmlRpcResponder.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-namespace Nwc.XmlRpc
-{
-    using System;
-    using System.Xml;
-    using System.Net.Sockets;
-    /// <summary>The class is a container of the context of an XML-RPC dialog on the server side.</summary>
-    /// <remarks>Instances of this class maintain the context for an individual XML-RPC server
-    /// side dialog. Namely they manage an inbound deserializer and an outbound serializer. </remarks>
-    public class XmlRpcResponder
-    {
-        private XmlRpcRequestDeserializer _deserializer = new XmlRpcRequestDeserializer();
-        private XmlRpcResponseSerializer _serializer = new XmlRpcResponseSerializer();
-        private XmlRpcServer _server;
-        private TcpClient _client;
-        private SimpleHttpRequest _httpReq;
-        /// <summary>The SimpleHttpRequest based on the TcpClient.</summary>
-        public SimpleHttpRequest HttpReq
-        {
-            get { return _httpReq; }
-        }
-        /// <summary>Basic constructor.</summary>
-        /// <param name="server">XmlRpcServer that this XmlRpcResponder services.</param>
-        /// <param name="client">TcpClient with the connection.</param>
-        public XmlRpcResponder(XmlRpcServer server, TcpClient client)
-        {
-            _server = server;
-            _client = client;
-            _httpReq = new SimpleHttpRequest(_client);
-        }
-        /// <summary>Call close to insure proper shutdown.</summary>
-        ~XmlRpcResponder()
-        {
-            Close();
-        }
-        ///<summary>Respond using this responders HttpReq.</summary>
-        public void Respond()
-        {
-            Respond(HttpReq);
-        }
-        /// <summary>Handle an HTTP request containing an XML-RPC request.</summary>
-        /// <remarks>This method deserializes the XML-RPC request, invokes the 
-        /// described method, serializes the response (or fault) and sends the XML-RPC response
-        /// back as a valid HTTP page.
-        /// </remarks>
-        /// <param name="httpReq"><c>SimpleHttpRequest</c> containing the request.</param>
-        public void Respond(SimpleHttpRequest httpReq)
-        {
-            XmlRpcRequest xmlRpcReq = (XmlRpcRequest)_deserializer.Deserialize(httpReq.Input);
-            XmlRpcResponse xmlRpcResp = new XmlRpcResponse();
-            try
-            {
-                xmlRpcResp.Value = _server.Invoke(xmlRpcReq);
-            }
-            catch (XmlRpcException e)
-            {
-                xmlRpcResp.SetFault(e.FaultCode, e.FaultString);
-            }
-            catch (Exception e2)
-            {
-                xmlRpcResp.SetFault(XmlRpcErrorCodes.APPLICATION_ERROR,
-                      XmlRpcErrorCodes.APPLICATION_ERROR_MSG + ": " + e2.Message);
-            }
-            if (Logger.Delegate != null)
-                Logger.WriteEntry(xmlRpcResp.ToString(), LogLevel.Information);
-            XmlRpcServer.HttpHeader(httpReq.Protocol, "text/xml", 0, " 200 OK", httpReq.Output);
-            httpReq.Output.Flush();
-            XmlTextWriter xml = new XmlTextWriter(httpReq.Output);
-            _serializer.Serialize(xml, xmlRpcResp);
-            xml.Flush();
-            httpReq.Output.Flush();
-        }
-        ///<summary>Close all contained resources, both the HttpReq and client.</summary>
-        public void Close()
-        {
-            if (_httpReq != null)
-            {
-                _httpReq.Close();
-                _httpReq = null;
-            }
-            if (_client != null)
-            {
-                _client.Close();
-                _client = null;
-            }
-        }
-    }
-}
diff --git a/Common/XmlRpcCS/XmlRpcResponse.cs b/Common/XmlRpcCS/XmlRpcResponse.cs
deleted file mode 100644
index 8ff8354..0000000
--- a/Common/XmlRpcCS/XmlRpcResponse.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-namespace Nwc.XmlRpc
-{
-    using System;
-    using System.Collections;
-    using System.IO;
-    using System.Xml;
-    /// <summary>Class designed to represent an XML-RPC response.</summary>
-    public class XmlRpcResponse
-    {
-        private Object _value;
-        /// <summary><c>bool</c> indicating if this response represents a fault.</summary>
-        public bool IsFault;
-        /// <summary>Basic constructor</summary>
-        public XmlRpcResponse()
-        {
-            Value = null;
-            IsFault = false;
-        }
-        /// <summary>Constructor for a fault.</summary>
-        /// <param name="code"><c>int</c> the numeric faultCode value.</param>
-        /// <param name="message"><c>String</c> the faultString value.</param>
-        public XmlRpcResponse(int code, String message)
-            : this()
-        {
-            SetFault(code, message);
-        }
-        /// <summary>The data value of the response, may be fault data.</summary>
-        public Object Value
-        {
-            get { return _value; }
-            set
-            {
-                IsFault = false;
-                _value = value;
-            }
-        }
-        /// <summary>The faultCode if this is a fault.</summary>
-        public int FaultCode
-        {
-            get
-            {
-                if (!IsFault)
-                    return 0;
-                else
-                    return (int)((Hashtable)_value)[XmlRpcXmlTokens.FAULT_CODE];
-            }
-        }
-        /// <summary>The faultString if this is a fault.</summary>
-        public String FaultString
-        {
-            get
-            {
-                if (!IsFault)
-                    return "";
-                else
-                    return (String)((Hashtable)_value)[XmlRpcXmlTokens.FAULT_STRING];
-            }
-        }
-        /// <summary>Set this response to be a fault.</summary>
-        /// <param name="code"><c>int</c> the numeric faultCode value.</param>
-        /// <param name="message"><c>String</c> the faultString value.</param>
-        public void SetFault(int code, String message)
-        {
-            Hashtable fault = new Hashtable();
-            fault.Add("faultCode", code);
-            fault.Add("faultString", message);
-            Value = fault;
-            IsFault = true;
-        }
-        /// <summary>Form a useful string representation of the object, in this case the XML response.</summary>
-        /// <returns><c>String</c> The XML serialized XML-RPC response.</returns>
-        override public String ToString()
-        {
-            return XmlRpcResponseSerializer.Singleton.Serialize(this);
-        }
-    }
-}
diff --git a/Common/XmlRpcCS/XmlRpcResponseDeserializer.cs b/Common/XmlRpcCS/XmlRpcResponseDeserializer.cs
deleted file mode 100644
index 032d8a3..0000000
--- a/Common/XmlRpcCS/XmlRpcResponseDeserializer.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-namespace Nwc.XmlRpc
-{
-    using System;
-    using System.Collections;
-    using System.IO;
-    using System.Xml;
-    /// <summary>Class to deserialize XML data representing a response.</summary>
-    public class XmlRpcResponseDeserializer : XmlRpcDeserializer
-    {
-        static private XmlRpcResponseDeserializer _singleton;
-        /// <summary>A static singleton instance of this deserializer.</summary>
-        [Obsolete("This object is now thread safe, just use an instance.", false)]
-        static public XmlRpcResponseDeserializer Singleton
-        {
-            get
-            {
-                if (_singleton == null)
-                    _singleton = new XmlRpcResponseDeserializer();
-                return _singleton;
-            }
-        }
-        /// <summary>Static method that parses XML data into a response using the Singleton.</summary>
-        /// <param name="xmlData"><c>StreamReader</c> containing an XML-RPC response.</param>
-        /// <returns><c>XmlRpcResponse</c> object resulting from the parse.</returns>
-        override public Object Deserialize(TextReader xmlData)
-        {
-            XmlTextReader reader = new XmlTextReader(xmlData);
-            XmlRpcResponse response = new XmlRpcResponse();
-            bool done = false;
-            lock (this)
-            {
-                Reset();
-                while (!done && reader.Read())
-                {
-                    DeserializeNode(reader); // Parent parse...
-                    switch (reader.NodeType)
-                    {
-                        case XmlNodeType.EndElement:
-                            switch (reader.Name)
-                            {
-                                case FAULT:
-                                    response.Value = _value;
-                                    response.IsFault = true;
-                                    break;
-                                case PARAM:
-                                    response.Value = _value;
-                                    _value = null;
-                                    _text = null;
-                                    break;
-                            }
-                            break;
-                        default:
-                            break;
-                    }
-                }
-            }
-            return response;
-        }
-    }
-}
diff --git a/Common/XmlRpcCS/XmlRpcResponseSerializer.cs b/Common/XmlRpcCS/XmlRpcResponseSerializer.cs
deleted file mode 100644
index 72ca568..0000000
--- a/Common/XmlRpcCS/XmlRpcResponseSerializer.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-namespace Nwc.XmlRpc
-{
-    using System;
-    using System.Collections;
-    using System.Xml;
-    /// <summary>Class responsible for serializing an XML-RPC response.</summary>
-    /// <remarks>This class handles the response envelope, depending on XmlRpcSerializer
-    /// to serialize the payload.</remarks>
-    /// <seealso cref="XmlRpcSerializer"/>
-    public class XmlRpcResponseSerializer : XmlRpcSerializer
-    {
-        static private XmlRpcResponseSerializer _singleton;
-        /// <summary>A static singleton instance of this deserializer.</summary>
-        static public XmlRpcResponseSerializer Singleton
-        {
-            get
-            {
-                if (_singleton == null)
-                    _singleton = new XmlRpcResponseSerializer();
-                return _singleton;
-            }
-        }
-        /// <summary>Serialize the <c>XmlRpcResponse</c> to the output stream.</summary>
-        /// <param name="output">An <c>XmlTextWriter</c> stream to write data to.</param>
-        /// <param name="obj">An <c>Object</c> to serialize.</param>
-        /// <seealso cref="XmlRpcResponse"/>
-        override public void Serialize(XmlTextWriter output, Object obj)
-        {
-            XmlRpcResponse response = (XmlRpcResponse)obj;
-            output.WriteStartDocument();
-            output.WriteStartElement(METHOD_RESPONSE);
-            if (response.IsFault)
-                output.WriteStartElement(FAULT);
-            else
-            {
-                output.WriteStartElement(PARAMS);
-                output.WriteStartElement(PARAM);
-            }
-            output.WriteStartElement(VALUE);
-            SerializeObject(output, response.Value);
-            output.WriteEndElement();
-            output.WriteEndElement();
-            if (!response.IsFault)
-                output.WriteEndElement();
-            output.WriteEndElement();
-        }
-    }
-}
diff --git a/Common/XmlRpcCS/XmlRpcSerializer.cs b/Common/XmlRpcCS/XmlRpcSerializer.cs
deleted file mode 100644
index 0643d38..0000000
--- a/Common/XmlRpcCS/XmlRpcSerializer.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-namespace Nwc.XmlRpc
-{
-    using System;
-    using System.Collections;
-    using System.IO;
-    using System.Xml;
-    /// <summary>Base class of classes serializing data to XML-RPC's XML format.</summary>
-    /// <remarks>This class handles the basic type conversions like Integer to &lt;i4&gt;. </remarks>
-    /// <seealso cref="XmlRpcXmlTokens"/>
-    public class XmlRpcSerializer : XmlRpcXmlTokens
-    {
-        /// <summary>Serialize the <c>XmlRpcRequest</c> to the output stream.</summary>
-        /// <param name="output">An <c>XmlTextWriter</c> stream to write data to.</param>
-        /// <param name="obj">An <c>Object</c> to serialize.</param>
-        /// <seealso cref="XmlRpcRequest"/>
-        virtual public void Serialize(XmlTextWriter output, Object obj)
-        {
-        }
-        /// <summary>Serialize the <c>XmlRpcRequest</c> to a String.</summary>
-        /// <remarks>Note this may represent a real memory hog for a large request.</remarks>
-        /// <param name="obj">An <c>Object</c> to serialize.</param>
-        /// <returns><c>String</c> containing XML-RPC representation of the request.</returns>
-        /// <seealso cref="XmlRpcRequest"/>
-        public String Serialize(Object obj)
-        {
-            StringWriter strBuf = new StringWriter();
-            XmlTextWriter xml = new XmlTextWriter(strBuf);
-            xml.Formatting = Formatting.Indented;
-            xml.Indentation = 4;
-            Serialize(xml, obj);
-            xml.Flush();
-            String returns = strBuf.ToString();
-            xml.Close();
-            return returns;
-        }
-        /// <remarks>Serialize the object to the output stream.</remarks>
-        /// <param name="output">An <c>XmlTextWriter</c> stream to write data to.</param>
-        /// <param name="obj">An <c>Object</c> to serialize.</param>
-        public void SerializeObject(XmlTextWriter output, Object obj)
-        {
-            if (obj == null)
-                return;
-            if (obj is byte[])
-            {
-                byte[] ba = (byte[])obj;
-                output.WriteStartElement(BASE64);
-                output.WriteBase64(ba, 0, ba.Length);
-                output.WriteEndElement();
-            }
-            else if (obj is String)
-            {
-                output.WriteElementString(STRING, obj.ToString());
-            }
-            else if (obj is Int32)
-            {
-                output.WriteElementString(INT, obj.ToString());
-            }
-            else if (obj is DateTime)
-            {
-                output.WriteElementString(DATETIME, ((DateTime)obj).ToString(ISO_DATETIME));
-            }
-            else if (obj is Double)
-            {
-                output.WriteElementString(DOUBLE, obj.ToString());
-            }
-            else if (obj is Boolean)
-            {
-                output.WriteElementString(BOOLEAN, ((((Boolean)obj) == true) ? "1" : "0"));
-            }
-            else if (obj is IList)
-            {
-                output.WriteStartElement(ARRAY);
-                output.WriteStartElement(DATA);
-                if (((ArrayList)obj).Count > 0)
-                {
-                    foreach (Object member in ((IList)obj))
-                    {
-                        output.WriteStartElement(VALUE);
-                        SerializeObject(output, member);
-                        output.WriteEndElement();
-                    }
-                }
-                output.WriteEndElement();
-                output.WriteEndElement();
-            }
-            else if (obj is IDictionary)
-            {
-                IDictionary h = (IDictionary)obj;
-                output.WriteStartElement(STRUCT);
-                foreach (String key in h.Keys)
-                {
-                    output.WriteStartElement(MEMBER);
-                    output.WriteElementString(NAME, key);
-                    output.WriteStartElement(VALUE);
-                    SerializeObject(output, h[key]);
-                    output.WriteEndElement();
-                    output.WriteEndElement();
-                }
-                output.WriteEndElement();
-            }
-        }
-    }
-}
diff --git a/Common/XmlRpcCS/XmlRpcServer.cs b/Common/XmlRpcCS/XmlRpcServer.cs
deleted file mode 100644
index 1c226c1..0000000
--- a/Common/XmlRpcCS/XmlRpcServer.cs
+++ /dev/null
@@ -1,239 +0,0 @@
-namespace Nwc.XmlRpc
-{
-    using System;
-    using System.Collections;
-    using System.IO;
-    using System.Net;
-    using System.Net.Sockets;
-    using System.Text;
-    using System.Threading;
-    using System.Xml;
-    /// <summary>A restricted HTTP server for use with XML-RPC.</summary>
-    /// <remarks>It only handles POST requests, and only POSTs representing XML-RPC calls.
-    /// In addition to dispatching requests it also provides a registry for request handlers. 
-    /// </remarks>
-    public class XmlRpcServer : IEnumerable
-    {
-#pragma warning disable 0414 // disable "private field assigned but not used"
-        const int RESPONDER_COUNT = 10;
-        private TcpListener _myListener;
-        private int _port;
-        private IPAddress _address;
-        private IDictionary _handlers;
-        private XmlRpcSystemObject _system;
-        private WaitCallback _wc;
-#pragma warning restore 0414
-        ///<summary>Constructor with port and address.</summary>
-        ///<remarks>This constructor sets up a TcpListener listening on the
-        ///given port and address. It also calls a Thread on the method StartListen().</remarks>
-        ///<param name="address"><c>IPAddress</c> value of the address to listen on.</param>
-        ///<param name="port"><c>Int</c> value of the port to listen on.</param>
-        public XmlRpcServer(IPAddress address, int port)
-        {
-            _port = port;
-            _address = address;
-            _handlers = new Hashtable();
-            _system = new XmlRpcSystemObject(this);
-            _wc = new WaitCallback(WaitCallback);
-        }
-        ///<summary>Basic constructor.</summary>
-        ///<remarks>This constructor sets up a TcpListener listening on the
-        ///given port. It also calls a Thread on the method StartListen(). IPAddress.Any
-        ///is assumed as the address here.</remarks>
-        ///<param name="port"><c>Int</c> value of the port to listen on.</param>
-        public XmlRpcServer(int port) : this(IPAddress.Any, port) { }
-        /// <summary>Start the server.</summary>
-        public void Start()
-        {
-            try
-            {
-                Stop();
-                //start listing on the given port
-                //          IPAddress addr = IPAddress.Parse("127.0.0.1");
-                lock (this)
-                {
-                    _myListener = new TcpListener(IPAddress.Any, _port);
-                    _myListener.Start();
-                    //start the thread which calls the method 'StartListen'
-                    Thread th = new Thread(new ThreadStart(StartListen));
-                    th.Start();
-                }
-            }
-            catch (Exception e)
-            {
-                Logger.WriteEntry("An Exception Occurred while Listening :" + e.ToString(), LogLevel.Error);
-            }
-        }
-        /// <summary>Stop the server.</summary>
-        public void Stop()
-        {
-            try
-            {
-                if (_myListener != null)
-                {
-                    lock (this)
-                    {
-                        _myListener.Stop();
-                        _myListener = null;
-                    }
-                }
-            }
-            catch (Exception e)
-            {
-                Logger.WriteEntry("An Exception Occurred while stopping :" +
-                      e.ToString(), LogLevel.Error);
-            }
-        }
-        /// <summary>Get an enumeration of my XML-RPC handlers.</summary>
-        /// <returns><c>IEnumerable</c> the handler enumeration.</returns>
-        public IEnumerator GetEnumerator()
-        {
-            return _handlers.GetEnumerator();
-        }
-        /// <summary>Retrieve a handler by name.</summary>
-        /// <param name="name"><c>String</c> naming a handler</param>
-        /// <returns><c>Object</c> that is the handler.</returns>
-        public Object this[String name]
-        {
-            get { return _handlers[name]; }
-        }
-        ///<summary>
-        ///This method Accepts new connections and dispatches them when appropriate.
-        ///</summary>
-        public void StartListen()
-        {
-            while (true && _myListener != null)
-            {
-                //Accept a new connection
-                XmlRpcResponder responder = new XmlRpcResponder(this, _myListener.AcceptTcpClient());
-                ThreadPool.QueueUserWorkItem(_wc, responder);
-            }
-        }
-        ///<summary>
-        ///Add an XML-RPC handler object by name.
-        ///</summary>
-        ///<param name="name"><c>String</c> XML-RPC dispatch name of this object.</param>
-        ///<param name="obj"><c>Object</c> The object that is the XML-RPC handler.</param>
-        public void Add(String name, Object obj)
-        {
-            _handlers.Add(name, obj);
-        }
-        ///<summary>Return a C# object.method name for and XML-RPC object.method name pair.</summary>
-        ///<param name="methodName">The XML-RPC object.method.</param>
-        ///<returns><c>String</c> of form object.method for the underlying C# method.</returns>
-        public String MethodName(String methodName)
-        {
-            int dotAt = methodName.LastIndexOf('.');
-            if (dotAt == -1)
-            {
-                throw new XmlRpcException(XmlRpcErrorCodes.SERVER_ERROR_METHOD,
-                              XmlRpcErrorCodes.SERVER_ERROR_METHOD_MSG + ": Bad method name " + methodName);
-            }
-            String objectName = methodName.Substring(0, dotAt);
-            Object target = _handlers[objectName];
-            if (target == null)
-            {
-                throw new XmlRpcException(XmlRpcErrorCodes.SERVER_ERROR_METHOD,
-                              XmlRpcErrorCodes.SERVER_ERROR_METHOD_MSG + ": Object " + objectName + " not found");
-            }
-            return target.GetType().FullName + "." + methodName.Substring(dotAt + 1);
-        }
-        ///<summary>Invoke a method described in a request.</summary>
-        ///<param name="req"><c>XmlRpcRequest</c> containing a method descriptions.</param>
-        /// <seealso cref="XmlRpcSystemObject.Invoke"/>
-        /// <seealso cref="XmlRpcServer.Invoke(String,String,IList)"/>
-        public Object Invoke(XmlRpcRequest req)
-        {
-            return Invoke(req.MethodNameObject, req.MethodNameMethod, req.Params);
-        }
-        ///<summary>Invoke a method on a named handler.</summary>
-        ///<param name="objectName"><c>String</c> The name of the handler.</param>
-        ///<param name="methodName"><c>String</c> The name of the method to invoke on the handler.</param>
-        ///<param name="parameters"><c>IList</c> The parameters to invoke the method with.</param>
-        /// <seealso cref="XmlRpcSystemObject.Invoke"/>
-        public Object Invoke(String objectName, String methodName, IList parameters)
-        {
-            Object target = _handlers[objectName];
-            if (target == null)
-            {
-                throw new XmlRpcException(XmlRpcErrorCodes.SERVER_ERROR_METHOD,
-                              XmlRpcErrorCodes.SERVER_ERROR_METHOD_MSG + ": Object " + objectName + " not found");
-            }
-            return XmlRpcSystemObject.Invoke(target, methodName, parameters);
-        }
-        /// <summary>The method the thread pool invokes when a thread is available to handle an HTTP request.</summary>
-        /// <param name="responder">TcpClient from the socket accept.</param>
-        public void WaitCallback(object responder)
-        {
-            XmlRpcResponder resp = (XmlRpcResponder)responder;
-            if (resp.HttpReq.HttpMethod == "POST")
-            {
-                try
-                {
-                    resp.Respond();
-                }
-                catch (Exception e)
-                {
-                    Logger.WriteEntry("Failed on post: " + e, LogLevel.Error);
-                }
-            }
-            else
-            {
-                Logger.WriteEntry("Only POST methods are supported: " + resp.HttpReq.HttpMethod +
-                          " ignored", LogLevel.Error);
-            }
-            resp.Close();
-        }
-        /// <summary>
-        /// This function send the Header Information to the client (Browser)
-        /// </summary>
-        /// <param name="sHttpVersion">HTTP Version</param>
-        /// <param name="sMIMEHeader">Mime Type</param>
-        /// <param name="iTotBytes">Total Bytes to be sent in the body</param>
-        /// <param name="sStatusCode"></param>
-        /// <param name="output">Socket reference</param>
-        static public void HttpHeader(string sHttpVersion, string sMIMEHeader, long iTotBytes, string sStatusCode, TextWriter output)
-        {
-            String sBuffer = "";
-            // if Mime type is not provided set default to text/html
-            if (sMIMEHeader.Length == 0)
-            {
-                sMIMEHeader = "text/html";  // Default Mime Type is text/html
-            }
-            sBuffer += sHttpVersion + sStatusCode + "\r\n";
-            sBuffer += "Connection: close\r\n";
-            if (iTotBytes > 0)
-                sBuffer += "Content-Length: " + iTotBytes + "\r\n";
-            sBuffer += "Server: XmlRpcServer \r\n";
-            sBuffer += "Content-Type: " + sMIMEHeader + "\r\n";
-            sBuffer += "\r\n";
-            output.Write(sBuffer);
-        }
-    }
-}
diff --git a/Common/XmlRpcCS/XmlRpcSystemObject.cs b/Common/XmlRpcCS/XmlRpcSystemObject.cs
deleted file mode 100644
index 5f79951..0000000
--- a/Common/XmlRpcCS/XmlRpcSystemObject.cs
+++ /dev/null
@@ -1,252 +0,0 @@
-namespace Nwc.XmlRpc
-{
-    using System;
-    using System.Collections;
-    using System.Reflection;
-    /// <summary> XML-RPC System object implementation of extended specifications.</summary>
-    [XmlRpcExposed]
-    public class XmlRpcSystemObject
-    {
-        private XmlRpcServer _server;
-        static private IDictionary _methodHelp = new Hashtable();
-        /// <summary>Static <c>IDictionary</c> to hold mappings of method name to associated documentation String</summary>
-        static public IDictionary MethodHelp
-        {
-            get { return _methodHelp; }
-        }
-        /// <summary>Constructor.</summary>
-        /// <param name="server"><c>XmlRpcServer</c> server to be the system object for.</param>
-        public XmlRpcSystemObject(XmlRpcServer server)
-        {
-            _server = server;
-            server.Add("system", this);
-            _methodHelp.Add(this.GetType().FullName + ".methodHelp", "Return a string description.");
-        }
-        /// <summary>Invoke a method on a given object.</summary>
-        /// <remarks>Using reflection, and respecting the <c>XmlRpcExposed</c> attribute,
-        /// invoke the <paramref>methodName</paramref> method on the <paramref>target</paramref>
-        /// instance with the <paramref>parameters</paramref> provided. All this packages other <c>Invoke</c> methods 
-        /// end up calling this.</remarks>
-        /// <returns><c>Object</c> the value the invoked method returns.</returns>
-        /// <exception cref="XmlRpcException">If method does not exist, is not exposed, parameters invalid, or invocation
-        /// results in an exception. Note, the <c>XmlRpcException.Code</c> will indicate cause.</exception>
-        static public Object Invoke(Object target, String methodName, IList parameters)
-        {
-            if (target == null)
-                throw new XmlRpcException(XmlRpcErrorCodes.SERVER_ERROR_METHOD,
-                              XmlRpcErrorCodes.SERVER_ERROR_METHOD_MSG + ": Invalid target object.");
-            Type type = target.GetType();
-            MethodInfo method = type.GetMethod(methodName);
-            try
-            {
-                if (!XmlRpcExposedAttribute.ExposedMethod(target, methodName))
-                    throw new XmlRpcException(XmlRpcErrorCodes.SERVER_ERROR_METHOD,
-                              XmlRpcErrorCodes.SERVER_ERROR_METHOD_MSG + ": Method " + methodName + " is not exposed.");
-            }
-            catch (MissingMethodException me)
-            {
-                throw new XmlRpcException(XmlRpcErrorCodes.SERVER_ERROR_METHOD,
-                              XmlRpcErrorCodes.SERVER_ERROR_METHOD_MSG + ": " + me.Message);
-            }
-            Object[] args = new Object[parameters.Count];
-            int index = 0;
-            foreach (Object arg in parameters)
-            {
-                args[index] = arg;
-                index++;
-            }
-            try
-            {
-                Object retValue = method.Invoke(target, args);
-                if (retValue == null)
-                    throw new XmlRpcException(XmlRpcErrorCodes.APPLICATION_ERROR,
-                              XmlRpcErrorCodes.APPLICATION_ERROR_MSG + ": Method returned NULL.");
-                return retValue;
-            }
-            catch (XmlRpcException e)
-            {
-                throw e;
-            }
-            catch (ArgumentException ae)
-            {
-                Logger.WriteEntry(XmlRpcErrorCodes.SERVER_ERROR_PARAMS_MSG + ": " + ae.Message,
-                          LogLevel.Information);
-                String call = methodName + "( ";
-                foreach (Object o in args)
-                {
-                    call += o.GetType().Name;
-                    call += " ";
-                }
-                call += ")";
-                throw new XmlRpcException(XmlRpcErrorCodes.SERVER_ERROR_PARAMS,
-                              XmlRpcErrorCodes.SERVER_ERROR_PARAMS_MSG + ": Arguement type mismatch invoking " + call);
-            }
-            catch (TargetParameterCountException tpce)
-            {
-                Logger.WriteEntry(XmlRpcErrorCodes.SERVER_ERROR_PARAMS_MSG + ": " + tpce.Message,
-                          LogLevel.Information);
-                throw new XmlRpcException(XmlRpcErrorCodes.SERVER_ERROR_PARAMS,
-                              XmlRpcErrorCodes.SERVER_ERROR_PARAMS_MSG + ": Arguement count mismatch invoking " + methodName);
-            }
-            catch (TargetInvocationException tie)
-            {
-                throw new XmlRpcException(XmlRpcErrorCodes.APPLICATION_ERROR,
-                              XmlRpcErrorCodes.APPLICATION_ERROR_MSG + " Invoked method " + methodName + ": " + tie.Message);
-            }
-        }
-        /// <summary>List methods available on all handlers of this server.</summary>
-        /// <returns><c>IList</c> An array of <c>Strings</c>, each <c>String</c> will have form "object.method".</returns>
-        [XmlRpcExposed]
-        public IList listMethods()
-        {
-            IList methods = new ArrayList();
-            Boolean considerExposure;
-            foreach (DictionaryEntry handlerEntry in _server)
-            {
-                considerExposure = XmlRpcExposedAttribute.IsExposed(handlerEntry.Value.GetType());
-                foreach (MemberInfo mi in handlerEntry.Value.GetType().GetMembers())
-                {
-                    if (mi.MemberType != MemberTypes.Method)
-                        continue;
-                    if (!((MethodInfo)mi).IsPublic)
-                        continue;
-                    if (considerExposure && !XmlRpcExposedAttribute.IsExposed(mi))
-                        continue;
-                    methods.Add(handlerEntry.Key + "." + mi.Name);
-                }
-            }
-            return methods;
-        }
-        /// <summary>Given a method name return the possible signatures for it.</summary>
-        /// <param name="name"><c>String</c> The object.method name to look up.</param>
-        /// <returns><c>IList</c> Of arrays of signatures.</returns>
-        [XmlRpcExposed]
-        public IList methodSignature(String name)
-        {
-            IList signatures = new ArrayList();
-            int index = name.IndexOf('.');
-            if (index < 0)
-                return signatures;
-            String oName = name.Substring(0, index);
-            Object obj = _server[oName];
-            if (obj == null)
-                return signatures;
-            MemberInfo[] mi = obj.GetType().GetMember(name.Substring(index + 1));
-            if (mi == null || mi.Length != 1) // for now we want a single signature
-                return signatures;
-            MethodInfo method;
-            try
-            {
-                method = (MethodInfo)mi[0];
-            }
-            catch (Exception e)
-            {
-                Logger.WriteEntry("Attempted methodSignature call on " + mi[0] + " caused: " + e,
-                          LogLevel.Information);
-                return signatures;
-            }
-            if (!method.IsPublic)
-                return signatures;
-            IList signature = new ArrayList();
-            signature.Add(method.ReturnType.Name);
-            foreach (ParameterInfo param in method.GetParameters())
-            {
-                signature.Add(param.ParameterType.Name);
-            }
-            signatures.Add(signature);
-            return signatures;
-        }
-        /// <summary>Help for given method signature. Not implemented yet.</summary>
-        /// <param name="name"><c>String</c> The object.method name to look up.</param>
-        /// <returns><c>String</c> help text. Rich HTML text.</returns>
-        [XmlRpcExposed]
-        public String methodHelp(String name)
-        {
-            String help = null;
-            try
-            {
-                help = (String)_methodHelp[_server.MethodName(name)];
-            }
-            catch (XmlRpcException e)
-            {
-                throw e;
-            }
-            catch (Exception) { /* ignored */ };
-            if (help == null)
-                help = "No help available for: " + name;
-            return help;
-        }
-        /// <summary>Boxcarring support method.</summary>
-        /// <param name="calls"><c>IList</c> of calls</param>
-        /// <returns><c>ArrayList</c> of results/faults.</returns>
-        [XmlRpcExposed]
-        public IList multiCall(IList calls)
-        {
-            IList responses = new ArrayList();
-            XmlRpcResponse fault = new XmlRpcResponse();
-            foreach (IDictionary call in calls)
-            {
-                try
-                {
-                    XmlRpcRequest req = new XmlRpcRequest((String)call[XmlRpcXmlTokens.METHOD_NAME],
-                                          (ArrayList)call[XmlRpcXmlTokens.PARAMS]);
-                    Object results = _server.Invoke(req);
-                    IList response = new ArrayList();
-                    response.Add(results);
-                    responses.Add(response);
-                }
-                catch (XmlRpcException e)
-                {
-                    fault.SetFault(e.FaultCode, e.FaultString);
-                    responses.Add(fault.Value);
-                }
-                catch (Exception e2)
-                {
-                    fault.SetFault(XmlRpcErrorCodes.APPLICATION_ERROR,
-                               XmlRpcErrorCodes.APPLICATION_ERROR_MSG + ": " + e2.Message);
-                    responses.Add(fault.Value);
-                }
-            }
-            return responses;
-        }
-    }
-}
diff --git a/Common/XmlRpcCS/XmlRpcXmlTokens.cs b/Common/XmlRpcCS/XmlRpcXmlTokens.cs
deleted file mode 100644
index 50788bd..0000000
--- a/Common/XmlRpcCS/XmlRpcXmlTokens.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-namespace Nwc.XmlRpc
-{
-    using System;
-    /// <summary>Class collecting <c>String</c> tokens that are part of XML-RPC files.</summary>
-    public class XmlRpcXmlTokens
-    {
-        /// <summary>C# formatting string to describe an ISO 8601 date.</summary>
-        public const String ISO_DATETIME = "yyyyMMdd\\THH\\:mm\\:ss";
-        /// <summary>Base64 field indicator.</summary>
-        /// <remarks>Corresponds to the &lt;base64&gt; tag.</remarks>
-        public const String BASE64 = "base64";
-        /// <summary>String field indicator.</summary>
-        /// <remarks>Corresponds to the &lt;string&gt; tag.</remarks>
-        public const String STRING = "string";
-        /// <summary>Integer field integer.</summary>
-        /// <remarks>Corresponds to the &lt;i4&gt; tag.</remarks>
-        public const String INT = "i4";
-        /// <summary>Alternate integer field indicator.</summary>
-        /// <remarks>Corresponds to the &lt;int&gt; tag.</remarks>
-        public const String ALT_INT = "int";
-        /// <summary>Date field indicator.</summary>
-        /// <remarks>Corresponds to the &lt;dateTime.iso8601&gt; tag.</remarks>
-        public const String DATETIME = "dateTime.iso8601";
-        /// <summary>Boolean field indicator.</summary>
-        /// <remarks>Corresponds to the &lt;boolean&gt; tag.</remarks>
-        public const String BOOLEAN = "boolean";
-        /// <summary>Value token.</summary>
-        /// <remarks>Corresponds to the &lt;value&gt; tag.</remarks>
-        public const String VALUE = "value";
-        /// <summary>Name token.</summary>
-        /// <remarks>Corresponds to the &lt;name&gt; tag.</remarks>
-        public const String NAME = "name";
-        /// <summary>Array field indicator..</summary>
-        /// <remarks>Corresponds to the &lt;array&gt; tag.</remarks>
-        public const String ARRAY = "array";
-        /// <summary>Data token.</summary>
-        /// <remarks>Corresponds to the &lt;data&gt; tag.</remarks>
-        public const String DATA = "data";
-        /// <summary>Member token.</summary>
-        /// <remarks>Corresponds to the &lt;member&gt; tag.</remarks>
-        public const String MEMBER = "member";
-        /// <summary>Stuct field indicator.</summary>
-        /// <remarks>Corresponds to the &lt;struct&gt; tag.</remarks>
-        public const String STRUCT = "struct";
-        /// <summary>Double field indicator.</summary>
-        /// <remarks>Corresponds to the &lt;double&gt; tag.</remarks>
-        public const String DOUBLE = "double";
-        /// <summary>Param token.</summary>
-        /// <remarks>Corresponds to the &lt;param&gt; tag.</remarks>
-        public const String PARAM = "param";
-        /// <summary>Params token.</summary>
-        /// <remarks>Corresponds to the &lt;params&gt; tag.</remarks>
-        public const String PARAMS = "params";
-        /// <summary>MethodCall token.</summary>
-        /// <remarks>Corresponds to the &lt;methodCall&gt; tag.</remarks>
-        public const String METHOD_CALL = "methodCall";
-        /// <summary>MethodName token.</summary>
-        /// <remarks>Corresponds to the &lt;methodName&gt; tag.</remarks>
-        public const String METHOD_NAME = "methodName";
-        /// <summary>MethodResponse token</summary>
-        /// <remarks>Corresponds to the &lt;methodResponse&gt; tag.</remarks>
-        public const String METHOD_RESPONSE = "methodResponse";
-        /// <summary>Fault response token.</summary>
-        /// <remarks>Corresponds to the &lt;fault&gt; tag.</remarks>
-        public const String FAULT = "fault";
-        /// <summary>FaultCode token.</summary>
-        /// <remarks>Corresponds to the &lt;faultCode&gt; tag.</remarks>
-        public const String FAULT_CODE = "faultCode";
-        /// <summary>FaultString token.</summary>
-        /// <remarks>Corresponds to the &lt;faultString&gt; tag.</remarks>
-        public const String FAULT_STRING = "faultString";
-    }
-}