462 files changed, 0 insertions, 64414 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
deleted file mode 100644
index 86fa8f3..0000000
--- a/CONTRIBUTORS.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-The following people have contributed to OpenSim (Thankyou for your effort!)
-Add your name in here if you have committed to OpenSim
-OpenSim Developers 
-(in order of appearance)
-* MW
-* Gareth
-* AdamZaius
-* MingChen
-* lbsa71
-* Andy-
-* MorphW
-* CW
-This software uses components from the following developers:
-* Sleepycat Software (Berkeley DB)
-* DB4objects, Inc. (DB4o)
-* SQLite (Public Domain)
-* XmlRpcCS (http://xmlrpccs.sf.net/)
-* MySQL, Inc. (MySQL Connector/NET)
-* AGEIA Inc. (PhysX)
-* Russel L. Smith (ODE)
-* Prebuild ( http://sourceforge.net/projects/dnpb/ )
-In addition, we would like to thank:
-* The Mono Project
-* The NANT Developers
-* Microsoft (.NET, MSSQL-Adapters)
-\ No newline at end of file
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/ConsoleBase.cs b/Common/OpenSim.Framework.Console/ConsoleBase.cs
deleted file mode 100644
index 30854fe..0000000
--- a/Common/OpenSim.Framework.Console/ConsoleBase.cs
+++ /dev/null
@@ -1,220 +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 ConsoleBase
-    {
-        StreamWriter Log;
-        public conscmd_callback cmdparser;
-        public string componentname;
-        private bool m_silent;
-        public ConsoleBase(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");
-            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 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();
-                } // Because mono and old debian sucks.
-                catch (System.ArgumentNullException)
-                {
-                    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 MainConsolePrompt()
-        {
-            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/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/MainConsole.cs b/Common/OpenSim.Framework.Console/MainConsole.cs
deleted file mode 100644
index 01aa3d1..0000000
--- a/Common/OpenSim.Framework.Console/MainConsole.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 MainConsole {
-                
-                private static ConsoleBase instance;
-                
-                public static ConsoleBase 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 7af0eca..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="ConsoleBase.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ConsoleCallbacksBase.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="MainConsole.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 9a03b54..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="ConsoleBase.cs" />
-                <include name="ConsoleCallbacksBase.cs" />
-                <include name="MainConsole.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 b36982a..0000000
--- a/Common/OpenSim.Framework/AgentInventory.cs
+++ /dev/null
@@ -1,278 +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))
-            {
-                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;
-                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)
-        {
-            Console.WriteLine("updating inventory item details");
-            if (this.InventoryItems.ContainsKey(itemID))
-            {
-                Console.WriteLine("changing name to "+ Util.FieldToString(packet.Name));
-                InventoryItem Item = this.InventoryItems[itemID];
-                Item.Name = Util.FieldToString(packet.Name);
-                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;
-        }
-    }
-    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()
-        {
-        }
-    }
-}
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/HeightMapGenHills.cs b/Common/OpenSim.Framework/HeightMapGenHills.cs
deleted file mode 100644
index 9777b82..0000000
--- a/Common/OpenSim.Framework/HeightMapGenHills.cs
+++ /dev/null
@@ -1,150 +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.Terrain
-{
-    public class HeightmapGenHills
-    {
-        private Random Rand = new Random();
-        private int NumHills;
-        private float HillMin;
-        private float HillMax;
-        private bool Island;
-        private float[] heightmap;
-        public float[] GenerateHeightmap(int numHills, float hillMin, float hillMax, bool island)
-        {
-            NumHills = numHills;
-            HillMin = hillMin;
-            HillMax = hillMax;
-            Island = island;
-            heightmap = new float[256 * 256];
-            for (int i = 0; i < numHills; i++)
-            {
-                AddHill();
-            }
-            Normalize();
-            return heightmap;
-        }
-        private void AddHill()
-        {
-            float x, y;
-            float radius = RandomRange(HillMin, HillMax);
-            if (Island)
-            {
-                // Which direction from the center of the map the hill is placed
-                float theta = RandomRange(0, 6.28f);
-                // How far from the center of the map to place the hill. The radius
-                // is subtracted from the range to prevent any part of the hill from
-                // reaching the edge of the map
-                float distance = RandomRange(radius / 2.0f, 128.0f - radius);
-                x = 128.0f + (float)Math.Cos(theta) * distance;
-                y = 128.0f + (float)Math.Sin(theta) * distance;
-            }
-            else
-            {
-                x = RandomRange(-radius, 256.0f + radius);
-                y = RandomRange(-radius, 256.0f + radius);
-            }
-            float radiusSq = radius * radius;
-            float distSq;
-            float height;
-            int xMin = (int)(x - radius) - 1;
-            int xMax = (int)(x + radius) + 1;
-            if (xMin < 0) xMin = 0;
-            if (xMax > 255) xMax = 255;
-            int yMin = (int)(y - radius) - 1;
-            int yMax = (int)(y + radius) + 1;
-            if (yMin < 0) yMin = 0;
-            if (yMax > 255) yMax = 255;
-            // Loop through each affected cell and determine the height at that point
-            for (int v = yMin; v <= yMax; ++v)
-            {
-                float fv = (float)v;
-                for (int h = xMin; h <= xMax; ++h)
-                {
-                    float fh = (float)h;
-                    // Determine how far from the center of this hill this point is
-                    distSq = (x - fh) * (x - fh) + (y - fv) * (y - fv);
-                    height = radiusSq - distSq;
-                    // Don't add negative hill values
-                    if (height > 0.0f) heightmap[h + v * 256] += height;
-                }
-            }
-        }
-        private void Normalize()
-        {
-            float min = heightmap[0];
-            float max = heightmap[0];
-            for (int x = 0; x < 256; x++)
-            {
-                for (int y = 0; y < 256; y++)
-                {
-                    if (heightmap[x + y * 256] < min) min = heightmap[x + y * 256];
-                    if (heightmap[x + y * 256] > max) max = heightmap[x + y * 256];
-                }
-            }
-            // Avoid a rare divide by zero
-            if (min != max)
-            {
-                for (int x = 0; x < 256; x++)
-                {
-                    for (int y = 0; y < 256; y++)
-                    {
-                        heightmap[x + y * 256] = ((heightmap[x + y * 256] - min) / (max - min)) * (HillMax - HillMin);
-                    }
-                }
-            }
-        }
-        private float RandomRange(float min, float max)
-        {
-            return (float)Rand.NextDouble() * (max - min) + min;
-        }
-    }
-}
diff --git a/Common/OpenSim.Framework/Interfaces/IAssetServer.cs b/Common/OpenSim.Framework/Interfaces/IAssetServer.cs
deleted file mode 100644
index 3f86acc..0000000
--- a/Common/OpenSim.Framework/Interfaces/IAssetServer.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
-* Copyright (c) OpenSim project, http://sim.opensecondlife.org/
-*
-* 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 <organization> 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 <copyright holder> ``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 <copyright holder> 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 9f7b619..0000000
--- a/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-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(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 interface IClientAPI
-    {
-        event ChatFromViewer OnChatFromViewer;
-        event RezObject OnRezObject;
-        event ModifyTerrain OnModifyTerrain;
-        event SetAppearance OnSetAppearance;
-        event StartAnim OnStartAnim;
-        event LinkObjects OnLinkObjects;
-        LLVector3 StartPos
-        {
-            get;
-            set;
-        }
-        void SendAppearance(AvatarWearable[] wearables);
-        void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID);
-    }
-}
diff --git a/Common/OpenSim.Framework/Interfaces/IConfig.cs b/Common/OpenSim.Framework/Interfaces/IConfig.cs
deleted file mode 100644
index 7b4c040..0000000
--- a/Common/OpenSim.Framework/Interfaces/IConfig.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
-Copyright (c) OpenSim project, http://osgrid.org/
-* Copyright (c) <year>, <copyright holder>
-* All rights reserved.
-*
-* 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 <organization> 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 <copyright holder> ``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 <copyright holder> 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>
-    /// This class handles connection to the underlying database used for configuration of the region.
-    /// Region content is also stored by this class. The main entry point is InitConfig() which attempts to locate
-    /// opensim.yap in the current working directory. If opensim.yap can not be found, default settings are loaded from
-    /// what is hardcoded here and then saved into opensim.yap for future startups.
-    /// </summary>
-    public abstract class SimConfig
-    {
-        public string RegionName;
-        public uint RegionLocX;
-        public uint RegionLocY;
-        public ulong RegionHandle;
-        public int IPListenPort;
-        public string IPListenAddr;
-        public string AssetURL;
-        public string AssetSendKey;
-        public string GridURL;
-        public string GridSendKey;
-        public string GridRecvKey;
-        public string UserURL;
-        public string UserSendKey;
-        public string UserRecvKey;
-        public abstract void InitConfig(bool sandboxMode);
-        public abstract void LoadFromGrid(); 
-    }
-    public interface ISimConfig
-    {
-        SimConfig GetConfigObject();
-    }
-}
diff --git a/Common/OpenSim.Framework/Interfaces/IGenericConfig.cs b/Common/OpenSim.Framework/Interfaces/IGenericConfig.cs
deleted file mode 100644
index a853fe4..0000000
--- a/Common/OpenSim.Framework/Interfaces/IGenericConfig.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-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/IGridConfig.cs b/Common/OpenSim.Framework/Interfaces/IGridConfig.cs
deleted file mode 100644
index b2f26da..0000000
--- a/Common/OpenSim.Framework/Interfaces/IGridConfig.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
-Copyright (c) OpenSim project, http://osgrid.org/
-* Copyright (c) <year>, <copyright holder>
-* All rights reserved.
-*
-* 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 <organization> 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 <copyright holder> ``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 <copyright holder> 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/IGridServer.cs b/Common/OpenSim.Framework/Interfaces/IGridServer.cs
deleted file mode 100644
index e67ea98..0000000
--- a/Common/OpenSim.Framework/Interfaces/IGridServer.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
-* Copyright (c) OpenSim project, http://sim.opensecondlife.org/
-*
-* 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 <organization> 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 <copyright holder> ``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 <copyright holder> 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
-{
-    /// <summary>
-    /// Handles connection to Grid Servers.
-    /// also Sim to Sim connections?
-    /// </summary>
-    public interface IGridServer
-    {
-        UUIDBlock RequestUUIDBlock();
-        NeighbourInfo[] RequestNeighbours(); //should return a array of neighbouring regions
-        AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);
-        bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);
-        string GetName();
-        bool RequestConnection(LLUUID SimUUID, string sim_ip, uint sim_port);
-        void SetServerInfo(string ServerUrl, string SendKey, string RecvKey);
-        IList RequestMapBlocks(int minX, int minY, int maxX, int maxY);
-        void Close();
-    }
-    
-    public struct UUIDBlock
-    {
-        public LLUUID BlockStart;
-        public LLUUID BlockEnd;
-    }
-    public class AuthenticateResponse
-    {
-        public bool Authorised;
-        public Login LoginInfo;
-        public AuthenticateResponse()
-        {
-        }
-    }
-    public interface IGridPlugin
-    {
-        IGridServer GetGridServer();
-    }
-}
diff --git a/Common/OpenSim.Framework/Interfaces/ILocalStorage.cs b/Common/OpenSim.Framework/Interfaces/ILocalStorage.cs
deleted file mode 100644
index dd17b72..0000000
--- a/Common/OpenSim.Framework/Interfaces/ILocalStorage.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
-* Copyright (c) OpenSim project, http://sim.opensecondlife.org/
-*
-* 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 <organization> 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 <copyright holder> ``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 <copyright holder> 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/IScriptAPI.cs b/Common/OpenSim.Framework/Interfaces/IScriptAPI.cs
deleted file mode 100644
index 3ad0f06..0000000
--- a/Common/OpenSim.Framework/Interfaces/IScriptAPI.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using OpenSim.Framework.Types;
-namespace OpenSim.Framework.Interfaces
-{
-    public interface IScriptAPI
-    {
-        OSVector3 GetEntityPosition(uint localID);
-        void SetEntityPosition(uint localID, float x, float y, float z);
-        uint GetRandomAvatarID();
-    }
-}
diff --git a/Common/OpenSim.Framework/Interfaces/IScriptEngine.cs b/Common/OpenSim.Framework/Interfaces/IScriptEngine.cs
deleted file mode 100644
index ed8974c..0000000
--- a/Common/OpenSim.Framework/Interfaces/IScriptEngine.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-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/Interfaces/IUserConfig.cs b/Common/OpenSim.Framework/Interfaces/IUserConfig.cs
deleted file mode 100644
index e15867d..0000000
--- a/Common/OpenSim.Framework/Interfaces/IUserConfig.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-Copyright (c) OpenSim project, http://osgrid.org/
-* Copyright (c) <year>, <copyright holder>
-* All rights reserved.
-*
-* 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 <organization> 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 <copyright holder> ``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 <copyright holder> 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/IUserServer.cs b/Common/OpenSim.Framework/Interfaces/IUserServer.cs
deleted file mode 100644
index 21f2721..0000000
--- a/Common/OpenSim.Framework/Interfaces/IUserServer.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-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/LocalGridBase.cs b/Common/OpenSim.Framework/Interfaces/LocalGridBase.cs
deleted file mode 100644
index ff46502..0000000
--- a/Common/OpenSim.Framework/Interfaces/LocalGridBase.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-using OpenSim.Framework.Types;
-using System.Collections;
-namespace OpenSim.Framework.Interfaces
-{
-    public abstract class LocalGridBase : IGridServer
-    {
-        public abstract UUIDBlock RequestUUIDBlock();
-        public abstract NeighbourInfo[] RequestNeighbours();
-        public abstract AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);
-        public abstract bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);
-        public abstract string GetName();
-        public abstract bool RequestConnection(LLUUID SimUUID, string sim_ip, uint sim_port);
-        public abstract void SetServerInfo(string ServerUrl, string SendKey, string RecvKey);
-        public abstract void AddNewSession(Login session);
-        public abstract IList RequestMapBlocks(int minX, int minY, int maxX, int maxY);
-        public abstract void Close();
-    }
-}
diff --git a/Common/OpenSim.Framework/Interfaces/RemoteGridBase.cs b/Common/OpenSim.Framework/Interfaces/RemoteGridBase.cs
deleted file mode 100644
index ed13ed5..0000000
--- a/Common/OpenSim.Framework/Interfaces/RemoteGridBase.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-using OpenSim.Framework.Types;
-namespace OpenSim.Framework.Interfaces
-{
-    public abstract class RemoteGridBase : IGridServer
-    {
-        public abstract Dictionary<uint, AgentCircuitData> agentcircuits
-        {
-            get;
-            set;
-        }
-        public abstract UUIDBlock RequestUUIDBlock();
-        public abstract NeighbourInfo[] RequestNeighbours();
-        public abstract AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);
-        public abstract bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);
-        public abstract string GetName();
-        public abstract bool RequestConnection(LLUUID SimUUID, string sim_ip, uint sim_port);
-        public abstract void SetServerInfo(string ServerUrl, string SendKey, string RecvKey);
-        public abstract IList RequestMapBlocks(int minX, int minY, int maxX, int maxY);
-        public abstract void Close();
-        public abstract Hashtable GridData {
-                get;
-                set;
-        }
-        public abstract ArrayList neighbours {
-                get;
-                set;
-        }
-    }
-}
diff --git a/Common/OpenSim.Framework/LoginService.cs b/Common/OpenSim.Framework/LoginService.cs
deleted file mode 100644
index a4f3cc8..0000000
--- a/Common/OpenSim.Framework/LoginService.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;
-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 4cedbd9..0000000
--- a/Common/OpenSim.Framework/OpenSim.Framework.csproj
+++ /dev/null
@@ -1,200 +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="..\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="BlockingQueue.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="HeightMapGenHills.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LoginService.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Remoting.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="SimProfile.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="SimProfileBase.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="UserProfile.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="UserProfileManager.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="UserProfileManagerBase.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Util.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\IConfig.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Interfaces\IGenericConfig.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Interfaces\IGridConfig.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Interfaces\IGridServer.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Interfaces\ILocalStorage.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Interfaces\IScriptAPI.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Interfaces\IScriptEngine.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Interfaces\IUserConfig.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Interfaces\IUserServer.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Interfaces\LocalGridBase.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Interfaces\RemoteGridBase.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Types\AgentCircuitData.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\NeighbourInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Types\OSVector3.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Types\ParcelData.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Types\PrimData.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/OpenSim.Framework.dll.build b/Common/OpenSim.Framework/OpenSim.Framework.dll.build
deleted file mode 100644
index 4d95c7d..0000000
--- a/Common/OpenSim.Framework/OpenSim.Framework.dll.build
+++ /dev/null
@@ -1,77 +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="BlockingQueue.cs" />
-                <include name="HeightMapGenHills.cs" />
-                <include name="LoginService.cs" />
-                <include name="Remoting.cs" />
-                <include name="SimProfile.cs" />
-                <include name="SimProfileBase.cs" />
-                <include name="UserProfile.cs" />
-                <include name="UserProfileManager.cs" />
-                <include name="UserProfileManagerBase.cs" />
-                <include name="Util.cs" />
-                <include name="Interfaces/IAssetServer.cs" />
-                <include name="Interfaces/IClientAPI.cs" />
-                <include name="Interfaces/IConfig.cs" />
-                <include name="Interfaces/IGenericConfig.cs" />
-                <include name="Interfaces/IGridConfig.cs" />
-                <include name="Interfaces/IGridServer.cs" />
-                <include name="Interfaces/ILocalStorage.cs" />
-                <include name="Interfaces/IScriptAPI.cs" />
-                <include name="Interfaces/IScriptEngine.cs" />
-                <include name="Interfaces/IUserConfig.cs" />
-                <include name="Interfaces/IUserServer.cs" />
-                <include name="Interfaces/LocalGridBase.cs" />
-                <include name="Interfaces/RemoteGridBase.cs" />
-                <include name="Properties/AssemblyInfo.cs" />
-                <include name="Types/AgentCircuitData.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/NeighbourInfo.cs" />
-                <include name="Types/OSVector3.cs" />
-                <include name="Types/ParcelData.cs" />
-                <include name="Types/PrimData.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="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/Remoting.cs b/Common/OpenSim.Framework/Remoting.cs
deleted file mode 100644
index 660cdde..0000000
--- a/Common/OpenSim.Framework/Remoting.cs
+++ /dev/null
@@ -1,137 +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 0d79ee9..0000000
--- a/Common/OpenSim.Framework/SimProfile.cs
+++ /dev/null
@@ -1,110 +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 : SimProfileBase
-    {
-        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)
-            {
-                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)
-            {
-                Console.WriteLine(e.ToString());
-            }
-            return this;
-        }
-        public SimProfile()
-        {
-        }
-    }
-}
diff --git a/Common/OpenSim.Framework/SimProfileBase.cs b/Common/OpenSim.Framework/SimProfileBase.cs
deleted file mode 100644
index bab18be..0000000
--- a/Common/OpenSim.Framework/SimProfileBase.cs
+++ /dev/null
@@ -1,54 +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.Sims
-{
-    [System.Obsolete("Depreciated, use SimProfileData instead")]
-    public class SimProfileBase
-    {
-        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 SimProfileBase()
-        {
-        }
-    }
-}
diff --git a/Common/OpenSim.Framework/Types/AgentCircuitData.cs b/Common/OpenSim.Framework/Types/AgentCircuitData.cs
deleted file mode 100644
index de79ce2..0000000
--- a/Common/OpenSim.Framework/Types/AgentCircuitData.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;
-    }
-}
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 baa3eef..0000000
--- a/Common/OpenSim.Framework/Types/EstateSettings.cs
+++ /dev/null
@@ -1,96 +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;
-    }
-}
diff --git a/Common/OpenSim.Framework/Types/Login.cs b/Common/OpenSim.Framework/Types/Login.cs
deleted file mode 100644
index 2737cbb..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 Login()
-        {
-        }
-    }
-}
diff --git a/Common/OpenSim.Framework/Types/NeighbourInfo.cs b/Common/OpenSim.Framework/Types/NeighbourInfo.cs
deleted file mode 100644
index e3e9dbb..0000000
--- a/Common/OpenSim.Framework/Types/NeighbourInfo.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;
-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/OSVector3.cs b/Common/OpenSim.Framework/Types/OSVector3.cs
deleted file mode 100644
index 7e3a849..0000000
--- a/Common/OpenSim.Framework/Types/OSVector3.cs
+++ /dev/null
@@ -1,46 +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.Types
-{
-    public class OSVector3
-    {
-        public float X;
-        public float Y;
-        public float Z;
-        public OSVector3()
-        {
-        }
-    }
-}
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 a63be76..0000000
--- a/Common/OpenSim.Framework/Types/PrimData.cs
+++ /dev/null
@@ -1,201 +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[] Texture;
-       
-        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.Texture = new byte[length];
-            Array.Copy(data, i, Texture, 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 + Texture.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)(Texture.Length % 256);
-            bytes[i++] = (byte)((Texture.Length >> 8) % 256);
-            Array.Copy(Texture, 0, bytes, i, Texture.Length); i += Texture.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;
-        }
-    }
-}
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/UserProfileManager.cs b/Common/OpenSim.Framework/UserProfileManager.cs
deleted file mode 100644
index a4dac05..0000000
--- a/Common/OpenSim.Framework/UserProfileManager.cs
+++ /dev/null
@@ -1,299 +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.Text;
-using System.Text.RegularExpressions;
-using System.Xml;
-using libsecondlife;
-using Nwc.XmlRpc;
-using OpenSim.Framework.Sims;
-using OpenSim.Framework.Inventory;
-using OpenSim.Framework.Utilities;
-namespace OpenSim.Framework.User
-{
-    public class UserProfileManager : UserProfileManagerBase
-    {
-        public string GridURL;
-        public string GridSendKey;
-        public string GridRecvKey;
-        public string DefaultStartupMsg;
-        public UserProfileManager()
-        {
-        }
-        public void SetKeys(string sendKey, string recvKey, string url, string message)
-        {
-            GridRecvKey = recvKey;
-            GridSendKey = sendKey;
-            GridURL = url;
-            DefaultStartupMsg = message;
-        }
-        public virtual string ParseXMLRPC(string requestBody)
-        {
-            XmlRpcRequest request = (XmlRpcRequest)(new XmlRpcRequestDeserializer()).Deserialize(requestBody);
-            switch (request.MethodName)
-            {
-                case "login_to_simulator":
-                    XmlRpcResponse response = XmlRpcLoginMethod(request);
-                    return (Regex.Replace(XmlRpcResponseSerializer.Singleton.Serialize(response), "utf-16", "utf-8"));
-            }
-            return "";
-        }
-        public string RestDeleteUserSessionMethod( string request, string path, string param )
-        {
-            LLUUID sessionid = new LLUUID(param);       // get usersessions/sessionid
-            foreach (libsecondlife.LLUUID UUID in UserProfiles.Keys)
-            {
-                if ( UserProfiles[UUID].CurrentSessionID == sessionid)
-                {
-                     UserProfiles[UUID].CurrentSessionID = null;
-                     UserProfiles[UUID].CurrentSecureSessionID = null;
-                     UserProfiles[UUID].Circuits.Clear();
-                }
-            }
-            return "OK";
-        }
-        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 = "";
-            if (GoodXML)
-            {
-                firstname = (string)requestData["first"];
-                lastname = (string)requestData["last"];
-                passwd = (string)requestData["passwd"];
-                GoodLogin = AuthenticateUser(firstname, lastname, passwd);
-            }
-            if (!(GoodXML && GoodLogin))
-            {
-                response = CreateErrorConnectingToGridResponse();
-            }
-            else
-            {
-                UserProfile TheUser = GetProfileByName(firstname, lastname);
-                //we need to sort out how sessions are logged out , currently the sim tells the gridserver
-                //but if as this suggests the userserver handles it then please have the sim telling the userserver instead
-                //as it really makes things messy for sandbox mode
-                //if (!((TheUser.CurrentSessionID == null) && (TheUser.CurrentSecureSessionID == null)))
-                // {
-                //   response = CreateAlreadyLoggedInResponse();
-                // }
-                //else
-                //{
-                try
-                {
-                    Hashtable responseData = new Hashtable();
-                    LLUUID AgentID = TheUser.UUID;
-                    TheUser.InitSessionData();
-                    //for loading data from a grid server, make any changes in CustomiseResponse() (or create a sub class of this and override that method)
-                   //SimProfile SimInfo = new SimProfile();
-                    //SimInfo = SimInfo.LoadFromGrid(TheUser.homeregionhandle, GridURL, GridSendKey, GridRecvKey);
-                    Hashtable GlobalT = new Hashtable();
-                    GlobalT["sun_texture_id"] = "cce0f112-878f-4586-a2e2-a8f104bba271";
-                    GlobalT["cloud_texture_id"] = "fc4b9f0b-d008-45c6-96a4-01dd947ac621";
-                    GlobalT["moon_texture_id"] = "fc4b9f0b-d008-45c6-96a4-01dd947ac621";
-                    ArrayList GlobalTextures = new ArrayList();
-                    GlobalTextures.Add(GlobalT);
-                    Hashtable LoginFlagsHash = new Hashtable();
-                    LoginFlagsHash["daylight_savings"] = "N";
-                    LoginFlagsHash["stipend_since_login"] = "N";
-                    LoginFlagsHash["gendered"] = "Y";
-                    LoginFlagsHash["ever_logged_in"] = "Y";
-                    ArrayList LoginFlags = new ArrayList();
-                    LoginFlags.Add(LoginFlagsHash);
-                    Hashtable uiconfig = new Hashtable();
-                    uiconfig["allow_first_life"] = "Y";
-                    ArrayList ui_config = new ArrayList();
-                    ui_config.Add(uiconfig);
-                    Hashtable ClassifiedCategoriesHash = new Hashtable();
-                    ClassifiedCategoriesHash["category_name"] = "bla bla";
-                    ClassifiedCategoriesHash["category_id"] = (Int32)1;
-                    ArrayList ClassifiedCategories = new ArrayList();
-                    ClassifiedCategories.Add(ClassifiedCategoriesHash);
-                    ArrayList AgentInventory = new ArrayList();
-                    Console.WriteLine("adding inventory to response");
-                    Hashtable TempHash;
-                    foreach (InventoryFolder InvFolder in TheUser.Inventory.InventoryFolders.Values)
-                    {
-                        TempHash = new Hashtable();
-                        Console.WriteLine("adding folder " + InvFolder.FolderName + ", ID: " + InvFolder.FolderID.ToStringHyphenated() + " with parent: " + InvFolder.ParentID.ToStringHyphenated()); 
-                        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();
-                        AgentInventory.Add(TempHash);
-                    }
-                    Hashtable InventoryRootHash = new Hashtable();
-                    InventoryRootHash["folder_id"] = TheUser.Inventory.InventoryRoot.FolderID.ToStringHyphenated();
-                    ArrayList InventoryRoot = new ArrayList();
-                    InventoryRoot.Add(InventoryRootHash);
-                    Hashtable InitialOutfitHash = new Hashtable();
-                    InitialOutfitHash["folder_name"] = "Nightclub Female";
-                    InitialOutfitHash["gender"] = "female";
-                    ArrayList InitialOutfit = new ArrayList();
-                    InitialOutfit.Add(InitialOutfitHash);
-                    uint circode = (uint)(Util.RandomClass.Next());
-                    //TheUser.AddSimCircuit(circode, SimInfo.UUID);
-                    responseData["last_name"] = TheUser.lastname;
-                    responseData["ui-config"] = ui_config;
-                    responseData["sim_ip"] = "127.0.0.1"; //SimInfo.sim_ip.ToString();
-                    responseData["login-flags"] = LoginFlags;
-                    responseData["global-textures"] = GlobalTextures;
-                    responseData["classified_categories"] = ClassifiedCategories;
-                    responseData["event_categories"] = new ArrayList();
-                    responseData["inventory-skeleton"] = AgentInventory;
-                    responseData["inventory-skel-lib"] = new ArrayList();
-                    responseData["inventory-root"] = InventoryRoot;
-                    responseData["event_notifications"] = new ArrayList();
-                    responseData["gestures"] = new ArrayList();
-                    responseData["inventory-lib-owner"] = new ArrayList();
-                    responseData["initial-outfit"] = InitialOutfit;
-                    responseData["seconds_since_epoch"] = (Int32)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;
-                    responseData["start_location"] = "last";
-                    responseData["home"] = "{'region_handle':[r" + (0 * 256).ToString() + ",r" + (0 * 256).ToString() + "], 'position':[r" + TheUser.homepos.X.ToString() + ",r" + TheUser.homepos.Y.ToString() + ",r" + TheUser.homepos.Z.ToString() + "], 'look_at':[r" + TheUser.homelookat.X.ToString() + ",r" + TheUser.homelookat.Y.ToString() + ",r" + TheUser.homelookat.Z.ToString() + "]}";
-                    responseData["message"] = DefaultStartupMsg;
-                    responseData["first_name"] = TheUser.firstname;
-                    responseData["circuit_code"] = (Int32)circode;
-                    responseData["sim_port"] = 0; //(Int32)SimInfo.sim_port;
-                    responseData["secure_session_id"] = TheUser.CurrentSecureSessionID.ToStringHyphenated();
-                    responseData["look_at"] = "\n[r" + TheUser.homelookat.X.ToString() + ",r" + TheUser.homelookat.Y.ToString() + ",r" + TheUser.homelookat.Z.ToString() + "]\n";
-                    responseData["agent_id"] = AgentID.ToStringHyphenated();
-                    responseData["region_y"] = (Int32)0 * 256; // (Int32)SimInfo.RegionLocY * 256;
-                    responseData["region_x"] = (Int32)0 * 256;  //SimInfo.RegionLocX * 256;
-                    responseData["seed_capability"] = "";
-                    responseData["agent_access"] = "M";
-                    responseData["session_id"] = TheUser.CurrentSessionID.ToStringHyphenated();
-                    responseData["login"] = "true";
-                    this.CustomiseResponse(ref responseData, TheUser);
-                    response.Value = responseData;
- //                   TheUser.SendDataToSim(SimInfo);
-                    return response;
-                }
-                catch (Exception E)
-                {
-                    Console.WriteLine(E.ToString());
-                }
-                //}
-            }
-            return response;
-        }
-        private static XmlRpcResponse CreateErrorConnectingToGridResponse()
-        {
-            XmlRpcResponse response = new XmlRpcResponse();
-            Hashtable ErrorRespData = new Hashtable();
-            ErrorRespData["reason"] = "key";
-            ErrorRespData["message"] = "Error connecting to grid. Please double check your login details and check with the grid owner if you are sure these are correct";
-            ErrorRespData["login"] = "false";
-            response.Value = ErrorRespData;
-            return response;
-        }
-        private static XmlRpcResponse CreateAlreadyLoggedInResponse()
-        {
-            XmlRpcResponse response = new XmlRpcResponse();
-            Hashtable PresenceErrorRespData = new Hashtable();
-            PresenceErrorRespData["reason"] = "presence";
-            PresenceErrorRespData["message"] = "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";
-            PresenceErrorRespData["login"] = "false";
-            response.Value = PresenceErrorRespData;
-            return response;
-        }
-        public virtual void CustomiseResponse(ref Hashtable response, UserProfile theUser)
-        {
-            //default method set up to act as ogs user server
-            SimProfile SimInfo= new SimProfile();
-            //get siminfo from grid server
-            SimInfo = SimInfo.LoadFromGrid(theUser.homeregionhandle, GridURL, GridSendKey, GridRecvKey);
-            Int32 circode = (Int32)Convert.ToUInt32(response["circuit_code"]);
-            theUser.AddSimCircuit((uint)circode, SimInfo.UUID);
-            response["home"] = "{'region_handle':[r" + (SimInfo.RegionLocX * 256).ToString() + ",r" + (SimInfo.RegionLocY * 256).ToString() + "], 'position':[r" + theUser.homepos.X.ToString() + ",r" + theUser.homepos.Y.ToString() + ",r" + theUser.homepos.Z.ToString() + "], 'look_at':[r" + theUser.homelookat.X.ToString() + ",r" + theUser.homelookat.Y.ToString() + ",r" + theUser.homelookat.Z.ToString() + "]}";
-            response["sim_ip"] = SimInfo.sim_ip;
-            response["sim_port"] = (Int32)SimInfo.sim_port;
-            response["region_y"] = (Int32)SimInfo.RegionLocY * 256;
-            response["region_x"] = (Int32)SimInfo.RegionLocX * 256;
-            //default is ogs user server, so let the sim know about the user via a XmlRpcRequest
-            Console.WriteLine(SimInfo.caps_url);
-            Hashtable SimParams = new Hashtable();
-            SimParams["session_id"] = theUser.CurrentSessionID.ToString();
-            SimParams["secure_session_id"] = theUser.CurrentSecureSessionID.ToString();
-            SimParams["firstname"] = theUser.firstname;
-            SimParams["lastname"] = theUser.lastname;
-            SimParams["agent_id"] = theUser.UUID.ToString();
-            SimParams["circuit_code"] = (Int32)circode;
-                SimParams["startpos_x"] = theUser.homepos.X.ToString();
-                SimParams["startpos_y"] = theUser.homepos.Y.ToString();
-                SimParams["startpos_z"] = theUser.homepos.Z.ToString();
-            ArrayList SendParams = new ArrayList();
-            SendParams.Add(SimParams);
-            XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams);
-            XmlRpcResponse GridResp = GridReq.Send(SimInfo.caps_url, 3000);
-        }
-    }
-}
diff --git a/Common/OpenSim.Framework/UserProfileManagerBase.cs b/Common/OpenSim.Framework/UserProfileManagerBase.cs
deleted file mode 100644
index e0c0174..0000000
--- a/Common/OpenSim.Framework/UserProfileManagerBase.cs
+++ /dev/null
@@ -1,152 +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.Utilities;
-using OpenSim.Framework.Inventory;
-using Db4objects.Db4o;
-namespace OpenSim.Framework.User
-{
-    public class UserProfileManagerBase
-    {
-        public Dictionary<LLUUID, UserProfile> UserProfiles = new Dictionary<LLUUID, UserProfile>();
-        public UserProfileManagerBase()
-        {
-        }
-        public virtual void InitUserProfiles()
-        {
-            IObjectContainer db;
-            db = Db4oFactory.OpenFile("userprofiles.yap");
-            IObjectSet result = db.Get(typeof(UserProfile));
-            foreach (UserProfile userprof in result)
-            {
-                UserProfiles.Add(userprof.UUID, userprof);
-            }
-            Console.WriteLine("UserProfiles.Cs:InitUserProfiles() - Successfully loaded " + result.Count.ToString() + " from database");
-            db.Close();
-        }
-        public virtual void SaveUserProfiles()          // ZOMG! INEFFICIENT!
-        {
-            IObjectContainer db;
-            db = Db4oFactory.OpenFile("userprofiles.yap");
-            IObjectSet result = db.Get(typeof(UserProfile));
-            foreach (UserProfile userprof in result)
-            {
-                db.Delete(userprof);
-                db.Commit();
-            }
-            foreach (UserProfile userprof in UserProfiles.Values)
-            {
-                db.Set(userprof);
-                db.Commit();
-            }
-            db.Close();
-        }
-        public UserProfile GetProfileByName(string firstname, string lastname)
-        {
-            foreach (libsecondlife.LLUUID UUID in UserProfiles.Keys)
-            {
-                if (UserProfiles[UUID].firstname.Equals(firstname)) if (UserProfiles[UUID].lastname.Equals(lastname))
-                {
-                    return UserProfiles[UUID];
-                }
-            }
-            return null;
-        }
-        public UserProfile GetProfileByLLUUID(LLUUID ProfileLLUUID)
-        {
-            return UserProfiles[ProfileLLUUID];
-        }
-        public virtual bool AuthenticateUser(string firstname, string lastname, string passwd)
-        {
-            UserProfile TheUser = GetProfileByName(firstname, lastname);
-            passwd = passwd.Remove(0, 3); //remove $1$
-            if (TheUser != null)
-            {
-                if (TheUser.MD5passwd == passwd)
-                {
-                    Console.WriteLine("UserProfile - authorised " + firstname + " " + lastname);
-                    return true;
-                }
-                else
-                {
-                    Console.WriteLine("UserProfile - not authorised, password not match " + TheUser.MD5passwd + " and " + passwd);
-                    return false;
-                }
-            }
-            else
-            {
-                Console.WriteLine("UserProfile - not authorised , unkown: " + firstname + " , " + lastname);
-                return false;
-            }
-        }
-        public void SetGod(LLUUID GodID)
-        {
-            this.UserProfiles[GodID].IsGridGod = true;
-        }
-        public virtual UserProfile CreateNewProfile(string firstname, string lastname, string MD5passwd)
-        {
-            Console.WriteLine("creating new profile for : " + firstname + " , " + lastname);
-            UserProfile newprofile = new UserProfile();
-            newprofile.homeregionhandle = Helpers.UIntsToLong((997 * 256), (996 * 256));
-            newprofile.firstname = firstname;
-            newprofile.lastname = lastname;
-            newprofile.MD5passwd = MD5passwd;
-            newprofile.UUID = LLUUID.Random();
-            newprofile.Inventory.CreateRootFolder(newprofile.UUID, true);
-            this.UserProfiles.Add(newprofile.UUID, newprofile);
-            SaveUserProfiles();
-            return newprofile;
-        }
-        public virtual AgentInventory GetUsersInventory(LLUUID agentID)
-        {
-            UserProfile user = this.GetProfileByLLUUID(agentID);
-            if (user != null)
-            {
-                return user.Inventory;
-            }
-            return null;
-        }
-    }
-}
diff --git a/Common/OpenSim.Framework/Util.cs b/Common/OpenSim.Framework/Util.cs
deleted file mode 100644
index 10e3fdf..0000000
--- a/Common/OpenSim.Framework/Util.cs
+++ /dev/null
@@ -1,178 +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 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 40c252f..0000000
--- a/Common/OpenSim.GenericConfig/Xml/XmlConfig.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.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();
-            try
-            {
-                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);
-                }
-            }
-            catch (Exception e)
-            {
-                Console.WriteLine(e.Message);
-                return;
-            }
-            try
-            {
-                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>");
-                
-            }
-            catch (Exception e)
-            {
-                Console.WriteLine(e.Message);
-            }
-            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 ec5a6d7..0000000
--- a/Common/OpenSim.Servers/BaseHttpServer.cs
+++ /dev/null
@@ -1,283 +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;
-        public BaseHttpServer(int port)
-        {
-            m_port = port;
-        }
-        public bool AddRestHandler(string method, string path, RestMethod handler)
-        {
-            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 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!
-            return "";
-        }
-        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 = "";
-                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);
-                        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()
-        {
-            MainConsole.Instance.Verbose("BaseHttpServer.cs: Starting up HTTP Server");
-            m_workerThread = new Thread(new ThreadStart(StartHTTP));
-            m_workerThread.IsBackground = true;
-            m_workerThread.Start();
-        }
-        private void StartHTTP()
-        {
-            try
-            {
-                MainConsole.Instance.Verbose("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)
-            {
-                MainConsole.Instance.Warn(e.Message);
-            }
-        }
-    }
-}
diff --git a/Common/OpenSim.Servers/BaseServer.cs b/Common/OpenSim.Servers/BaseServer.cs
deleted file mode 100644
index f248186..0000000
--- a/Common/OpenSim.Servers/BaseServer.cs
+++ /dev/null
@@ -1,37 +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 class BaseServer
-    {
-    }
-}
diff --git a/Common/OpenSim.Servers/CheckSumServer.cs b/Common/OpenSim.Servers/CheckSumServer.cs
deleted file mode 100644
index b6bfe3a..0000000
--- a/Common/OpenSim.Servers/CheckSumServer.cs
+++ /dev/null
@@ -1,139 +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_console;
-        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)
-            {
-                MainConsole.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/LocalUserProfileManager.cs b/Common/OpenSim.Servers/LocalUserProfileManager.cs
deleted file mode 100644
index 6f65176..0000000
--- a/Common/OpenSim.Servers/LocalUserProfileManager.cs
+++ /dev/null
@@ -1,124 +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.Text;
-using OpenSim.Framework.User;
-using OpenSim.Framework.Grid;
-using OpenSim.Framework.Inventory;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-using libsecondlife;
-namespace OpenSim.UserServer
-{
-    public class LocalUserProfileManager : UserProfileManager 
-    {
-        private IGridServer m_gridServer;
-        private int m_port;
-        private string m_ipAddr;
-        private uint regionX;
-        private uint regionY;
-        private AddNewSessionHandler AddSession;
-        public LocalUserProfileManager(IGridServer gridServer, int simPort, string ipAddr , uint regX, uint regY)
-                {
-                        m_gridServer = gridServer;
-            m_port = simPort;
-            m_ipAddr = ipAddr;
-            regionX = regX;
-            regionY = regY;
-                }
-        public void SetSessionHandler(AddNewSessionHandler sessionHandler)
-        {
-            this.AddSession = sessionHandler;
-        }
-        public override void InitUserProfiles()
-        {
-            base.InitUserProfiles();
-        }
-        public override void CustomiseResponse(ref System.Collections.Hashtable response, UserProfile theUser)
-        {
-            Int32 circode = (Int32)response["circuit_code"];
-            theUser.AddSimCircuit((uint)circode, LLUUID.Random());
-            response["home"] = "{'region_handle':[r" + (997 * 256).ToString() + ",r" + (996 * 256).ToString() + "], 'position':[r" + theUser.homepos.X.ToString() + ",r" + theUser.homepos.Y.ToString() + ",r" + theUser.homepos.Z.ToString() + "], 'look_at':[r" + theUser.homelookat.X.ToString() + ",r" + theUser.homelookat.Y.ToString() + ",r" + theUser.homelookat.Z.ToString() + "]}";
-            response["sim_port"] = m_port;
-            response["sim_ip"] = m_ipAddr;
-            response["region_y"] = (Int32)regionY* 256;
-            response["region_x"] = (Int32)regionX* 256;
-            string first;
-            string last;
-            if (response.Contains("first_name"))
-            {
-                first = (string)response["first_name"];
-            }
-            else
-            {
-                first = "test";
-            }
-            if (response.Contains("last_name"))
-            {
-                last = (string)response["last_name"];
-            }
-            else
-            {
-                last = "User";
-            }
-            ArrayList InventoryList = (ArrayList)response["inventory-skeleton"];
-            Hashtable Inventory1 = (Hashtable)InventoryList[0];
-            Login _login = new Login();
-            //copy data to login object
-            _login.First = first;
-            _login.Last = last;
-            _login.Agent = new LLUUID((string)response["agent_id"]) ;
-            _login.Session = new LLUUID((string)response["session_id"]);
-            _login.SecureSession = new LLUUID((string)response["secure_session_id"]);
-            _login.CircuitCode =(uint) circode;
-            _login.BaseFolder = null;
-            _login.InventoryFolder = new LLUUID((string)Inventory1["folder_id"]);
-            //working on local computer if so lets add to the gridserver's list of sessions?
-            /*if (m_gridServer.GetName() == "Local")
-            {
-                Console.WriteLine("adding login data to gridserver");
-                ((LocalGridBase)this.m_gridServer).AddNewSession(_login);
-            }*/
-            this.AddSession(_login);
-        }
-    }
-}
diff --git a/Common/OpenSim.Servers/LoginResponse.cs b/Common/OpenSim.Servers/LoginResponse.cs
deleted file mode 100644
index 9e37409..0000000
--- a/Common/OpenSim.Servers/LoginResponse.cs
+++ /dev/null
@@ -1,669 +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 Nwc.XmlRpc;
-using System;
-using System.IO;
-using System.Net;
-using System.Net.Sockets;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Threading;
-using System.Collections;
-using System.Security.Cryptography;
-using System.Xml;
-using libsecondlife;
-using OpenSim;
-using OpenSim.Framework.User;
-using OpenSim.Framework.Inventory;
-using OpenSim.Framework.Utilities;
-using OpenSim.Framework.Interfaces;
-// ?
-using OpenSim.Framework.Grid;
-namespace OpenSim.UserServer
-{
-    /// <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 UserProfile userProfile;
-        private LLUUID agentID;
-        private LLUUID sessionID;
-        private LLUUID secureSessionID;
-        private LLUUID baseFolderID;
-        private LLUUID inventoryFolderID;
-        // Login Flags
-        private string dst;
-        private string stipendSinceLogin;
-        private string gendered;
-        private string everLoggedIn;
-        private string login;
-        private string 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 UserProfile();
-            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()
-        {
-            try
-            {
-                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");
-                int SessionRand = Util.RandomClass.Next(1, 999);
-                this.SessionID = new LLUUID("aaaabbbb-0200-" + SessionRand.ToString("0000") + "-8664-58f53e442797");
-                this.SecureSessionID = LLUUID.Random();
-                this.userProfile.Inventory.CreateRootFolder(this.userProfile.UUID, true);
-                this.baseFolderID = this.userProfile.Inventory.GetFolderID("Textures");
-                this.inventoryFolderID = this.userProfile.Inventory.GetFolderID("My Inventory-");
-                Hashtable InventoryRootHash = new Hashtable();
-                InventoryRootHash["folder_id"] = this.userProfile.Inventory.InventoryRoot.FolderID.ToStringHyphenated();
-                this.inventoryRoot.Add(InventoryRootHash);
-                Hashtable TempHash;
-                foreach (InventoryFolder InvFolder in this.userProfile.Inventory.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();
-                    this.agentInventory.Add(TempHash);
-                }
-                Hashtable InitialOutfitHash = new Hashtable();
-                InitialOutfitHash["folder_name"] = "Nightclub Female";
-                InitialOutfitHash["gender"] = "female";
-                this.initialOutfit.Add(InitialOutfitHash);
-            }
-            catch (Exception e)
-            {
-                OpenSim.Framework.Console.MainConsole.Instance.Warn(
-                    "LoginResponse: Unable to set default values: " + e.Message
-                );
-            }
-        } // SetDefaultValues
-        protected virtual LLUUID GetAgentId()
-        {
-            // todo
-            LLUUID Agent;
-            int AgentRand = Util.RandomClass.Next(1, 9999);
-            Agent = new LLUUID("99998888-0100-" + AgentRand.ToString("0000") + "-8ec1-0b1d5cd6aead");
-            return Agent;
-        } // GetAgentId
-        private 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 LoginFailedResponse()
-        {
-            return (this.GenerateFailureResponse("key", "You have entered an invalid name/password combination.  Check Caps/lock.", "false"));
-        } // LoginFailedResponse
-        public XmlRpcResponse ConnectionFailedResponse()
-        {
-            return (this.LoginFailedResponse());
-        } // CreateErrorConnectingToGridResponse()
-        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 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);
-                // Create a agent and session LLUUID
-                this.agentID = this.GetAgentId();
-                responseData["sim_port"] = 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["login"] = "true";
-                this.xmlRpcResponse.Value = responseData;
-                return (this.xmlRpcResponse);
-            }
-            catch (Exception e)
-            {
-                OpenSim.Framework.Console.MainConsole.Instance.Error(
-                    "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
-        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 string 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 LLUUID BaseFolderID
-        {
-            get
-            {
-                return this.baseFolderID;
-            }
-            set
-            {
-                this.baseFolderID = value;
-            }
-        } // BaseFolderID
-        public LLUUID InventoryFolderID
-        {
-            get
-            {
-                return this.inventoryFolderID;
-            }
-            set
-            {
-                this.inventoryFolderID = value;
-            }
-        } // InventoryFolderID
-        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
-    } // LoginResponse
-} // namespace OpenSim.UserServer
-\ No newline at end of file
diff --git a/Common/OpenSim.Servers/LoginServer.cs b/Common/OpenSim.Servers/LoginServer.cs
deleted file mode 100644
index 4f4d76f..0000000
--- a/Common/OpenSim.Servers/LoginServer.cs
+++ /dev/null
@@ -1,296 +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 Nwc.XmlRpc;
-using System;
-using System.IO;
-using System.Net;
-using System.Net.Sockets;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Threading;
-using System.Collections;
-using System.Security.Cryptography;
-using System.Xml;
-using libsecondlife;
-using OpenSim;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Grid;
-using OpenSim.Framework.Inventory;
-using OpenSim.Framework.User;
-using OpenSim.Framework.Utilities;
-using OpenSim.Framework.Types;
-namespace OpenSim.UserServer
-{
-    public delegate void AddNewSessionHandler(Login loginData);
-    /// <summary>
-    /// When running in local (default) mode , handles client logins.
-    /// </summary>
-    public class LoginServer : LoginService, IUserServer
-    {
-        private IGridServer m_gridServer;
-        public IPAddress clientAddress = IPAddress.Loopback;
-        public IPAddress remoteAddress = IPAddress.Any;
-        private int NumClients;
-        private bool userAccounts = false;
-        private string _mpasswd;
-        private bool _needPasswd = false;
-        private LocalUserProfileManager userManager;
-        private int m_simPort;
-        private string m_simAddr;
-        private uint regionX;
-        private uint regionY;
-        private AddNewSessionHandler AddSession;
-        public LocalUserProfileManager LocalUserManager
-        {
-            get
-            {
-                return userManager;
-            }
-        }
-        public LoginServer( string simAddr, int simPort, uint regX, uint regY, bool useAccounts)
-        {
-            m_simPort = simPort;
-            m_simAddr = simAddr;
-            regionX = regX;
-            regionY = regY;
-            this.userAccounts = useAccounts;
-        }
-        public void SetSessionHandler(AddNewSessionHandler sessionHandler)
-        {
-            this.AddSession = sessionHandler;
-            this.userManager.SetSessionHandler(sessionHandler);
-        }
-        public void Startup()
-        {
-            this._needPasswd = false;
-            this._mpasswd = EncodePassword("testpass");
-            userManager = new LocalUserProfileManager(this.m_gridServer, m_simPort, m_simAddr, regionX, regionY);
-            userManager.InitUserProfiles();
-            userManager.SetKeys("", "", "", "Welcome to OpenSim");
-        }
-        public XmlRpcResponse XmlRpcLoginMethod(XmlRpcRequest request)
-        {
-            Console.WriteLine("login attempt");
-            Hashtable requestData = (Hashtable)request.Params[0];
-            string first;
-            string last;
-            string passwd;
-            LoginResponse loginResponse = new LoginResponse();
-            loginResponse.RegionX = regionX;
-            loginResponse.RegionY = regionY;
-            //get login name
-            if (requestData.Contains("first"))
-            {
-                first = (string)requestData["first"];
-            }
-            else
-            {
-                first = "test";
-            }
-            if (requestData.Contains("last"))
-            {
-                last = (string)requestData["last"];
-            }
-            else
-            {
-                last = "User" + NumClients.ToString();
-            }
-            if (requestData.Contains("passwd"))
-            {
-                passwd = (string)requestData["passwd"];
-            }
-            else
-            {
-                passwd = "notfound";
-            }
-            if (!Authenticate(first, last, passwd))
-            {
-                return loginResponse.LoginFailedResponse();
-            }
-            NumClients++;
-            // Create a agent and session LLUUID
-            // Agent = GetAgentId(first, last);
-            // int SessionRand = Util.RandomClass.Next(1, 999);
-            // Session = new LLUUID("aaaabbbb-0200-" + SessionRand.ToString("0000") + "-8664-58f53e442797");
-            // LLUUID secureSess = LLUUID.Random();            
-            loginResponse.SimPort = m_simPort.ToString();
-            // 7 June 2007, AJD:
-            // [10:03:05]  (@AdamZaius) Sandbox should work listening on 0.0.0.0 if you can fix the login XML reply
-            // OLD: loginResponse.SimAddress = m_simAddr.ToString();
-            loginResponse.SimAddress = "0.0.0.0";
-            // loginResponse.AgentID = Agent.ToStringHyphenated();
-            // loginResponse.SessionID = Session.ToStringHyphenated();
-            // loginResponse.SecureSessionID = secureSess.ToStringHyphenated();
-            loginResponse.CircuitCode = (Int32)(Util.RandomClass.Next());
-            XmlRpcResponse response = loginResponse.ToXmlRpcResponse();
-            Hashtable responseData = (Hashtable)response.Value;
-            //inventory
-            /* ArrayList InventoryList = (ArrayList)responseData["inventory-skeleton"];
-             Hashtable Inventory1 = (Hashtable)InventoryList[0];
-            Hashtable Inventory2 = (Hashtable)InventoryList[1];
-            LLUUID BaseFolderID = LLUUID.Random();
-             LLUUID InventoryFolderID = LLUUID.Random();
-             Inventory2["name"] = "Textures";
-             Inventory2["folder_id"] = BaseFolderID.ToStringHyphenated();
-             Inventory2["type_default"] = 0;
-             Inventory1["folder_id"] = InventoryFolderID.ToStringHyphenated();
-             ArrayList InventoryRoot = (ArrayList)responseData["inventory-root"];
-             Hashtable Inventoryroot = (Hashtable)InventoryRoot[0];
-             Inventoryroot["folder_id"] = InventoryFolderID.ToStringHyphenated();
-            */
-            CustomiseLoginResponse(responseData, first, last);
-            Login _login = new Login();
-            //copy data to login object
-            _login.First = first;
-            _login.Last = last;
-            _login.Agent = loginResponse.AgentID;
-            _login.Session = loginResponse.SessionID;
-            _login.SecureSession = loginResponse.SecureSessionID;
-            _login.CircuitCode = (uint) loginResponse.CircuitCode;
-            _login.BaseFolder = loginResponse.BaseFolderID;
-            _login.InventoryFolder = loginResponse.InventoryFolderID;
-            //working on local computer if so lets add to the gridserver's list of sessions?
-           /* if (m_gridServer.GetName() == "Local")
-            {
-                ((LocalGridBase)m_gridServer).AddNewSession(_login);
-            }*/
-            AddSession(_login);
-            return response;
-        }
-        protected virtual void CustomiseLoginResponse(Hashtable responseData, string first, string last)
-        {
-        }
-        protected virtual LLUUID GetAgentId(string firstName, string lastName)
-        {
-            LLUUID Agent;
-            int AgentRand = Util.RandomClass.Next(1, 9999);
-            Agent = new LLUUID("99998888-0100-" + AgentRand.ToString("0000") + "-8ec1-0b1d5cd6aead");
-            return Agent;
-        }
-        protected virtual bool Authenticate(string first, string last, string passwd)
-        {
-            if (this._needPasswd)
-            {
-                //every user needs the password to login
-                string encodedPass = passwd.Remove(0, 3); //remove $1$
-                if (encodedPass == this._mpasswd)
-                {
-                    return true;
-                }
-                else
-                {
-                    return false;
-                }
-            }
-            else
-            {
-                //do not need password to login
-                return true;
-            }
-        }
-        private static string EncodePassword(string passwd)
-        {
-            Byte[] originalBytes;
-            Byte[] encodedBytes;
-            MD5 md5;
-            md5 = new MD5CryptoServiceProvider();
-            originalBytes = ASCIIEncoding.Default.GetBytes(passwd);
-            encodedBytes = md5.ComputeHash(originalBytes);
-            return Regex.Replace(BitConverter.ToString(encodedBytes), "-", "").ToLower();
-        }
-        public bool CreateUserAccount(string firstName, string lastName, string password)
-        {
-            Console.WriteLine("creating new user account");
-            string mdPassword = EncodePassword(password);
-            Console.WriteLine("with password: " + mdPassword);
-            this.userManager.CreateNewProfile(firstName, lastName, mdPassword);
-            
-            return true;
-        }
-        public UserProfile GetProfileByName(string firstName, string lastName)
-        {
-            return this.userManager.GetProfileByName(firstName, lastName);
-        }
-        //IUserServer implementation
-        public AgentInventory RequestAgentsInventory(LLUUID agentID)
-        {
-            AgentInventory aInventory = null;
-            if (this.userAccounts)
-            {
-                aInventory = this.userManager.GetUsersInventory(agentID);
-            }
-            return aInventory;
-        }
-        public bool UpdateAgentsInventory(LLUUID agentID, AgentInventory inventory)
-        {
-            return true;
-        }
-        public void SetServerInfo(string ServerUrl, string SendKey, string RecvKey)
-        {
-        }
-    }
-}
diff --git a/Common/OpenSim.Servers/OpenSim.Servers.csproj b/Common/OpenSim.Servers/OpenSim.Servers.csproj
deleted file mode 100644
index 7a99206..0000000
--- a/Common/OpenSim.Servers/OpenSim.Servers.csproj
+++ /dev/null
@@ -1,133 +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="BaseServer.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="CheckSumServer.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="IRestHandler.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LocalUserProfileManager.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LoginResponse.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LoginServer.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="SocketRegistry.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>
diff --git a/Common/OpenSim.Servers/OpenSim.Servers.dll.build b/Common/OpenSim.Servers/OpenSim.Servers.dll.build
deleted file mode 100644
index 6147ea7..0000000
--- a/Common/OpenSim.Servers/OpenSim.Servers.dll.build
+++ /dev/null
@@ -1,53 +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="BaseServer.cs" />
-                <include name="CheckSumServer.cs" />
-                <include name="IRestHandler.cs" />
-                <include name="LocalUserProfileManager.cs" />
-                <include name="LoginResponse.cs" />
-                <include name="LoginServer.cs" />
-                <include name="SocketRegistry.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/SocketRegistry.cs b/Common/OpenSim.Servers/SocketRegistry.cs
deleted file mode 100644
index 2ebf80c..0000000
--- a/Common/OpenSim.Servers/SocketRegistry.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Created by SharpDevelop.
- * User: Adam Stevenson
- * Date: 6/13/2007
- * Time: 12:55 AM
- * 
- * To change this template use Tools | Options | Coding | Edit Standard Headers.
- */
-using System;
-using System.Collections.Generic;
-using System.Net;
-using System.Net.Sockets;
-namespace OpenSim.Servers
-{
-        /// <summary>
-        /// 
-        /// </summary>
-        public class SocketRegistry
-        {
-                static List<Socket> _Sockets;
-        static SocketRegistry()
-        {
-            _Sockets = new List<Socket>();
-        }
-                private SocketRegistry()
-                {
-                        
-                }
-                
-                public static void Register(Socket pSocket)
-                {
-            _Sockets.Add(pSocket);
-                }
-        public static void Unregister(Socket pSocket)
-        {
-            _Sockets.Remove(pSocket);
-        }
-        public static void UnregisterAllAndClose()
-        {
-            int iSockets = _Sockets.Count;
-            for (int i = 0; i < iSockets; i++)
-            {
-                try
-                {
-                    _Sockets[i].Close();
-                }
-                catch
-                {
-                }
-            }
-            _Sockets.Clear();
-        }
-    }
-}
diff --git a/Common/OpenSim.Servers/UDPServerBase.cs b/Common/OpenSim.Servers/UDPServerBase.cs
deleted file mode 100644
index b763315..0000000
--- a/Common/OpenSim.Servers/UDPServerBase.cs
+++ /dev/null
@@ -1,103 +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);
-            /// Add this new socket to the list of sockets that was opened by the application.  When the application
-            /// closes, either gracefully or not, all sockets can be cleaned up.  Right now I am not aware of any method
-            /// to get all of the sockets for a process within .NET, but if so, this process can be refactored, as
-            /// socket registration would not be neccessary.
-            SocketRegistry.Register(Server);
-            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 b331ce0..0000000
--- a/Common/XmlRpcCS/SimpleHttpRequest.cs
+++ /dev/null
@@ -1,234 +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.
-* 
-*/
-namespace Nwc.XmlRpc
-{
-    using System;
-    using System.IO;
-    using System.Net.Sockets;
-    using System.Collections;
-    using System.Text;
-    ///<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 064c165..0000000
--- a/Common/XmlRpcCS/XmlRpcBoxcarRequest.cs
+++ /dev/null
@@ -1,78 +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.
-* 
-*/
-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 e9af1ac..0000000
--- a/Common/XmlRpcCS/XmlRpcClientProxy.cs
+++ /dev/null
@@ -1,88 +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.
-* 
-*/
-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 bffda57..0000000
--- a/Common/XmlRpcCS/XmlRpcDeserializer.cs
+++ /dev/null
@@ -1,222 +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.
-* 
-*/
-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 258ebe6..0000000
--- a/Common/XmlRpcCS/XmlRpcErrorCodes.cs
+++ /dev/null
@@ -1,78 +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.
-* 
-*/
-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 f728f90..0000000
--- a/Common/XmlRpcCS/XmlRpcException.cs
+++ /dev/null
@@ -1,66 +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.
-* 
-*/
-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 261ade3..0000000
--- a/Common/XmlRpcCS/XmlRpcExposedAttribute.cs
+++ /dev/null
@@ -1,87 +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.
-* 
-*/
-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 71a0dc9..0000000
--- a/Common/XmlRpcCS/XmlRpcRequest.cs
+++ /dev/null
@@ -1,177 +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.
-* 
-*/
-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 UTF8Encoding();
-        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 126a172..0000000
--- a/Common/XmlRpcCS/XmlRpcRequestDeserializer.cs
+++ /dev/null
@@ -1,92 +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.
-* 
-*/
-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 9bf95c7..0000000
--- a/Common/XmlRpcCS/XmlRpcRequestSerializer.cs
+++ /dev/null
@@ -1,78 +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.
-* 
-*/
-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 05377a2..0000000
--- a/Common/XmlRpcCS/XmlRpcResponder.cs
+++ /dev/null
@@ -1,127 +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.
-* 
-*/
-namespace Nwc.XmlRpc
-{
-    using System;
-    using System.Xml;
-    using System.Net.Sockets;
-    using System.Text;
-    /// <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 414998e..0000000
--- a/Common/XmlRpcCS/XmlRpcResponse.cs
+++ /dev/null
@@ -1,112 +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.
-* 
-*/
-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 46c5742..0000000
--- a/Common/XmlRpcCS/XmlRpcResponseDeserializer.cs
+++ /dev/null
@@ -1,92 +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.
-* 
-*/
-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 5ee4954..0000000
--- a/Common/XmlRpcCS/XmlRpcResponseSerializer.cs
+++ /dev/null
@@ -1,84 +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.
-* 
-*/
-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 b3b9af3..0000000
--- a/Common/XmlRpcCS/XmlRpcSerializer.cs
+++ /dev/null
@@ -1,143 +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.
-* 
-*/
-namespace Nwc.XmlRpc
-{
-    using System;
-    using System.Collections;
-    using System.IO;
-    using System.Xml;
-    using System.Text;
-    /// <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)
-        {
-            using (MemoryStream memStream = new MemoryStream(4096))
-            {
-                XmlTextWriter xml = new XmlTextWriter( memStream, null );
-                xml.Formatting = Formatting.Indented;
-                xml.Indentation = 4;                
-                Serialize(xml, obj);
-                xml.Flush();
-                byte[] resultBytes = memStream.ToArray();
-                
-                UTF8Encoding encoder = new UTF8Encoding();
-                String returns = encoder.GetString( resultBytes, 0, resultBytes.Length );
-                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 6d1f33a..0000000
--- a/Common/XmlRpcCS/XmlRpcServer.cs
+++ /dev/null
@@ -1,266 +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.
-* 
-*/
-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 4055d29..0000000
--- a/Common/XmlRpcCS/XmlRpcSystemObject.cs
+++ /dev/null
@@ -1,279 +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.
-* 
-*/
-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 27447bb..0000000
--- a/Common/XmlRpcCS/XmlRpcXmlTokens.cs
+++ /dev/null
@@ -1,103 +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.
-* 
-*/
-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";
-    }
-}
diff --git a/OpenGridServices.build b/OpenGridServices.build
deleted file mode 100644
index 76874bd..0000000
--- a/OpenGridServices.build
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" ?>
-<project name="OpenGridServices" default="build">
-    <echo message="Using '${nant.settings.currentframework}' Framework"/>
-    <property name="bin.dir" value="bin" />
-    <property name="obj.dir" value="obj" />
-    <property name="doc.dir" value="doc" />
-    <property name="project.main.dir" value="${project::get-base-directory()}" />
-    <target name="Debug" description="">
-        <property name="project.config" value="Debug" />
-        <property name="build.debug" value="true" />
-    </target>
-    <property name="project.config" value="Release" />
-    <target name="Release" description="">
-        <property name="project.config" value="Release" />
-        <property name="build.debug" value="false" />
-    </target>
-    <target name="net-1.1" description="Sets framework to .NET 1.1">
-        <property name="nant.settings.currentframework" value="net-1.1" />
-    </target>
-    <target name="net-2.0" description="Sets framework to .NET 2.0">
-        <property name="nant.settings.currentframework" value="net-2.0" />
-    </target>
-    <target name="mono-2.0" description="Sets framework to mono 2.0">
-        <property name="nant.settings.currentframework" value="mono-2.0" />
-    </target>
-    <target name="mono-1.0" description="Sets framework to mono 1.0">
-        <property name="nant.settings.currentframework" value="mono-1.0" />
-    </target>
-    <target name="init" description="">
-        <call target="${project.config}" />
-        <sysinfo />
-        <echo message="Platform ${sys.os.platform}" />
-        <property name="build.dir" value="${bin.dir}/${project.config}" />
-    </target>
-    <target name="clean" description="">
-        <echo message="Deleting all builds from all configurations" />
-        <delete dir="${bin.dir}" failonerror="false" />
-        <delete dir="${obj.dir}" failonerror="false" />
-        <nant buildfile="OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build" target="clean" />
-        <nant buildfile="OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build" target="clean" />
-        <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build" target="clean" />
-        <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build" target="clean" />
-        <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build" target="clean" />
-        <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build" target="clean" />
-        <nant buildfile="OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build" target="clean" />
-        <nant buildfile="OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build" target="clean" />
-        <nant buildfile="OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="clean" />
-        <nant buildfile="OpenGridServices/OpenGridServices.InventoryServer/OpenGridServices.InventoryServer.exe.build" target="clean" />
-        <nant buildfile="OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="clean" />
-        <nant buildfile="OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build" target="clean" />
-        <nant buildfile="OpenGridServices/ServiceManager/ServiceManager.exe.build" target="clean" />
-    </target>
-    <target name="build" depends="init" description="">
-        <nant buildfile="OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build" target="build" />
-        <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build" target="build" />
-        <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build" target="build" />
-        <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build" target="build" />
-        <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build" target="build" />
-        <nant buildfile="OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build" target="build" />
-        <nant buildfile="OpenGridServices/ServiceManager/ServiceManager.exe.build" target="build" />
-        <nant buildfile="OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="build" />
-        <nant buildfile="OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build" target="build" />
-        <nant buildfile="OpenGridServices/OpenGridServices.InventoryServer/OpenGridServices.InventoryServer.exe.build" target="build" />
-        <nant buildfile="OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="build" />
-        <nant buildfile="OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build" target="build" />
-        <nant buildfile="OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build" target="build" />
-    </target>
-    <target name="build-release" depends="Release, init, build" description="Builds in Release mode" />
-    <target name="build-debug" depends="Debug, init, build" description="Builds in Debug mode" />
-    <target name="package" depends="clean, doc" description="Builds all" />
-    <target name="doc" depends="build-release">
-        <echo message="Generating all documentation from all builds" />
-        <nant buildfile="OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build" target="doc" />
-        <nant buildfile="OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build" target="doc" />
-        <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build" target="doc" />
-        <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build" target="doc" />
-        <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build" target="doc" />
-        <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build" target="doc" />
-        <nant buildfile="OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build" target="doc" />
-        <nant buildfile="OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build" target="doc" />
-        <nant buildfile="OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="doc" />
-        <nant buildfile="OpenGridServices/OpenGridServices.InventoryServer/OpenGridServices.InventoryServer.exe.build" target="doc" />
-        <nant buildfile="OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="doc" />
-        <nant buildfile="OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build" target="doc" />
-        <nant buildfile="OpenGridServices/ServiceManager/ServiceManager.exe.build" target="doc" />
-    </target>
-</project>
diff --git a/OpenGridServices.sln b/OpenGridServices.sln
deleted file mode 100644
index 73e53c0..0000000
--- a/OpenGridServices.sln
+++ /dev/null
@@ -1,91 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Config.GridConfigDb4o", "OpenGridServices\OpenGrid.Config\GridConfigDb4o\OpenGrid.Config.GridConfigDb4o.csproj", "{B0027747-0000-0000-0000-000000000000}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Data", "OpenGridServices\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj", "{62CDF671-0000-0000-0000-000000000000}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Data.DB4o", "OpenGridServices\OpenGrid.Framework.Data.DB4o\OpenGrid.Framework.Data.DB4o.csproj", "{39BD9497-0000-0000-0000-000000000000}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Data.MSSQL", "OpenGridServices\OpenGrid.Framework.Data.MSSQL\OpenGrid.Framework.Data.MSSQL.csproj", "{0A563AC1-0000-0000-0000-000000000000}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Data.MySQL", "OpenGridServices\OpenGrid.Framework.Data.MySQL\OpenGrid.Framework.Data.MySQL.csproj", "{0F3C3AC1-0000-0000-0000-000000000000}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Data.SQLite", "OpenGridServices\OpenGrid.Framework.Data.SQLite\OpenGrid.Framework.Data.SQLite.csproj", "{1E3F341A-0000-0000-0000-000000000000}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Manager", "OpenGridServices\OpenGrid.Framework.Manager\OpenGrid.Framework.Manager.csproj", "{7924FD35-0000-0000-0000-000000000000}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.AssetServer", "OpenGridServices\OpenGridServices.AssetServer\OpenGridServices.AssetServer.csproj", "{0021261B-0000-0000-0000-000000000000}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.GridServer", "OpenGridServices\OpenGridServices.GridServer\OpenGridServices.GridServer.csproj", "{21BFC8E2-0000-0000-0000-000000000000}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.InventoryServer", "OpenGridServices\OpenGridServices.InventoryServer\OpenGridServices.InventoryServer.csproj", "{338FA00B-0000-0000-0000-000000000000}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.UserServer", "OpenGridServices\OpenGridServices.UserServer\OpenGridServices.UserServer.csproj", "{66591469-0000-0000-0000-000000000000}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenUser.Config.UserConfigDb4o", "OpenGridServices\OpenUser.Config\UserConfigDb4o\OpenUser.Config.UserConfigDb4o.csproj", "{7E494328-0000-0000-0000-000000000000}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceManager", "OpenGridServices\ServiceManager\ServiceManager.csproj", "{E141F4EE-0000-0000-0000-000000000000}"
-EndProject
-Global
-        GlobalSection(SolutionConfigurationPlatforms) = preSolution
-                Debug|Any CPU = Debug|Any CPU
-                Release|Any CPU = Release|Any CPU
-        EndGlobalSection
-        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-                {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-                {62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-                {39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-                {0A563AC1-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {0A563AC1-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {0A563AC1-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {0A563AC1-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-                {0F3C3AC1-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {0F3C3AC1-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {0F3C3AC1-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {0F3C3AC1-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-                {1E3F341A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {1E3F341A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {1E3F341A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {1E3F341A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-                {7924FD35-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {7924FD35-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {7924FD35-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {7924FD35-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-                {0021261B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {0021261B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {0021261B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {0021261B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-                {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-                {338FA00B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {338FA00B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {338FA00B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {338FA00B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-                {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {66591469-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {66591469-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-                {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-                {E141F4EE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {E141F4EE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {E141F4EE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {E141F4EE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-        EndGlobalSection
-        GlobalSection(SolutionProperties) = preSolution
-                HideSolutionNode = FALSE
-        EndGlobalSection
-EndGlobal
diff --git a/OpenGridServices/OpenGrid.Config/GridConfigDb4o/AssemblyInfo.cs b/OpenGridServices/OpenGrid.Config/GridConfigDb4o/AssemblyInfo.cs
deleted file mode 100644
index c9701d6..0000000
--- a/OpenGridServices/OpenGrid.Config/GridConfigDb4o/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("GridConfig")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("GridConfig")]
-[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/OpenGridServices/OpenGrid.Config/GridConfigDb4o/DbGridConfig.cs b/OpenGridServices/OpenGrid.Config/GridConfigDb4o/DbGridConfig.cs
deleted file mode 100644
index e69515a..0000000
--- a/OpenGridServices/OpenGrid.Config/GridConfigDb4o/DbGridConfig.cs
+++ /dev/null
@@ -1,161 +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 OpenSim.Framework.Console;
-using OpenSim.Framework.Interfaces;
-using Db4objects.Db4o;
-namespace OpenGrid.Config.GridConfigDb4o
-{
-    /// <summary>
-    /// A grid configuration interface for returning the DB4o Config Provider
-    /// </summary>
-        public class Db40ConfigPlugin: IGridConfig
-        {
-        /// <summary>
-        /// Loads and returns a configuration objeect
-        /// </summary>
-        /// <returns>A grid configuration object</returns>
-                public GridConfig GetConfigObject()
-                {
-                        OpenSim.Framework.Console.MainConsole.Instance.Verbose("Loading Db40Config dll");
-                        return ( new DbGridConfig());
-                }
-        }
-        
-    /// <summary>
-    /// A DB4o based Gridserver configuration object
-    /// </summary>
-        public class DbGridConfig : GridConfig
-        {
-        /// <summary>
-        /// The DB4o Database
-        /// </summary>
-                private IObjectContainer db;    
-                
-        /// <summary>
-        /// User configuration for the Grid Config interfaces
-        /// </summary>
-                public void LoadDefaults() {
-                        OpenSim.Framework.Console.MainConsole.Instance.Notice("Config.cs:LoadDefaults() - Please press enter to retain default or enter new settings");
-                        
-            // About the grid options
-                        this.GridOwner = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Grid owner", "OGS development team");
-            // Asset Options
-                        this.DefaultAssetServer = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Default asset server","http://127.0.0.1:8003/");
-            this.AssetSendKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to send to asset server","null");
-            this.AssetRecvKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to expect from asset server","null");
-            // User Server Options
-                this.DefaultUserServer = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Default user server","http://127.0.0.1:8002/");
-                this.UserSendKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to send to user server","null");
-                this.UserRecvKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to expect from user server","null");
-            // Region Server Options
-            this.SimSendKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to send to sims","null");
-            this.SimRecvKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to expect from sims","null");
-                }
-        /// <summary>
-        /// Initialises a new configuration object
-        /// </summary>
-                public override void InitConfig() {
-                        try {
-                // Perform Db4o initialisation
-                                db = Db4oFactory.OpenFile("opengrid.yap");
-                // Locate the grid configuration object
-                                IObjectSet result = db.Get(typeof(DbGridConfig));
-                // Found?
-                                if(result.Count==1) {
-                                        OpenSim.Framework.Console.MainConsole.Instance.Verbose("Config.cs:InitConfig() - Found a GridConfig object in the local database, loading");
-                                        foreach (DbGridConfig cfg in result) {
-                        // Import each setting into this class
-                        // Grid Settings
-                                                this.GridOwner=cfg.GridOwner;
-                        // Asset Settings
-                                                this.DefaultAssetServer=cfg.DefaultAssetServer;
-                                                this.AssetSendKey=cfg.AssetSendKey;
-                                                this.AssetRecvKey=cfg.AssetRecvKey;
-                        // User Settings
-                                                this.DefaultUserServer=cfg.DefaultUserServer;
-                                                this.UserSendKey=cfg.UserSendKey;
-                                                this.UserRecvKey=cfg.UserRecvKey;
-                        // Region Settings
-                                                this.SimSendKey=cfg.SimSendKey;
-                                                this.SimRecvKey=cfg.SimRecvKey;
-                                        }
-                // Create a new configuration object from this class
-                                } else {
-                                        OpenSim.Framework.Console.MainConsole.Instance.Verbose("Config.cs:InitConfig() - Could not find object in database, loading precompiled defaults");
-                    // Load default settings into this class
-                                        LoadDefaults();
-                    // Saves to the database file...
-                    OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Writing out default settings to local database");
-                                        db.Set(this);
-                    // Closes file locks
-                                        db.Close();
-                                }
-                        } catch(Exception e) {
-                                OpenSim.Framework.Console.MainConsole.Instance.Warn("Config.cs:InitConfig() - Exception occured");
-                OpenSim.Framework.Console.MainConsole.Instance.Warn(e.ToString());
-                        }
-                        
-            // Grid Settings
-                        OpenSim.Framework.Console.MainConsole.Instance.Verbose("Grid settings loaded:");
-                        OpenSim.Framework.Console.MainConsole.Instance.Verbose("Grid owner: " + this.GridOwner);
-            // Asset Settings
-                        OpenSim.Framework.Console.MainConsole.Instance.Verbose("Default asset server: " + this.DefaultAssetServer);
-                        OpenSim.Framework.Console.MainConsole.Instance.Verbose("Key to send to asset server: " + this.AssetSendKey);
-                        OpenSim.Framework.Console.MainConsole.Instance.Verbose("Key to expect from asset server: " + this.AssetRecvKey);
-            // User Settings
-                        OpenSim.Framework.Console.MainConsole.Instance.Verbose("Default user server: " + this.DefaultUserServer);
-                        OpenSim.Framework.Console.MainConsole.Instance.Verbose("Key to send to user server: " + this.UserSendKey);
-                        OpenSim.Framework.Console.MainConsole.Instance.Verbose("Key to expect from user server: " + this.UserRecvKey);
-            // Region Settings
-                        OpenSim.Framework.Console.MainConsole.Instance.Verbose("Key to send to sims: " + this.SimSendKey);
-                        OpenSim.Framework.Console.MainConsole.Instance.Verbose("Key to expect from sims: " + this.SimRecvKey);
-                }
-        
-        /// <summary>
-        /// Closes down the database and releases filesystem locks
-        /// </summary>
-                public void Shutdown() {
-                        db.Close();
-                }
-        }
-        
-}
diff --git a/OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.csproj b/OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.csproj
deleted file mode 100644
index ddb48af..0000000
--- a/OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.csproj
+++ /dev/null
@@ -1,107 +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>{B0027747-0000-0000-0000-000000000000}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon></ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>OpenGrid.Config.GridConfigDb4o</AssemblyName>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenGrid.Config.GridConfigDb4o</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="System" >
-      <HintPath>System.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Data.dll" >
-      <HintPath>..\..\..\bin\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="AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="DbGridConfig.cs">
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
diff --git a/OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build b/OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build
deleted file mode 100644
index 075593b..0000000
--- a/OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" ?>
-<project name="OpenGrid.Config.GridConfigDb4o" 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.Config.GridConfigDb4o" dynamicprefix="true" >
-            </resources>
-            <sources failonempty="true">
-                <include name="AssemblyInfo.cs" />
-                <include name="DbGridConfig.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.dll" />
-                <include name="../../../bin/OpenSim.Framework.Console.dll" />
-                <include name="System.dll" />
-                <include name="System.Data.dll.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/OpenGridServices/OpenGrid.Framework.Data.DB4o/DB4oGridData.cs b/OpenGridServices/OpenGrid.Framework.Data.DB4o/DB4oGridData.cs
deleted file mode 100644
index 2b23131..0000000
--- a/OpenGridServices/OpenGrid.Framework.Data.DB4o/DB4oGridData.cs
+++ /dev/null
@@ -1,161 +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";
-        }
-    }
-}
diff --git a/OpenGridServices/OpenGrid.Framework.Data.DB4o/DB4oManager.cs b/OpenGridServices/OpenGrid.Framework.Data.DB4o/DB4oManager.cs
deleted file mode 100644
index 356a49c..0000000
--- a/OpenGridServices/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/OpenGridServices/OpenGrid.Framework.Data.DB4o/DB4oUserData.cs b/OpenGridServices/OpenGrid.Framework.Data.DB4o/DB4oUserData.cs
deleted file mode 100644
index 315f48d..0000000
--- a/OpenGridServices/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/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj b/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj
deleted file mode 100644
index d2d6140..0000000
--- a/OpenGridServices/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/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build b/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build
deleted file mode 100644
index d82d751..0000000
--- a/OpenGridServices/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/OpenGridServices/OpenGrid.Framework.Data.DB4o/Properties/AssemblyInfo.cs b/OpenGridServices/OpenGrid.Framework.Data.DB4o/Properties/AssemblyInfo.cs
deleted file mode 100644
index dc4a9a1..0000000
--- a/OpenGridServices/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/OpenGridServices/OpenGrid.Framework.Data.MSSQL/MSSQLGridData.cs b/OpenGridServices/OpenGrid.Framework.Data.MSSQL/MSSQLGridData.cs
deleted file mode 100644
index 92169c4..0000000
--- a/OpenGridServices/OpenGrid.Framework.Data.MSSQL/MSSQLGridData.cs
+++ /dev/null
@@ -1,190 +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;
-namespace OpenGrid.Framework.Data.MSSQL
-{
-    /// <summary>
-    /// A grid data interface for Microsoft SQL Server
-    /// </summary>
-    public class SqlGridData : IGridData
-    {
-        /// <summary>
-        /// Database manager
-        /// </summary>
-        private MSSqlManager database;
-        /// <summary>
-        /// Initialises the Grid Interface
-        /// </summary>
-        public void Initialise()
-        {
-            database = new MSSqlManager("localhost", "db", "user", "password", "false");
-        }
-        /// <summary>
-        /// Shuts down the grid interface
-        /// </summary>
-        public void Close()
-        {
-            database.Close();
-        }
-        /// <summary>
-        /// Returns the storage system name
-        /// </summary>
-        /// <returns>A string containing the storage system name</returns>
-        public string getName()
-        {
-            return "Sql OpenGridData";
-        }
-        /// <summary>
-        /// Returns the storage system version
-        /// </summary>
-        /// <returns>A string containing the storage system version</returns>
-        public string getVersion()
-        {
-            return "0.1";
-        }
-        /// <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 sim profile from it's location
-        /// </summary>
-        /// <param name="handle">Region location handle</param>
-        /// <returns>Sim profile</returns>
-        public SimProfileData GetProfileByHandle(ulong handle)
-        {
-            Dictionary<string, string> param = new Dictionary<string, string>();
-            param["handle"] = handle.ToString();
-            System.Data.IDbCommand result = database.Query("SELECT * FROM regions WHERE handle = @handle", param);
-            System.Data.IDataReader reader = result.ExecuteReader();
-            SimProfileData row = database.getRow(reader);
-            reader.Close();
-            result.Dispose();
-            return row;
-        }
-        /// <summary>
-        /// Returns a sim profile from it's UUID
-        /// </summary>
-        /// <param name="uuid">The region UUID</param>
-        /// <returns>The sim profile</returns>
-        public SimProfileData GetProfileByLLUUID(libsecondlife.LLUUID uuid)
-        {
-            Dictionary<string, string> param = new Dictionary<string, string>();
-            param["uuid"] = uuid.ToStringHyphenated();
-            System.Data.IDbCommand result = database.Query("SELECT * FROM regions WHERE uuid = @uuid", param);
-            System.Data.IDataReader reader = result.ExecuteReader();
-            SimProfileData row = database.getRow(reader);
-            reader.Close();
-            result.Dispose();
-            return row;
-        }
-        /// <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)
-        {
-            if (database.insertRow(profile))
-            {
-                return DataResponse.RESPONSE_OK;
-            }
-            else
-            {
-                return DataResponse.RESPONSE_ERROR;
-            }
-        }
-        /// <summary>
-        /// DEPRECIATED. Attempts to authenticate a region by comparing a shared secret.
-        /// </summary>
-        /// <param name="uuid">The UUID of the challenger</param>
-        /// <param name="handle">The attempted regionHandle of the challenger</param>
-        /// <param name="authkey">The secret</param>
-        /// <returns>Whether the secret and regionhandle match the database entry for UUID</returns>
-        public bool AuthenticateSim(libsecondlife.LLUUID uuid, ulong handle, string authkey)
-        {
-            bool throwHissyFit = false; // Should be true by 1.0
-            if (throwHissyFit)
-                throw new Exception("CRYPTOWEAK AUTHENTICATE: Refusing to authenticate due to replay potential.");
-            SimProfileData data = GetProfileByLLUUID(uuid);
-            return (handle == data.regionHandle && authkey == data.regionSecret);
-        }
-        /// <summary>
-        /// NOT YET FUNCTIONAL. Provides a cryptographic authentication of a region
-        /// </summary>
-        /// <remarks>This requires a security audit.</remarks>
-        /// <param name="uuid"></param>
-        /// <param name="handle"></param>
-        /// <param name="authhash"></param>
-        /// <param name="challenge"></param>
-        /// <returns></returns>
-        public bool AuthenticateSim(libsecondlife.LLUUID uuid, ulong handle, string authhash, string challenge)
-        {
-            System.Security.Cryptography.SHA512Managed HashProvider = new System.Security.Cryptography.SHA512Managed();
-            System.Text.ASCIIEncoding TextProvider = new ASCIIEncoding();
-            byte[] stream = TextProvider.GetBytes(uuid.ToStringHyphenated() + ":" + handle.ToString() + ":" + challenge);
-            byte[] hash = HashProvider.ComputeHash(stream);
-            return false;
-        }
-    }
-}
diff --git a/OpenGridServices/OpenGrid.Framework.Data.MSSQL/MSSQLManager.cs b/OpenGridServices/OpenGrid.Framework.Data.MSSQL/MSSQLManager.cs
deleted file mode 100644
index 475a3e7..0000000
--- a/OpenGridServices/OpenGrid.Framework.Data.MSSQL/MSSQLManager.cs
+++ /dev/null
@@ -1,214 +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.Data;
-using System.Data.SqlClient;
-using OpenGrid.Framework.Data;
-namespace OpenGrid.Framework.Data.MSSQL
-{
-    /// <summary>
-    /// A management class for the MS SQL Storage Engine
-    /// </summary>
-    class MSSqlManager
-    {
-        /// <summary>
-        /// The database connection object
-        /// </summary>
-        IDbConnection dbcon;
-        /// <summary>
-        /// Initialises and creates a new Sql connection and maintains it.
-        /// </summary>
-        /// <param name="hostname">The Sql server being connected to</param>
-        /// <param name="database">The name of the Sql database being used</param>
-        /// <param name="username">The username logging into the database</param>
-        /// <param name="password">The password for the user logging in</param>
-        /// <param name="cpooling">Whether to use connection pooling or not, can be one of the following: 'yes', 'true', 'no' or 'false', if unsure use 'false'.</param>
-        public MSSqlManager(string hostname, string database, string username, string password, string cpooling)
-        {
-            try
-            {
-                string connectionString = "Server=" + hostname + ";Database=" + database + ";User ID=" + username + ";Password=" + password + ";Pooling=" + cpooling + ";";
-                dbcon = new SqlConnection(connectionString);
-                dbcon.Open();
-            }
-            catch (Exception e)
-            {
-                throw new Exception("Error initialising Sql Database: " + e.ToString());
-            }
-        }
-        /// <summary>
-        /// Shuts down the database connection
-        /// </summary>
-        public void Close()
-        {
-            dbcon.Close();
-            dbcon = null;
-        }
-        /// <summary>
-        /// Runs a query with protection against SQL Injection by using parameterised input.
-        /// </summary>
-        /// <param name="sql">The SQL string - replace any variables such as WHERE x = "y" with WHERE x = @y</param>
-        /// <param name="parameters">The parameters - index so that @y is indexed as 'y'</param>
-        /// <returns>A Sql DB Command</returns>
-        public IDbCommand Query(string sql, Dictionary<string, string> parameters)
-        {
-            SqlCommand dbcommand = (SqlCommand)dbcon.CreateCommand();
-            dbcommand.CommandText = sql;
-            foreach (KeyValuePair<string, string> param in parameters)
-            {
-                dbcommand.Parameters.AddWithValue(param.Key, param.Value);
-            }
-            return (IDbCommand)dbcommand;
-        }
-        /// <summary>
-        /// Runs a database reader object and returns a region row
-        /// </summary>
-        /// <param name="reader">An active database reader</param>
-        /// <returns>A region row</returns>
-        public SimProfileData getRow(IDataReader reader)
-        {
-            SimProfileData regionprofile = new SimProfileData();
-            if (reader.Read())
-            {
-                // Region Main
-                regionprofile.regionHandle = (ulong)reader["regionHandle"];
-                regionprofile.regionName = (string)reader["regionName"];
-                regionprofile.UUID = new libsecondlife.LLUUID((string)reader["uuid"]);
-                // Secrets
-                regionprofile.regionRecvKey = (string)reader["regionRecvKey"];
-                regionprofile.regionSecret = (string)reader["regionSecret"];
-                regionprofile.regionSendKey = (string)reader["regionSendKey"];
-                // Region Server
-                regionprofile.regionDataURI = (string)reader["regionDataURI"];
-                regionprofile.regionOnline = false; // Needs to be pinged before this can be set.
-                regionprofile.serverIP = (string)reader["serverIP"];
-                regionprofile.serverPort = (uint)reader["serverPort"];
-                regionprofile.serverURI = (string)reader["serverURI"];
-                // Location
-                regionprofile.regionLocX = (uint)((int)reader["locX"]);
-                regionprofile.regionLocY = (uint)((int)reader["locY"]);
-                regionprofile.regionLocZ = (uint)((int)reader["locZ"]);
-                // Neighbours - 0 = No Override
-                regionprofile.regionEastOverrideHandle = (ulong)reader["eastOverrideHandle"];
-                regionprofile.regionWestOverrideHandle = (ulong)reader["westOverrideHandle"];
-                regionprofile.regionSouthOverrideHandle = (ulong)reader["southOverrideHandle"];
-                regionprofile.regionNorthOverrideHandle = (ulong)reader["northOverrideHandle"];
-                // Assets
-                regionprofile.regionAssetURI = (string)reader["regionAssetURI"];
-                regionprofile.regionAssetRecvKey = (string)reader["regionAssetRecvKey"];
-                regionprofile.regionAssetSendKey = (string)reader["regionAssetSendKey"];
-                // Userserver
-                regionprofile.regionUserURI = (string)reader["regionUserURI"];
-                regionprofile.regionUserRecvKey = (string)reader["regionUserRecvKey"];
-                regionprofile.regionUserSendKey = (string)reader["regionUserSendKey"];
-            }
-            else
-            {
-                throw new Exception("No rows to return");
-            }
-            return regionprofile;
-        }
-        /// <summary>
-        /// Creates a new region in the database
-        /// </summary>
-        /// <param name="profile">The region profile to insert</param>
-        /// <returns>Successful?</returns>
-        public bool insertRow(SimProfileData profile)
-        {
-            string sql = "REPLACE INTO regions VALUES (regionHandle, regionName, uuid, regionRecvKey, regionSecret, regionSendKey, regionDataURI, ";
-            sql += "serverIP, serverPort, serverURI, locX, locY, locZ, eastOverrideHandle, westOverrideHandle, southOverrideHandle, northOverrideHandle, regionAssetURI, regionAssetRecvKey, ";
-            sql += "regionAssetSendKey, regionUserURI, regionUserRecvKey, regionUserSendKey) VALUES ";
-            sql += "(@regionHandle, @regionName, @uuid, @regionRecvKey, @regionSecret, @regionSendKey, @regionDataURI, ";
-            sql += "@serverIP, @serverPort, @serverURI, @locX, @locY, @locZ, @eastOverrideHandle, @westOverrideHandle, @southOverrideHandle, @northOverrideHandle, @regionAssetURI, @regionAssetRecvKey, ";
-            sql += "@regionAssetSendKey, @regionUserURI, @regionUserRecvKey, @regionUserSendKey);";
-            Dictionary<string, string> parameters = new Dictionary<string, string>();
-            parameters["regionHandle"] = profile.regionHandle.ToString();
-            parameters["regionName"] = profile.regionName;
-            parameters["uuid"] = profile.UUID.ToString();
-            parameters["regionRecvKey"] = profile.regionRecvKey;
-            parameters["regionSendKey"] = profile.regionSendKey;
-            parameters["regionDataURI"] = profile.regionDataURI;
-            parameters["serverIP"] = profile.serverIP;
-            parameters["serverPort"] = profile.serverPort.ToString();
-            parameters["serverURI"] = profile.serverURI;
-            parameters["locX"] = profile.regionLocX.ToString();
-            parameters["locY"] = profile.regionLocY.ToString();
-            parameters["locZ"] = profile.regionLocZ.ToString();
-            parameters["eastOverrideHandle"] = profile.regionEastOverrideHandle.ToString();
-            parameters["westOverrideHandle"] = profile.regionWestOverrideHandle.ToString();
-            parameters["northOverrideHandle"] = profile.regionNorthOverrideHandle.ToString();
-            parameters["southOverrideHandle"] = profile.regionSouthOverrideHandle.ToString();
-            parameters["regionAssetURI"] = profile.regionAssetURI;
-            parameters["regionAssetRecvKey"] = profile.regionAssetRecvKey;
-            parameters["regionAssetSendKey"] = profile.regionAssetSendKey;
-            parameters["regionUserURI"] = profile.regionUserURI;
-            parameters["regionUserRecvKey"] = profile.regionUserRecvKey;
-            parameters["regionUserSendKey"] = profile.regionUserSendKey;
-            bool returnval = false;
-            try
-            {
-                IDbCommand result = Query(sql, parameters);
-                if (result.ExecuteNonQuery() == 1)
-                    returnval = true;
-                result.Dispose();
-            }
-            catch (Exception e)
-            {
-                return false;
-            }
-            return returnval;
-        }
-    }
-}
diff --git a/OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj b/OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj
deleted file mode 100644
index fa18c28..0000000
--- a/OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj
+++ /dev/null
@@ -1,104 +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>{0A563AC1-0000-0000-0000-000000000000}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon></ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>OpenGrid.Framework.Data.MSSQL</AssemblyName>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenGrid.Framework.Data.MSSQL</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>
-    <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="MSSQLGridData.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="MSSQLManager.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/OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build b/OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build
deleted file mode 100644
index 577da4b..0000000
--- a/OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" ?>
-<project name="OpenGrid.Framework.Data.MSSQL" 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.MSSQL" dynamicprefix="true" >
-            </resources>
-            <sources failonempty="true">
-                <include name="MSSQLGridData.cs" />
-                <include name="MSSQLManager.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="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/OpenGridServices/OpenGrid.Framework.Data.MSSQL/Properties/AssemblyInfo.cs b/OpenGridServices/OpenGrid.Framework.Data.MSSQL/Properties/AssemblyInfo.cs
deleted file mode 100644
index bbe3cdf..0000000
--- a/OpenGridServices/OpenGrid.Framework.Data.MSSQL/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.MSSQL")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("OpenGrid.Framework.Data.MSSQL")]
-[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("0e1c1ca4-2cf2-4315-b0e7-432c02feea8a")]
-// 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/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLGridData.cs b/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLGridData.cs
deleted file mode 100644
index d9a517d..0000000
--- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLGridData.cs
+++ /dev/null
@@ -1,258 +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;
-namespace OpenGrid.Framework.Data.MySQL
-{
-    /// <summary>
-    /// A MySQL Interface for the Grid Server
-    /// </summary>
-    public class MySQLGridData : IGridData
-    {
-        /// <summary>
-        /// MySQL Database Manager
-        /// </summary>
-        private MySQLManager database;
-        /// <summary>
-        /// Initialises the Grid Interface
-        /// </summary>
-        public void Initialise()
-        {
-            IniFile GridDataMySqlFile = new IniFile("mysql_connection.ini");
-            string settingHostname = GridDataMySqlFile.ParseFileReadValue("hostname");
-            string settingDatabase = GridDataMySqlFile.ParseFileReadValue("database");
-            string settingUsername = GridDataMySqlFile.ParseFileReadValue("username");
-            string settingPassword = GridDataMySqlFile.ParseFileReadValue("password");
-            string settingPooling = GridDataMySqlFile.ParseFileReadValue("pooling");
-            string settingPort = GridDataMySqlFile.ParseFileReadValue("port");
-            database = new MySQLManager(settingHostname, settingDatabase, settingUsername, settingPassword, settingPooling, settingPort);
-        }
-        /// <summary>
-        /// Shuts down the grid interface
-        /// </summary>
-        public void Close()
-        {
-            database.Close();
-        }
-        /// <summary>
-        /// Returns the plugin name
-        /// </summary>
-        /// <returns>Plugin name</returns>
-        public string getName()
-        {
-            return "MySql OpenGridData";
-        }
-        /// <summary>
-        /// Returns the plugin version
-        /// </summary>
-        /// <returns>Plugin version</returns>
-        public string getVersion()
-        {
-            return "0.1";
-        }
-        /// <summary>
-        /// Returns all the specified region profiles within coordates -- coordinates are inclusive
-        /// </summary>
-        /// <param name="xmin">Minimum X coordinate</param>
-        /// <param name="ymin">Minimum Y coordinate</param>
-        /// <param name="xmax">Maximum X coordinate</param>
-        /// <param name="ymax">Maximum Y coordinate</param>
-        /// <returns></returns>
-        public SimProfileData[] GetProfilesInRange(uint xmin, uint ymin, uint xmax, uint ymax)
-        {
-            try
-            {
-                lock (database)
-                {
-                    Dictionary<string, string> param = new Dictionary<string, string>();
-                    param["?xmin"] = xmin.ToString();
-                    param["?ymin"] = ymin.ToString();
-                    param["?xmax"] = xmax.ToString();
-                    param["?ymax"] = ymax.ToString();
-                    System.Data.IDbCommand result = database.Query("SELECT * FROM regions WHERE locX >= ?xmin AND locX <= ?xmax AND locY >= ?ymin AND locY <= ?ymax", param);
-                    System.Data.IDataReader reader = result.ExecuteReader();
-                    SimProfileData row;
-                    List<SimProfileData> rows = new List<SimProfileData>();
-                    while ((row = database.readSimRow(reader)) != null)
-                    {
-                        rows.Add(row);
-                    }
-                    reader.Close();
-                    result.Dispose();
-                    return rows.ToArray();
-                }
-            }
-            catch (Exception e)
-            {
-                database.Reconnect();
-                Console.WriteLine(e.ToString());
-                return null;
-            }
-        }
-        /// <summary>
-        /// Returns a sim profile from it's location
-        /// </summary>
-        /// <param name="handle">Region location handle</param>
-        /// <returns>Sim profile</returns>
-        public SimProfileData GetProfileByHandle(ulong handle)
-        {
-            try
-            {
-                lock (database)
-                {
-                    Dictionary<string, string> param = new Dictionary<string, string>();
-                    param["?handle"] = handle.ToString();
-                    System.Data.IDbCommand result = database.Query("SELECT * FROM regions WHERE regionHandle = ?handle", param);
-                    System.Data.IDataReader reader = result.ExecuteReader();
-                    SimProfileData row = database.readSimRow(reader);
-                    reader.Close();
-                    result.Dispose();
-                    return row;
-                }
-            }
-            catch (Exception e)
-            {
-                database.Reconnect();
-                Console.WriteLine(e.ToString());
-                return null;
-            }
-        }
-        /// <summary>
-        /// Returns a sim profile from it's UUID
-        /// </summary>
-        /// <param name="uuid">The region UUID</param>
-        /// <returns>The sim profile</returns>
-        public SimProfileData GetProfileByLLUUID(libsecondlife.LLUUID uuid)
-        {
-            try
-            {
-                lock (database)
-                {
-                    Dictionary<string, string> param = new Dictionary<string, string>();
-                    param["?uuid"] = uuid.ToStringHyphenated();
-                    System.Data.IDbCommand result = database.Query("SELECT * FROM regions WHERE uuid = ?uuid", param);
-                    System.Data.IDataReader reader = result.ExecuteReader();
-                    SimProfileData row = database.readSimRow(reader);
-                    reader.Close();
-                    result.Dispose();
-                    return row;
-                }
-            }
-            catch (Exception e)
-            {
-                database.Reconnect();
-                Console.WriteLine(e.ToString());
-                return null;
-            }
-        }
-        /// <summary>
-        /// Adds a new profile to the database
-        /// </summary>
-        /// <param name="profile">The profile to add</param>
-        /// <returns>Successful?</returns>
-        public DataResponse AddProfile(SimProfileData profile)
-        {
-            lock (database)
-            {
-                if (database.insertRegion(profile))
-                {
-                    return DataResponse.RESPONSE_OK;
-                }
-                else
-                {
-                    return DataResponse.RESPONSE_ERROR;
-                }
-            }
-        }
-        /// <summary>
-        /// DEPRECIATED. Attempts to authenticate a region by comparing a shared secret.
-        /// </summary>
-        /// <param name="uuid">The UUID of the challenger</param>
-        /// <param name="handle">The attempted regionHandle of the challenger</param>
-        /// <param name="authkey">The secret</param>
-        /// <returns>Whether the secret and regionhandle match the database entry for UUID</returns>
-        public bool AuthenticateSim(libsecondlife.LLUUID uuid, ulong handle, string authkey)
-        {
-            bool throwHissyFit = false; // Should be true by 1.0
-            if (throwHissyFit)
-                throw new Exception("CRYPTOWEAK AUTHENTICATE: Refusing to authenticate due to replay potential.");
-            SimProfileData data = GetProfileByLLUUID(uuid);
-            return (handle == data.regionHandle && authkey == data.regionSecret);
-        }
-        /// <summary>
-        /// NOT YET FUNCTIONAL. Provides a cryptographic authentication of a region
-        /// </summary>
-        /// <remarks>This requires a security audit.</remarks>
-        /// <param name="uuid"></param>
-        /// <param name="handle"></param>
-        /// <param name="authhash"></param>
-        /// <param name="challenge"></param>
-        /// <returns></returns>
-        public bool AuthenticateSim(libsecondlife.LLUUID uuid, ulong handle, string authhash, string challenge)
-        {
-            System.Security.Cryptography.SHA512Managed HashProvider = new System.Security.Cryptography.SHA512Managed();
-            System.Text.ASCIIEncoding TextProvider = new ASCIIEncoding();
-            byte[] stream = TextProvider.GetBytes(uuid.ToStringHyphenated() + ":" + handle.ToString() + ":" + challenge);
-            byte[] hash = HashProvider.ComputeHash(stream);
-            return false;
-        }
-    }
-}
diff --git a/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLInventoryData.cs b/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLInventoryData.cs
deleted file mode 100644
index fb429e4..0000000
--- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLInventoryData.cs
+++ /dev/null
@@ -1,309 +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.MySQL
-{
-    /// <summary>
-    /// A MySQL interface for the inventory server
-    /// </summary>
-    class MySQLInventoryData : IInventoryData
-    {
-        /// <summary>
-        /// The database manager
-        /// </summary>
-        public MySQLManager database;
-        /// <summary>
-        /// Loads and initialises this database plugin
-        /// </summary>
-        public void Initialise()
-        {
-            IniFile GridDataMySqlFile = new IniFile("mysql_connection.ini");
-            string settingHostname = GridDataMySqlFile.ParseFileReadValue("hostname");
-            string settingDatabase = GridDataMySqlFile.ParseFileReadValue("database");
-            string settingUsername = GridDataMySqlFile.ParseFileReadValue("username");
-            string settingPassword = GridDataMySqlFile.ParseFileReadValue("password");
-            string settingPooling = GridDataMySqlFile.ParseFileReadValue("pooling");
-            string settingPort = GridDataMySqlFile.ParseFileReadValue("port");
-            database = new MySQLManager(settingHostname, settingDatabase, settingUsername, settingPassword, settingPooling, settingPort);
-        }
-        
-        /// <summary>
-        /// The name of this DB provider
-        /// </summary>
-        /// <returns>Name of DB provider</returns>
-        public string getName()
-        {
-            return "MySQL Inventory Data Interface";
-        }
-        /// <summary>
-        /// Closes this DB provider
-        /// </summary>
-        public void Close()
-        {
-            // Do nothing.
-        }
-        /// <summary>
-        /// Returns the version of this DB provider
-        /// </summary>
-        /// <returns>A string containing the DB provider</returns>
-        public string getVersion()
-        {
-            return "0.1";
-        }
-        /// <summary>
-        /// Returns a list of items in a specified folder
-        /// </summary>
-        /// <param name="folderID">The folder to search</param>
-        /// <returns>A list containing inventory items</returns>
-        public List<InventoryItemBase> getInventoryInFolder(LLUUID folderID)
-        {
-            try
-            {
-                lock (database)
-                {
-                    Dictionary<string, string> param = new Dictionary<string, string>();
-                    param["?uuid"] = folderID.ToStringHyphenated();
-                    System.Data.IDbCommand result = database.Query("SELECT * FROM inventoryitems WHERE parentFolderID = ?uuid", param);
-                    System.Data.IDataReader reader = result.ExecuteReader();
-                    List<InventoryItemBase> items = database.readInventoryItems(reader);
-                    reader.Close();
-                    result.Dispose();
-                    return items;
-                }
-            }
-            catch (Exception e)
-            {
-                database.Reconnect();
-                Console.WriteLine(e.ToString());
-                return null;
-            }
-        }
-        /// <summary>
-        /// Returns a list of the root folders within a users inventory
-        /// </summary>
-        /// <param name="user">The user whos inventory is to be searched</param>
-        /// <returns>A list of folder objects</returns>
-        public List<InventoryFolderBase> getUserRootFolders(LLUUID user)
-        {
-            try
-            {
-                lock (database)
-                {
-                    Dictionary<string, string> param = new Dictionary<string, string>();
-                    param["?uuid"] = user.ToStringHyphenated();
-                    param["?zero"] = LLUUID.Zero.ToStringHyphenated();
-                    System.Data.IDbCommand result = database.Query("SELECT * FROM inventoryfolders WHERE parentFolderID = ?zero AND agentID = ?uuid", param);
-                    System.Data.IDataReader reader = result.ExecuteReader();
-                    List<InventoryFolderBase> items = database.readInventoryFolders(reader);
-                    reader.Close();
-                    result.Dispose();
-                    return items;
-                }
-            }
-            catch (Exception e)
-            {
-                database.Reconnect();
-                Console.WriteLine(e.ToString());
-                return null;
-            }
-        }
-        /// <summary>
-        /// Returns a list of folders in a users inventory contained within the specified folder
-        /// </summary>
-        /// <param name="parentID">The folder to search</param>
-        /// <returns>A list of inventory folders</returns>
-        public List<InventoryFolderBase> getInventoryFolders(LLUUID parentID)
-        {
-            try
-            {
-                lock (database)
-                {
-                    Dictionary<string, string> param = new Dictionary<string, string>();
-                    param["?uuid"] = parentID.ToStringHyphenated();
-                    System.Data.IDbCommand result = database.Query("SELECT * FROM inventoryfolders WHERE parentFolderID = ?uuid", param);
-                    System.Data.IDataReader reader = result.ExecuteReader();
-                    List<InventoryFolderBase> items = database.readInventoryFolders(reader);
-                    reader.Close();
-                    result.Dispose();
-                    return items;
-                }
-            }
-            catch (Exception e)
-            {
-                database.Reconnect();
-                Console.WriteLine(e.ToString());
-                return null;
-            }
-        }
-        /// <summary>
-        /// Returns a specified inventory item
-        /// </summary>
-        /// <param name="item">The item to return</param>
-        /// <returns>An inventory item</returns>
-        public InventoryItemBase getInventoryItem(LLUUID item)
-        {
-            try
-            {
-                lock (database)
-                {
-                    Dictionary<string, string> param = new Dictionary<string, string>();
-                    param["?uuid"] = item.ToStringHyphenated();
-                    System.Data.IDbCommand result = database.Query("SELECT * FROM inventoryitems WHERE inventoryID = ?uuid", param);
-                    System.Data.IDataReader reader = result.ExecuteReader();
-                    List<InventoryItemBase> items = database.readInventoryItems(reader);
-                    reader.Close();
-                    result.Dispose();
-                    if (items.Count > 0)
-                    {
-                        return items[0];
-                    }
-                    else
-                    {
-                        return null;
-                    }
-                }
-            }
-            catch (Exception e)
-            {
-                database.Reconnect();
-                Console.WriteLine(e.ToString());
-                return null;
-            }
-        }
-        /// <summary>
-        /// Returns a specified inventory folder
-        /// </summary>
-        /// <param name="folder">The folder to return</param>
-        /// <returns>A folder class</returns>
-        public InventoryFolderBase getInventoryFolder(LLUUID folder)
-        {
-            try
-            {
-                lock (database)
-                {
-                    Dictionary<string, string> param = new Dictionary<string, string>();
-                    param["?uuid"] = folder.ToStringHyphenated();
-                    System.Data.IDbCommand result = database.Query("SELECT * FROM inventoryfolders WHERE folderID = ?uuid", param);
-                    System.Data.IDataReader reader = result.ExecuteReader();
-                    List<InventoryFolderBase> items = database.readInventoryFolders(reader);
-                    reader.Close();
-                    result.Dispose();
-                    if (items.Count > 0)
-                    {
-                        return items[0];
-                    }
-                    else
-                    {
-                        return null;
-                    }
-                }
-            }
-            catch (Exception e)
-            {
-                database.Reconnect();
-                Console.WriteLine(e.ToString());
-                return null;
-            }
-        }
-        /// <summary>
-        /// Adds a specified item to the database
-        /// </summary>
-        /// <param name="item">The inventory item</param>
-        public void addInventoryItem(InventoryItemBase item)
-        {
-            lock (database)
-            {
-                database.insertItem(item);
-            }
-        }
-        /// <summary>
-        /// Updates the specified inventory item
-        /// </summary>
-        /// <param name="item">Inventory item to update</param>
-        public void updateInventoryItem(InventoryItemBase item)
-        {
-            addInventoryItem(item);
-        }
-        /// <summary>
-        /// Creates a new inventory folder
-        /// </summary>
-        /// <param name="folder">Folder to create</param>
-        public void addInventoryFolder(InventoryFolderBase folder)
-        {
-            lock (database)
-            {
-                database.insertFolder(folder);
-            }
-        }
-        /// <summary>
-        /// Updates an inventory folder
-        /// </summary>
-        /// <param name="folder">Folder to update</param>
-        public void updateInventoryFolder(InventoryFolderBase folder)
-        {
-            addInventoryFolder(folder);
-        }
-    }
-}
diff --git a/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLLogData.cs b/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLLogData.cs
deleted file mode 100644
index c88b39f..0000000
--- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLLogData.cs
+++ /dev/null
@@ -1,107 +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.MySQL
-{
-    /// <summary>
-    /// An interface to the log database for MySQL
-    /// </summary>
-    class MySQLLogData : ILogData
-    {
-        /// <summary>
-        /// The database manager
-        /// </summary>
-        public MySQLManager database;
-        /// <summary>
-        /// Artificial constructor called when the plugin is loaded
-        /// </summary>
-        public void Initialise()
-        {
-            IniFile GridDataMySqlFile = new IniFile("mysql_connection.ini");
-            string settingHostname = GridDataMySqlFile.ParseFileReadValue("hostname");
-            string settingDatabase = GridDataMySqlFile.ParseFileReadValue("database");
-            string settingUsername = GridDataMySqlFile.ParseFileReadValue("username");
-            string settingPassword = GridDataMySqlFile.ParseFileReadValue("password");
-            string settingPooling = GridDataMySqlFile.ParseFileReadValue("pooling");
-            string settingPort = GridDataMySqlFile.ParseFileReadValue("port");
-            database = new MySQLManager(settingHostname, settingDatabase, settingUsername, settingPassword, settingPooling, settingPort);
-        }
-        /// <summary>
-        /// Saves a log item to the database
-        /// </summary>
-        /// <param name="serverDaemon">The daemon triggering the event</param>
-        /// <param name="target">The target of the action (region / agent UUID, etc)</param>
-        /// <param name="methodCall">The method call where the problem occured</param>
-        /// <param name="arguments">The arguments passed to the method</param>
-        /// <param name="priority">How critical is this?</param>
-        /// <param name="logMessage">The message to log</param>
-        public void saveLog(string serverDaemon, string target, string methodCall, string arguments, int priority, string logMessage)
-        {
-            try
-            {
-                database.insertLogRow(serverDaemon, target, methodCall, arguments, priority, logMessage);
-            }
-            catch (Exception e)
-            {
-                database.Reconnect();
-            }
-        }
-        /// <summary>
-        /// Returns the name of this DB provider
-        /// </summary>
-        /// <returns>A string containing the DB provider name</returns>
-        public string getName()
-        {
-            return "MySQL Logdata Interface";
-        }
-        /// <summary>
-        /// Closes the database provider
-        /// </summary>
-        public void Close()
-        {
-            // Do nothing.
-        }
-        /// <summary>
-        /// Returns the version of this DB provider
-        /// </summary>
-        /// <returns>A string containing the provider version</returns>
-        public string getVersion()
-        {
-            return "0.1";
-        }
-    }
-}
diff --git a/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLManager.cs b/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLManager.cs
deleted file mode 100644
index b42ec09..0000000
--- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLManager.cs
+++ /dev/null
@@ -1,665 +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.Data;
-// MySQL Native
-using MySql;
-using MySql.Data;
-using MySql.Data.Types;
-using MySql.Data.MySqlClient;
-using OpenGrid.Framework.Data;
-namespace OpenGrid.Framework.Data.MySQL
-{
-    /// <summary>
-    /// A MySQL Database manager
-    /// </summary>
-    class MySQLManager
-    {
-        /// <summary>
-        /// The database connection object
-        /// </summary>
-        IDbConnection dbcon;
-        /// <summary>
-        /// Connection string for ADO.net
-        /// </summary>
-        string connectionString;
-        /// <summary>
-        /// Initialises and creates a new MySQL connection and maintains it.
-        /// </summary>
-        /// <param name="hostname">The MySQL server being connected to</param>
-        /// <param name="database">The name of the MySQL database being used</param>
-        /// <param name="username">The username logging into the database</param>
-        /// <param name="password">The password for the user logging in</param>
-        /// <param name="cpooling">Whether to use connection pooling or not, can be one of the following: 'yes', 'true', 'no' or 'false', if unsure use 'false'.</param>
-        public MySQLManager(string hostname, string database, string username, string password, string cpooling, string port)
-        {
-            try
-            {
-                connectionString = "Server=" + hostname + ";Port=" + port + ";Database=" + database + ";User ID=" + username + ";Password=" + password + ";Pooling=" + cpooling + ";";
-                dbcon = new MySqlConnection(connectionString);
-                dbcon.Open();
-                System.Console.WriteLine("MySQL connection established");
-            }
-            catch (Exception e)
-            {
-                throw new Exception("Error initialising MySql Database: " + e.ToString());
-            }
-        }
-        /// <summary>
-        /// Shuts down the database connection
-        /// </summary>
-        public void Close()
-        {
-            dbcon.Close();
-            dbcon = null;
-        }
-        /// <summary>
-        /// Reconnects to the database
-        /// </summary>
-        public void Reconnect()
-        {
-            lock (dbcon)
-            {
-                try
-                {
-                    // Close the DB connection
-                    dbcon.Close();
-                    // Try reopen it
-                    dbcon = new MySqlConnection(connectionString);
-                    dbcon.Open();
-                }
-                catch (Exception e)
-                {
-                    Console.WriteLine("Unable to reconnect to database " + e.ToString());
-                }
-            }
-        }
-        /// <summary>
-        /// Runs a query with protection against SQL Injection by using parameterised input.
-        /// </summary>
-        /// <param name="sql">The SQL string - replace any variables such as WHERE x = "y" with WHERE x = @y</param>
-        /// <param name="parameters">The parameters - index so that @y is indexed as 'y'</param>
-        /// <returns>A MySQL DB Command</returns>
-        public IDbCommand Query(string sql, Dictionary<string, string> parameters)
-        {
-            try
-            {
-                MySqlCommand dbcommand = (MySqlCommand)dbcon.CreateCommand();
-                dbcommand.CommandText = sql;
-                foreach (KeyValuePair<string, string> param in parameters)
-                {
-                    dbcommand.Parameters.Add(param.Key, param.Value);
-                }
-                return (IDbCommand)dbcommand;
-            }
-            catch
-            {
-                lock (dbcon)
-                {
-                    // Close the DB connection
-                    try
-                    {
-                        dbcon.Close();
-                    }
-                    catch { }
-                    // Try reopen it
-                    try
-                    {
-                        dbcon = new MySqlConnection(connectionString);
-                        dbcon.Open();
-                    }
-                    catch (Exception e)
-                    {
-                        Console.WriteLine("Unable to reconnect to database " + e.ToString());
-                    }
-                    // Run the query again
-                    try
-                    {
-                        MySqlCommand dbcommand = (MySqlCommand)dbcon.CreateCommand();
-                        dbcommand.CommandText = sql;
-                        foreach (KeyValuePair<string, string> param in parameters)
-                        {
-                            dbcommand.Parameters.Add(param.Key, param.Value);
-                        }
-                        return (IDbCommand)dbcommand;
-                    }
-                    catch (Exception e)
-                    {
-                        // Return null if it fails.
-                        Console.WriteLine("Failed during Query generation: " + e.ToString());
-                        return null;
-                    }
-                }
-            }
-        }
-        /// <summary>
-        /// Reads a region row from a database reader
-        /// </summary>
-        /// <param name="reader">An active database reader</param>
-        /// <returns>A region profile</returns>
-        public SimProfileData readSimRow(IDataReader reader)
-        {
-            SimProfileData retval = new SimProfileData();
-            if (reader.Read())
-            {
-                // Region Main
-                retval.regionHandle = Convert.ToUInt64(reader["regionHandle"].ToString());
-                retval.regionName = (string)reader["regionName"];
-                retval.UUID = new libsecondlife.LLUUID((string)reader["uuid"]);
-                // Secrets
-                retval.regionRecvKey = (string)reader["regionRecvKey"];
-                retval.regionSecret = (string)reader["regionSecret"];
-                retval.regionSendKey = (string)reader["regionSendKey"];
-                // Region Server
-                retval.regionDataURI = (string)reader["regionDataURI"];
-                retval.regionOnline = false; // Needs to be pinged before this can be set.
-                retval.serverIP = (string)reader["serverIP"];
-                retval.serverPort = (uint)reader["serverPort"];
-                retval.serverURI = (string)reader["serverURI"];
-                // Location
-                retval.regionLocX = Convert.ToUInt32(reader["locX"].ToString());
-                retval.regionLocY = Convert.ToUInt32(reader["locY"].ToString());
-                retval.regionLocZ = Convert.ToUInt32(reader["locZ"].ToString());
-                // Neighbours - 0 = No Override
-                retval.regionEastOverrideHandle = Convert.ToUInt64(reader["eastOverrideHandle"].ToString());
-                retval.regionWestOverrideHandle = Convert.ToUInt64(reader["westOverrideHandle"].ToString());
-                retval.regionSouthOverrideHandle = Convert.ToUInt64(reader["southOverrideHandle"].ToString());
-                retval.regionNorthOverrideHandle = Convert.ToUInt64(reader["northOverrideHandle"].ToString());
-                // Assets
-                retval.regionAssetURI = (string)reader["regionAssetURI"];
-                retval.regionAssetRecvKey = (string)reader["regionAssetRecvKey"];
-                retval.regionAssetSendKey = (string)reader["regionAssetSendKey"];
-                // Userserver
-                retval.regionUserURI = (string)reader["regionUserURI"];
-                retval.regionUserRecvKey = (string)reader["regionUserRecvKey"];
-                retval.regionUserSendKey = (string)reader["regionUserSendKey"];
-                // World Map Addition
-                string tempRegionMap = reader["regionMapTexture"].ToString();
-                if (tempRegionMap != "")
-                {
-                    retval.regionMapTextureID = new libsecondlife.LLUUID(tempRegionMap);
-                }
-                else
-                {
-                    retval.regionMapTextureID = new libsecondlife.LLUUID();
-                }
-            }
-            else
-            {
-                return null;
-            }
-            return retval;
-        }
-        /// <summary>
-        /// Reads an agent row from a database reader
-        /// </summary>
-        /// <param name="reader">An active database reader</param>
-        /// <returns>A user session agent</returns>
-        public UserAgentData readAgentRow(IDataReader reader)
-        {
-            UserAgentData retval = new UserAgentData();
-            if (reader.Read())
-            {
-                // Agent IDs
-                retval.UUID = new libsecondlife.LLUUID((string)reader["UUID"]);
-                retval.sessionID = new libsecondlife.LLUUID((string)reader["sessionID"]);
-                retval.secureSessionID = new libsecondlife.LLUUID((string)reader["secureSessionID"]);
-                // Agent Who?
-                retval.agentIP = (string)reader["agentIP"];
-                retval.agentPort = Convert.ToUInt32(reader["agentPort"].ToString());
-                retval.agentOnline = Convert.ToBoolean(reader["agentOnline"].ToString());
-                // Login/Logout times (UNIX Epoch)
-                retval.loginTime = Convert.ToInt32(reader["loginTime"].ToString());
-                retval.logoutTime = Convert.ToInt32(reader["logoutTime"].ToString());
-                // Current position
-                retval.currentRegion = (string)reader["currentRegion"];
-                retval.currentHandle = Convert.ToUInt64(reader["currentHandle"].ToString());
-                libsecondlife.LLVector3.TryParse((string)reader["currentPos"], out retval.currentPos);
-            }
-            else
-            {
-                return null;
-            }
-            return retval;
-        }
-        /// <summary>
-        /// Reads a user profile from an active data reader
-        /// </summary>
-        /// <param name="reader">An active database reader</param>
-        /// <returns>A user profile</returns>
-        public UserProfileData readUserRow(IDataReader reader)
-        {
-            UserProfileData retval = new UserProfileData();
-            if (reader.Read())
-            {
-                retval.UUID = new libsecondlife.LLUUID((string)reader["UUID"]);
-                retval.username = (string)reader["username"];
-                retval.surname = (string)reader["lastname"];
-                retval.passwordHash = (string)reader["passwordHash"];
-                retval.passwordSalt = (string)reader["passwordSalt"];
-                retval.homeRegion = Convert.ToUInt64(reader["homeRegion"].ToString());
-                retval.homeLocation = new libsecondlife.LLVector3(
-                    Convert.ToSingle(reader["homeLocationX"].ToString()),
-                    Convert.ToSingle(reader["homeLocationY"].ToString()),
-                    Convert.ToSingle(reader["homeLocationZ"].ToString()));
-                retval.homeLookAt = new libsecondlife.LLVector3(
-                    Convert.ToSingle(reader["homeLookAtX"].ToString()),
-                    Convert.ToSingle(reader["homeLookAtY"].ToString()),
-                    Convert.ToSingle(reader["homeLookAtZ"].ToString()));
-                retval.created = Convert.ToInt32(reader["created"].ToString());
-                retval.lastLogin = Convert.ToInt32(reader["lastLogin"].ToString());
-                retval.userInventoryURI = (string)reader["userInventoryURI"];
-                retval.userAssetURI = (string)reader["userAssetURI"];
-                retval.profileCanDoMask = Convert.ToUInt32(reader["profileCanDoMask"].ToString());
-                retval.profileWantDoMask = Convert.ToUInt32(reader["profileWantDoMask"].ToString());
-                retval.profileAboutText = (string)reader["profileAboutText"];
-                retval.profileFirstText = (string)reader["profileFirstText"];
-                retval.profileImage = new libsecondlife.LLUUID((string)reader["profileImage"]);
-                retval.profileFirstImage = new libsecondlife.LLUUID((string)reader["profileFirstImage"]);
-            }
-            else
-            {
-                return null;
-            }
-            return retval;
-        }
-        /// <summary>
-        /// Reads a list of inventory folders returned by a query.
-        /// </summary>
-        /// <param name="reader">A MySQL Data Reader</param>
-        /// <returns>A List containing inventory folders</returns>
-        public List<InventoryFolderBase> readInventoryFolders(IDataReader reader)
-        {
-            List<InventoryFolderBase> rows = new List<InventoryFolderBase>();
-            while(reader.Read())
-            {
-                try
-                {
-                    InventoryFolderBase folder = new InventoryFolderBase();
-                    folder.agentID = new libsecondlife.LLUUID((string)reader["agentID"]);
-                    folder.parentID = new libsecondlife.LLUUID((string)reader["parentFolderID"]);
-                    folder.folderID = new libsecondlife.LLUUID((string)reader["folderID"]);
-                    folder.name = (string)reader["folderName"];
-                    rows.Add(folder);
-                }
-                catch (Exception e)
-                {
-                    Console.WriteLine(e.ToString());
-                }
-            }
-            return rows;
-        }
-        /// <summary>
-        /// Reads a collection of items from an SQL result
-        /// </summary>
-        /// <param name="reader">The SQL Result</param>
-        /// <returns>A List containing Inventory Items</returns>
-        public List<InventoryItemBase> readInventoryItems(IDataReader reader)
-        {
-            List<InventoryItemBase> rows = new List<InventoryItemBase>();
-            while (reader.Read())
-            {
-                try
-                {
-                    InventoryItemBase item = new InventoryItemBase();
-                    item.assetID = new libsecondlife.LLUUID((string)reader["assetID"]);
-                    item.avatarID = new libsecondlife.LLUUID((string)reader["avatarID"]);
-                    item.inventoryCurrentPermissions = Convert.ToUInt32(reader["inventoryCurrentPermissions"].ToString());
-                    item.inventoryDescription = (string)reader["inventoryDescription"];
-                    item.inventoryID = new libsecondlife.LLUUID((string)reader["inventoryID"]);
-                    item.inventoryName = (string)reader["inventoryName"];
-                    item.inventoryNextPermissions = Convert.ToUInt32(reader["inventoryNextPermissions"].ToString());
-                    item.parentFolderID = new libsecondlife.LLUUID((string)reader["parentFolderID"]);
-                    item.type = Convert.ToInt32(reader["type"].ToString());
-                    rows.Add(item);
-                }
-                catch (Exception e)
-                {
-                    Console.WriteLine(e.ToString());
-                }
-            }
-            return rows;
-        }
-        /// <summary>
-        /// Inserts a new row into the log database
-        /// </summary>
-        /// <param name="serverDaemon">The daemon which triggered this event</param>
-        /// <param name="target">Who were we operating on when this occured (region UUID, user UUID, etc)</param>
-        /// <param name="methodCall">The method call where the problem occured</param>
-        /// <param name="arguments">The arguments passed to the method</param>
-        /// <param name="priority">How critical is this?</param>
-        /// <param name="logMessage">Extra message info</param>
-        /// <returns>Saved successfully?</returns>
-        public bool insertLogRow(string serverDaemon, string target, string methodCall, string arguments, int priority, string logMessage)
-        {
-            string sql = "INSERT INTO logs (`target`, `server`, `method`, `arguments`, `priority`, `message`) VALUES ";
-            sql += "(?target, ?server, ?method, ?arguments, ?priority, ?message)";
-            Dictionary<string, string> parameters = new Dictionary<string, string>();
-            parameters["?server"] = serverDaemon;
-            parameters["?target"] = target;
-            parameters["?method"] = methodCall;
-            parameters["?arguments"] = arguments;
-            parameters["?priority"] = priority.ToString();
-            parameters["?message"] = logMessage;
-            bool returnval = false;
-            try
-            {
-                IDbCommand result = Query(sql, parameters);
-                if (result.ExecuteNonQuery() == 1)
-                    returnval = true;
-                result.Dispose();
-            }
-            catch (Exception e)
-            {
-                Console.WriteLine(e.ToString());
-                return false;
-            }
-            return returnval;
-        }
-        /// <summary>
-        /// Inserts a new item into the database
-        /// </summary>
-        /// <param name="item">The item</param>
-        /// <returns>Success?</returns>
-        public bool insertItem(InventoryItemBase item)
-        {
-            string sql = "REPLACE INTO inventoryitems (inventoryID, assetID, type, parentFolderID, avatarID, inventoryName, inventoryDescription, inventoryNextPermissions, inventoryCurrentPermissions) VALUES ";
-            sql += "(?inventoryID, ?assetID, ?type, ?parentFolderID, ?avatarID, ?inventoryName, ?inventoryDescription, ?inventoryNextPermissions, ?inventoryCurrentPermissions)";
-            Dictionary<string, string> parameters = new Dictionary<string, string>();
-            parameters["?inventoryID"] = item.inventoryID.ToStringHyphenated();
-            parameters["?assetID"] = item.assetID.ToStringHyphenated();
-            parameters["?type"] = item.type.ToString();
-            parameters["?parentFolderID"] = item.parentFolderID.ToStringHyphenated();
-            parameters["?avatarID"] = item.avatarID.ToStringHyphenated();
-            parameters["?inventoryName"] = item.inventoryName;
-            parameters["?inventoryDescription"] = item.inventoryDescription;
-            parameters["?inventoryNextPermissions"] = item.inventoryNextPermissions.ToString();
-            parameters["?inventoryCurrentPermissions"] = item.inventoryCurrentPermissions.ToString();
-            bool returnval = false;
-            try
-            {
-                IDbCommand result = Query(sql, parameters);
-                if (result.ExecuteNonQuery() == 1)
-                    returnval = true;
-                result.Dispose();
-            }
-            catch (Exception e)
-            {
-                Console.WriteLine(e.ToString());
-                return false;
-            }
-            return returnval;
-        }
-        /// <summary>
-        /// Inserts a new folder into the database
-        /// </summary>
-        /// <param name="folder">The folder</param>
-        /// <returns>Success?</returns>
-        public bool insertFolder(InventoryFolderBase folder)
-        {
-            string sql = "REPLACE INTO inventoryfolders (folderID, agentID, parentFolderID, folderName) VALUES ";
-            sql += "(?folderID, ?agentID, ?parentFolderID, ?folderName)";
-            Dictionary<string, string> parameters = new Dictionary<string, string>();
-            parameters["?folderID"] = folder.folderID.ToStringHyphenated();
-            parameters["?agentID"] = folder.agentID.ToStringHyphenated();
-            parameters["?parentFolderID"] = folder.parentID.ToStringHyphenated();
-            parameters["?folderName"] = folder.name;
-            bool returnval = false;
-            try
-            {
-                IDbCommand result = Query(sql, parameters);
-                if (result.ExecuteNonQuery() == 1)
-                    returnval = true;
-                result.Dispose();
-            }
-            catch (Exception e)
-            {
-                Console.WriteLine(e.ToString());
-                return false;
-            }
-            return returnval;
-        }
-        /// <summary>
-        /// Creates a new user and inserts it into the database
-        /// </summary>
-        /// <param name="uuid">User ID</param>
-        /// <param name="username">First part of the login</param>
-        /// <param name="lastname">Second part of the login</param>
-        /// <param name="passwordHash">A salted hash of the users password</param>
-        /// <param name="passwordSalt">The salt used for the password hash</param>
-        /// <param name="homeRegion">A regionHandle of the users home region</param>
-        /// <param name="homeLocX">Home region position vector</param>
-        /// <param name="homeLocY">Home region position vector</param>
-        /// <param name="homeLocZ">Home region position vector</param>
-        /// <param name="homeLookAtX">Home region 'look at' vector</param>
-        /// <param name="homeLookAtY">Home region 'look at' vector</param>
-        /// <param name="homeLookAtZ">Home region 'look at' vector</param>
-        /// <param name="created">Account created (unix timestamp)</param>
-        /// <param name="lastlogin">Last login (unix timestamp)</param>
-        /// <param name="inventoryURI">Users inventory URI</param>
-        /// <param name="assetURI">Users asset URI</param>
-        /// <param name="canDoMask">I can do mask</param>
-        /// <param name="wantDoMask">I want to do mask</param>
-        /// <param name="aboutText">Profile text</param>
-        /// <param name="firstText">Firstlife text</param>
-        /// <param name="profileImage">UUID for profile image</param>
-        /// <param name="firstImage">UUID for firstlife image</param>
-        /// <returns>Success?</returns>
-        public bool insertUserRow(libsecondlife.LLUUID uuid, string username, string lastname, string passwordHash, string passwordSalt, UInt64 homeRegion, float homeLocX, float homeLocY, float homeLocZ,
-            float homeLookAtX, float homeLookAtY, float homeLookAtZ, int created, int lastlogin, string inventoryURI, string assetURI, uint canDoMask, uint wantDoMask, string aboutText, string firstText,
-            libsecondlife.LLUUID profileImage, libsecondlife.LLUUID firstImage)
-        {
-            string sql = "INSERT INTO users (`UUID`, `username`, `lastname`, `passwordHash`, `passworldSalt`, `homeRegion`, ";
-            sql += "`homeLocationX`, `homeLocationY`, `homeLocationZ`, `homeLookAtX`, `homeLookAtY`, `homeLookAtZ`, `created`, ";
-            sql += "`lastLogin`, `userInventoryURI`, `userAssetURI`, `profileCanDoMask`, `profileWantDoMask`, `profileAboutText`, ";
-            sql += "`profileFirstText`, `profileImage`, profileFirstImage`) VALUES ";
-            sql += "(?UUID, ?username, ?lastname, ?passwordHash, ?passworldSalt, ?homeRegion, ";
-            sql += "?homeLocationX, ?homeLocationY, ?homeLocationZ, ?homeLookAtX`, ?homeLookAtY, ?homeLookAtZ, ?created, ";
-            sql += "?lastLogin`, ?userInventoryURI, ?userAssetURI, ?profileCanDoMask, ?profileWantDoMask, ?profileAboutText, ";
-            sql += "?profileFirstText, ?profileImage, ?profileFirstImage)";
-            Dictionary<string, string> parameters = new Dictionary<string, string>();
-            parameters["?UUID"] = uuid.ToStringHyphenated();
-            parameters["?username"] = username.ToString();
-            parameters["?lastname"] = lastname.ToString();
-            parameters["?passwordHash"] = passwordHash.ToString();
-            parameters["?passworldSalt"] = passwordSalt.ToString();
-            parameters["?homeRegion"] = homeRegion.ToString();
-            parameters["?homeLocationX"] = homeLocX.ToString();
-            parameters["?homeLocationY"] = homeLocY.ToString();
-            parameters["?homeLocationZ"] = homeLocZ.ToString();
-            parameters["?homeLookAtX"] = homeLookAtX.ToString();
-            parameters["?homeLookAtY"] = homeLookAtY.ToString();
-            parameters["?homeLookAtZ"] = homeLookAtZ.ToString();
-            parameters["?created"] = created.ToString();
-            parameters["?lastLogin"] = lastlogin.ToString();
-            parameters["?userInventoryURI"] = inventoryURI.ToString();
-            parameters["?userAssetURI"] = assetURI.ToString();
-            parameters["?profileCanDoMask"] = canDoMask.ToString();
-            parameters["?profileWantDoMask"] = wantDoMask.ToString();
-            parameters["?profileAboutText"] = aboutText.ToString();
-            parameters["?profileFirstText"] = firstText.ToString();
-            parameters["?profileImage"] = profileImage.ToStringHyphenated();
-            parameters["?profileFirstImage"] = firstImage.ToStringHyphenated();
-            bool returnval = false;
-            try
-            {
-                IDbCommand result = Query(sql, parameters);
-                if (result.ExecuteNonQuery() == 1)
-                    returnval = true;
-                result.Dispose();
-            }
-            catch (Exception e)
-            {
-                Console.WriteLine(e.ToString());
-                return false;
-            }
-            return returnval;
-        }
-        /// <summary>
-        /// Inserts a new region into the database
-        /// </summary>
-        /// <param name="profile">The region to insert</param>
-        /// <returns>Success?</returns>
-        public bool insertRegion(SimProfileData regiondata)
-        {
-            string sql = "REPLACE INTO regions (regionHandle, regionName, uuid, regionRecvKey, regionSecret, regionSendKey, regionDataURI, ";
-            sql += "serverIP, serverPort, serverURI, locX, locY, locZ, eastOverrideHandle, westOverrideHandle, southOverrideHandle, northOverrideHandle, regionAssetURI, regionAssetRecvKey, ";
-            sql += "regionAssetSendKey, regionUserURI, regionUserRecvKey, regionUserSendKey, regionMapTexture) VALUES ";
-            sql += "(?regionHandle, ?regionName, ?uuid, ?regionRecvKey, ?regionSecret, ?regionSendKey, ?regionDataURI, ";
-            sql += "?serverIP, ?serverPort, ?serverURI, ?locX, ?locY, ?locZ, ?eastOverrideHandle, ?westOverrideHandle, ?southOverrideHandle, ?northOverrideHandle, ?regionAssetURI, ?regionAssetRecvKey, ";
-            sql += "?regionAssetSendKey, ?regionUserURI, ?regionUserRecvKey, ?regionUserSendKey, ?regionMapTexture);";
-            Dictionary<string, string> parameters = new Dictionary<string, string>();
-            parameters["?regionHandle"] = regiondata.regionHandle.ToString();
-            parameters["?regionName"] = regiondata.regionName.ToString();
-            parameters["?uuid"] = regiondata.UUID.ToStringHyphenated();
-            parameters["?regionRecvKey"] = regiondata.regionRecvKey.ToString();
-            parameters["?regionSecret"] = regiondata.regionSecret.ToString();
-            parameters["?regionSendKey"] = regiondata.regionSendKey.ToString();
-            parameters["?regionDataURI"] = regiondata.regionDataURI.ToString();
-            parameters["?serverIP"] = regiondata.serverIP.ToString();
-            parameters["?serverPort"] = regiondata.serverPort.ToString();
-            parameters["?serverURI"] = regiondata.serverURI.ToString();
-            parameters["?locX"] = regiondata.regionLocX.ToString();
-            parameters["?locY"] = regiondata.regionLocY.ToString();
-            parameters["?locZ"] = regiondata.regionLocZ.ToString();
-            parameters["?eastOverrideHandle"] = regiondata.regionEastOverrideHandle.ToString();
-            parameters["?westOverrideHandle"] = regiondata.regionWestOverrideHandle.ToString();
-            parameters["?northOverrideHandle"] = regiondata.regionNorthOverrideHandle.ToString();
-            parameters["?southOverrideHandle"] = regiondata.regionSouthOverrideHandle.ToString();
-            parameters["?regionAssetURI"] = regiondata.regionAssetURI.ToString();
-            parameters["?regionAssetRecvKey"] = regiondata.regionAssetRecvKey.ToString();
-            parameters["?regionAssetSendKey"] = regiondata.regionAssetSendKey.ToString();
-            parameters["?regionUserURI"] = regiondata.regionUserURI.ToString();
-            parameters["?regionUserRecvKey"] = regiondata.regionUserRecvKey.ToString();
-            parameters["?regionUserSendKey"] = regiondata.regionUserSendKey.ToString();
-            parameters["?regionMapTexture"] = regiondata.regionMapTextureID.ToStringHyphenated();
-            bool returnval = false;
-            try
-            {
-                
-                IDbCommand result = Query(sql, parameters);
-                //Console.WriteLine(result.CommandText);
-                if (result.ExecuteNonQuery() == 1)
-                    returnval = true;
-                result.Dispose();
-            }
-            catch (Exception e)
-            {
-                Console.WriteLine(e.ToString());
-                return false;
-            }
-            return returnval;
-        }
-    }
-}
diff --git a/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLUserData.cs b/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLUserData.cs
deleted file mode 100644
index e988c94..0000000
--- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLUserData.cs
+++ /dev/null
@@ -1,271 +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.MySQL
-{
-    /// <summary>
-    /// A database interface class to a user profile storage system
-    /// </summary>
-    class MySQLUserData : IUserData
-    {
-        /// <summary>
-        /// Database manager for MySQL
-        /// </summary>
-        public MySQLManager database;
-        /// <summary>
-        /// Loads and initialises the MySQL storage plugin
-        /// </summary>
-        public void Initialise()
-        {
-            // Load from an INI file connection details
-            // TODO: move this to XML?
-            IniFile GridDataMySqlFile = new IniFile("mysql_connection.ini");
-            string settingHostname = GridDataMySqlFile.ParseFileReadValue("hostname");
-            string settingDatabase = GridDataMySqlFile.ParseFileReadValue("database");
-            string settingUsername = GridDataMySqlFile.ParseFileReadValue("username");
-            string settingPassword = GridDataMySqlFile.ParseFileReadValue("password");
-            string settingPooling = GridDataMySqlFile.ParseFileReadValue("pooling");
-            string settingPort = GridDataMySqlFile.ParseFileReadValue("port");
-            database = new MySQLManager(settingHostname, settingDatabase, settingUsername, settingPassword, settingPooling, settingPort);
-        }
-        /// <summary>
-        /// Searches the database for a specified user profile
-        /// </summary>
-        /// <param name="name">The account name of the user</param>
-        /// <returns>A user profile</returns>
-        public UserProfileData getUserByName(string name)
-        {
-            return getUserByName(name.Split(' ')[0], name.Split(' ')[1]);
-        }
-        /// <summary>
-        /// Searches the database for a specified user profile by name components
-        /// </summary>
-        /// <param name="user">The first part of the account name</param>
-        /// <param name="last">The second part of the account name</param>
-        /// <returns>A user profile</returns>
-        public UserProfileData getUserByName(string user, string last)
-        {
-            try
-            {
-                lock (database)
-                {
-                    Dictionary<string, string> param = new Dictionary<string, string>();
-                    param["?first"] = user;
-                    param["?second"] = last;
-                    System.Data.IDbCommand result = database.Query("SELECT * FROM users WHERE username = ?first AND lastname = ?second", param);
-                    System.Data.IDataReader reader = result.ExecuteReader();
-                    UserProfileData row = database.readUserRow(reader);
-                    
-                    reader.Close();
-                    result.Dispose();
-                    return row;
-                }
-            }
-            catch (Exception e)
-            {
-                database.Reconnect();
-                Console.WriteLine(e.ToString());
-                return null;
-            }
-        }
-        /// <summary>
-        /// Searches the database for a specified user profile by UUID
-        /// </summary>
-        /// <param name="uuid">The account ID</param>
-        /// <returns>The users profile</returns>
-        public UserProfileData getUserByUUID(LLUUID uuid)
-        {
-            try
-            {
-                lock (database)
-                {
-                    Dictionary<string, string> param = new Dictionary<string, string>();
-                    param["?uuid"] = uuid.ToStringHyphenated();
-                    System.Data.IDbCommand result = database.Query("SELECT * FROM users WHERE UUID = ?uuid", param);
-                    System.Data.IDataReader reader = result.ExecuteReader();
-                    UserProfileData row = database.readUserRow(reader);
-                    reader.Close();
-                    result.Dispose();
-                    return row;
-                }
-            }
-            catch (Exception e)
-            {
-                database.Reconnect();
-                Console.WriteLine(e.ToString());
-                return null;
-            }
-        }
-        /// <summary>
-        /// Returns a user session searching by name
-        /// </summary>
-        /// <param name="name">The account name</param>
-        /// <returns>The users session</returns>
-        public UserAgentData getAgentByName(string name)
-        {
-            return getAgentByName(name.Split(' ')[0], name.Split(' ')[1]);
-        }
-        /// <summary>
-        /// Returns a user session by account name
-        /// </summary>
-        /// <param name="user">First part of the users account name</param>
-        /// <param name="last">Second part of the users account name</param>
-        /// <returns>The users session</returns>
-        public UserAgentData getAgentByName(string user, string last)
-        {
-            UserProfileData profile = getUserByName(user, last);
-            return getAgentByUUID(profile.UUID);
-        }
-        /// <summary>
-        /// Returns an agent session by account UUID
-        /// </summary>
-        /// <param name="uuid">The accounts UUID</param>
-        /// <returns>The users session</returns>
-        public UserAgentData getAgentByUUID(LLUUID uuid)
-        {
-            try
-            {
-                lock (database)
-                {
-                    Dictionary<string, string> param = new Dictionary<string, string>();
-                    param["?uuid"] = uuid.ToStringHyphenated();
-                    System.Data.IDbCommand result = database.Query("SELECT * FROM agents WHERE UUID = ?uuid", param);
-                    System.Data.IDataReader reader = result.ExecuteReader();
-                    UserAgentData row = database.readAgentRow(reader);
-                    reader.Close();
-                    result.Dispose();
-                    return row;
-                }
-            }
-            catch (Exception e)
-            {
-                database.Reconnect();
-                Console.WriteLine(e.ToString());
-                return null;
-            }
-        }
-        /// <summary>
-        /// Creates a new users profile
-        /// </summary>
-        /// <param name="user">The user profile to create</param>
-        public void addNewUserProfile(UserProfileData user)
-        {
-            try
-            {
-                lock (database)
-                {
-                    database.insertUserRow(user.UUID, user.username, user.surname, user.passwordHash, user.passwordSalt, user.homeRegion, user.homeLocation.X, user.homeLocation.Y, user.homeLocation.Z,
-                        user.homeLookAt.X, user.homeLookAt.Y, user.homeLookAt.Z, user.created, user.lastLogin, user.userInventoryURI, user.userAssetURI, user.profileCanDoMask, user.profileWantDoMask,
-                        user.profileAboutText, user.profileFirstText, user.profileImage, user.profileFirstImage);
-                }
-            }
-            catch (Exception e)
-            {
-                database.Reconnect();
-                Console.WriteLine(e.ToString());
-            }
-        }
-        /// <summary>
-        /// Creates a new agent
-        /// </summary>
-        /// <param name="agent">The agent to create</param>
-        public void addNewUserAgent(UserAgentData agent)
-        {
-            // Do nothing.
-        }
-        /// <summary>
-        /// Performs a money transfer request between two accounts
-        /// </summary>
-        /// <param name="from">The senders account ID</param>
-        /// <param name="to">The recievers account ID</param>
-        /// <param name="amount">The amount to transfer</param>
-        /// <returns>Success?</returns>
-        public bool moneyTransferRequest(LLUUID from, LLUUID to, uint amount)
-        {
-            return false;
-        }
-        /// <summary>
-        /// Performs an inventory transfer request between two accounts
-        /// </summary>
-        /// <remarks>TODO: Move to inventory server</remarks>
-        /// <param name="from">The senders account ID</param>
-        /// <param name="to">The recievers account ID</param>
-        /// <param name="item">The item to transfer</param>
-        /// <returns>Success?</returns>
-        public bool inventoryTransferRequest(LLUUID from, LLUUID to, LLUUID item)
-        {
-            return false;
-        }
-        /// <summary>
-        /// Database provider name
-        /// </summary>
-        /// <returns>Provider name</returns>
-        public string getName()
-        {
-            return "MySQL Userdata Interface";
-        }
-        /// <summary>
-        /// Database provider version
-        /// </summary>
-        /// <returns>provider version</returns>
-        public string getVersion()
-        {
-            return "0.1";
-        }
-    }
-}
diff --git a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj b/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj
deleted file mode 100644
index cc3aacb..0000000
--- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj
+++ /dev/null
@@ -1,117 +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>{0F3C3AC1-0000-0000-0000-000000000000}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon></ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>OpenGrid.Framework.Data.MySQL</AssemblyName>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenGrid.Framework.Data.MySQL</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="MySql.Data.dll" >
-      <HintPath>..\..\bin\MySql.Data.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="MySQLGridData.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="MySQLInventoryData.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="MySQLLogData.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="MySQLManager.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="MySQLUserData.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/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build b/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build
deleted file mode 100644
index a5f4028..0000000
--- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" ?>
-<project name="OpenGrid.Framework.Data.MySQL" 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.MySQL" dynamicprefix="true" >
-            </resources>
-            <sources failonempty="true">
-                <include name="MySQLGridData.cs" />
-                <include name="MySQLInventoryData.cs" />
-                <include name="MySQLLogData.cs" />
-                <include name="MySQLManager.cs" />
-                <include name="MySQLUserData.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/MySql.Data.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/OpenGridServices/OpenGrid.Framework.Data.MySQL/Properties/AssemblyInfo.cs b/OpenGridServices/OpenGrid.Framework.Data.MySQL/Properties/AssemblyInfo.cs
deleted file mode 100644
index 0bfd1d6..0000000
--- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/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.MySQL")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("OpenGrid.Framework.Data.MySQL")]
-[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("e49826b2-dcef-41be-a5bd-596733fa3304")]
-// 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/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj b/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj
deleted file mode 100644
index 63d0bd9..0000000
--- a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj
+++ /dev/null
@@ -1,108 +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>{1E3F341A-0000-0000-0000-000000000000}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon></ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>OpenGrid.Framework.Data.SQLite</AssemblyName>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenGrid.Framework.Data.SQLite</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.Data.SQLite.dll" >
-      <HintPath>..\..\bin\System.Data.SQLite.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="SQLiteGridData.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="SQLiteManager.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/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build b/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build
deleted file mode 100644
index 79b0edf..0000000
--- a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" ?>
-<project name="OpenGrid.Framework.Data.SQLite" 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.SQLite" dynamicprefix="true" >
-            </resources>
-            <sources failonempty="true">
-                <include name="SQLiteGridData.cs" />
-                <include name="SQLiteManager.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="System.dll" />
-                <include name="System.Data.dll" />
-                <include name="../../bin/System.Data.SQLite.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/OpenGridServices/OpenGrid.Framework.Data.SQLite/Properties/AssemblyInfo.cs b/OpenGridServices/OpenGrid.Framework.Data.SQLite/Properties/AssemblyInfo.cs
deleted file mode 100644
index 57c4bae..0000000
--- a/OpenGridServices/OpenGrid.Framework.Data.SQLite/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.SQLite")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("OpenGrid.Framework.Data.SQLite")]
-[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("6113d5ce-4547-49f4-9236-0dcc503457b1")]
-// 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/OpenGridServices/OpenGrid.Framework.Data.SQLite/SQLiteGridData.cs b/OpenGridServices/OpenGrid.Framework.Data.SQLite/SQLiteGridData.cs
deleted file mode 100644
index 94ed46f..0000000
--- a/OpenGridServices/OpenGrid.Framework.Data.SQLite/SQLiteGridData.cs
+++ /dev/null
@@ -1,190 +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;
-namespace OpenGrid.Framework.Data.SQLite
-{
-    /// <summary>
-    /// A Grid Interface to the SQLite database
-    /// </summary>
-    public class SQLiteGridData : IGridData
-    {
-        /// <summary>
-        /// A database manager
-        /// </summary>
-        private SQLiteManager database;
-        /// <summary>
-        /// Initialises the Grid Interface
-        /// </summary>
-        public void Initialise()
-        {
-            database = new SQLiteManager("localhost", "db", "user", "password", "false");
-        }
-        /// <summary>
-        /// Shuts down the grid interface
-        /// </summary>
-        public void Close()
-        {
-            database.Close();
-        }
-        /// <summary>
-        /// Returns the name of this grid interface
-        /// </summary>
-        /// <returns>A string containing the grid interface</returns>
-        public string getName()
-        {
-            return "SQLite OpenGridData";
-        }
-        /// <summary>
-        /// Returns the version of this grid interface
-        /// </summary>
-        /// <returns>A string containing the version</returns>
-        public string getVersion()
-        {
-            return "0.1";
-        }
-        /// <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 sim profile from it's location
-        /// </summary>
-        /// <param name="handle">Region location handle</param>
-        /// <returns>Sim profile</returns>
-        public SimProfileData GetProfileByHandle(ulong handle)
-        {
-            Dictionary<string, string> param = new Dictionary<string, string>();
-            param["handle"] = handle.ToString();
-            System.Data.IDbCommand result = database.Query("SELECT * FROM regions WHERE handle = @handle", param);
-            System.Data.IDataReader reader = result.ExecuteReader();
-            SimProfileData row = database.getRow(reader);
-            reader.Close();
-            result.Dispose();
-            return row;
-        }
-        /// <summary>
-        /// Returns a sim profile from it's UUID
-        /// </summary>
-        /// <param name="uuid">The region UUID</param>
-        /// <returns>The sim profile</returns>
-        public SimProfileData GetProfileByLLUUID(libsecondlife.LLUUID uuid)
-        {
-            Dictionary<string, string> param = new Dictionary<string, string>();
-            param["uuid"] = uuid.ToStringHyphenated();
-            System.Data.IDbCommand result = database.Query("SELECT * FROM regions WHERE uuid = @uuid", param);
-            System.Data.IDataReader reader = result.ExecuteReader();
-            SimProfileData row = database.getRow(reader);
-            reader.Close();
-            result.Dispose();
-            return row;
-        }
-        /// <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)
-        {
-            if (database.insertRow(profile))
-            {
-                return DataResponse.RESPONSE_OK;
-            }
-            else
-            {
-                return DataResponse.RESPONSE_ERROR;
-            }
-        }
-        /// <summary>
-        /// DEPRECIATED. Attempts to authenticate a region by comparing a shared secret.
-        /// </summary>
-        /// <param name="uuid">The UUID of the challenger</param>
-        /// <param name="handle">The attempted regionHandle of the challenger</param>
-        /// <param name="authkey">The secret</param>
-        /// <returns>Whether the secret and regionhandle match the database entry for UUID</returns>
-        public bool AuthenticateSim(libsecondlife.LLUUID uuid, ulong handle, string authkey)
-        {
-            bool throwHissyFit = false; // Should be true by 1.0
-            if (throwHissyFit)
-                throw new Exception("CRYPTOWEAK AUTHENTICATE: Refusing to authenticate due to replay potential.");
-            SimProfileData data = GetProfileByLLUUID(uuid);
-            return (handle == data.regionHandle && authkey == data.regionSecret);
-        }
-        /// <summary>
-        /// NOT YET FUNCTIONAL. Provides a cryptographic authentication of a region
-        /// </summary>
-        /// <remarks>This requires a security audit.</remarks>
-        /// <param name="uuid"></param>
-        /// <param name="handle"></param>
-        /// <param name="authhash"></param>
-        /// <param name="challenge"></param>
-        /// <returns></returns>
-        public bool AuthenticateSim(libsecondlife.LLUUID uuid, ulong handle, string authhash, string challenge)
-        {
-            System.Security.Cryptography.SHA512Managed HashProvider = new System.Security.Cryptography.SHA512Managed();
-            System.Text.ASCIIEncoding TextProvider = new ASCIIEncoding();
-            byte[] stream = TextProvider.GetBytes(uuid.ToStringHyphenated() + ":" + handle.ToString() + ":" + challenge);
-            byte[] hash = HashProvider.ComputeHash(stream);
-            return false;
-        }
-    }
-}
diff --git a/OpenGridServices/OpenGrid.Framework.Data.SQLite/SQLiteManager.cs b/OpenGridServices/OpenGrid.Framework.Data.SQLite/SQLiteManager.cs
deleted file mode 100644
index 9689356..0000000
--- a/OpenGridServices/OpenGrid.Framework.Data.SQLite/SQLiteManager.cs
+++ /dev/null
@@ -1,209 +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.Data;
-using System.Data.SQLite;
-using OpenGrid.Framework.Data;
-namespace OpenGrid.Framework.Data.SQLite
-{
-    class SQLiteManager
-    {
-        IDbConnection dbcon;
-        /// <summary>
-        /// Initialises and creates a new SQLite connection and maintains it.
-        /// </summary>
-        /// <param name="hostname">The SQLite server being connected to</param>
-        /// <param name="database">The name of the SQLite database being used</param>
-        /// <param name="username">The username logging into the database</param>
-        /// <param name="password">The password for the user logging in</param>
-        /// <param name="cpooling">Whether to use connection pooling or not, can be one of the following: 'yes', 'true', 'no' or 'false', if unsure use 'false'.</param>
-        public SQLiteManager(string hostname, string database, string username, string password, string cpooling)
-        {
-            try
-            {
-                string connectionString = "URI=file:GridServerSqlite.db;";
-                dbcon = new SQLiteConnection(connectionString);
-                dbcon.Open();
-            }
-            catch (Exception e)
-            {
-                throw new Exception("Error initialising SQLite Database: " + e.ToString());
-            }
-        }
-        /// <summary>
-        /// Shuts down the database connection
-        /// </summary>
-        public void Close()
-        {
-            dbcon.Close();
-            dbcon = null;
-        }
-        /// <summary>
-        /// Runs a query with protection against SQL Injection by using parameterised input.
-        /// </summary>
-        /// <param name="sql">The SQL string - replace any variables such as WHERE x = "y" with WHERE x = @y</param>
-        /// <param name="parameters">The parameters - index so that @y is indexed as 'y'</param>
-        /// <returns>A SQLite DB Command</returns>
-        public IDbCommand Query(string sql, Dictionary<string, string> parameters)
-        {
-            SQLiteCommand dbcommand = (SQLiteCommand)dbcon.CreateCommand();
-            dbcommand.CommandText = sql;
-            foreach (KeyValuePair<string, string> param in parameters)
-            {
-                SQLiteParameter paramx = new SQLiteParameter(param.Key,param.Value);
-                dbcommand.Parameters.Add(paramx);
-            }
-            return (IDbCommand)dbcommand;
-        }
-        /// <summary>
-        /// Reads a region row from a database reader
-        /// </summary>
-        /// <param name="reader">An active database reader</param>
-        /// <returns>A region profile</returns>
-        public SimProfileData getRow(IDataReader reader)
-        {
-            SimProfileData retval = new SimProfileData();
-            if (reader.Read())
-            {
-                // Region Main
-                retval.regionHandle = (ulong)reader["regionHandle"];
-                retval.regionName = (string)reader["regionName"];
-                retval.UUID = new libsecondlife.LLUUID((string)reader["uuid"]);
-                // Secrets
-                retval.regionRecvKey = (string)reader["regionRecvKey"];
-                retval.regionSecret = (string)reader["regionSecret"];
-                retval.regionSendKey = (string)reader["regionSendKey"];
-                // Region Server
-                retval.regionDataURI = (string)reader["regionDataURI"];
-                retval.regionOnline = false; // Needs to be pinged before this can be set.
-                retval.serverIP = (string)reader["serverIP"];
-                retval.serverPort = (uint)reader["serverPort"];
-                retval.serverURI = (string)reader["serverURI"];
-                // Location
-                retval.regionLocX = (uint)((int)reader["locX"]);
-                retval.regionLocY = (uint)((int)reader["locY"]);
-                retval.regionLocZ = (uint)((int)reader["locZ"]);
-                // Neighbours - 0 = No Override
-                retval.regionEastOverrideHandle = (ulong)reader["eastOverrideHandle"];
-                retval.regionWestOverrideHandle = (ulong)reader["westOverrideHandle"];
-                retval.regionSouthOverrideHandle = (ulong)reader["southOverrideHandle"];
-                retval.regionNorthOverrideHandle = (ulong)reader["northOverrideHandle"];
-                // Assets
-                retval.regionAssetURI = (string)reader["regionAssetURI"];
-                retval.regionAssetRecvKey = (string)reader["regionAssetRecvKey"];
-                retval.regionAssetSendKey = (string)reader["regionAssetSendKey"];
-                // Userserver
-                retval.regionUserURI = (string)reader["regionUserURI"];
-                retval.regionUserRecvKey = (string)reader["regionUserRecvKey"];
-                retval.regionUserSendKey = (string)reader["regionUserSendKey"];
-            }
-            else
-            {
-                throw new Exception("No rows to return");
-            }
-            return retval;
-        }
-        /// <summary>
-        /// Inserts a new region into the database
-        /// </summary>
-        /// <param name="profile">The region to insert</param>
-        /// <returns>Success?</returns>
-        public bool insertRow(SimProfileData profile)
-        {
-            string sql = "REPLACE INTO regions VALUES (regionHandle, regionName, uuid, regionRecvKey, regionSecret, regionSendKey, regionDataURI, ";
-            sql += "serverIP, serverPort, serverURI, locX, locY, locZ, eastOverrideHandle, westOverrideHandle, southOverrideHandle, northOverrideHandle, regionAssetURI, regionAssetRecvKey, ";
-            sql += "regionAssetSendKey, regionUserURI, regionUserRecvKey, regionUserSendKey) VALUES ";
-            sql += "(@regionHandle, @regionName, @uuid, @regionRecvKey, @regionSecret, @regionSendKey, @regionDataURI, ";
-            sql += "@serverIP, @serverPort, @serverURI, @locX, @locY, @locZ, @eastOverrideHandle, @westOverrideHandle, @southOverrideHandle, @northOverrideHandle, @regionAssetURI, @regionAssetRecvKey, ";
-            sql += "@regionAssetSendKey, @regionUserURI, @regionUserRecvKey, @regionUserSendKey);";
-            Dictionary<string, string> parameters = new Dictionary<string, string>();
-            parameters["regionHandle"] = profile.regionHandle.ToString();
-            parameters["regionName"] = profile.regionName;
-            parameters["uuid"] = profile.UUID.ToString();
-            parameters["regionRecvKey"] = profile.regionRecvKey;
-            parameters["regionSendKey"] = profile.regionSendKey;
-            parameters["regionDataURI"] = profile.regionDataURI;
-            parameters["serverIP"] = profile.serverIP;
-            parameters["serverPort"] = profile.serverPort.ToString();
-            parameters["serverURI"] = profile.serverURI;
-            parameters["locX"] = profile.regionLocX.ToString();
-            parameters["locY"] = profile.regionLocY.ToString();
-            parameters["locZ"] = profile.regionLocZ.ToString();
-            parameters["eastOverrideHandle"] = profile.regionEastOverrideHandle.ToString();
-            parameters["westOverrideHandle"] = profile.regionWestOverrideHandle.ToString();
-            parameters["northOverrideHandle"] = profile.regionNorthOverrideHandle.ToString();
-            parameters["southOverrideHandle"] = profile.regionSouthOverrideHandle.ToString();
-            parameters["regionAssetURI"] = profile.regionAssetURI;
-            parameters["regionAssetRecvKey"] = profile.regionAssetRecvKey;
-            parameters["regionAssetSendKey"] = profile.regionAssetSendKey;
-            parameters["regionUserURI"] = profile.regionUserURI;
-            parameters["regionUserRecvKey"] = profile.regionUserRecvKey;
-            parameters["regionUserSendKey"] = profile.regionUserSendKey;
-            bool returnval = false;
-            try
-            {
-                IDbCommand result = Query(sql, parameters);
-                if (result.ExecuteNonQuery() == 1)
-                    returnval = true;
-                result.Dispose();
-            }
-            catch (Exception e)
-            {
-                return false;
-            }
-            return returnval;
-        }
-    }
-}
diff --git a/OpenGridServices/OpenGrid.Framework.Data/GridData.cs b/OpenGridServices/OpenGrid.Framework.Data/GridData.cs
deleted file mode 100644
index e9fb215..0000000
--- a/OpenGridServices/OpenGrid.Framework.Data/GridData.cs
+++ /dev/null
@@ -1,110 +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);
-    }
-}
diff --git a/OpenGridServices/OpenGrid.Framework.Data/ILogData.cs b/OpenGridServices/OpenGrid.Framework.Data/ILogData.cs
deleted file mode 100644
index 2ac0bfe..0000000
--- a/OpenGridServices/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/OpenGridServices/OpenGrid.Framework.Data/IniConfig.cs b/OpenGridServices/OpenGrid.Framework.Data/IniConfig.cs
deleted file mode 100644
index d17afac..0000000
--- a/OpenGridServices/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/OpenGridServices/OpenGrid.Framework.Data/InventoryData.cs b/OpenGridServices/OpenGrid.Framework.Data/InventoryData.cs
deleted file mode 100644
index 12f559b..0000000
--- a/OpenGridServices/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/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj b/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj
deleted file mode 100644
index 0b53b02..0000000
--- a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj
+++ /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="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="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/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build b/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build
deleted file mode 100644
index 7abebeb..0000000
--- a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build
+++ /dev/null
@@ -1,49 +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="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/OpenGridServices/OpenGrid.Framework.Data/Properties/AssemblyInfo.cs b/OpenGridServices/OpenGrid.Framework.Data/Properties/AssemblyInfo.cs
deleted file mode 100644
index 1446673..0000000
--- a/OpenGridServices/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/OpenGridServices/OpenGrid.Framework.Data/SimProfileData.cs b/OpenGridServices/OpenGrid.Framework.Data/SimProfileData.cs
deleted file mode 100644
index a3e7cb7..0000000
--- a/OpenGridServices/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/OpenGridServices/OpenGrid.Framework.Data/UserData.cs b/OpenGridServices/OpenGrid.Framework.Data/UserData.cs
deleted file mode 100644
index c2d5a72..0000000
--- a/OpenGridServices/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/OpenGridServices/OpenGrid.Framework.Data/UserProfileData.cs b/OpenGridServices/OpenGrid.Framework.Data/UserProfileData.cs
deleted file mode 100644
index 82633e1..0000000
--- a/OpenGridServices/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/OpenGridServices/OpenGrid.Framework.Manager/GridManagementAgent.cs b/OpenGridServices/OpenGrid.Framework.Manager/GridManagementAgent.cs
deleted file mode 100644
index dfc572a..0000000
--- a/OpenGridServices/OpenGrid.Framework.Manager/GridManagementAgent.cs
+++ /dev/null
@@ -1,140 +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 Nwc.XmlRpc;
-using OpenSim.Framework;
-using OpenSim.Servers;
-using System.Collections;
-using System.Collections.Generic;
-using libsecondlife;
-namespace OpenGrid.Framework.Manager
-{
-    /// <summary>
-    /// Used to pass messages to the gridserver
-    /// </summary>
-    /// <param name="param">Pass this argument</param>
-    public delegate void GridManagerCallback(string param);
-    /// <summary>
-    /// Serverside listener for grid commands
-    /// </summary>
-    public class GridManagementAgent
-    {
-        /// <summary>
-        /// Passes grid server messages
-        /// </summary>
-        private GridManagerCallback thecallback;
-        /// <summary>
-        /// Security keys
-        /// </summary>
-        private string sendkey;
-        private string recvkey;
-        /// <summary>
-        /// Our component type
-        /// </summary>
-        private string component_type;
-        /// <summary>
-        /// List of active sessions
-        /// </summary>
-        private static ArrayList Sessions;
-        /// <summary>
-        /// Initialises a new GridManagementAgent
-        /// </summary>
-        /// <param name="app_httpd">HTTP Daemon for this server</param>
-        /// <param name="component_type">What component type are we?</param>
-        /// <param name="sendkey">Security send key</param>
-        /// <param name="recvkey">Security recieve key</param>
-        /// <param name="thecallback">Message callback</param>
-        public GridManagementAgent(BaseHttpServer app_httpd, string component_type, string sendkey, string recvkey, GridManagerCallback thecallback)
-        {
-            this.sendkey = sendkey;
-            this.recvkey = recvkey;
-            this.component_type = component_type;
-            this.thecallback = thecallback;
-            Sessions = new ArrayList();
-            app_httpd.AddXmlRPCHandler("manager_login", XmlRpcLoginMethod);
-            switch (component_type)
-            {
-                case "gridserver":
-                    GridServerManager.sendkey = this.sendkey;
-                    GridServerManager.recvkey = this.recvkey;
-                    GridServerManager.thecallback = thecallback;
-                    app_httpd.AddXmlRPCHandler("shutdown", GridServerManager.XmlRpcShutdownMethod);
-                    break;
-            }
-        }
-        /// <summary>
-        /// Checks if a session exists
-        /// </summary>
-        /// <param name="sessionID">The session ID</param>
-        /// <returns>Exists?</returns>
-        public static bool SessionExists(LLUUID sessionID)
-        {
-            return Sessions.Contains(sessionID);
-        }
-        /// <summary>
-        /// Logs a new session to the grid manager
-        /// </summary>
-        /// <param name="request">the XMLRPC request</param>
-        /// <returns>An XMLRPC reply</returns>
-        public static XmlRpcResponse XmlRpcLoginMethod(XmlRpcRequest request)
-        {
-            XmlRpcResponse response = new XmlRpcResponse();
-            Hashtable requestData = (Hashtable)request.Params[0];
-            Hashtable responseData = new Hashtable();
-            // TODO: Switch this over to using OpenGrid.Framework.Data
-            if (requestData["username"].Equals("admin") && requestData["password"].Equals("supersecret"))
-            {
-                response.IsFault = false;
-                LLUUID new_session = LLUUID.Random();
-                Sessions.Add(new_session);
-                responseData["session_id"] = new_session.ToString();
-                responseData["msg"] = "Login OK";
-            }
-            else
-            {
-                response.IsFault = true;
-                responseData["error"] = "Invalid username or password";
-            }
-            response.Value = responseData;
-            return response;
-        }
-    }
-}
diff --git a/OpenGridServices/OpenGrid.Framework.Manager/GridServerManager.cs b/OpenGridServices/OpenGrid.Framework.Manager/GridServerManager.cs
deleted file mode 100644
index d665ab4..0000000
--- a/OpenGridServices/OpenGrid.Framework.Manager/GridServerManager.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;
-using System.Collections.Generic;
-using Nwc.XmlRpc;
-using System.Threading;
-using libsecondlife;
-namespace OpenGrid.Framework.Manager {
-    /// <summary>
-    /// A remote management system for the grid server
-    /// </summary>
-        public class GridServerManager 
-        {
-        /// <summary>
-        /// Triggers events from the grid manager
-        /// </summary>
-                public static GridManagerCallback thecallback;
-        /// <summary>
-        /// Security keys
-        /// </summary>
-                public static string sendkey;
-                public static string recvkey;
-        /// <summary>
-        /// Disconnects the grid server and shuts it down
-        /// </summary>
-        /// <param name="request">XmlRpc Request</param>
-        /// <returns>An XmlRpc response containing either a "msg" or an "error"</returns>
-                public static XmlRpcResponse XmlRpcShutdownMethod(XmlRpcRequest request)
-                {
-                        XmlRpcResponse response = new XmlRpcResponse();
-                        Hashtable requestData = (Hashtable)request.Params[0];
-                        Hashtable responseData = new Hashtable();
-         
-                        if(requestData.ContainsKey("session_id")) {
-                                if(GridManagementAgent.SessionExists(new LLUUID((string)requestData["session_id"]))) {
-                                        responseData["msg"]="Shutdown command accepted";
-                                        (new Thread(new ThreadStart(ShutdownServer))).Start();
-                                } else {
-                                        response.IsFault=true;
-                                        responseData["error"]="bad session ID";
-                                }
-                        } else {
-                                response.IsFault=true;
-                                responseData["error"]="no session ID";
-                        }
-                        response.Value = responseData;
-                        return response;
-                }
-                /// <summary>
-        /// Shuts down the grid server
-                /// </summary>
-                public static void ShutdownServer()
-                {
-                        Console.WriteLine("Shutting down the grid server - recieved a grid manager request");
-            Console.WriteLine("Terminating in three seconds...");
-                        Thread.Sleep(3000);
-                        thecallback("shutdown");
-                }
-         }
-}
diff --git a/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj b/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj
deleted file mode 100644
index 83ba00f..0000000
--- a/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj
+++ /dev/null
@@ -1,99 +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>{7924FD35-0000-0000-0000-000000000000}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon></ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>OpenGrid.Framework.Manager</AssemblyName>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenGrid.Framework.Manager</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="OpenSim.Framework.dll" >
-      <HintPath>..\..\bin\OpenSim.Framework.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="OpenSim.Servers.dll" >
-      <HintPath>..\..\bin\OpenSim.Servers.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System" >
-      <HintPath>System.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="XMLRPC" >
-      <HintPath>XMLRPC.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="GridManagementAgent.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="GridServerManager.cs">
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
diff --git a/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build b/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build
deleted file mode 100644
index 9430ab9..0000000
--- a/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" ?>
-<project name="OpenGrid.Framework.Manager" 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.Manager" dynamicprefix="true" >
-            </resources>
-            <sources failonempty="true">
-                <include name="GridManagementAgent.cs" />
-                <include name="GridServerManager.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.Servers.dll" />
-                <include name="System.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/OpenGridServices/OpenGridServices.AssetServer/AssetHttpServer.cs b/OpenGridServices/OpenGridServices.AssetServer/AssetHttpServer.cs
deleted file mode 100644
index 6fc6bf8..0000000
--- a/OpenGridServices/OpenGridServices.AssetServer/AssetHttpServer.cs
+++ /dev/null
@@ -1,130 +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;
-using OpenSim.Servers;
-namespace OpenGridServices.AssetServer
-{
-    /// <summary>
-    /// An HTTP server for sending assets
-    /// </summary>
-    public class AssetHttpServer :BaseHttpServer
-    {
-        /// <summary>
-        /// Creates the new asset server
-        /// </summary>
-        /// <param name="port">Port to initalise on</param>
-        public AssetHttpServer(int port)
-            : base(port)
-        {
-        }
-        /// <summary>
-        /// Handles an HTTP request
-        /// </summary>
-        /// <param name="stateinfo">HTTP State Info</param>
-        public override 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 = "";
-                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);
-                        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/plain");
-                        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/plain");
-                        break;
-                }
-                Encoding Windows1252Encoding = Encoding.GetEncoding(1252);
-                byte[] buffer = Windows1252Encoding.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());
-            }
-        }
-    }
-}
diff --git a/OpenGridServices/OpenGridServices.AssetServer/Main.cs b/OpenGridServices/OpenGridServices.AssetServer/Main.cs
deleted file mode 100644
index e9b94ea..0000000
--- a/OpenGridServices/OpenGridServices.AssetServer/Main.cs
+++ /dev/null
@@ -1,338 +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;
-using System.Text;
-using System.Timers;
-using System.Net;
-using System.Reflection;
-using System.Threading;
-using libsecondlife;
-using OpenSim.Framework;
-using OpenSim.Framework.Sims;
-using OpenSim.Framework.Console;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Utilities;
-using OpenSim.GridInterfaces.Local;             // REFACTORING IS NEEDED!!!!!!!!!!!
-using OpenSim.Servers;
-using Db4objects.Db4o;
-using Db4objects.Db4o.Query;
-namespace OpenGridServices.AssetServer
-{
-    /// <summary>
-    /// An asset server
-    /// </summary>
-    public class OpenAsset_Main : BaseServer, conscmd_callback
-    {
-        private IObjectContainer db;
-        public static OpenAsset_Main assetserver;
-        private ConsoleBase m_console;
-        [STAThread]
-        public static void Main(string[] args)
-        {
-            Console.WriteLine("Starting...\n");
-            assetserver = new OpenAsset_Main();
-            assetserver.Startup();
-            assetserver.Work();
-        }
-        private void Work()
-        {
-            m_console.Notice("Enter help for a list of commands");
-            while (true)
-            {
-                m_console.MainConsolePrompt();
-            }
-        }
-        private OpenAsset_Main()
-        {
-            m_console = new ConsoleBase("opengrid-AssetServer-console.log", "OpenAsset", this, false);
-            MainConsole.Instance = m_console;
-        }
-        public void Startup()
-        {
-            m_console.Verbose( "Main.cs:Startup() - Setting up asset DB");
-            setupDB();
-            m_console.Verbose( "Main.cs:Startup() - Starting HTTP process");
-            AssetHttpServer httpServer = new AssetHttpServer(8003);
-            httpServer.AddRestHandler("GET", "/assets/", this.assetGetMethod);
-            httpServer.AddRestHandler("POST", "/assets/", this.assetPostMethod);
-            httpServer.Start();
-        }
-        public string assetPostMethod(string requestBody, string path, string param)
-        {
-            AssetBase asset = new AssetBase();
-            asset.Name = "";
-            asset.FullID = new LLUUID(param);
-            Encoding Windows1252Encoding = Encoding.GetEncoding(1252);
-            byte[] buffer = Windows1252Encoding.GetBytes(requestBody);
-            asset.Data = buffer;
-            AssetStorage store = new AssetStorage();
-            store.Data = asset.Data;
-            store.Name = asset.Name;
-            store.UUID = asset.FullID;
-            db.Set(store);
-            db.Commit();
-            return "";
-        }
-        public string assetGetMethod(string request, string path, string param)
-        {
-            Console.WriteLine("got a request " + param);
-            byte[] assetdata = getAssetData(new LLUUID(param), false);
-            if (assetdata != null)
-            {
-                 Encoding Windows1252Encoding = Encoding.GetEncoding(1252);
-                 string ret = Windows1252Encoding.GetString(assetdata);
-                //string ret = System.Text.Encoding.Unicode.GetString(assetdata);
-                return ret;
-               
-            }
-            else
-            {
-                return "";
-            }
-        }
-        public byte[] getAssetData(LLUUID assetID, bool isTexture)
-        {
-            bool found = false;
-            AssetStorage foundAsset = null;
-            IObjectSet result = db.Get(new AssetStorage(assetID));
-            if (result.Count > 0)
-            {
-                foundAsset = (AssetStorage)result.Next();
-                found = true;
-            }
-            if (found)
-            {
-                return foundAsset.Data;
-            }
-            else
-            {
-                return null;
-            }
-        }
-        public void setupDB()
-        {
-            bool yapfile = System.IO.File.Exists("assets.yap");
-            try
-            {
-                db = Db4oFactory.OpenFile("assets.yap");
-                OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Main.cs:setupDB() - creation");
-            }
-            catch (Exception e)
-            {
-                db.Close();
-                OpenSim.Framework.Console.MainConsole.Instance.Warn("Main.cs:setupDB() - Exception occured");
-                OpenSim.Framework.Console.MainConsole.Instance.Warn(e.ToString());
-            }
-            if (!yapfile)
-            {
-                this.LoadDB();
-            }
-        }
-        public void LoadDB()
-        {
-            try
-            {
-                Console.WriteLine("setting up Asset database");
-                AssetBase Image = new AssetBase();
-                Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000001");
-                Image.Name = "Bricks";
-                this.LoadAsset(Image, true, "bricks.jp2");
-                AssetStorage store = new AssetStorage();
-                store.Data = Image.Data;
-                store.Name = Image.Name;
-                store.UUID = Image.FullID;
-                db.Set(store);
-                db.Commit();
-                Image = new AssetBase();
-                Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000002");
-                Image.Name = "Plywood";
-                this.LoadAsset(Image, true, "plywood.jp2");
-                store = new AssetStorage();
-                store.Data = Image.Data;
-                store.Name = Image.Name;
-                store.UUID = Image.FullID;
-                db.Set(store);
-                db.Commit();
-                Image = new AssetBase();
-                Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000003");
-                Image.Name = "Rocks";
-                this.LoadAsset(Image, true, "rocks.jp2");
-                store = new AssetStorage();
-                store.Data = Image.Data;
-                store.Name = Image.Name;
-                store.UUID = Image.FullID;
-                db.Set(store);
-                db.Commit();
-                Image = new AssetBase();
-                Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000004");
-                Image.Name = "Granite";
-                this.LoadAsset(Image, true, "granite.jp2");
-                store = new AssetStorage();
-                store.Data = Image.Data;
-                store.Name = Image.Name;
-                store.UUID = Image.FullID;
-                db.Set(store);
-                db.Commit();
-                Image = new AssetBase();
-                Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000005");
-                Image.Name = "Hardwood";
-                this.LoadAsset(Image, true, "hardwood.jp2");
-                store = new AssetStorage();
-                store.Data = Image.Data;
-                store.Name = Image.Name;
-                store.UUID = Image.FullID;
-                db.Set(store);
-                db.Commit();
-                Image = new AssetBase();
-                Image.FullID = new LLUUID("00000000-0000-0000-5005-000000000005");
-                Image.Name = "Prim Base Texture";
-                this.LoadAsset(Image, true, "plywood.jp2");
-                store = new AssetStorage();
-                store.Data = Image.Data;
-                store.Name = Image.Name;
-                store.UUID = Image.FullID;
-                db.Set(store);
-                db.Commit();
-                Image = new AssetBase();
-                Image.FullID = new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73");
-                Image.Name = "Shape";
-                this.LoadAsset(Image, false, "base_shape.dat");
-                store = new AssetStorage();
-                store.Data = Image.Data;
-                store.Name = Image.Name;
-                store.UUID = Image.FullID;
-                db.Set(store);
-                db.Commit();
-            }
-            catch (Exception e)
-            {
-                Console.WriteLine(e.Message);
-            }
-        }
-        private void LoadAsset(AssetBase info, bool image, string filename)
-        {
-            string dataPath = Path.Combine(System.AppDomain.CurrentDomain.BaseDirectory, "assets"); //+ folder;
-            string fileName = Path.Combine(dataPath, filename);
-            FileInfo fInfo = new FileInfo(fileName);
-            long numBytes = fInfo.Length;
-            FileStream fStream = new FileStream(fileName, FileMode.Open, FileAccess.Read);
-            byte[] idata = new byte[numBytes];
-            BinaryReader br = new BinaryReader(fStream);
-            idata = br.ReadBytes((int)numBytes);
-            br.Close();
-            fStream.Close();
-            info.Data = idata;
-            //info.loaded=true;
-        }
-        /*private GridConfig LoadConfigDll(string dllName)
-        {
-            Assembly pluginAssembly = Assembly.LoadFrom(dllName);
-            GridConfig config = null;
-            foreach (Type pluginType in pluginAssembly.GetTypes())
-            {
-                if (pluginType.IsPublic)
-                {
-                    if (!pluginType.IsAbstract)
-                    {
-                        Type typeInterface = pluginType.GetInterface("IGridConfig", true);
-                        if (typeInterface != null)
-                        {
-                            IGridConfig plug = (IGridConfig)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
-                            config = plug.GetConfigObject();
-                            break;
-                        }
-                        typeInterface = null;
-                    }
-                }
-            }
-            pluginAssembly = null;
-            return config;
-        }*/
-        public void RunCmd(string cmd, string[] cmdparams)
-        {
-            switch (cmd)
-            {
-                case "help":
-                    m_console.Notice("shutdown - shutdown this asset server (USE CAUTION!)");
-                    break;
-                case "shutdown":
-                    m_console.Close();
-                    Environment.Exit(0);
-                    break;
-            }
-        }
-        public void Show(string ShowWhat)
-        {
-        }
-    }
-}
diff --git a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj b/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj
deleted file mode 100644
index 50ffb36..0000000
--- a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.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>{0021261B-0000-0000-0000-000000000000}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon></ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>OpenGridServices.AssetServer</AssemblyName>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenGridServices.AssetServer</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.GridInterfaces.Local" >
-      <HintPath>OpenSim.GridInterfaces.Local.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>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AssetHttpServer.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Main.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/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build b/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build
deleted file mode 100644
index 808f015..0000000
--- a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" ?>
-<project name="OpenGridServices.AssetServer" 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="exe" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe">
-            <resources prefix="OpenGridServices.AssetServer" dynamicprefix="true" >
-            </resources>
-            <sources failonempty="true">
-                <include name="AssetHttpServer.cs" />
-                <include name="Main.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/OpenSim.Framework.dll" />
-                <include name="../../bin/OpenSim.Framework.Console.dll" />
-                <include name="../../bin/OpenSim.GridInterfaces.Local.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/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.GridServer.csproj b/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.GridServer.csproj
deleted file mode 100644
index 9b8cc87..0000000
--- a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.GridServer.csproj
+++ /dev/null
@@ -1,126 +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>{21BFC8E2-0000-0000-0000-000000000000}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon></ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>OpenGridServices.GridServer</AssemblyName>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenGridServices.GridServer</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.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="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="..\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="Main.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="SimProfiles.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/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.GridServer.exe.build b/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.GridServer.exe.build
deleted file mode 100644
index 6bef534..0000000
--- a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.GridServer.exe.build
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" ?>
-<project name="OpenGridServices.GridServer" 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="exe" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe">
-            <resources prefix="OpenGridServices.GridServer" dynamicprefix="true" >
-            </resources>
-            <sources failonempty="true">
-                <include name="Main.cs" />
-                <include name="SimProfiles.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="System.dll" />
-                <include name="System.Data.dll" />
-                <include name="System.Xml.dll" />
-                <include name="../bin/OpenSim.Framework.dll" />
-                <include name="../bin/OpenSim.Framework.Console.dll" />
-                <include name="../bin/OpenSim.Servers.dll" />
-                <include name="../bin/libsecondlife.dll" />
-                <include name="../bin/Db4objects.Db4o.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/OpenGridServices/OpenGridServices.AssetServer/Properties/AssemblyInfo.cs b/OpenGridServices/OpenGridServices.AssetServer/Properties/AssemblyInfo.cs
deleted file mode 100644
index 7014284..0000000
--- a/OpenGridServices/OpenGridServices.AssetServer/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("OGS-AssetServer")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("OGS-AssetServer")]
-[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("b541b244-3d1d-4625-9003-bc2a3a6a39a4")]
-// 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/OpenGridServices/OpenGridServices.GridServer/GridManager.cs b/OpenGridServices/OpenGridServices.GridServer/GridManager.cs
deleted file mode 100644
index 45d3676..0000000
--- a/OpenGridServices/OpenGridServices.GridServer/GridManager.cs
+++ /dev/null
@@ -1,589 +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 System.Reflection;
-using OpenGrid.Framework.Data;
-using OpenSim.Framework.Utilities;
-using OpenSim.Framework.Console;
-using OpenSim.Framework.Sims;
-using libsecondlife;
-using Nwc.XmlRpc;
-using System.Xml;
-namespace OpenGridServices.GridServer
-{
-    class GridManager
-    {
-        Dictionary<string, IGridData> _plugins = new Dictionary<string, IGridData>();
-        Dictionary<string, ILogData> _logplugins = new Dictionary<string, ILogData>();
-        public OpenSim.Framework.Interfaces.GridConfig config;
-        /// <summary>
-        /// Adds a new grid server plugin - grid servers will be requested in the order they were loaded.
-        /// </summary>
-        /// <param name="FileName">The filename to the grid server plugin DLL</param>
-        public void AddPlugin(string FileName)
-                {
-            OpenSim.Framework.Console.MainConsole.Instance.Verbose("Storage: Attempting to load " + FileName);
-                        Assembly pluginAssembly = Assembly.LoadFrom(FileName);
-            OpenSim.Framework.Console.MainConsole.Instance.Verbose("Storage: Found " + pluginAssembly.GetTypes().Length + " interfaces.");
-                        foreach (Type pluginType in pluginAssembly.GetTypes())
-                        {
-                if (!pluginType.IsAbstract)
-                {
-                    // Regions go here
-                    Type typeInterface = pluginType.GetInterface("IGridData", true);
-                    if (typeInterface != null)
-                    {
-                        IGridData plug = (IGridData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
-                        plug.Initialise();
-                        this._plugins.Add(plug.getName(), plug);
-                        OpenSim.Framework.Console.MainConsole.Instance.Verbose("Storage: Added IGridData Interface");
-                    }
-                    typeInterface = null;
-                    // Logs go here
-                    typeInterface = pluginType.GetInterface("ILogData", true);
-                    if (typeInterface != null)
-                    {
-                        ILogData plug = (ILogData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
-                        plug.Initialise();
-                        this._logplugins.Add(plug.getName(), plug);
-                        OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Storage: Added ILogData Interface");
-                    }
-                    typeInterface = null;
-                }
-                        }
-                        
-                        pluginAssembly = null; 
-        }
-        /// <summary>
-        /// Logs a piece of information to the database
-        /// </summary>
-        /// <param name="target">What you were operating on (in grid server, this will likely be the region UUIDs)</param>
-        /// <param name="method">Which method is being called?</param>
-        /// <param name="args">What arguments are being passed?</param>
-        /// <param name="priority">How high priority is this? 1 = Max, 6 = Verbose</param>
-        /// <param name="message">The message to log</param>
-        private void logToDB(string target, string method, string args, int priority, string message)
-        {
-            foreach (KeyValuePair<string, ILogData> kvp in _logplugins)
-            {
-                try
-                {
-                    kvp.Value.saveLog("Gridserver", target, method, args, priority, message);
-                }
-                catch (Exception e)
-                {
-                    OpenSim.Framework.Console.MainConsole.Instance.Warn("Storage: unable to write log via " + kvp.Key);
-                }
-            }
-        }
-        /// <summary>
-        /// Returns a region by argument
-        /// </summary>
-        /// <param name="uuid">A UUID key of the region to return</param>
-        /// <returns>A SimProfileData for the region</returns>
-        public SimProfileData getRegion(libsecondlife.LLUUID uuid)
-        {
-            foreach(KeyValuePair<string,IGridData> kvp in _plugins) {
-                try
-                {
-                    return kvp.Value.GetProfileByLLUUID(uuid);
-                }
-                catch (Exception e)
-                {
-                    OpenSim.Framework.Console.MainConsole.Instance.Warn("Storage: Unable to find region " + uuid.ToStringHyphenated() + " via " + kvp.Key);
-                }
-            }
-            return null;
-        }
-        /// <summary>
-        /// Returns a region by argument
-        /// </summary>
-        /// <param name="uuid">A regionHandle of the region to return</param>
-        /// <returns>A SimProfileData for the region</returns>
-        public SimProfileData getRegion(ulong handle)
-        {
-            foreach (KeyValuePair<string, IGridData> kvp in _plugins)
-            {
-                try
-                {
-                    return kvp.Value.GetProfileByHandle(handle);
-                }
-                catch (Exception e)
-                {
-                    OpenSim.Framework.Console.MainConsole.Instance.Warn("Storage: Unable to find region " + handle.ToString() + " via " + kvp.Key);
-                }
-            }
-            return null;
-        }
-        public Dictionary<ulong, SimProfileData> getRegions(uint xmin, uint ymin, uint xmax, uint ymax)
-        {
-            Dictionary<ulong, SimProfileData> regions = new Dictionary<ulong, SimProfileData>();
-            SimProfileData[] neighbours;
-            foreach (KeyValuePair<string, IGridData> kvp in _plugins)
-            {
-                try
-                {
-                    neighbours = kvp.Value.GetProfilesInRange(xmin, ymin, xmax, ymax);
-                    foreach (SimProfileData neighbour in neighbours)
-                    {
-                        regions[neighbour.regionHandle] = neighbour;
-                    }
-                }
-                catch (Exception e)
-                {
-                    OpenSim.Framework.Console.MainConsole.Instance.Warn("Storage: Unable to query regionblock via " + kvp.Key);
-                }
-            }
-            return regions;
-        }
-        /// <summary>
-        /// Returns a XML String containing a list of the neighbouring regions
-        /// </summary>
-        /// <param name="reqhandle">The regionhandle for the center sim</param>
-        /// <returns>An XML string containing neighbour entities</returns>
-        public string GetXMLNeighbours(ulong reqhandle)
-        {
-            string response = "";
-            SimProfileData central_region = getRegion(reqhandle);
-            SimProfileData neighbour;
-            for (int x = -1; x < 2; x++) for (int y = -1; y < 2; y++)
-                {
-                    if (getRegion(Util.UIntsToLong((uint)((central_region.regionLocX + x) * 256), (uint)(central_region.regionLocY + y) * 256)) != null)
-                    {
-                        neighbour = getRegion(Util.UIntsToLong((uint)((central_region.regionLocX + x) * 256), (uint)(central_region.regionLocY + y) * 256));
-                        response += "<neighbour>";
-                        response += "<sim_ip>" + neighbour.serverIP + "</sim_ip>";
-                        response += "<sim_port>" + neighbour.serverPort.ToString() + "</sim_port>";
-                        response += "<locx>" + neighbour.regionLocX.ToString() + "</locx>";
-                        response += "<locy>" + neighbour.regionLocY.ToString() + "</locy>";
-                        response += "<regionhandle>" + neighbour.regionHandle.ToString() + "</regionhandle>";
-                        response += "</neighbour>";
-                    }
-                }
-            return response;
-        }
-        /// <summary>
-        /// Performed when a region connects to the grid server initially.
-        /// </summary>
-        /// <param name="request">The XMLRPC Request</param>
-        /// <returns>Startup parameters</returns>
-        public XmlRpcResponse XmlRpcLoginToSimulatorMethod(XmlRpcRequest request)
-        {
-            XmlRpcResponse response = new XmlRpcResponse();
-            Hashtable responseData = new Hashtable();
-            response.Value = responseData;
-            SimProfileData TheSim = null;
-            Hashtable requestData = (Hashtable)request.Params[0];
-            if (requestData.ContainsKey("UUID"))
-            {
-                TheSim = getRegion(new LLUUID((string)requestData["UUID"]));
-                logToDB((new LLUUID((string)requestData["UUID"])).ToStringHyphenated(),"XmlRpcLoginToSimulatorMethod","", 5,"Region attempting login with UUID.");
-            }
-            else if (requestData.ContainsKey("region_handle"))
-            {
-                TheSim = getRegion((ulong)Convert.ToUInt64(requestData["region_handle"]));
-                logToDB((string)requestData["region_handle"], "XmlRpcLoginToSimulatorMethod", "", 5, "Region attempting login with regionHandle.");
-            }
-            else
-            {
-                responseData["error"] = "No UUID or region_handle passed to grid server - unable to connect you";
-                return response;
-            }
-            if (TheSim == null)
-            {
-                responseData["error"] = "sim not found";
-                return response;
-            }
-            else
-            {
-                ArrayList SimNeighboursData = new ArrayList();
-                SimProfileData neighbour;
-                Hashtable NeighbourBlock;
-                bool fastMode = false; // Only compatible with MySQL right now
-                if (fastMode)
-                {
-                    Dictionary<ulong, SimProfileData> neighbours = getRegions(TheSim.regionLocX - 1, TheSim.regionLocY - 1, TheSim.regionLocX + 1, TheSim.regionLocY + 1);
-                    foreach (KeyValuePair<ulong, SimProfileData> aSim in neighbours)
-                    {
-                        NeighbourBlock = new Hashtable();
-                        NeighbourBlock["sim_ip"] = aSim.Value.serverIP.ToString();
-                        NeighbourBlock["sim_port"] = aSim.Value.serverPort.ToString();
-                        NeighbourBlock["region_locx"] = aSim.Value.regionLocX.ToString();
-                        NeighbourBlock["region_locy"] = aSim.Value.regionLocY.ToString();
-                        NeighbourBlock["UUID"] = aSim.Value.UUID.ToString();
-                        if (aSim.Value.UUID != TheSim.UUID)
-                            SimNeighboursData.Add(NeighbourBlock);
-                    }
-                }
-                else
-                {
-                    for (int x = -1; x < 2; x++) for (int y = -1; y < 2; y++)
-                        {
-                            if (getRegion(Helpers.UIntsToLong((uint)((TheSim.regionLocX + x) * 256), (uint)(TheSim.regionLocY + y) * 256)) != null)
-                            {
-                                neighbour = getRegion(Helpers.UIntsToLong((uint)((TheSim.regionLocX + x) * 256), (uint)(TheSim.regionLocY + y) * 256));
-                                NeighbourBlock = new Hashtable();
-                                NeighbourBlock["sim_ip"] = neighbour.serverIP;
-                                NeighbourBlock["sim_port"] = neighbour.serverPort.ToString();
-                                NeighbourBlock["region_locx"] = neighbour.regionLocX.ToString();
-                                NeighbourBlock["region_locy"] = neighbour.regionLocY.ToString();
-                                NeighbourBlock["UUID"] = neighbour.UUID.ToString();
-                                if (neighbour.UUID != TheSim.UUID) SimNeighboursData.Add(NeighbourBlock);
-                            }
-                        }
-                }
-                responseData["UUID"] = TheSim.UUID.ToString();
-                responseData["region_locx"] = TheSim.regionLocX.ToString();
-                responseData["region_locy"] = TheSim.regionLocY.ToString();
-                responseData["regionname"] = TheSim.regionName;
-                responseData["estate_id"] = "1";
-                responseData["neighbours"] = SimNeighboursData;
-                responseData["sim_ip"] = TheSim.serverIP;
-                responseData["sim_port"] = TheSim.serverPort.ToString();
-                responseData["asset_url"] = TheSim.regionAssetURI;
-                responseData["asset_sendkey"] = TheSim.regionAssetSendKey;
-                responseData["asset_recvkey"] = TheSim.regionAssetRecvKey;
-                responseData["user_url"] = TheSim.regionUserURI;
-                responseData["user_sendkey"] = TheSim.regionUserSendKey;
-                responseData["user_recvkey"] = TheSim.regionUserRecvKey;
-                responseData["authkey"] = TheSim.regionSecret;
-                // New! If set, use as URL to local sim storage (ie http://remotehost/region.yap)
-                responseData["data_uri"] = TheSim.regionDataURI;
-            }
-            return response;
-        }
-        public XmlRpcResponse XmlRpcMapBlockMethod(XmlRpcRequest request)
-        {
-            int xmin=980, ymin=980, xmax=1020, ymax=1020;
-            Hashtable requestData = (Hashtable)request.Params[0];
-            if (requestData.ContainsKey("xmin"))
-            {
-                xmin = (Int32)requestData["xmin"];
-            }
-            if (requestData.ContainsKey("ymin"))
-            {
-                ymin = (Int32)requestData["ymin"];
-            }
-            if (requestData.ContainsKey("xmax"))
-            {
-                xmax = (Int32)requestData["xmax"];
-            }
-            if (requestData.ContainsKey("ymax"))
-            {
-                ymax = (Int32)requestData["ymax"];
-            }
-            XmlRpcResponse response = new XmlRpcResponse();
-            Hashtable responseData = new Hashtable();
-            response.Value = responseData;
-            IList simProfileList = new ArrayList();
-            bool fastMode = true; // MySQL Only
-            if (fastMode)
-            {
-                Dictionary<ulong, SimProfileData> neighbours = getRegions((uint)xmin, (uint)ymin, (uint)xmax, (uint)ymax);
-                foreach (KeyValuePair<ulong, SimProfileData> aSim in neighbours)
-                {
-                    Hashtable simProfileBlock = new Hashtable();
-                    simProfileBlock["x"] = aSim.Value.regionLocX.ToString();
-                    simProfileBlock["y"] = aSim.Value.regionLocY.ToString();
-                    simProfileBlock["name"] = aSim.Value.regionName;
-                    simProfileBlock["access"] = 21;
-                    simProfileBlock["region-flags"] = 512;
-                    simProfileBlock["water-height"] = 0;
-                    simProfileBlock["agents"] = 1;
-                    simProfileBlock["map-image-id"] = aSim.Value.regionMapTextureID.ToString();
-                    // For Sugilite compatibility
-                    simProfileBlock["regionhandle"] = aSim.Value.regionHandle.ToString();
-                    simProfileBlock["sim_ip"] = aSim.Value.serverIP.ToString();
-                    simProfileBlock["sim_port"] = aSim.Value.serverPort.ToString();
-                    simProfileBlock["sim_uri"] = aSim.Value.serverURI.ToString();
-                    simProfileBlock["uuid"] = aSim.Value.UUID.ToStringHyphenated();
-                    simProfileList.Add(simProfileBlock);
-                }
-                OpenSim.Framework.Console.MainConsole.Instance.Verbose("World map request processed, returned " + simProfileList.Count.ToString() + " region(s) in range via FastMode");
-            }
-            else
-            {
-                SimProfileData simProfile;
-                for (int x = xmin; x < xmax; x++)
-                {
-                    for (int y = ymin; y < ymax; y++)
-                    {
-                        simProfile = getRegion(Helpers.UIntsToLong((uint)(x * 256), (uint)(y * 256)));
-                        if (simProfile != null)
-                        {
-                            Hashtable simProfileBlock = new Hashtable();
-                            simProfileBlock["x"] = x;
-                            simProfileBlock["y"] = y;
-                            simProfileBlock["name"] = simProfile.regionName;
-                            simProfileBlock["access"] = 0;
-                            simProfileBlock["region-flags"] = 0;
-                            simProfileBlock["water-height"] = 20;
-                            simProfileBlock["agents"] = 1;
-                            simProfileBlock["map-image-id"] = simProfile.regionMapTextureID.ToString();
-                            // For Sugilite compatibility
-                            simProfileBlock["regionhandle"] = simProfile.regionHandle.ToString();
-                            simProfileBlock["sim_ip"] = simProfile.serverIP.ToString();
-                            simProfileBlock["sim_port"] = simProfile.serverPort.ToString();
-                            simProfileBlock["sim_uri"] = simProfile.serverURI.ToString();
-                            simProfileBlock["uuid"] = simProfile.UUID.ToStringHyphenated();
-                            simProfileList.Add(simProfileBlock);
-                        }
-                    }
-                }
-                OpenSim.Framework.Console.MainConsole.Instance.Verbose("World map request processed, returned " + simProfileList.Count.ToString() + " region(s) in range via Standard Mode");
-            }
-            responseData["sim-profiles"] = simProfileList;
-            return response;
-        }
-        /// <summary>
-        /// Performs a REST Get Operation
-        /// </summary>
-        /// <param name="request"></param>
-        /// <param name="path"></param>
-        /// <param name="param"></param>
-        /// <returns></returns>
-        public string RestGetRegionMethod(string request, string path, string param)
-        {
-            return RestGetSimMethod("", "/sims/", param);
-        }
-        /// <summary>
-        /// Performs a REST Set Operation
-        /// </summary>
-        /// <param name="request"></param>
-        /// <param name="path"></param>
-        /// <param name="param"></param>
-        /// <returns></returns>
-        public string RestSetRegionMethod(string request, string path, string param)
-        {
-            return RestSetSimMethod("", "/sims/", param);
-        }
-        /// <summary>
-        /// Returns information about a sim via a REST Request
-        /// </summary>
-        /// <param name="request"></param>
-        /// <param name="path"></param>
-        /// <param name="param"></param>
-        /// <returns>Information about the sim in XML</returns>
-        public string RestGetSimMethod(string request, string path, string param)
-        {
-            string respstring = String.Empty;
-            SimProfileData TheSim;
-            LLUUID UUID = new LLUUID(param);
-            TheSim = getRegion(UUID);
-            if (!(TheSim == null))
-            {
-                respstring = "<Root>";
-                respstring += "<authkey>" + TheSim.regionSendKey + "</authkey>";
-                respstring += "<sim>";
-                respstring += "<uuid>" + TheSim.UUID.ToString() + "</uuid>";
-                respstring += "<regionname>" + TheSim.regionName + "</regionname>";
-                respstring += "<sim_ip>" + TheSim.serverIP + "</sim_ip>";
-                respstring += "<sim_port>" + TheSim.serverPort.ToString() + "</sim_port>";
-                respstring += "<region_locx>" + TheSim.regionLocX.ToString() + "</region_locx>";
-                respstring += "<region_locy>" + TheSim.regionLocY.ToString() + "</region_locy>";
-                respstring += "<estate_id>1</estate_id>";
-                respstring += "</sim>";
-                respstring += "</Root>";
-            }
-            return respstring;
-        }
-        /// <summary>
-        /// Creates or updates a sim via a REST Method Request
-        /// BROKEN with SQL Update
-        /// </summary>
-        /// <param name="request"></param>
-        /// <param name="path"></param>
-        /// <param name="param"></param>
-        /// <returns>"OK" or an error</returns>
-        public string RestSetSimMethod(string request, string path, string param)
-        {
-            Console.WriteLine("Processing region update");
-            SimProfileData TheSim;
-            TheSim = getRegion(new LLUUID(param));
-            if ((TheSim) == null)
-            {
-                TheSim = new SimProfileData();
-                LLUUID UUID = new LLUUID(param);
-                TheSim.UUID = UUID;
-                TheSim.regionRecvKey = config.SimRecvKey;
-            }
-            XmlDocument doc = new XmlDocument();
-            doc.LoadXml(request);
-            XmlNode rootnode = doc.FirstChild;
-            XmlNode authkeynode = rootnode.ChildNodes[0];
-            if (authkeynode.Name != "authkey")
-            {
-                return "ERROR! bad XML - expected authkey tag";
-            }
-            XmlNode simnode = rootnode.ChildNodes[1];
-            if (simnode.Name != "sim")
-            {
-                return "ERROR! bad XML - expected sim tag";
-            }
-            if (authkeynode.InnerText != TheSim.regionRecvKey)
-            {
-                return "ERROR! invalid key";
-            }
-            //TheSim.regionSendKey = Cfg;
-            TheSim.regionRecvKey = config.SimRecvKey;
-            TheSim.regionSendKey = config.SimSendKey;
-            TheSim.regionSecret = config.SimRecvKey;
-            TheSim.regionDataURI = "";
-            TheSim.regionAssetURI = config.DefaultAssetServer;
-            TheSim.regionAssetRecvKey = config.AssetRecvKey;
-            TheSim.regionAssetSendKey = config.AssetSendKey;
-            TheSim.regionUserURI = config.DefaultUserServer;
-            TheSim.regionUserSendKey = config.UserSendKey;
-            TheSim.regionUserRecvKey = config.UserRecvKey;
-            for (int i = 0; i < simnode.ChildNodes.Count; i++)
-            {
-                switch (simnode.ChildNodes[i].Name)
-                {
-                    case "regionname":
-                        TheSim.regionName = simnode.ChildNodes[i].InnerText;
-                        break;
-                    case "sim_ip":
-                        TheSim.serverIP = simnode.ChildNodes[i].InnerText;
-                        break;
-                    case "sim_port":
-                        TheSim.serverPort = Convert.ToUInt32(simnode.ChildNodes[i].InnerText);
-                        break;
-                    case "region_locx":
-                        TheSim.regionLocX = Convert.ToUInt32((string)simnode.ChildNodes[i].InnerText);
-                        TheSim.regionHandle = Helpers.UIntsToLong((TheSim.regionLocX * 256), (TheSim.regionLocY * 256));
-                        break;
-                    case "region_locy":
-                        TheSim.regionLocY = Convert.ToUInt32((string)simnode.ChildNodes[i].InnerText);
-                        TheSim.regionHandle = Helpers.UIntsToLong((TheSim.regionLocX * 256), (TheSim.regionLocY * 256));
-                        break;
-                }
-            }
-            TheSim.serverURI = "http://" + TheSim.serverIP + ":" + TheSim.serverPort + "/";
-            bool requirePublic = false;
-            if (requirePublic && (TheSim.serverIP.StartsWith("172.16") || TheSim.serverIP.StartsWith("192.168") || TheSim.serverIP.StartsWith("10.") || TheSim.serverIP.StartsWith("0.") || TheSim.serverIP.StartsWith("255.")))
-            {
-                return "ERROR! Servers must register with public addresses.";
-            }
-            try
-            {
-                OpenSim.Framework.Console.MainConsole.Instance.Verbose("Updating / adding via " + _plugins.Count + " storage provider(s) registered.");
-                foreach (KeyValuePair<string, IGridData> kvp in _plugins)
-                {
-                    try
-                    {
-                        kvp.Value.AddProfile(TheSim);
-                        OpenSim.Framework.Console.MainConsole.Instance.Verbose("New sim added to grid (" + TheSim.regionName + ")");
-                        logToDB(TheSim.UUID.ToStringHyphenated(), "RestSetSimMethod", "", 5, "Region successfully updated and connected to grid.");
-                    }
-                    catch (Exception e)
-                    {
-                        OpenSim.Framework.Console.MainConsole.Instance.Verbose("getRegionPlugin Handle " + kvp.Key + " unable to add new sim: " + e.ToString());
-                    }
-                }
-                return "OK";
-            }
-            catch (Exception e)
-            {
-                return "ERROR! Could not save to database! (" + e.ToString() + ")";
-            }
-        }
-    }
-}
diff --git a/OpenGridServices/OpenGridServices.GridServer/Main.cs b/OpenGridServices/OpenGridServices.GridServer/Main.cs
deleted file mode 100644
index 9a7eb00..0000000
--- a/OpenGridServices/OpenGridServices.GridServer/Main.cs
+++ /dev/null
@@ -1,271 +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;
-using System.Text;
-using System.Timers;
-using System.Net;
-using System.Threading;
-using System.Reflection;
-using libsecondlife;
-using OpenGrid.Framework.Manager;
-using OpenSim.Framework;
-using OpenSim.Framework.Sims;
-using OpenSim.Framework.Console;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Servers;
-using OpenSim.GenericConfig;
-namespace OpenGridServices.GridServer
-{
-    /// <summary>
-    /// </summary>
-    public class OpenGrid_Main : BaseServer, conscmd_callback
-    {
-        private string ConfigDll = "OpenGrid.Config.GridConfigDb4o.dll";
-        private string GridDll = "OpenGrid.Framework.Data.MySQL.dll";
-        public GridConfig Cfg;
-        public static OpenGrid_Main thegrid;
-        protected IGenericConfig localXMLConfig;
-        public static bool setuponly;
-        //public LLUUID highestUUID;
-        //        private SimProfileManager m_simProfileManager;
-        private GridManager m_gridManager;
-        private ConsoleBase m_console;
-        [STAThread]
-        public static void Main(string[] args)
-        {
-            if (args.Length > 0)
-            {
-                if (args[0] == "-setuponly") setuponly = true;
-            }
-            Console.WriteLine("Starting...\n");
-            thegrid = new OpenGrid_Main();
-            thegrid.Startup();
-            thegrid.Work();
-        }
-        private void Work()
-        {
-            while (true)
-            {
-                Thread.Sleep(5000);
-                // should flush the DB etc here
-            }
-        }
-        private OpenGrid_Main()
-        {
-            m_console = new ConsoleBase("opengrid-gridserver-console.log", "OpenGrid", this, false);
-            MainConsole.Instance = m_console;
-        }
-        public void managercallback(string cmd)
-        {
-            switch (cmd)
-            {
-                case "shutdown":
-                    RunCmd("shutdown", new string[0]);
-                    break;
-            }
-        }
-        public void Startup()
-        {
-            this.localXMLConfig = new XmlConfig("GridServerConfig.xml");
-            this.localXMLConfig.LoadData();
-            this.ConfigDB(this.localXMLConfig);
-            this.localXMLConfig.Close();
-            m_console.Verbose( "Main.cs:Startup() - Loading configuration");
-            Cfg = this.LoadConfigDll(this.ConfigDll);
-            Cfg.InitConfig();
-            if (setuponly) Environment.Exit(0);
-            m_console.Verbose( "Main.cs:Startup() - Connecting to Storage Server");
-            m_gridManager = new GridManager();
-            m_gridManager.AddPlugin(GridDll); // Made of win
-            m_gridManager.config = Cfg;
-            m_console.Verbose( "Main.cs:Startup() - Starting HTTP process");
-            BaseHttpServer httpServer = new BaseHttpServer(8001);
-            //GridManagementAgent GridManagerAgent = new GridManagementAgent(httpServer, "gridserver", Cfg.SimSendKey, Cfg.SimRecvKey, managercallback);
-            httpServer.AddXmlRPCHandler("simulator_login", m_gridManager.XmlRpcLoginToSimulatorMethod);
-            httpServer.AddXmlRPCHandler("map_block", m_gridManager.XmlRpcMapBlockMethod);
-            httpServer.AddRestHandler("GET", "/sims/", m_gridManager.RestGetSimMethod);
-            httpServer.AddRestHandler("POST", "/sims/", m_gridManager.RestSetSimMethod);
-            httpServer.AddRestHandler("GET", "/regions/", m_gridManager.RestGetRegionMethod);
-            httpServer.AddRestHandler("POST", "/regions/", m_gridManager.RestSetRegionMethod);
-            // lbsa71 : This code snippet taken from old http server.
-            // I have no idea what this was supposed to do - looks like an infinite recursion to me.
-            //        case "regions":
-            //// DIRTY HACK ALERT
-            //Console.Notice("/regions/ accessed");
-            //TheSim = OpenGrid_Main.thegrid._regionmanager.GetProfileByHandle((ulong)Convert.ToUInt64(rest_params[1]));
-            //respstring = ParseREST("/regions/" + rest_params[1], requestBody, HTTPmethod);
-            //break;
-            // lbsa71 : I guess these were never used?
-            //Listener.Prefixes.Add("http://+:8001/gods/");
-            //Listener.Prefixes.Add("http://+:8001/highestuuid/");
-            //Listener.Prefixes.Add("http://+:8001/uuidblocks/");
-            httpServer.Start();
-            m_console.Verbose( "Main.cs:Startup() - Starting sim status checker");
-            System.Timers.Timer simCheckTimer = new System.Timers.Timer(3600000 * 3); // 3 Hours between updates.
-            simCheckTimer.Elapsed += new ElapsedEventHandler(CheckSims);
-            simCheckTimer.Enabled = true;
-        }
-        private GridConfig LoadConfigDll(string dllName)
-        {
-            Assembly pluginAssembly = Assembly.LoadFrom(dllName);
-            GridConfig config = null;
-            foreach (Type pluginType in pluginAssembly.GetTypes())
-            {
-                if (pluginType.IsPublic)
-                {
-                    if (!pluginType.IsAbstract)
-                    {
-                        Type typeInterface = pluginType.GetInterface("IGridConfig", true);
-                        if (typeInterface != null)
-                        {
-                            IGridConfig plug = (IGridConfig)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
-                            config = plug.GetConfigObject();
-                            break;
-                        }
-                        typeInterface = null;
-                    }
-                }
-            }
-            pluginAssembly = null;
-            return config;
-        }
-        public void CheckSims(object sender, ElapsedEventArgs e)
-        {
-            /*
-            foreach (SimProfileBase sim in m_simProfileManager.SimProfiles.Values)
-            {
-                string SimResponse = "";
-                try
-                {
-                    WebRequest CheckSim = WebRequest.Create("http://" + sim.sim_ip + ":" + sim.sim_port.ToString() + "/checkstatus/");
-                    CheckSim.Method = "GET";
-                    CheckSim.ContentType = "text/plaintext";
-                    CheckSim.ContentLength = 0;
-                    StreamWriter stOut = new StreamWriter(CheckSim.GetRequestStream(), System.Text.Encoding.ASCII);
-                    stOut.Write("");
-                    stOut.Close();
-                    StreamReader stIn = new StreamReader(CheckSim.GetResponse().GetResponseStream());
-                    SimResponse = stIn.ReadToEnd();
-                    stIn.Close();
-                }
-                catch
-                {
-                }
-                
-                if (SimResponse == "OK")
-                {
-                    m_simProfileManager.SimProfiles[sim.UUID].online = true;
-                }
-                else
-                {
-                    m_simProfileManager.SimProfiles[sim.UUID].online = false;
-                }
-            }
-            */
-        }
-        public void RunCmd(string cmd, string[] cmdparams)
-        {
-            switch (cmd)
-            {
-                case "help":
-                    m_console.Notice("shutdown - shutdown the grid (USE CAUTION!)");
-                    break;
-                case "shutdown":
-                    m_console.Close();
-                    Environment.Exit(0);
-                    break;
-            }
-        }
-        public void Show(string ShowWhat)
-        {
-        }
-        private void ConfigDB(IGenericConfig configData)
-        {
-            try
-            {
-                string attri = "";
-                attri = configData.GetAttribute("DataBaseProvider");
-                if (attri == "")
-                {
-                    GridDll = "OpenGrid.Framework.Data.DB4o.dll";
-                    configData.SetAttribute("DataBaseProvider", "OpenGrid.Framework.Data.DB4o.dll");
-                }
-                else
-                {
-                    GridDll = attri;
-                }
-                configData.Commit();
-            }
-            catch (Exception e)
-            {
-            }
-        }
-    }
-}
diff --git a/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj b/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj
deleted file mode 100644
index 55a0e02..0000000
--- a/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj
+++ /dev/null
@@ -1,134 +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>{21BFC8E2-0000-0000-0000-000000000000}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon></ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>OpenGridServices.GridServer</AssemblyName>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenGridServices.GridServer</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>
-    <ProjectReference Include="..\OpenGrid.Framework.Manager\OpenGrid.Framework.Manager.csproj">
-      <Name>OpenGrid.Framework.Manager</Name>
-      <Project>{7924FD35-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-                        <Private>False</Private>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="GridManager.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Main.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/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build b/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build
deleted file mode 100644
index 60c0f85..0000000
--- a/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" ?>
-<project name="OpenGridServices.GridServer" 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="exe" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe">
-            <resources prefix="OpenGridServices.GridServer" dynamicprefix="true" >
-            </resources>
-            <sources failonempty="true">
-                <include name="GridManager.cs" />
-                <include name="Main.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="../../bin/OpenGrid.Framework.Manager.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/OpenGridServices/OpenGridServices.GridServer/Properties/AssemblyInfo.cs b/OpenGridServices/OpenGridServices.GridServer/Properties/AssemblyInfo.cs
deleted file mode 100644
index 8471e6b..0000000
--- a/OpenGridServices/OpenGridServices.GridServer/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("OGS-GridServer")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("OGS-GridServer")]
-[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("b541b244-3d1d-4625-9003-bc2a3a6a39a4")]
-// 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/OpenGridServices/OpenGridServices.InventoryServer/InventoryManager.cs b/OpenGridServices/OpenGridServices.InventoryServer/InventoryManager.cs
deleted file mode 100644
index 928e7c6..0000000
--- a/OpenGridServices/OpenGridServices.InventoryServer/InventoryManager.cs
+++ /dev/null
@@ -1,126 +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 OpenGridServices.InventoryServer
-{
-    class InventoryManager
-    {
-        Dictionary<string, IInventoryData> _plugins = new Dictionary<string, IInventoryData>();
-        /// <summary>
-        /// Adds a new inventory server plugin - user servers will be requested in the order they were loaded.
-        /// </summary>
-        /// <param name="FileName">The filename to the inventory server plugin DLL</param>
-        public void AddPlugin(string FileName)
-        {
-            OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Invenstorage: Attempting to load " + FileName);
-            Assembly pluginAssembly = Assembly.LoadFrom(FileName);
-            OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Invenstorage: Found " + pluginAssembly.GetTypes().Length + " interfaces.");
-            foreach (Type pluginType in pluginAssembly.GetTypes())
-            {
-                if (!pluginType.IsAbstract)
-                {
-                    Type typeInterface = pluginType.GetInterface("IInventoryData", true);
-                    if (typeInterface != null)
-                    {
-                        IInventoryData plug = (IInventoryData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
-                        plug.Initialise();
-                        this._plugins.Add(plug.getName(), plug);
-                        OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Invenstorage: Added IUserData Interface");
-                    }
-                    typeInterface = null;
-                }
-            }
-            pluginAssembly = null;
-        }
-        public List<InventoryFolderBase> getRootFolders(LLUUID user)
-        {
-            foreach (KeyValuePair<string, IInventoryData> kvp in _plugins)
-            {
-                try
-                {
-                    return kvp.Value.getUserRootFolders(user);
-                }
-                catch (Exception e)
-                {
-                    OpenSim.Framework.Console.MainConsole.Instance.Notice("Unable to get root folders via " + kvp.Key + " (" + e.ToString() + ")");
-                }
-            }
-            return null;
-        }
-        public XmlRpcResponse XmlRpcInventoryRequest(XmlRpcRequest request)
-        {
-            XmlRpcResponse response = new XmlRpcResponse();
-            Hashtable requestData = (Hashtable)request.Params[0];
-            Hashtable responseData = new Hashtable();
-            // Stuff happens here
-            if (requestData.ContainsKey("Access-type"))
-            {
-                if (requestData["access-type"] == "rootfolders")
-                {
-//                    responseData["rootfolders"] =
-                }
-            }
-            else
-            {
-                responseData["error"] = "No access-type specified.";
-            }
-            // Stuff stops happening here
-            response.Value = responseData;
-            return response;
-        }
-    }
-}
diff --git a/OpenGridServices/OpenGridServices.InventoryServer/Main.cs b/OpenGridServices/OpenGridServices.InventoryServer/Main.cs
deleted file mode 100644
index f479a79..0000000
--- a/OpenGridServices/OpenGridServices.InventoryServer/Main.cs
+++ /dev/null
@@ -1,87 +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.Reflection;
-using System.IO;
-using System.Text;
-using libsecondlife;
-using OpenSim.Framework.User;
-using OpenSim.Framework.Sims;
-using OpenSim.Framework.Inventory;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Console;
-using OpenSim.Servers;
-using OpenSim.Framework.Utilities;
-namespace OpenGridServices.InventoryServer
-{
-    public class OpenInventory_Main : BaseServer, conscmd_callback
-    {
-        ConsoleBase m_console;
-        InventoryManager m_inventoryManager;
-        public static void Main(string[] args)
-        {
-        }
-        public OpenInventory_Main()
-        {
-            m_console = new ConsoleBase("opengrid-inventory-console.log", "OpenInventory", this, false);
-            MainConsole.Instance = m_console;
-        }
-        public void Startup()
-        {
-            MainConsole.Instance.Notice("Initialising inventory manager...");
-            m_inventoryManager = new InventoryManager();
-            MainConsole.Instance.Notice("Starting HTTP server");
-            BaseHttpServer httpServer = new BaseHttpServer(8004);
-            httpServer.AddXmlRPCHandler("rootfolders", m_inventoryManager.XmlRpcInventoryRequest);
-            //httpServer.AddRestHandler("GET","/rootfolders/",Rest
-        }
-        public void RunCmd(string cmd, string[] cmdparams)
-        {
-            switch (cmd)
-            {
-                case "shutdown":
-                    m_console.Close();
-                    Environment.Exit(0);
-                    break;
-            }
-        }
-        public void Show(string ShowWhat)
-        {
-        }
-    }
-}
diff --git a/OpenGridServices/OpenGridServices.InventoryServer/OpenGridServices.InventoryServer.csproj b/OpenGridServices/OpenGridServices.InventoryServer/OpenGridServices.InventoryServer.csproj
deleted file mode 100644
index b5a25bf..0000000
--- a/OpenGridServices/OpenGridServices.InventoryServer/OpenGridServices.InventoryServer.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>{338FA00B-0000-0000-0000-000000000000}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon></ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>OpenGridServices.InventoryServer</AssemblyName>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenGridServices.InventoryServer</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.GridInterfaces.Local" >
-      <HintPath>OpenSim.GridInterfaces.Local.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="InventoryManager.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Main.cs">
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
diff --git a/OpenGridServices/OpenGridServices.InventoryServer/OpenGridServices.InventoryServer.csproj.user b/OpenGridServices/OpenGridServices.InventoryServer/OpenGridServices.InventoryServer.csproj.user
deleted file mode 100644
index 179959e..0000000
--- a/OpenGridServices/OpenGridServices.InventoryServer/OpenGridServices.InventoryServer.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\trunk\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/OpenGridServices/OpenGridServices.InventoryServer/OpenGridServices.InventoryServer.exe.build b/OpenGridServices/OpenGridServices.InventoryServer/OpenGridServices.InventoryServer.exe.build
deleted file mode 100644
index 5e67af1..0000000
--- a/OpenGridServices/OpenGridServices.InventoryServer/OpenGridServices.InventoryServer.exe.build
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" ?>
-<project name="OpenGridServices.InventoryServer" 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="exe" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe">
-            <resources prefix="OpenGridServices.InventoryServer" dynamicprefix="true" >
-            </resources>
-            <sources failonempty="true">
-                <include name="InventoryManager.cs" />
-                <include name="Main.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.GridInterfaces.Local.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/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager.mds b/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager.mds
deleted file mode 100644
index ed7bc24..0000000
--- a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager.mds
+++ /dev/null
@@ -1,16 +0,0 @@
-<Combine name="OpenGridServices.Manager" fileversion="2.0" outputpath="../../mono-1.2.3.1/lib/monodevelop/bin" MakePkgConfig="False" MakeLibPC="True">
-  <Configurations active="Debug">
-    <Configuration name="Debug" ctype="CombineConfiguration">
-      <Entry build="True" name="OpenGridServices.Manager" configuration="Debug" />
-    </Configuration>
-    <Configuration name="Release" ctype="CombineConfiguration">
-      <Entry build="True" name="OpenGridServices.Manager" configuration="Release" />
-    </Configuration>
-  </Configurations>
-  <StartMode startupentry="OpenGridServices.Manager" single="True">
-    <Execute type="None" entry="OpenGridServices.Manager" />
-  </StartMode>
-  <Entries>
-    <Entry filename="./OpenGridServices.Manager/OpenGridServices.Manager.mdp" />
-  </Entries>
-</Combine>
-\ No newline at end of file
diff --git a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager.userprefs b/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager.userprefs
deleted file mode 100644
index f221509..0000000
--- a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager.userprefs
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0"?>
-<UserCombinePreferences filename="/home/gareth/OpenGridServices.Manager/OpenGridServices.Manager.mds">
-  <Files>
-    <File filename="Welcome" />
-    <File filename="./OpenGridServices.Manager/MainWindow.cs" />
-    <File filename="./OpenGridServices.Manager/ConnectToGridServerDialog.cs" />
-    <File filename="./OpenGridServices.Manager/Main.cs" />
-  </Files>
-  <Views>
-    <ViewMemento Id="MonoDevelop.Ide.Gui.Pads.ProjectPad">
-      <TreeView>
-        <Node expanded="True">
-          <Node name="OpenGridServices.Manager" expanded="True">
-            <Node name="References" expanded="True" />
-            <Node name="Resources" expanded="True" />
-            <Node name="UserInterface" expanded="True" />
-            <Node name="ConnectToGridServerDialog.cs" expanded="False" selected="True" />
-          </Node>
-        </Node>
-      </TreeView>
-    </ViewMemento>
-    <ViewMemento Id="MonoDevelop.Ide.Gui.Pads.ClassPad">
-      <TreeView>
-        <Node expanded="True" />
-      </TreeView>
-    </ViewMemento>
-    <ViewMemento Id="MonoDevelop.NUnit.TestPad">
-      <TreeView>
-        <Node expanded="False" />
-      </TreeView>
-    </ViewMemento>
-  </Views>
-  <Properties>
-    <Properties>
-      <Property key="ActiveConfiguration" value="Debug" />
-      <Property key="ActiveWindow" value="/home/gareth/OpenGridServices.Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs" />
-    </Properties>
-  </Properties>
-</UserCombinePreferences>
-\ No newline at end of file
diff --git a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager.usertasks b/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager.usertasks
deleted file mode 100644
index d887d0e..0000000
--- a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager.usertasks
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ArrayOfUserTask xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" />
-\ No newline at end of file
diff --git a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/AssemblyInfo.cs b/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/AssemblyInfo.cs
deleted file mode 100644
index af4e275..0000000
--- a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/AssemblyInfo.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-// 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("")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-// 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.*")]
-// The following attributes specify the key for the sign of your assembly. See the
-// .NET Framework documentation for more information about signing.
-// This is not required, if you don't want signing let these attributes like they're.
-[assembly: AssemblyDelaySign(false)]
-[assembly: AssemblyKeyFile("")]
diff --git a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/BlockingQueue.cs b/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/BlockingQueue.cs
deleted file mode 100644
index 83685fc..0000000
--- a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/BlockingQueue.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System;
-using System.Threading;
-using System.Collections.Generic;
-using System.Text;
-namespace OpenGridServices.Manager
-{
-    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/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/Connect to grid server.cs b/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/Connect to grid server.cs
deleted file mode 100644
index 0d509ef..0000000
--- a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/Connect to grid server.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-namespace OpenGridServices.Manager
-{
-        
-        
-        public partial class Connect to grid server : Gtk.Dialog
-        {
-                
-                public Connect to grid server()
-                {
-                        this.Build();
-                }
-        }
-}
diff --git a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs b/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs
deleted file mode 100644
index 8a80b1d..0000000
--- a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using Gtk;
-using System;
-namespace OpenGridServices.Manager {
-        public partial class ConnectToGridServerDialog : Gtk.Dialog
-        {
-                
-                public ConnectToGridServerDialog()
-                {
-                        this.Build();
-                }
-                protected virtual void OnResponse(object o, Gtk.ResponseArgs args)
-                {
-                        switch(args.ResponseId) {
-                                case Gtk.ResponseType.Ok:
-                                        MainClass.PendingOperations.Enqueue("connect_to_gridserver " + this.entry1.Text + " " + this.entry2.Text + " " + this.entry3.Text);
-                                break;
-                                
-                                case Gtk.ResponseType.Cancel:
-                                break;
-                        }
-                        this.Hide();
-                        
-                }
-        }
-}
-\ No newline at end of file
diff --git a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/GridServerConnectionManager.cs b/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/GridServerConnectionManager.cs
deleted file mode 100644
index 6b632d6..0000000
--- a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/GridServerConnectionManager.cs
+++ /dev/null
@@ -1,106 +0,0 @@
-using Nwc.XmlRpc;
-using System;
-using System.Net;
-using System.IO;
-using System.Xml;
-using System.Collections;
-using System.Collections.Generic;
-using libsecondlife;
-namespace OpenGridServices.Manager
-{
-        public class GridServerConnectionManager
-        {
-                private string ServerURL;
-                public LLUUID SessionID;
-                public bool connected=false;
-                
-                public RegionBlock[][] WorldMap;
-                
-                public bool Connect(string GridServerURL, string username, string password)
-                {
-                        try {
-                                this.ServerURL=GridServerURL;
-                                Hashtable LoginParamsHT = new Hashtable();
-                                LoginParamsHT["username"]=username;
-                                LoginParamsHT["password"]=password;
-                                ArrayList LoginParams = new ArrayList();
-                                LoginParams.Add(LoginParamsHT);
-                                XmlRpcRequest GridLoginReq = new XmlRpcRequest("manager_login",LoginParams);
-                                XmlRpcResponse GridResp = GridLoginReq.Send(ServerURL,3000);
-                                if(GridResp.IsFault) {
-                                        connected=false;
-                                        return false;
-                                } else {
-                                        Hashtable gridrespData = (Hashtable)GridResp.Value;
-                                        this.SessionID = new LLUUID((string)gridrespData["session_id"]);
-                                        connected=true;
-                                        return true;
-                                }
-                        } catch(Exception e) {
-                                Console.WriteLine(e.ToString());
-                                connected=false;
-                                return false;
-                        }
-                }
-                
-                public void DownloadMap()
-                {
-                        System.Net.WebClient mapdownloader = new WebClient();
-                        Stream regionliststream = mapdownloader.OpenRead(ServerURL + "/regionlist");
-                        
-                        RegionBlock TempRegionData;
-                        
-                        XmlDocument doc = new XmlDocument();
-            doc.Load(regionliststream);
-            regionliststream.Close();
-            XmlNode rootnode = doc.FirstChild;
-            if (rootnode.Name != "regions")
-            {
-                                // TODO - ERROR!
-            }
-            for(int i=0; i<=rootnode.ChildNodes.Count; i++)
-            {
-                if(rootnode.ChildNodes.Item(i).Name != "region") {
-                        // TODO - ERROR!
-                } else {
-                                        TempRegionData = new RegionBlock();
-                                        
-                }
-                        }
-                }
-                
-                public bool RestartServer()
-                {
-                        return true;
-                }
-                
-                public bool ShutdownServer()
-                {
-                        try {
-                                Hashtable ShutdownParamsHT = new Hashtable();
-                                ArrayList ShutdownParams = new ArrayList();
-                                ShutdownParamsHT["session_id"]=this.SessionID.ToString();
-                                ShutdownParams.Add(ShutdownParamsHT);
-                                XmlRpcRequest GridShutdownReq = new XmlRpcRequest("shutdown",ShutdownParams);
-                                XmlRpcResponse GridResp = GridShutdownReq.Send(this.ServerURL,3000);
-                                if(GridResp.IsFault) {
-                                        return false;
-                                } else {
-                                        connected=false;
-                                        return true;
-                                }
-                        } catch(Exception e) {
-                                Console.WriteLine(e.ToString());
-                                return false;
-                        }
-                }
-        
-                public void DisconnectServer()
-                {
-                        this.connected=false;
-                }
-        }
-}
diff --git a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/Main.cs b/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/Main.cs
deleted file mode 100644
index 42e09e0..0000000
--- a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/Main.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-// project created on 5/14/2007 at 2:04 PM
-using System;
-using System.Threading;
-using Gtk;
-namespace OpenGridServices.Manager
-{
-        class MainClass
-        {
-                public static bool QuitReq=false;
-                public static BlockingQueue<string> PendingOperations = new BlockingQueue<string>();
-                private static Thread OperationsRunner;
-                
-                private static GridServerConnectionManager gridserverConn;
-                
-                private static MainWindow win;
-                public static void DoMainLoop()
-                {
-                        while(!QuitReq)
-                        {
-                                Application.RunIteration();
-                        }
-                }
-                public static void RunOperations()
-                {
-                        string operation;
-                        string cmd;
-                        char[] sep = new char[1];
-                        sep[0]=' ';
-                        while(!QuitReq)
-                        {
-                                operation=PendingOperations.Dequeue();
-                                Console.WriteLine(operation);
-                                cmd = operation.Split(sep)[0];
-                                switch(cmd) {
-                                        case "connect_to_gridserver":
-                                                win.SetStatus("Connecting to grid server...");                                          
-                                                if(gridserverConn.Connect(operation.Split(sep)[1],operation.Split(sep)[2],operation.Split(sep)[3])) {
-                                                        win.SetStatus("Connected OK with session ID:" + gridserverConn.SessionID);
-                                                        win.SetGridServerConnected(true);
-                                                        Thread.Sleep(3000);
-                                                        win.SetStatus("Downloading region maps...");
-                                                        gridserverConn.DownloadMap();
-                                                } else {
-                                                        win.SetStatus("Could not connect");
-                                                }
-                                        break;
-                                        
-                                        case "restart_gridserver":
-                                                win.SetStatus("Restarting grid server...");
-                                                if(gridserverConn.RestartServer()) {
-                                                        win.SetStatus("Restarted server OK");
-                                                        Thread.Sleep(3000);
-                                                        win.SetStatus("");
-                                                } else {
-                                                        win.SetStatus("Error restarting grid server!!!");
-                                                }
-                                        break;
-                                        
-                                        case "shutdown_gridserver":
-                                                win.SetStatus("Shutting down grid server...");
-                                                if(gridserverConn.ShutdownServer()) {
-                                                        win.SetStatus("Grid server shutdown");
-                                                        win.SetGridServerConnected(false);
-                                                        Thread.Sleep(3000);
-                                                        win.SetStatus("");
-                                                } else {
-                                                        win.SetStatus("Could not shutdown grid server!!!");
-                                                }
-                                        break;
-                                        
-                                        case "disconnect_gridserver":
-                                                gridserverConn.DisconnectServer();
-                                                win.SetGridServerConnected(false);
-                                        break;
-                                }
-                        }
-                }
-                public static void Main (string[] args)
-                {
-                        gridserverConn = new GridServerConnectionManager();
-                        Application.Init ();
-                        win = new MainWindow ();
-                        win.Show ();
-                        OperationsRunner = new Thread(new ThreadStart(RunOperations));
-                        OperationsRunner.IsBackground=true;
-                        OperationsRunner.Start();
-                        DoMainLoop();
-                }
-        }
-}
-\ No newline at end of file
diff --git a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/MainWindow.cs b/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/MainWindow.cs
deleted file mode 100644
index 1db38f0..0000000
--- a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/MainWindow.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-using System;
-using Gtk;
-namespace OpenGridServices.Manager {
-        public partial class MainWindow: Gtk.Window
-        {       
-                public MainWindow (): base (Gtk.WindowType.Toplevel)
-                {
-                        Build ();
-                }
-                
-                public void SetStatus(string statustext)
-                {
-                        this.statusbar1.Pop(0);
-                        this.statusbar1.Push(0,statustext);
-                }
-                public void DrawGrid(RegionBlock[][] regions)
-                {
-                        for(int x=0; x<=regions.GetUpperBound(0); x++) {
-                         for(int y=0; y<=regions.GetUpperBound(1); y++) {
-                                Gdk.Image themap = new Gdk.Image(Gdk.ImageType.Fastest,Gdk.Visual.System,256,256);
-                                this.drawingarea1.GdkWindow.DrawImage(new Gdk.GC(this.drawingarea1.GdkWindow),themap,0,0,x*256,y*256,256,256);
-                         }
-                        }
-                }
-                
-                public void SetGridServerConnected(bool connected)
-                {
-                        if(connected) {
-                                this.ConnectToGridserver.Visible=false;
-                                this.DisconnectFromGridServer.Visible=true;
-                        } else {
-                                this.ConnectToGridserver.Visible=true;
-                                this.DisconnectFromGridServer.Visible=false;
-                        }
-                }
-                
-                protected void OnDeleteEvent (object sender, DeleteEventArgs a)
-                {
-                        Application.Quit ();
-                        MainClass.QuitReq=true;
-                        a.RetVal = true;
-                }
-        
-                protected virtual void QuitMenu(object sender, System.EventArgs e)
-                {
-                        MainClass.QuitReq=true;
-                        Application.Quit();
-                }
-        
-                protected virtual void ConnectToGridServerMenu(object sender, System.EventArgs e)
-                {
-                        ConnectToGridServerDialog griddialog = new ConnectToGridServerDialog ();
-                        griddialog.Show();
-                }
-                protected virtual void RestartGridserverMenu(object sender, System.EventArgs e)
-                {
-                        MainClass.PendingOperations.Enqueue("restart_gridserver");
-                }
-                protected virtual void ShutdownGridserverMenu(object sender, System.EventArgs e)
-                {
-                        MainClass.PendingOperations.Enqueue("shutdown_gridserver");
-                }
-                protected virtual void DisconnectGridServerMenu(object sender, System.EventArgs e)
-                {
-                        MainClass.PendingOperations.Enqueue("disconnect_gridserver");
-                }
-        }
-}
-        
-\ No newline at end of file
diff --git a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/OpenGridServices.Manager.mdp b/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/OpenGridServices.Manager.mdp
deleted file mode 100644
index cfdc085..0000000
--- a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/OpenGridServices.Manager.mdp
+++ /dev/null
@@ -1,43 +0,0 @@
-<Project name="OpenGridServices.Manager" fileversion="2.0" language="C#" clr-version="Net_2_0" ctype="DotNetProject">
-  <Configurations active="Debug">
-    <Configuration name="Debug" ctype="DotNetProjectConfiguration">
-      <Output directory="./bin/Debug" assembly="OpenGridServices.Manager" />
-      <Build debugmode="True" target="Exe" />
-      <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
-      <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
-    </Configuration>
-    <Configuration name="Release" ctype="DotNetProjectConfiguration">
-      <Output directory="./bin/Release" assembly="OpenGridServices.Manager" />
-      <Build debugmode="False" target="Exe" />
-      <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
-      <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
-    </Configuration>
-  </Configurations>
-  <Contents>
-    <File name="./gtk-gui/gui.stetic" subtype="Code" buildaction="EmbedAsResource" />
-    <File name="./gtk-gui/generated.cs" subtype="Code" buildaction="Compile" />
-    <File name="./MainWindow.cs" subtype="Code" buildaction="Compile" />
-    <File name="./Main.cs" subtype="Code" buildaction="Compile" />
-    <File name="./AssemblyInfo.cs" subtype="Code" buildaction="Compile" />
-    <File name="./ConnectToGridServerDialog.cs" subtype="Code" buildaction="Compile" />
-    <File name="./Util.cs" subtype="Code" buildaction="Compile" />
-    <File name="./gtk-gui/OpenGridServices.Manager.MainWindow.cs" subtype="Code" buildaction="Compile" />
-    <File name="./BlockingQueue.cs" subtype="Code" buildaction="Compile" />
-    <File name="./gtk-gui/OpenGridServices.Manager.ConnectToGridServerDialog.cs" subtype="Code" buildaction="Compile" />
-    <File name="./GridServerConnectionManager.cs" subtype="Code" buildaction="Compile" />
-    <File name="./RegionBlock.cs" subtype="Code" buildaction="Compile" />
-  </Contents>
-  <References>
-    <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <ProjectReference type="Gac" localcopy="True" refto="glib-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <ProjectReference type="Gac" localcopy="True" refto="glade-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <ProjectReference type="Gac" localcopy="True" refto="pango-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <ProjectReference type="Assembly" localcopy="True" refto="../../bin/libsecondlife.dll" />
-    <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-    <ProjectReference type="Gac" localcopy="True" refto="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
-    <ProjectReference type="Assembly" localcopy="True" refto="../../bin/XMLRPC.dll" />
-    <ProjectReference type="Gac" localcopy="True" refto="System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  </References>
-  <GtkDesignInfo partialTypes="True" />
-</Project>
-\ No newline at end of file
diff --git a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/OpenGridServices.Manager.pidb b/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/OpenGridServices.Manager.pidb
deleted file mode 100644
index 44e7a61..0000000
--- a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/OpenGridServices.Manager.pidb
+++ /dev/null
Binary files differ
diff --git a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/RegionBlock.cs b/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/RegionBlock.cs
deleted file mode 100644
index 00f7c65..0000000
--- a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/RegionBlock.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System;
-using System.Xml;
-using libsecondlife;
-using OpenSim.Framework.Utilities;
-namespace OpenGridServices.Manager
-{
-        
-        
-        public class RegionBlock
-        {
-                public uint regloc_x;
-                public uint regloc_y;
-                
-                public string httpd_url;
-                
-                public string region_name;
-                
-                public ulong regionhandle {
-                        get {  return Util.UIntsToLong(regloc_x*256,regloc_y*256); }
-                }
-                public Gdk.Pixbuf MiniMap;
-                                                
-                public RegionBlock()
-                {
-                }
-                public void LoadFromXmlNode(XmlNode sourcenode)
-                {
-                        this.regloc_x=Convert.ToUInt32(sourcenode.Attributes.GetNamedItem("loc_x").Value);
-                        this.regloc_y=Convert.ToUInt32(sourcenode.Attributes.GetNamedItem("loc_y").Value);
-                        this.region_name=sourcenode.Attributes.GetNamedItem("region_name").Value;
-                        this.httpd_url=sourcenode.Attributes.GetNamedItem("httpd_url").Value;
-                }
-        }
-}
diff --git a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/Util.cs b/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/Util.cs
deleted file mode 100644
index 5bf7ff9..0000000
--- a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/Util.cs
+++ /dev/null
@@ -1,133 +0,0 @@
-using System;
-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 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/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.ConnectToGridServerDialog.cs b/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.ConnectToGridServerDialog.cs
deleted file mode 100644
index da6739e..0000000
--- a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.ConnectToGridServerDialog.cs
+++ /dev/null
@@ -1,226 +0,0 @@
-// ------------------------------------------------------------------------------
-//  <autogenerated>
-//      This code was generated by a tool.
-//      Mono Runtime Version: 2.0.50727.42
-// 
-//      Changes to this file may cause incorrect behavior and will be lost if 
-//      the code is regenerated.
-//  </autogenerated>
-// ------------------------------------------------------------------------------
-namespace OpenGridServices.Manager {
-    
-    
-    public partial class ConnectToGridServerDialog {
-        
-        private Gtk.VBox vbox2;
-        
-        private Gtk.VBox vbox3;
-        
-        private Gtk.HBox hbox1;
-        
-        private Gtk.Label label1;
-        
-        private Gtk.Entry entry1;
-        
-        private Gtk.HBox hbox2;
-        
-        private Gtk.Label label2;
-        
-        private Gtk.Entry entry2;
-        
-        private Gtk.HBox hbox3;
-        
-        private Gtk.Label label3;
-        
-        private Gtk.Entry entry3;
-        
-        private Gtk.Button button2;
-        
-        private Gtk.Button button8;
-        
-        protected virtual void Build() {
-            Stetic.Gui.Initialize();
-            // Widget OpenGridServices.Manager.ConnectToGridServerDialog
-            this.Events = ((Gdk.EventMask)(256));
-            this.Name = "OpenGridServices.Manager.ConnectToGridServerDialog";
-            this.Title = Mono.Unix.Catalog.GetString("Connect to Grid server");
-            this.WindowPosition = ((Gtk.WindowPosition)(4));
-            this.HasSeparator = false;
-            // Internal child OpenGridServices.Manager.ConnectToGridServerDialog.VBox
-            Gtk.VBox w1 = this.VBox;
-            w1.Events = ((Gdk.EventMask)(256));
-            w1.Name = "dialog_VBox";
-            w1.BorderWidth = ((uint)(2));
-            // Container child dialog_VBox.Gtk.Box+BoxChild
-            this.vbox2 = new Gtk.VBox();
-            this.vbox2.Name = "vbox2";
-            // Container child vbox2.Gtk.Box+BoxChild
-            this.vbox3 = new Gtk.VBox();
-            this.vbox3.Name = "vbox3";
-            // Container child vbox3.Gtk.Box+BoxChild
-            this.hbox1 = new Gtk.HBox();
-            this.hbox1.Name = "hbox1";
-            // Container child hbox1.Gtk.Box+BoxChild
-            this.label1 = new Gtk.Label();
-            this.label1.Name = "label1";
-            this.label1.Xalign = 1F;
-            this.label1.LabelProp = Mono.Unix.Catalog.GetString("Grid server URL: ");
-            this.label1.Justify = ((Gtk.Justification)(1));
-            this.hbox1.Add(this.label1);
-            Gtk.Box.BoxChild w2 = ((Gtk.Box.BoxChild)(this.hbox1[this.label1]));
-            w2.Position = 0;
-            // Container child hbox1.Gtk.Box+BoxChild
-            this.entry1 = new Gtk.Entry();
-            this.entry1.CanFocus = true;
-            this.entry1.Name = "entry1";
-            this.entry1.Text = Mono.Unix.Catalog.GetString("http://gridserver:8001");
-            this.entry1.IsEditable = true;
-            this.entry1.MaxLength = 255;
-            this.entry1.InvisibleChar = '•';
-            this.hbox1.Add(this.entry1);
-            Gtk.Box.BoxChild w3 = ((Gtk.Box.BoxChild)(this.hbox1[this.entry1]));
-            w3.Position = 1;
-            this.vbox3.Add(this.hbox1);
-            Gtk.Box.BoxChild w4 = ((Gtk.Box.BoxChild)(this.vbox3[this.hbox1]));
-            w4.Position = 0;
-            w4.Expand = false;
-            w4.Fill = false;
-            // Container child vbox3.Gtk.Box+BoxChild
-            this.hbox2 = new Gtk.HBox();
-            this.hbox2.Name = "hbox2";
-            // Container child hbox2.Gtk.Box+BoxChild
-            this.label2 = new Gtk.Label();
-            this.label2.Name = "label2";
-            this.label2.Xalign = 1F;
-            this.label2.LabelProp = Mono.Unix.Catalog.GetString("Username:");
-            this.label2.Justify = ((Gtk.Justification)(1));
-            this.hbox2.Add(this.label2);
-            Gtk.Box.BoxChild w5 = ((Gtk.Box.BoxChild)(this.hbox2[this.label2]));
-            w5.Position = 0;
-            // Container child hbox2.Gtk.Box+BoxChild
-            this.entry2 = new Gtk.Entry();
-            this.entry2.CanFocus = true;
-            this.entry2.Name = "entry2";
-            this.entry2.IsEditable = true;
-            this.entry2.InvisibleChar = '•';
-            this.hbox2.Add(this.entry2);
-            Gtk.Box.BoxChild w6 = ((Gtk.Box.BoxChild)(this.hbox2[this.entry2]));
-            w6.Position = 1;
-            this.vbox3.Add(this.hbox2);
-            Gtk.Box.BoxChild w7 = ((Gtk.Box.BoxChild)(this.vbox3[this.hbox2]));
-            w7.Position = 1;
-            w7.Expand = false;
-            w7.Fill = false;
-            // Container child vbox3.Gtk.Box+BoxChild
-            this.hbox3 = new Gtk.HBox();
-            this.hbox3.Name = "hbox3";
-            // Container child hbox3.Gtk.Box+BoxChild
-            this.label3 = new Gtk.Label();
-            this.label3.Name = "label3";
-            this.label3.Xalign = 1F;
-            this.label3.LabelProp = Mono.Unix.Catalog.GetString("Password:");
-            this.label3.Justify = ((Gtk.Justification)(1));
-            this.hbox3.Add(this.label3);
-            Gtk.Box.BoxChild w8 = ((Gtk.Box.BoxChild)(this.hbox3[this.label3]));
-            w8.Position = 0;
-            // Container child hbox3.Gtk.Box+BoxChild
-            this.entry3 = new Gtk.Entry();
-            this.entry3.CanFocus = true;
-            this.entry3.Name = "entry3";
-            this.entry3.IsEditable = true;
-            this.entry3.InvisibleChar = '•';
-            this.hbox3.Add(this.entry3);
-            Gtk.Box.BoxChild w9 = ((Gtk.Box.BoxChild)(this.hbox3[this.entry3]));
-            w9.Position = 1;
-            this.vbox3.Add(this.hbox3);
-            Gtk.Box.BoxChild w10 = ((Gtk.Box.BoxChild)(this.vbox3[this.hbox3]));
-            w10.Position = 2;
-            w10.Expand = false;
-            w10.Fill = false;
-            this.vbox2.Add(this.vbox3);
-            Gtk.Box.BoxChild w11 = ((Gtk.Box.BoxChild)(this.vbox2[this.vbox3]));
-            w11.Position = 2;
-            w11.Expand = false;
-            w11.Fill = false;
-            w1.Add(this.vbox2);
-            Gtk.Box.BoxChild w12 = ((Gtk.Box.BoxChild)(w1[this.vbox2]));
-            w12.Position = 0;
-            // Internal child OpenGridServices.Manager.ConnectToGridServerDialog.ActionArea
-            Gtk.HButtonBox w13 = this.ActionArea;
-            w13.Events = ((Gdk.EventMask)(256));
-            w13.Name = "OpenGridServices.Manager.ConnectToGridServerDialog_ActionArea";
-            w13.Spacing = 6;
-            w13.BorderWidth = ((uint)(5));
-            w13.LayoutStyle = ((Gtk.ButtonBoxStyle)(4));
-            // Container child OpenGridServices.Manager.ConnectToGridServerDialog_ActionArea.Gtk.ButtonBox+ButtonBoxChild
-            this.button2 = new Gtk.Button();
-            this.button2.CanDefault = true;
-            this.button2.CanFocus = true;
-            this.button2.Name = "button2";
-            this.button2.UseUnderline = true;
-            // Container child button2.Gtk.Container+ContainerChild
-            Gtk.Alignment w14 = new Gtk.Alignment(0.5F, 0.5F, 0F, 0F);
-            w14.Name = "GtkAlignment";
-            // Container child GtkAlignment.Gtk.Container+ContainerChild
-            Gtk.HBox w15 = new Gtk.HBox();
-            w15.Name = "GtkHBox";
-            w15.Spacing = 2;
-            // Container child GtkHBox.Gtk.Container+ContainerChild
-            Gtk.Image w16 = new Gtk.Image();
-            w16.Name = "image1";
-            w16.Pixbuf = Gtk.IconTheme.Default.LoadIcon("gtk-apply", 16, 0);
-            w15.Add(w16);
-            // Container child GtkHBox.Gtk.Container+ContainerChild
-            Gtk.Label w18 = new Gtk.Label();
-            w18.Name = "GtkLabel";
-            w18.LabelProp = Mono.Unix.Catalog.GetString("Connect");
-            w18.UseUnderline = true;
-            w15.Add(w18);
-            w14.Add(w15);
-            this.button2.Add(w14);
-            this.AddActionWidget(this.button2, -5);
-            Gtk.ButtonBox.ButtonBoxChild w22 = ((Gtk.ButtonBox.ButtonBoxChild)(w13[this.button2]));
-            w22.Expand = false;
-            w22.Fill = false;
-            // Container child OpenGridServices.Manager.ConnectToGridServerDialog_ActionArea.Gtk.ButtonBox+ButtonBoxChild
-            this.button8 = new Gtk.Button();
-            this.button8.CanDefault = true;
-            this.button8.CanFocus = true;
-            this.button8.Name = "button8";
-            this.button8.UseUnderline = true;
-            // Container child button8.Gtk.Container+ContainerChild
-            Gtk.Alignment w23 = new Gtk.Alignment(0.5F, 0.5F, 0F, 0F);
-            w23.Name = "GtkAlignment1";
-            // Container child GtkAlignment1.Gtk.Container+ContainerChild
-            Gtk.HBox w24 = new Gtk.HBox();
-            w24.Name = "GtkHBox1";
-            w24.Spacing = 2;
-            // Container child GtkHBox1.Gtk.Container+ContainerChild
-            Gtk.Image w25 = new Gtk.Image();
-            w25.Name = "image2";
-            w25.Pixbuf = Gtk.IconTheme.Default.LoadIcon("gtk-cancel", 16, 0);
-            w24.Add(w25);
-            // Container child GtkHBox1.Gtk.Container+ContainerChild
-            Gtk.Label w27 = new Gtk.Label();
-            w27.Name = "GtkLabel1";
-            w27.LabelProp = Mono.Unix.Catalog.GetString("Cancel");
-            w27.UseUnderline = true;
-            w24.Add(w27);
-            w23.Add(w24);
-            this.button8.Add(w23);
-            this.AddActionWidget(this.button8, -6);
-            Gtk.ButtonBox.ButtonBoxChild w31 = ((Gtk.ButtonBox.ButtonBoxChild)(w13[this.button8]));
-            w31.Position = 1;
-            w31.Expand = false;
-            w31.Fill = false;
-            if ((this.Child != null)) {
-                this.Child.ShowAll();
-            }
-            this.DefaultWidth = 476;
-            this.DefaultHeight = 137;
-            this.Show();
-            this.Response += new Gtk.ResponseHandler(this.OnResponse);
-        }
-    }
-}
diff --git a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.MainWindow.cs b/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.MainWindow.cs
deleted file mode 100644
index 8798dac..0000000
--- a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.MainWindow.cs
+++ /dev/null
@@ -1,256 +0,0 @@
-// ------------------------------------------------------------------------------
-//  <autogenerated>
-//      This code was generated by a tool.
-//      Mono Runtime Version: 2.0.50727.42
-// 
-//      Changes to this file may cause incorrect behavior and will be lost if 
-//      the code is regenerated.
-//  </autogenerated>
-// ------------------------------------------------------------------------------
-namespace OpenGridServices.Manager {
-    
-    
-    public partial class MainWindow {
-        
-        private Gtk.Action Grid;
-        
-        private Gtk.Action User;
-        
-        private Gtk.Action Asset;
-        
-        private Gtk.Action Region;
-        
-        private Gtk.Action Services;
-        
-        private Gtk.Action ConnectToGridserver;
-        
-        private Gtk.Action RestartWholeGrid;
-        
-        private Gtk.Action ShutdownWholeGrid;
-        
-        private Gtk.Action ExitGridManager;
-        
-        private Gtk.Action ConnectToUserserver;
-        
-        private Gtk.Action AccountManagment;
-        
-        private Gtk.Action GlobalNotice;
-        
-        private Gtk.Action DisableAllLogins;
-        
-        private Gtk.Action DisableNonGodUsersOnly;
-        
-        private Gtk.Action ShutdownUserServer;
-        
-        private Gtk.Action ShutdownGridserverOnly;
-        
-        private Gtk.Action RestartGridserverOnly;
-        
-        private Gtk.Action DefaultLocalGridUserserver;
-        
-        private Gtk.Action CustomUserserver;
-        
-        private Gtk.Action RemoteGridDefaultUserserver;
-        
-        private Gtk.Action DisconnectFromGridServer;
-        
-        private Gtk.Action UploadAsset;
-        
-        private Gtk.Action AssetManagement;
-        
-        private Gtk.Action ConnectToAssetServer;
-        
-        private Gtk.Action ConnectToDefaultAssetServerForGrid;
-        
-        private Gtk.Action DefaultForLocalGrid;
-        
-        private Gtk.Action DefaultForRemoteGrid;
-        
-        private Gtk.Action CustomAssetServer;
-        
-        private Gtk.VBox vbox1;
-        
-        private Gtk.MenuBar menubar2;
-        
-        private Gtk.HBox hbox1;
-        
-        private Gtk.ScrolledWindow scrolledwindow1;
-        
-        private Gtk.DrawingArea drawingarea1;
-        
-        private Gtk.TreeView treeview1;
-        
-        private Gtk.Statusbar statusbar1;
-        
-        protected virtual void Build() {
-            Stetic.Gui.Initialize();
-            // Widget OpenGridServices.Manager.MainWindow
-            Gtk.UIManager w1 = new Gtk.UIManager();
-            Gtk.ActionGroup w2 = new Gtk.ActionGroup("Default");
-            this.Grid = new Gtk.Action("Grid", Mono.Unix.Catalog.GetString("Grid"), null, null);
-            this.Grid.HideIfEmpty = false;
-            this.Grid.ShortLabel = Mono.Unix.Catalog.GetString("Grid");
-            w2.Add(this.Grid, "<Alt><Mod2>g");
-            this.User = new Gtk.Action("User", Mono.Unix.Catalog.GetString("User"), null, null);
-            this.User.HideIfEmpty = false;
-            this.User.ShortLabel = Mono.Unix.Catalog.GetString("User");
-            w2.Add(this.User, null);
-            this.Asset = new Gtk.Action("Asset", Mono.Unix.Catalog.GetString("Asset"), null, null);
-            this.Asset.HideIfEmpty = false;
-            this.Asset.ShortLabel = Mono.Unix.Catalog.GetString("Asset");
-            w2.Add(this.Asset, null);
-            this.Region = new Gtk.Action("Region", Mono.Unix.Catalog.GetString("Region"), null, null);
-            this.Region.ShortLabel = Mono.Unix.Catalog.GetString("Region");
-            w2.Add(this.Region, null);
-            this.Services = new Gtk.Action("Services", Mono.Unix.Catalog.GetString("Services"), null, null);
-            this.Services.ShortLabel = Mono.Unix.Catalog.GetString("Services");
-            w2.Add(this.Services, null);
-            this.ConnectToGridserver = new Gtk.Action("ConnectToGridserver", Mono.Unix.Catalog.GetString("Connect to gridserver..."), null, "gtk-connect");
-            this.ConnectToGridserver.HideIfEmpty = false;
-            this.ConnectToGridserver.ShortLabel = Mono.Unix.Catalog.GetString("Connect to gridserver");
-            w2.Add(this.ConnectToGridserver, null);
-            this.RestartWholeGrid = new Gtk.Action("RestartWholeGrid", Mono.Unix.Catalog.GetString("Restart whole grid"), null, "gtk-refresh");
-            this.RestartWholeGrid.ShortLabel = Mono.Unix.Catalog.GetString("Restart whole grid");
-            w2.Add(this.RestartWholeGrid, null);
-            this.ShutdownWholeGrid = new Gtk.Action("ShutdownWholeGrid", Mono.Unix.Catalog.GetString("Shutdown whole grid"), null, "gtk-stop");
-            this.ShutdownWholeGrid.ShortLabel = Mono.Unix.Catalog.GetString("Shutdown whole grid");
-            w2.Add(this.ShutdownWholeGrid, null);
-            this.ExitGridManager = new Gtk.Action("ExitGridManager", Mono.Unix.Catalog.GetString("Exit grid manager"), null, "gtk-close");
-            this.ExitGridManager.ShortLabel = Mono.Unix.Catalog.GetString("Exit grid manager");
-            w2.Add(this.ExitGridManager, null);
-            this.ConnectToUserserver = new Gtk.Action("ConnectToUserserver", Mono.Unix.Catalog.GetString("Connect to userserver"), null, "gtk-connect");
-            this.ConnectToUserserver.ShortLabel = Mono.Unix.Catalog.GetString("Connect to userserver");
-            w2.Add(this.ConnectToUserserver, null);
-            this.AccountManagment = new Gtk.Action("AccountManagment", Mono.Unix.Catalog.GetString("Account managment"), null, "gtk-properties");
-            this.AccountManagment.ShortLabel = Mono.Unix.Catalog.GetString("Account managment");
-            w2.Add(this.AccountManagment, null);
-            this.GlobalNotice = new Gtk.Action("GlobalNotice", Mono.Unix.Catalog.GetString("Global notice"), null, "gtk-network");
-            this.GlobalNotice.ShortLabel = Mono.Unix.Catalog.GetString("Global notice");
-            w2.Add(this.GlobalNotice, null);
-            this.DisableAllLogins = new Gtk.Action("DisableAllLogins", Mono.Unix.Catalog.GetString("Disable all logins"), null, "gtk-no");
-            this.DisableAllLogins.ShortLabel = Mono.Unix.Catalog.GetString("Disable all logins");
-            w2.Add(this.DisableAllLogins, null);
-            this.DisableNonGodUsersOnly = new Gtk.Action("DisableNonGodUsersOnly", Mono.Unix.Catalog.GetString("Disable non-god users only"), null, "gtk-no");
-            this.DisableNonGodUsersOnly.ShortLabel = Mono.Unix.Catalog.GetString("Disable non-god users only");
-            w2.Add(this.DisableNonGodUsersOnly, null);
-            this.ShutdownUserServer = new Gtk.Action("ShutdownUserServer", Mono.Unix.Catalog.GetString("Shutdown user server"), null, "gtk-stop");
-            this.ShutdownUserServer.ShortLabel = Mono.Unix.Catalog.GetString("Shutdown user server");
-            w2.Add(this.ShutdownUserServer, null);
-            this.ShutdownGridserverOnly = new Gtk.Action("ShutdownGridserverOnly", Mono.Unix.Catalog.GetString("Shutdown gridserver only"), null, "gtk-stop");
-            this.ShutdownGridserverOnly.ShortLabel = Mono.Unix.Catalog.GetString("Shutdown gridserver only");
-            w2.Add(this.ShutdownGridserverOnly, null);
-            this.RestartGridserverOnly = new Gtk.Action("RestartGridserverOnly", Mono.Unix.Catalog.GetString("Restart gridserver only"), null, "gtk-refresh");
-            this.RestartGridserverOnly.ShortLabel = Mono.Unix.Catalog.GetString("Restart gridserver only");
-            w2.Add(this.RestartGridserverOnly, null);
-            this.DefaultLocalGridUserserver = new Gtk.Action("DefaultLocalGridUserserver", Mono.Unix.Catalog.GetString("Default local grid userserver"), null, null);
-            this.DefaultLocalGridUserserver.ShortLabel = Mono.Unix.Catalog.GetString("Default local grid userserver");
-            w2.Add(this.DefaultLocalGridUserserver, null);
-            this.CustomUserserver = new Gtk.Action("CustomUserserver", Mono.Unix.Catalog.GetString("Custom userserver..."), null, null);
-            this.CustomUserserver.ShortLabel = Mono.Unix.Catalog.GetString("Custom userserver");
-            w2.Add(this.CustomUserserver, null);
-            this.RemoteGridDefaultUserserver = new Gtk.Action("RemoteGridDefaultUserserver", Mono.Unix.Catalog.GetString("Remote grid default userserver..."), null, null);
-            this.RemoteGridDefaultUserserver.ShortLabel = Mono.Unix.Catalog.GetString("Remote grid default userserver");
-            w2.Add(this.RemoteGridDefaultUserserver, null);
-            this.DisconnectFromGridServer = new Gtk.Action("DisconnectFromGridServer", Mono.Unix.Catalog.GetString("Disconnect from grid server"), null, "gtk-disconnect");
-            this.DisconnectFromGridServer.ShortLabel = Mono.Unix.Catalog.GetString("Disconnect from grid server");
-            this.DisconnectFromGridServer.Visible = false;
-            w2.Add(this.DisconnectFromGridServer, null);
-            this.UploadAsset = new Gtk.Action("UploadAsset", Mono.Unix.Catalog.GetString("Upload asset"), null, null);
-            this.UploadAsset.ShortLabel = Mono.Unix.Catalog.GetString("Upload asset");
-            w2.Add(this.UploadAsset, null);
-            this.AssetManagement = new Gtk.Action("AssetManagement", Mono.Unix.Catalog.GetString("Asset management"), null, null);
-            this.AssetManagement.ShortLabel = Mono.Unix.Catalog.GetString("Asset management");
-            w2.Add(this.AssetManagement, null);
-            this.ConnectToAssetServer = new Gtk.Action("ConnectToAssetServer", Mono.Unix.Catalog.GetString("Connect to asset server"), null, null);
-            this.ConnectToAssetServer.ShortLabel = Mono.Unix.Catalog.GetString("Connect to asset server");
-            w2.Add(this.ConnectToAssetServer, null);
-            this.ConnectToDefaultAssetServerForGrid = new Gtk.Action("ConnectToDefaultAssetServerForGrid", Mono.Unix.Catalog.GetString("Connect to default asset server for grid"), null, null);
-            this.ConnectToDefaultAssetServerForGrid.ShortLabel = Mono.Unix.Catalog.GetString("Connect to default asset server for grid");
-            w2.Add(this.ConnectToDefaultAssetServerForGrid, null);
-            this.DefaultForLocalGrid = new Gtk.Action("DefaultForLocalGrid", Mono.Unix.Catalog.GetString("Default for local grid"), null, null);
-            this.DefaultForLocalGrid.ShortLabel = Mono.Unix.Catalog.GetString("Default for local grid");
-            w2.Add(this.DefaultForLocalGrid, null);
-            this.DefaultForRemoteGrid = new Gtk.Action("DefaultForRemoteGrid", Mono.Unix.Catalog.GetString("Default for remote grid..."), null, null);
-            this.DefaultForRemoteGrid.ShortLabel = Mono.Unix.Catalog.GetString("Default for remote grid...");
-            w2.Add(this.DefaultForRemoteGrid, null);
-            this.CustomAssetServer = new Gtk.Action("CustomAssetServer", Mono.Unix.Catalog.GetString("Custom asset server..."), null, null);
-            this.CustomAssetServer.ShortLabel = Mono.Unix.Catalog.GetString("Custom asset server...");
-            w2.Add(this.CustomAssetServer, null);
-            w1.InsertActionGroup(w2, 0);
-            this.AddAccelGroup(w1.AccelGroup);
-            this.WidthRequest = 800;
-            this.HeightRequest = 600;
-            this.Name = "OpenGridServices.Manager.MainWindow";
-            this.Title = Mono.Unix.Catalog.GetString("Open Grid Services Manager");
-            this.Icon = Gtk.IconTheme.Default.LoadIcon("gtk-network", 48, 0);
-            // Container child OpenGridServices.Manager.MainWindow.Gtk.Container+ContainerChild
-            this.vbox1 = new Gtk.VBox();
-            this.vbox1.Name = "vbox1";
-            // Container child vbox1.Gtk.Box+BoxChild
-            w1.AddUiFromString("<ui><menubar name='menubar2'><menu action='Grid'><menuitem action='ConnectToGridserver'/><menuitem action='DisconnectFromGridServer'/><separator/><menuitem action='RestartWholeGrid'/><menuitem action='RestartGridserverOnly'/><separator/><menuitem action='ShutdownWholeGrid'/><menuitem action='ShutdownGridserverOnly'/><separator/><menuitem action='ExitGridManager'/></menu><menu action='User'><menu action='ConnectToUserserver'><menuitem action='DefaultLocalGridUserserver'/><menuitem action='CustomUserserver'/><menuitem action='RemoteGridDefaultUserserver'/></menu><separator/><menuitem action='AccountManagment'/><menuitem action='GlobalNotice'/><separator/><menuitem action='DisableAllLogins'/><menuitem action='DisableNonGodUsersOnly'/><separator/><menuitem action='ShutdownUserServer'/></menu><menu action='Asset'><menuitem action='UploadAsset'/><menuitem action='AssetManagement'/><menu action='ConnectToAssetServer'><menuitem action='DefaultForLocalGrid'/><menuitem action='DefaultForRemoteGrid'/><menuitem action='CustomAssetServer'/></menu></menu><menu action='Region'/><menu action='Services'/></menubar></ui>");
-            this.menubar2 = ((Gtk.MenuBar)(w1.GetWidget("/menubar2")));
-            this.menubar2.HeightRequest = 25;
-            this.menubar2.Name = "menubar2";
-            this.vbox1.Add(this.menubar2);
-            Gtk.Box.BoxChild w3 = ((Gtk.Box.BoxChild)(this.vbox1[this.menubar2]));
-            w3.Position = 0;
-            w3.Expand = false;
-            w3.Fill = false;
-            // Container child vbox1.Gtk.Box+BoxChild
-            this.hbox1 = new Gtk.HBox();
-            this.hbox1.Name = "hbox1";
-            // Container child hbox1.Gtk.Box+BoxChild
-            this.scrolledwindow1 = new Gtk.ScrolledWindow();
-            this.scrolledwindow1.CanFocus = true;
-            this.scrolledwindow1.Name = "scrolledwindow1";
-            this.scrolledwindow1.VscrollbarPolicy = ((Gtk.PolicyType)(1));
-            this.scrolledwindow1.HscrollbarPolicy = ((Gtk.PolicyType)(1));
-            // Container child scrolledwindow1.Gtk.Container+ContainerChild
-            Gtk.Viewport w4 = new Gtk.Viewport();
-            w4.Name = "GtkViewport";
-            w4.ShadowType = ((Gtk.ShadowType)(0));
-            // Container child GtkViewport.Gtk.Container+ContainerChild
-            this.drawingarea1 = new Gtk.DrawingArea();
-            this.drawingarea1.Name = "drawingarea1";
-            w4.Add(this.drawingarea1);
-            this.scrolledwindow1.Add(w4);
-            this.hbox1.Add(this.scrolledwindow1);
-            Gtk.Box.BoxChild w7 = ((Gtk.Box.BoxChild)(this.hbox1[this.scrolledwindow1]));
-            w7.Position = 1;
-            // Container child hbox1.Gtk.Box+BoxChild
-            this.treeview1 = new Gtk.TreeView();
-            this.treeview1.CanFocus = true;
-            this.treeview1.Name = "treeview1";
-            this.hbox1.Add(this.treeview1);
-            Gtk.Box.BoxChild w8 = ((Gtk.Box.BoxChild)(this.hbox1[this.treeview1]));
-            w8.Position = 2;
-            this.vbox1.Add(this.hbox1);
-            Gtk.Box.BoxChild w9 = ((Gtk.Box.BoxChild)(this.vbox1[this.hbox1]));
-            w9.Position = 1;
-            // Container child vbox1.Gtk.Box+BoxChild
-            this.statusbar1 = new Gtk.Statusbar();
-            this.statusbar1.Name = "statusbar1";
-            this.statusbar1.Spacing = 5;
-            this.vbox1.Add(this.statusbar1);
-            Gtk.Box.BoxChild w10 = ((Gtk.Box.BoxChild)(this.vbox1[this.statusbar1]));
-            w10.PackType = ((Gtk.PackType)(1));
-            w10.Position = 2;
-            w10.Expand = false;
-            w10.Fill = false;
-            this.Add(this.vbox1);
-            if ((this.Child != null)) {
-                this.Child.ShowAll();
-            }
-            this.DefaultWidth = 800;
-            this.DefaultHeight = 800;
-            this.Show();
-            this.DeleteEvent += new Gtk.DeleteEventHandler(this.OnDeleteEvent);
-            this.ConnectToGridserver.Activated += new System.EventHandler(this.ConnectToGridServerMenu);
-            this.ExitGridManager.Activated += new System.EventHandler(this.QuitMenu);
-            this.ShutdownGridserverOnly.Activated += new System.EventHandler(this.ShutdownGridserverMenu);
-            this.RestartGridserverOnly.Activated += new System.EventHandler(this.RestartGridserverMenu);
-            this.DisconnectFromGridServer.Activated += new System.EventHandler(this.DisconnectGridServerMenu);
-        }
-    }
-}
diff --git a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/generated.cs b/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/generated.cs
deleted file mode 100644
index dd4abdd..0000000
--- a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/generated.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-// ------------------------------------------------------------------------------
-//  <autogenerated>
-//      This code was generated by a tool.
-//      Mono Runtime Version: 2.0.50727.42
-// 
-//      Changes to this file may cause incorrect behavior and will be lost if 
-//      the code is regenerated.
-//  </autogenerated>
-// ------------------------------------------------------------------------------
-namespace Stetic {
-    
-    
-    internal class Gui {
-        
-        private static bool initialized;
-        
-        internal static void Initialize() {
-            if ((Stetic.Gui.initialized == false)) {
-                Stetic.Gui.initialized = true;
-            }
-        }
-    }
-    
-    internal class ActionGroups {
-        
-        public static Gtk.ActionGroup GetActionGroup(System.Type type) {
-            return Stetic.ActionGroups.GetActionGroup(type.FullName);
-        }
-        
-        public static Gtk.ActionGroup GetActionGroup(string name) {
-            return null;
-        }
-    }
-}
diff --git a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/gui.stetic b/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/gui.stetic
deleted file mode 100644
index c883f08..0000000
--- a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/gui.stetic
+++ /dev/null
@@ -1,502 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<stetic-interface>
-  <widget class="Gtk.Window" id="OpenGridServices.Manager.MainWindow" design-size="800 800">
-    <action-group name="Default">
-      <action id="Grid">
-        <property name="Type">Action</property>
-        <property name="Accelerator">&lt;Alt&gt;&lt;Mod2&gt;g</property>
-        <property name="HideIfEmpty">False</property>
-        <property name="Label" translatable="yes">Grid</property>
-        <property name="ShortLabel" translatable="yes">Grid</property>
-      </action>
-      <action id="User">
-        <property name="Type">Action</property>
-        <property name="HideIfEmpty">False</property>
-        <property name="Label" translatable="yes">User</property>
-        <property name="ShortLabel" translatable="yes">User</property>
-      </action>
-      <action id="Asset">
-        <property name="Type">Action</property>
-        <property name="HideIfEmpty">False</property>
-        <property name="Label" translatable="yes">Asset</property>
-        <property name="ShortLabel" translatable="yes">Asset</property>
-      </action>
-      <action id="Region">
-        <property name="Type">Action</property>
-        <property name="Label" translatable="yes">Region</property>
-        <property name="ShortLabel" translatable="yes">Region</property>
-      </action>
-      <action id="Services">
-        <property name="Type">Action</property>
-        <property name="Label" translatable="yes">Services</property>
-        <property name="ShortLabel" translatable="yes">Services</property>
-      </action>
-      <action id="ConnectToGridserver">
-        <property name="Type">Action</property>
-        <property name="HideIfEmpty">False</property>
-        <property name="Label" translatable="yes">Connect to gridserver...</property>
-        <property name="ShortLabel" translatable="yes">Connect to gridserver</property>
-        <property name="StockId">gtk-connect</property>
-        <signal name="Activated" handler="ConnectToGridServerMenu" />
-      </action>
-      <action id="RestartWholeGrid">
-        <property name="Type">Action</property>
-        <property name="Label" translatable="yes">Restart whole grid</property>
-        <property name="ShortLabel" translatable="yes">Restart whole grid</property>
-        <property name="StockId">gtk-refresh</property>
-      </action>
-      <action id="ShutdownWholeGrid">
-        <property name="Type">Action</property>
-        <property name="Label" translatable="yes">Shutdown whole grid</property>
-        <property name="ShortLabel" translatable="yes">Shutdown whole grid</property>
-        <property name="StockId">gtk-stop</property>
-      </action>
-      <action id="ExitGridManager">
-        <property name="Type">Action</property>
-        <property name="Label" translatable="yes">Exit grid manager</property>
-        <property name="ShortLabel" translatable="yes">Exit grid manager</property>
-        <property name="StockId">gtk-close</property>
-        <signal name="Activated" handler="QuitMenu" after="yes" />
-      </action>
-      <action id="ConnectToUserserver">
-        <property name="Type">Action</property>
-        <property name="Label" translatable="yes">Connect to userserver</property>
-        <property name="ShortLabel" translatable="yes">Connect to userserver</property>
-        <property name="StockId">gtk-connect</property>
-      </action>
-      <action id="AccountManagment">
-        <property name="Type">Action</property>
-        <property name="Label" translatable="yes">Account managment</property>
-        <property name="ShortLabel" translatable="yes">Account managment</property>
-        <property name="StockId">gtk-properties</property>
-      </action>
-      <action id="GlobalNotice">
-        <property name="Type">Action</property>
-        <property name="Label" translatable="yes">Global notice</property>
-        <property name="ShortLabel" translatable="yes">Global notice</property>
-        <property name="StockId">gtk-network</property>
-      </action>
-      <action id="DisableAllLogins">
-        <property name="Type">Action</property>
-        <property name="Label" translatable="yes">Disable all logins</property>
-        <property name="ShortLabel" translatable="yes">Disable all logins</property>
-        <property name="StockId">gtk-no</property>
-      </action>
-      <action id="DisableNonGodUsersOnly">
-        <property name="Type">Action</property>
-        <property name="Label" translatable="yes">Disable non-god users only</property>
-        <property name="ShortLabel" translatable="yes">Disable non-god users only</property>
-        <property name="StockId">gtk-no</property>
-      </action>
-      <action id="ShutdownUserServer">
-        <property name="Type">Action</property>
-        <property name="Label" translatable="yes">Shutdown user server</property>
-        <property name="ShortLabel" translatable="yes">Shutdown user server</property>
-        <property name="StockId">gtk-stop</property>
-      </action>
-      <action id="ShutdownGridserverOnly">
-        <property name="Type">Action</property>
-        <property name="Label" translatable="yes">Shutdown gridserver only</property>
-        <property name="ShortLabel" translatable="yes">Shutdown gridserver only</property>
-        <property name="StockId">gtk-stop</property>
-        <signal name="Activated" handler="ShutdownGridserverMenu" after="yes" />
-      </action>
-      <action id="RestartGridserverOnly">
-        <property name="Type">Action</property>
-        <property name="Label" translatable="yes">Restart gridserver only</property>
-        <property name="ShortLabel" translatable="yes">Restart gridserver only</property>
-        <property name="StockId">gtk-refresh</property>
-        <signal name="Activated" handler="RestartGridserverMenu" after="yes" />
-      </action>
-      <action id="DefaultLocalGridUserserver">
-        <property name="Type">Action</property>
-        <property name="Label" translatable="yes">Default local grid userserver</property>
-        <property name="ShortLabel" translatable="yes">Default local grid userserver</property>
-      </action>
-      <action id="CustomUserserver">
-        <property name="Type">Action</property>
-        <property name="Label" translatable="yes">Custom userserver...</property>
-        <property name="ShortLabel" translatable="yes">Custom userserver</property>
-      </action>
-      <action id="RemoteGridDefaultUserserver">
-        <property name="Type">Action</property>
-        <property name="Label" translatable="yes">Remote grid default userserver...</property>
-        <property name="ShortLabel" translatable="yes">Remote grid default userserver</property>
-      </action>
-      <action id="DisconnectFromGridServer">
-        <property name="Type">Action</property>
-        <property name="Label" translatable="yes">Disconnect from grid server</property>
-        <property name="ShortLabel" translatable="yes">Disconnect from grid server</property>
-        <property name="StockId">gtk-disconnect</property>
-        <property name="Visible">False</property>
-        <signal name="Activated" handler="DisconnectGridServerMenu" after="yes" />
-      </action>
-      <action id="UploadAsset">
-        <property name="Type">Action</property>
-        <property name="Label" translatable="yes">Upload asset</property>
-        <property name="ShortLabel" translatable="yes">Upload asset</property>
-      </action>
-      <action id="AssetManagement">
-        <property name="Type">Action</property>
-        <property name="Label" translatable="yes">Asset management</property>
-        <property name="ShortLabel" translatable="yes">Asset management</property>
-      </action>
-      <action id="ConnectToAssetServer">
-        <property name="Type">Action</property>
-        <property name="Label" translatable="yes">Connect to asset server</property>
-        <property name="ShortLabel" translatable="yes">Connect to asset server</property>
-      </action>
-      <action id="ConnectToDefaultAssetServerForGrid">
-        <property name="Type">Action</property>
-        <property name="Label" translatable="yes">Connect to default asset server for grid</property>
-        <property name="ShortLabel" translatable="yes">Connect to default asset server for grid</property>
-      </action>
-      <action id="DefaultForLocalGrid">
-        <property name="Type">Action</property>
-        <property name="Label" translatable="yes">Default for local grid</property>
-        <property name="ShortLabel" translatable="yes">Default for local grid</property>
-      </action>
-      <action id="DefaultForRemoteGrid">
-        <property name="Type">Action</property>
-        <property name="Label" translatable="yes">Default for remote grid...</property>
-        <property name="ShortLabel" translatable="yes">Default for remote grid...</property>
-      </action>
-      <action id="CustomAssetServer">
-        <property name="Type">Action</property>
-        <property name="Label" translatable="yes">Custom asset server...</property>
-        <property name="ShortLabel" translatable="yes">Custom asset server...</property>
-      </action>
-    </action-group>
-    <property name="MemberName" />
-    <property name="WidthRequest">800</property>
-    <property name="HeightRequest">600</property>
-    <property name="Title" translatable="yes">Open Grid Services Manager</property>
-    <property name="Icon">stock:gtk-network Dialog</property>
-    <signal name="DeleteEvent" handler="OnDeleteEvent" />
-    <child>
-      <widget class="Gtk.VBox" id="vbox1">
-        <property name="MemberName" />
-        <child>
-          <widget class="Gtk.MenuBar" id="menubar2">
-            <property name="MemberName" />
-            <property name="HeightRequest">25</property>
-            <node name="menubar2" type="Menubar">
-              <node type="Menu" action="Grid">
-                <node type="Menuitem" action="ConnectToGridserver" />
-                <node type="Menuitem" action="DisconnectFromGridServer" />
-                <node type="Separator" />
-                <node type="Menuitem" action="RestartWholeGrid" />
-                <node type="Menuitem" action="RestartGridserverOnly" />
-                <node type="Separator" />
-                <node type="Menuitem" action="ShutdownWholeGrid" />
-                <node type="Menuitem" action="ShutdownGridserverOnly" />
-                <node type="Separator" />
-                <node type="Menuitem" action="ExitGridManager" />
-              </node>
-              <node type="Menu" action="User">
-                <node type="Menu" action="ConnectToUserserver">
-                  <node type="Menuitem" action="DefaultLocalGridUserserver" />
-                  <node type="Menuitem" action="CustomUserserver" />
-                  <node type="Menuitem" action="RemoteGridDefaultUserserver" />
-                </node>
-                <node type="Separator" />
-                <node type="Menuitem" action="AccountManagment" />
-                <node type="Menuitem" action="GlobalNotice" />
-                <node type="Separator" />
-                <node type="Menuitem" action="DisableAllLogins" />
-                <node type="Menuitem" action="DisableNonGodUsersOnly" />
-                <node type="Separator" />
-                <node type="Menuitem" action="ShutdownUserServer" />
-              </node>
-              <node type="Menu" action="Asset">
-                <node type="Menuitem" action="UploadAsset" />
-                <node type="Menuitem" action="AssetManagement" />
-                <node type="Menu" action="ConnectToAssetServer">
-                  <node type="Menuitem" action="DefaultForLocalGrid" />
-                  <node type="Menuitem" action="DefaultForRemoteGrid" />
-                  <node type="Menuitem" action="CustomAssetServer" />
-                </node>
-              </node>
-              <node type="Menu" action="Region" />
-              <node type="Menu" action="Services" />
-            </node>
-          </widget>
-          <packing>
-            <property name="Position">0</property>
-            <property name="AutoSize">False</property>
-            <property name="Expand">False</property>
-            <property name="Fill">False</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="Gtk.HBox" id="hbox1">
-            <property name="MemberName" />
-            <child>
-              <placeholder />
-            </child>
-            <child>
-              <widget class="Gtk.ScrolledWindow" id="scrolledwindow1">
-                <property name="MemberName" />
-                <property name="CanFocus">True</property>
-                <property name="VscrollbarPolicy">Automatic</property>
-                <property name="HscrollbarPolicy">Automatic</property>
-                <child>
-                  <widget class="Gtk.Viewport" id="GtkViewport">
-                    <property name="MemberName" />
-                    <property name="ShadowType">None</property>
-                    <child>
-                      <widget class="Gtk.DrawingArea" id="drawingarea1">
-                        <property name="MemberName" />
-                      </widget>
-                    </child>
-                  </widget>
-                </child>
-              </widget>
-              <packing>
-                <property name="Position">1</property>
-                <property name="AutoSize">True</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="Gtk.TreeView" id="treeview1">
-                <property name="MemberName" />
-                <property name="CanFocus">True</property>
-              </widget>
-              <packing>
-                <property name="Position">2</property>
-                <property name="AutoSize">True</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="Position">1</property>
-            <property name="AutoSize">True</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="Gtk.Statusbar" id="statusbar1">
-            <property name="MemberName">statusBar1</property>
-            <property name="Spacing">5</property>
-            <child>
-              <placeholder />
-            </child>
-            <child>
-              <placeholder />
-            </child>
-          </widget>
-          <packing>
-            <property name="PackType">End</property>
-            <property name="Position">2</property>
-            <property name="AutoSize">False</property>
-            <property name="Expand">False</property>
-            <property name="Fill">False</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-  </widget>
-  <widget class="Gtk.Dialog" id="OpenGridServices.Manager.ConnectToGridServerDialog" design-size="476 137">
-    <property name="MemberName" />
-    <property name="Events">ButtonPressMask</property>
-    <property name="Title" translatable="yes">Connect to Grid server</property>
-    <property name="WindowPosition">CenterOnParent</property>
-    <property name="Buttons">2</property>
-    <property name="HelpButton">False</property>
-    <property name="HasSeparator">False</property>
-    <signal name="Response" handler="OnResponse" />
-    <child internal-child="VBox">
-      <widget class="Gtk.VBox" id="dialog_VBox">
-        <property name="MemberName" />
-        <property name="Events">ButtonPressMask</property>
-        <property name="BorderWidth">2</property>
-        <child>
-          <widget class="Gtk.VBox" id="vbox2">
-            <property name="MemberName" />
-            <child>
-              <placeholder />
-            </child>
-            <child>
-              <placeholder />
-            </child>
-            <child>
-              <widget class="Gtk.VBox" id="vbox3">
-                <property name="MemberName" />
-                <child>
-                  <widget class="Gtk.HBox" id="hbox1">
-                    <property name="MemberName" />
-                    <child>
-                      <widget class="Gtk.Label" id="label1">
-                        <property name="MemberName" />
-                        <property name="Xalign">1</property>
-                        <property name="LabelProp" translatable="yes">Grid server URL: </property>
-                        <property name="Justify">Right</property>
-                      </widget>
-                      <packing>
-                        <property name="Position">0</property>
-                        <property name="AutoSize">False</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="Gtk.Entry" id="entry1">
-                        <property name="MemberName" />
-                        <property name="CanFocus">True</property>
-                        <property name="Text" translatable="yes">http://gridserver:8001</property>
-                        <property name="IsEditable">True</property>
-                        <property name="MaxLength">255</property>
-                        <property name="InvisibleChar">•</property>
-                      </widget>
-                      <packing>
-                        <property name="Position">1</property>
-                        <property name="AutoSize">False</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <placeholder />
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="Position">0</property>
-                    <property name="AutoSize">True</property>
-                    <property name="Expand">False</property>
-                    <property name="Fill">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="Gtk.HBox" id="hbox2">
-                    <property name="MemberName" />
-                    <child>
-                      <widget class="Gtk.Label" id="label2">
-                        <property name="MemberName" />
-                        <property name="Xalign">1</property>
-                        <property name="LabelProp" translatable="yes">Username:</property>
-                        <property name="Justify">Right</property>
-                      </widget>
-                      <packing>
-                        <property name="Position">0</property>
-                        <property name="AutoSize">False</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="Gtk.Entry" id="entry2">
-                        <property name="MemberName" />
-                        <property name="CanFocus">True</property>
-                        <property name="IsEditable">True</property>
-                        <property name="InvisibleChar">•</property>
-                      </widget>
-                      <packing>
-                        <property name="Position">1</property>
-                        <property name="AutoSize">True</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <placeholder />
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="Position">1</property>
-                    <property name="AutoSize">False</property>
-                    <property name="Expand">False</property>
-                    <property name="Fill">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="Gtk.HBox" id="hbox3">
-                    <property name="MemberName" />
-                    <child>
-                      <widget class="Gtk.Label" id="label3">
-                        <property name="MemberName" />
-                        <property name="Xalign">1</property>
-                        <property name="LabelProp" translatable="yes">Password:</property>
-                        <property name="Justify">Right</property>
-                      </widget>
-                      <packing>
-                        <property name="Position">0</property>
-                        <property name="AutoSize">False</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="Gtk.Entry" id="entry3">
-                        <property name="MemberName" />
-                        <property name="CanFocus">True</property>
-                        <property name="IsEditable">True</property>
-                        <property name="InvisibleChar">•</property>
-                      </widget>
-                      <packing>
-                        <property name="Position">1</property>
-                        <property name="AutoSize">True</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <placeholder />
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="Position">2</property>
-                    <property name="AutoSize">True</property>
-                    <property name="Expand">False</property>
-                    <property name="Fill">False</property>
-                  </packing>
-                </child>
-              </widget>
-              <packing>
-                <property name="Position">2</property>
-                <property name="AutoSize">True</property>
-                <property name="Expand">False</property>
-                <property name="Fill">False</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="Position">0</property>
-            <property name="AutoSize">True</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-    <child internal-child="ActionArea">
-      <widget class="Gtk.HButtonBox" id="OpenGridServices.Manager.ConnectToGridServerDialog_ActionArea">
-        <property name="MemberName" />
-        <property name="Events">ButtonPressMask</property>
-        <property name="Spacing">6</property>
-        <property name="BorderWidth">5</property>
-        <property name="Size">2</property>
-        <property name="LayoutStyle">End</property>
-        <child>
-          <widget class="Gtk.Button" id="button2">
-            <property name="MemberName" />
-            <property name="CanDefault">True</property>
-            <property name="CanFocus">True</property>
-            <property name="Type">TextAndIcon</property>
-            <property name="Icon">stock:gtk-apply Menu</property>
-            <property name="Label" translatable="yes">Connect</property>
-            <property name="UseUnderline">True</property>
-            <property name="IsDialogButton">True</property>
-            <property name="ResponseId">-5</property>
-          </widget>
-          <packing>
-            <property name="Expand">False</property>
-            <property name="Fill">False</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="Gtk.Button" id="button8">
-            <property name="MemberName" />
-            <property name="CanDefault">True</property>
-            <property name="CanFocus">True</property>
-            <property name="Type">TextAndIcon</property>
-            <property name="Icon">stock:gtk-cancel Menu</property>
-            <property name="Label" translatable="yes">Cancel</property>
-            <property name="UseUnderline">True</property>
-            <property name="IsDialogButton">True</property>
-            <property name="ResponseId">-6</property>
-          </widget>
-          <packing>
-            <property name="Position">1</property>
-            <property name="Expand">False</property>
-            <property name="Fill">False</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-  </widget>
-</stetic-interface>
-\ No newline at end of file
diff --git a/OpenGridServices/OpenGridServices.UserServer/Main.cs b/OpenGridServices/OpenGridServices.UserServer/Main.cs
deleted file mode 100644
index bb20576..0000000
--- a/OpenGridServices/OpenGridServices.UserServer/Main.cs
+++ /dev/null
@@ -1,216 +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.Reflection;
-using System.IO;
-using System.Text;
-using libsecondlife;
-using OpenSim.Framework.User;
-using OpenSim.Framework.Sims;
-using OpenSim.Framework.Inventory;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Console;
-using OpenSim.Servers;
-using OpenSim.Framework.Utilities;
-using OpenSim.GenericConfig;
-namespace OpenGridServices.UserServer
-{
-    /// <summary>
-    /// </summary>
-    public class OpenUser_Main : BaseServer, conscmd_callback
-    {
-        private string ConfigDll = "OpenUser.Config.UserConfigDb4o.dll";
-        private string StorageDll = "OpenGrid.Framework.Data.MySQL.dll";
-        private UserConfig Cfg;
-        protected IGenericConfig localXMLConfig;
-        public UserManager m_userManager; // Replaces below.
-        //private UserProfileManager m_userProfileManager; // Depreciated
-        public Dictionary<LLUUID, UserProfile> UserSessions = new Dictionary<LLUUID, UserProfile>();
-        ConsoleBase m_console;
-        [STAThread]
-        public static void Main(string[] args)
-        {
-            Console.WriteLine("Starting...\n");
-            OpenUser_Main userserver = new OpenUser_Main();
-            userserver.Startup();
-            userserver.Work();
-        }
-        private OpenUser_Main()
-        {
-            m_console = new ConsoleBase("opengrid-userserver-console.log", "OpenUser", this , false);
-            MainConsole.Instance = m_console;
-        }
-        private void Work()
-        {
-            m_console.Notice("Enter help for a list of commands\n");
-            while (true)
-            {
-                m_console.MainConsolePrompt();
-            }
-        }
-        public void Startup()
-        {
-            this.localXMLConfig = new XmlConfig("UserServerConfig.xml");
-            this.localXMLConfig.LoadData();
-            this.ConfigDB(this.localXMLConfig);
-            this.localXMLConfig.Close();
-            MainConsole.Instance.Verbose("Main.cs:Startup() - Loading configuration");
-            Cfg = this.LoadConfigDll(this.ConfigDll);
-            Cfg.InitConfig();
-            MainConsole.Instance.Verbose( "Main.cs:Startup() - Establishing data connection");
-            m_userManager = new UserManager();
-            m_userManager._config = Cfg;
-            m_userManager.AddPlugin(StorageDll);
-            MainConsole.Instance.Verbose("Main.cs:Startup() - Starting HTTP process");
-            BaseHttpServer httpServer = new BaseHttpServer(8002);
-            httpServer.AddXmlRPCHandler("login_to_simulator", m_userManager.XmlRpcLoginMethod);
-            httpServer.AddRestHandler("DELETE", "/usersessions/", m_userManager.RestDeleteUserSessionMethod);
-            httpServer.Start();
-        }
-        public void do_create(string what)
-        {
-            switch (what)
-            {
-                case "user":
-                    string tempfirstname;
-                    string templastname;
-                    string tempMD5Passwd;
-                    uint regX = 997;
-                    uint regY = 996;
-                    tempfirstname = m_console.CmdPrompt("First name");
-                    templastname = m_console.CmdPrompt("Last name");
-                    tempMD5Passwd = m_console.PasswdPrompt("Password");
-                    regX = Convert.ToUInt32(m_console.CmdPrompt("Start Region X"));
-                    regY = Convert.ToUInt32(m_console.CmdPrompt("Start Region Y"));
-                    tempMD5Passwd = Util.Md5Hash(Util.Md5Hash(tempMD5Passwd) + ":" + "");
-                    m_userManager.AddUserProfile(tempfirstname, templastname, tempMD5Passwd, regX, regY); 
-                    break;
-            }
-        }
-        public void RunCmd(string cmd, string[] cmdparams)
-        {
-            switch (cmd)
-            {
-                case "help":
-                    m_console.Notice("create user - create a new user");
-                    m_console.Notice("shutdown - shutdown the grid (USE CAUTION!)");
-                    break;
-                case "create":
-                    do_create(cmdparams[0]);
-                    break;
-                case "shutdown":
-                    m_console.Close();
-                    Environment.Exit(0);
-                    break;
-            }
-        }
-        private void ConfigDB(IGenericConfig configData)
-        {
-            try
-            {
-                string attri = "";
-                attri = configData.GetAttribute("DataBaseProvider");
-                if (attri == "")
-                {
-                    StorageDll = "OpenGrid.Framework.Data.DB4o.dll";
-                    configData.SetAttribute("DataBaseProvider", "OpenGrid.Framework.Data.DB4o.dll");
-                }
-                else
-                {
-                    StorageDll = attri;
-                }
-                configData.Commit();
-            }
-            catch (Exception e)
-            {
-            }
-        }
-        private UserConfig LoadConfigDll(string dllName)
-        {
-            Assembly pluginAssembly = Assembly.LoadFrom(dllName);
-            UserConfig config = null;
-            foreach (Type pluginType in pluginAssembly.GetTypes())
-            {
-                if (pluginType.IsPublic)
-                {
-                    if (!pluginType.IsAbstract)
-                    {
-                        Type typeInterface = pluginType.GetInterface("IUserConfig", true);
-                        if (typeInterface != null)
-                        {
-                            IUserConfig plug = (IUserConfig)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
-                            config = plug.GetConfigObject();
-                            break;
-                        }
-                        typeInterface = null;
-                    }
-                }
-            }
-            pluginAssembly = null;
-            return config;
-        }
-        public void Show(string ShowWhat)
-        {
-        }
-    }
-}
diff --git a/OpenGridServices/OpenGridServices.UserServer/OGS-UserServer.csproj b/OpenGridServices/OpenGridServices.UserServer/OGS-UserServer.csproj
deleted file mode 100644
index f4fa8b6..0000000
--- a/OpenGridServices/OpenGridServices.UserServer/OGS-UserServer.csproj
+++ /dev/null
@@ -1,63 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{D45B6E48-5668-478D-B9CB-6D46E665FACF}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>OGS_UserServer</RootNamespace>
-    <AssemblyName>OGS-UserServer</AssemblyName>
-    <StartupObject>OpenGridServices.OpenUser_Main</StartupObject>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="libsecondlife, Version=0.9.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\common\bin\libsecondlife.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\..\common\src\OGS-Console.cs">
-      <Link>OGS-Console.cs</Link>
-    </Compile>
-    <Compile Include="..\..\common\VersionInfo\VersionInfo.cs">
-      <Link>VersionInfo.cs</Link>
-    </Compile>
-    <Compile Include="ConsoleCmds.cs" />
-    <Compile Include="Main.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="UserHttp.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\OpenSim.FrameWork\OpenSim.Framework.csproj">
-      <Project>{2E46A825-3168-492F-93BC-637126B5B72B}</Project>
-      <Name>OpenSim.Framework</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\ServerConsole\ServerConsole.csproj">
-      <Project>{7667E6E2-F227-41A2-B1B2-315613E1BAFC}</Project>
-      <Name>ServerConsole</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-</Project>
-\ No newline at end of file
diff --git a/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj b/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj
deleted file mode 100644
index b3d318c..0000000
--- a/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj
+++ /dev/null
@@ -1,128 +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>{66591469-0000-0000-0000-000000000000}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon></ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>OpenGridServices.UserServer</AssemblyName>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenGridServices.UserServer</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="Main.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="UserManager.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/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build b/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build
deleted file mode 100644
index 68cbef7..0000000
--- a/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" ?>
-<project name="OpenGridServices.UserServer" 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="exe" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe">
-            <resources prefix="OpenGridServices.UserServer" dynamicprefix="true" >
-            </resources>
-            <sources failonempty="true">
-                <include name="Main.cs" />
-                <include name="UserManager.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="../../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/OpenGridServices/OpenGridServices.UserServer/Properties/AssemblyInfo.cs b/OpenGridServices/OpenGridServices.UserServer/Properties/AssemblyInfo.cs
deleted file mode 100644
index 5d5ce8d..0000000
--- a/OpenGridServices/OpenGridServices.UserServer/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("OGS-UserServer")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("OGS-UserServer")]
-[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("e266513a-090b-4d38-80f6-8599eef68c8c")]
-// 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/OpenGridServices/OpenGridServices.UserServer/UserManager.cs b/OpenGridServices/OpenGridServices.UserServer/UserManager.cs
deleted file mode 100644
index 4fb7984..0000000
--- a/OpenGridServices/OpenGridServices.UserServer/UserManager.cs
+++ /dev/null
@@ -1,660 +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 OpenGridServices.UserServer
-{
-    public class UserManager
-    {
-        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.MainConsole.Instance.Verbose( "Userstorage: Attempting to load " + FileName);
-            Assembly pluginAssembly = Assembly.LoadFrom(FileName);
-            OpenSim.Framework.Console.MainConsole.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.MainConsole.Instance.Verbose( "Userstorage: Added IUserData Interface");
-                    }
-                    typeInterface = null;
-                }
-            }
-            pluginAssembly = null;
-        }
-        /// <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.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
-                }
-            }
-        }
-        /// <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.MainConsole.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.MainConsole.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.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
-                }
-            }
-            return null;
-        }
-        /// <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.MainConsole.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.MainConsole.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.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
-                }
-            }
-            return null;
-        }
-        /// <summary>
-        /// Creates a error response caused by invalid XML
-        /// </summary>
-        /// <returns>An XMLRPC response</returns>
-        private static XmlRpcResponse CreateErrorConnectingToGridResponse()
-        {
-            XmlRpcResponse response = new XmlRpcResponse();
-            Hashtable ErrorRespData = new Hashtable();
-            ErrorRespData["reason"] = "key";
-            ErrorRespData["message"] = "Error connecting to grid. Could not percieve credentials from login XML.";
-            ErrorRespData["login"] = "false";
-            response.Value = ErrorRespData;
-            return response;
-        }
-        /// <summary>
-        /// Creates an error response caused by bad login credentials
-        /// </summary>
-        /// <returns>An XMLRPC response</returns>
-        private static XmlRpcResponse CreateLoginErrorResponse()
-        {
-            XmlRpcResponse response = new XmlRpcResponse();
-            Hashtable ErrorRespData = new Hashtable();
-            ErrorRespData["reason"] = "key";
-            ErrorRespData["message"] = "Could not authenticate your avatar. Please check your username and password, and check the grid if problems persist.";
-            ErrorRespData["login"] = "false";
-            response.Value = ErrorRespData;
-            return response;
-        }
-        /// <summary>
-        /// Creates an error response caused by being logged in already
-        /// </summary>
-        /// <returns>An XMLRPC Response</returns>
-        private static XmlRpcResponse CreateAlreadyLoggedInResponse()
-        {
-            XmlRpcResponse response = new XmlRpcResponse();
-            Hashtable PresenceErrorRespData = new Hashtable();
-            PresenceErrorRespData["reason"] = "presence";
-            PresenceErrorRespData["message"] = "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";
-            PresenceErrorRespData["login"] = "false";
-            response.Value = PresenceErrorRespData;
-            return response;
-        }
-        /// <summary>
-        /// Creates an error response caused by target region being down
-        /// </summary>
-        /// <returns>An XMLRPC Response</returns>
-        private static XmlRpcResponse CreateDeadRegionResponse()
-        {
-            XmlRpcResponse response = new XmlRpcResponse();
-            Hashtable PresenceErrorRespData = new Hashtable();
-            PresenceErrorRespData["reason"] = "key";
-            PresenceErrorRespData["message"] = "The region you are attempting to log into is not responding. Please select another region and try again.";
-            PresenceErrorRespData["login"] = "false";
-            response.Value = PresenceErrorRespData;
-            return response;
-        }
-        /// <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 Hashtable response, ref UserProfileData theUser)
-        {
-            // Load information from the gridserver
-            SimProfile SimInfo = new SimProfile();
-            SimInfo = SimInfo.LoadFromGrid(theUser.currentAgent.currentHandle, _config.GridServerURL, _config.GridSendKey, _config.GridRecvKey);
-            // Customise the response
-            // Home Location
-            response["home"] = "{'region_handle':[r" + (SimInfo.RegionLocX * 256).ToString() + ",r" + (SimInfo.RegionLocY * 256).ToString() + "], " + 
-                "'position':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "], " +
-                "'look_at':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}";
-            // Destination
-            response["sim_ip"] = SimInfo.sim_ip;
-            response["sim_port"] = (Int32)SimInfo.sim_port;
-            response["region_y"] = (Int32)SimInfo.RegionLocY * 256;
-            response["region_x"] = (Int32)SimInfo.RegionLocX * 256;
-            // Notify the target of an incoming user
-            Console.WriteLine("Notifying " + SimInfo.regionname + " (" + SimInfo.caps_url + ")");
-            // Prepare notification
-            Hashtable SimParams = new Hashtable();
-            SimParams["session_id"] = theUser.currentAgent.sessionID.ToString();
-            SimParams["secure_session_id"] = theUser.currentAgent.secureSessionID.ToString();
-            SimParams["firstname"] = theUser.username;
-            SimParams["lastname"] = theUser.surname;
-            SimParams["agent_id"] = theUser.UUID.ToString();
-            SimParams["circuit_code"] = (Int32)Convert.ToUInt32(response["circuit_code"]);
-            SimParams["startpos_x"] = theUser.currentAgent.currentPos.X.ToString();
-            SimParams["startpos_y"] = theUser.currentAgent.currentPos.Y.ToString();
-            SimParams["startpos_z"] = theUser.currentAgent.currentPos.Z.ToString();
-            SimParams["regionhandle"] = theUser.currentAgent.currentHandle.ToString();
-            ArrayList SendParams = new ArrayList();
-            SendParams.Add(SimParams);
-            // Update agent with target sim
-            theUser.currentAgent.currentRegion = SimInfo.UUID;
-            theUser.currentAgent.currentHandle = SimInfo.regionhandle;
-            // Send
-            XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams);
-            XmlRpcResponse GridResp = GridReq.Send(SimInfo.caps_url, 3000);
-        }
-        /// <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 bool AuthenticateUser(ref UserProfileData profile, string password)
-        {
-            OpenSim.Framework.Console.MainConsole.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);
-        }
-        /// <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;
-        }
-        /// <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;
-            if (GoodXML)
-            {
-                firstname = (string)requestData["first"];
-                lastname = (string)requestData["last"];
-                passwd = (string)requestData["passwd"];
-                TheUser = getUserProfile(firstname, lastname);
-                if (TheUser == null)
-                    return CreateLoginErrorResponse();
-                GoodLogin = AuthenticateUser(ref TheUser, passwd);
-            }
-            else
-            {
-                return CreateErrorConnectingToGridResponse();
-            }
-            if (!GoodLogin)
-            {
-                return CreateLoginErrorResponse();
-            }
-            else
-            {
-                // If we already have a session...
-                if (TheUser.currentAgent != null && TheUser.currentAgent.agentOnline)
-                {
-                    // Reject the login
-                    return CreateAlreadyLoggedInResponse();
-                }
-                // Otherwise...
-                // Create a new agent session
-                CreateAgent(ref TheUser, request);
-                try
-                {
-                    Hashtable responseData = new Hashtable();
-                    LLUUID AgentID = TheUser.UUID;
-                    
-                    // Global Texture Section
-                    Hashtable GlobalT = new Hashtable();
-                    GlobalT["sun_texture_id"] = "cce0f112-878f-4586-a2e2-a8f104bba271";
-                    GlobalT["cloud_texture_id"] = "fc4b9f0b-d008-45c6-96a4-01dd947ac621";
-                    GlobalT["moon_texture_id"] = "fc4b9f0b-d008-45c6-96a4-01dd947ac621";
-                    ArrayList GlobalTextures = new ArrayList();
-                    GlobalTextures.Add(GlobalT);
-                    // Login Flags Section
-                    Hashtable LoginFlagsHash = new Hashtable();
-                    LoginFlagsHash["daylight_savings"] = "N";
-                    LoginFlagsHash["stipend_since_login"] = "N";
-                    LoginFlagsHash["gendered"] = "Y"; // Needs to be combined with below...
-                    LoginFlagsHash["ever_logged_in"] = "Y"; // Should allow male/female av selection
-                    ArrayList LoginFlags = new ArrayList();
-                    LoginFlags.Add(LoginFlagsHash);
-                    // UI Customisation Section
-                    Hashtable uiconfig = new Hashtable();
-                    uiconfig["allow_first_life"] = "Y";
-                    ArrayList ui_config = new ArrayList();
-                    ui_config.Add(uiconfig);
-                    // Classified Categories Section
-                    Hashtable ClassifiedCategoriesHash = new Hashtable();
-                    ClassifiedCategoriesHash["category_name"] = "Generic";
-                    ClassifiedCategoriesHash["category_id"] = (Int32)1;
-                    ArrayList ClassifiedCategories = new ArrayList();
-                    ClassifiedCategories.Add(ClassifiedCategoriesHash);
-                    // 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);
-                    Hashtable InitialOutfitHash = new Hashtable();
-                    InitialOutfitHash["folder_name"] = "Nightclub Female";
-                    InitialOutfitHash["gender"] = "female";
-                    ArrayList InitialOutfit = new ArrayList();
-                    InitialOutfit.Add(InitialOutfitHash);
-                    // Circuit Code
-                    uint circode = (uint)(Util.RandomClass.Next());
-                    // Generics
-                    responseData["last_name"] = TheUser.surname;
-                    responseData["ui-config"] = ui_config;
-                    responseData["sim_ip"] = "127.0.0.1"; //SimInfo.sim_ip.ToString();
-                    responseData["login-flags"] = LoginFlags;
-                    responseData["global-textures"] = GlobalTextures;
-                    responseData["classified_categories"] = ClassifiedCategories;
-                    responseData["event_categories"] = new ArrayList();
-                    responseData["inventory-skeleton"] = AgentInventoryArray;
-                    responseData["inventory-skel-lib"] = new ArrayList();
-                    responseData["inventory-root"] = InventoryRoot;
-                    responseData["event_notifications"] = new ArrayList();
-                    responseData["gestures"] = new ArrayList();
-                    responseData["inventory-lib-owner"] = new ArrayList();
-                    responseData["initial-outfit"] = InitialOutfit;
-                    responseData["seconds_since_epoch"] = (Int32)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;
-                    responseData["start_location"] = "last";
-                    responseData["home"] = "!!null temporary value {home}!!";   // Overwritten
-                    responseData["message"] = _config.DefaultStartupMsg;
-                    responseData["first_name"] = TheUser.username;
-                    responseData["circuit_code"] = (Int32)circode;
-                    responseData["sim_port"] = 0; //(Int32)SimInfo.sim_port;
-                    responseData["secure_session_id"] = TheUser.currentAgent.secureSessionID.ToStringHyphenated();
-                    responseData["look_at"] = "\n[r" + TheUser.homeLookAt.X.ToString() + ",r" + TheUser.homeLookAt.Y.ToString() + ",r" + TheUser.homeLookAt.Z.ToString() + "]\n";
-                    responseData["agent_id"] = AgentID.ToStringHyphenated();
-                    responseData["region_y"] = (Int32)0;    // Overwritten
-                    responseData["region_x"] = (Int32)0;    // Overwritten
-                    responseData["seed_capability"] = "";
-                    responseData["agent_access"] = "M";
-                    responseData["session_id"] = TheUser.currentAgent.sessionID.ToStringHyphenated();
-                    responseData["login"] = "true";
-                    try
-                    {
-                        this.CustomiseResponse(ref responseData, ref TheUser);
-                    }
-                    catch (Exception e)
-                    {
-                        Console.WriteLine(e.ToString());
-                        return CreateDeadRegionResponse();
-                    }
-                    CommitAgent(ref TheUser);
-                    response.Value = responseData;
-                    //                   TheUser.SendDataToSim(SimInfo);
-                    return response;
-                }
-                catch (Exception E)
-                {
-                    Console.WriteLine(E.ToString());
-                }
-                //}
-            }
-            return response;
-        }
-        /// <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";
-        }
-    }
-}
diff --git a/OpenGridServices/OpenUser.Config/UserConfigDb4o/AssemblyInfo.cs b/OpenGridServices/OpenUser.Config/UserConfigDb4o/AssemblyInfo.cs
deleted file mode 100644
index 25e0211..0000000
--- a/OpenGridServices/OpenUser.Config/UserConfigDb4o/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("UserConfig")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("UserConfig")]
-[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/OpenGridServices/OpenUser.Config/UserConfigDb4o/DbUserConfig.cs b/OpenGridServices/OpenUser.Config/UserConfigDb4o/DbUserConfig.cs
deleted file mode 100644
index fe0e7aa..0000000
--- a/OpenGridServices/OpenUser.Config/UserConfigDb4o/DbUserConfig.cs
+++ /dev/null
@@ -1,96 +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 OpenSim.Framework.Console;
-using OpenSim.Framework.Interfaces;
-using Db4objects.Db4o;
-namespace OpenUser.Config.UserConfigDb4o
-{
-        public class Db4oConfigPlugin: IUserConfig
-        {
-                public UserConfig GetConfigObject()
-                {
-                        OpenSim.Framework.Console.MainConsole.Instance.Verbose("Loading Db40Config dll");
-                        return ( new DbUserConfig());
-                }
-        }
-        
-        public class DbUserConfig : UserConfig
-        {
-                private IObjectContainer db;    
-                
-                public void LoadDefaults() {
-                        OpenSim.Framework.Console.MainConsole.Instance.Notice("Config.cs:LoadDefaults() - Please press enter to retain default or enter new settings");
-                        
-                        this.DefaultStartupMsg = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Default startup message", "Welcome to OGS");
-                        this.GridServerURL = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Grid server URL","http://127.0.0.1:8001/");
-                        this.GridSendKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to send to grid server","null");
-                        this.GridRecvKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to expect from grid server","null");
-                }
-                public override void InitConfig() {
-                        try {
-                                db = Db4oFactory.OpenFile("openuser.yap");
-                                IObjectSet result = db.Get(typeof(DbUserConfig));
-                                if(result.Count==1) {
-                                        OpenSim.Framework.Console.MainConsole.Instance.Verbose("Config.cs:InitConfig() - Found a UserConfig object in the local database, loading");
-                                        foreach (DbUserConfig cfg in result) {
-                                                this.GridServerURL=cfg.GridServerURL;
-                                                this.GridSendKey=cfg.GridSendKey;
-                                                this.GridRecvKey=cfg.GridRecvKey;
-                                                this.DefaultStartupMsg=cfg.DefaultStartupMsg;
-                                        }
-                                } else {
-                                        OpenSim.Framework.Console.MainConsole.Instance.Verbose("Config.cs:InitConfig() - Could not find object in database, loading precompiled defaults");
-                                        LoadDefaults();
-                                        OpenSim.Framework.Console.MainConsole.Instance.Verbose("Writing out default settings to local database");
-                                        db.Set(this);
-                                        db.Close();
-                                }
-                        } catch(Exception e) {
-                                OpenSim.Framework.Console.MainConsole.Instance.Warn("Config.cs:InitConfig() - Exception occured");
-                OpenSim.Framework.Console.MainConsole.Instance.Warn(e.ToString());
-                        }
-                        
-                        OpenSim.Framework.Console.MainConsole.Instance.Verbose("User settings loaded:");
-                        OpenSim.Framework.Console.MainConsole.Instance.Verbose("Default startup message: " + this.DefaultStartupMsg);
-                        OpenSim.Framework.Console.MainConsole.Instance.Verbose("Grid server URL: " + this.GridServerURL);
-                        OpenSim.Framework.Console.MainConsole.Instance.Verbose("Key to send to grid: " + this.GridSendKey);
-                        OpenSim.Framework.Console.MainConsole.Instance.Verbose("Key to expect from grid: " + this.GridRecvKey);
-                }
-        
-                public void Shutdown() {
-                        db.Close();
-                }
-        }
-        
-}
diff --git a/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj b/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj
deleted file mode 100644
index a89a38d..0000000
--- a/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj
+++ /dev/null
@@ -1,107 +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>{7E494328-0000-0000-0000-000000000000}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon></ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>OpenUser.Config.UserConfigDb4o</AssemblyName>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenUser.Config.UserConfigDb4o</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="System" >
-      <HintPath>System.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Data.dll" >
-      <HintPath>..\..\..\bin\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="AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="DbUserConfig.cs">
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
diff --git a/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build b/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build
deleted file mode 100644
index bd5d49f..0000000
--- a/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" ?>
-<project name="OpenUser.Config.UserConfigDb4o" 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="OpenUser.Config.UserConfigDb4o" dynamicprefix="true" >
-            </resources>
-            <sources failonempty="true">
-                <include name="AssemblyInfo.cs" />
-                <include name="DbUserConfig.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.dll" />
-                <include name="../../../bin/OpenSim.Framework.Console.dll" />
-                <include name="System.dll" />
-                <include name="System.Data.dll.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/OpenGridServices/ServiceManager/ServiceManager.cs b/OpenGridServices/ServiceManager/ServiceManager.cs
deleted file mode 100644
index 8cb9c80..0000000
--- a/OpenGridServices/ServiceManager/ServiceManager.cs
+++ /dev/null
@@ -1,259 +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.Diagnostics;
-using System.Threading;
-using System.ServiceProcess;
-using System.Xml;
-using System.IO;
-using libsecondlife;
-using OpenSim.GenericConfig;
-public class OpenGridMasterService : System.ServiceProcess.ServiceBase {
-        private Thread ServiceWorkerThread;
-        private static string GridURL;          // URL of grid server
-        private static string GridSimKey;       // key sent from Grid>Sim
-        private static string SimGridKey;       // key sent Sim>Grid
-        private static string AssetURL;         // URL of asset server
-        private static string UserSendKey;      // key sent from user>sim
-        private static string UserRecvKey;      // key sent from sim>user
-        public OpenGridMasterService()
-        {
-                CanPauseAndContinue = false;
-                ServiceName = "OpenGridServices-master";
-        }
-        private void InitializeComponent()
-        {
-                this.CanPauseAndContinue = false;
-                this.CanShutdown = true;
-                this.ServiceName = "OpenGridServices-master";
-        }
-        protected override void OnStart(string[] args)
-        {
-                ServiceWorkerThread = new Thread(new ThreadStart(MainServiceThread));           
-                ServiceWorkerThread.Start();
-        }
-        protected override void OnStop()
-        {
-                ServiceWorkerThread.Abort();
-        }
-        private void MainServiceThread()
-        {
-         try {  
-            StreamReader reader=new  StreamReader("opengrid-master-cfg.xml");
-            
-            string configxml = reader.ReadToEnd();
-            XmlDocument doc = new XmlDocument();
-            doc.LoadXml(configxml);
-            XmlNode rootnode = doc.FirstChild;
-            if (rootnode.Name != "regions")
-            {
-                EventLog.WriteEntry("ERROR! bad XML in opengrid-master-cfg.xml - expected regions tag");
-                Console.WriteLine("Sorry, could not startup the service - please check your opengrid-master-cfg.xml file: missing regions tag");
-                (new ServiceController("OpenGridServices-master")).Stop();
-            }
-            for(int i=0; i<=rootnode.ChildNodes.Count; i++)
-            {
-                if(rootnode.ChildNodes.Item(i).Name != "region") {
-                        EventLog.WriteEntry("nonfatal error - unexpected tag inside regions block of opengrid-master-cfg.xml");
-                        (new ServiceController("OpenGridServices-master")).Stop();
-                }
-            }
-         } catch(Exception e) {
-            Console.WriteLine(e.ToString());
-            (new ServiceController("OpenGridServices-master")).Stop();
-         }
-        
-        }
-        private static string SetupGrid()
-        {
-        Console.WriteLine("Running external program (OpenGridServices.GridServer.exe) to configure the grid server");
-                try {
-                        Process p = new Process();
-                        p.StartInfo.Arguments = "-setuponly"; 
-                        p.StartInfo.FileName  = "OpenGridServices.GridServer.exe";
-                        p.Start();
-                        p.StartInfo.Arguments = "-dumpxmlconf";
-                        p.Start();
-                        XmlConfig GridConf = new XmlConfig("opengrid-cfg.xml");
-                        GridConf.LoadData();
-                        GridURL="http://" + GridConf.GetAttribute("ListenAddr") + ":" + GridConf.GetAttribute("ListenPort") + "/";
-                        StreamReader reader=new  StreamReader("opengrid-cfg.xml");
-                        string configxml = reader.ReadToEnd();
-        
-                        return configxml;
-                } catch(Exception e) {
-            Console.WriteLine("An error occurred while running the grid server, please rectify it and try again");
-                        Console.WriteLine(e.ToString());
-                        Environment.Exit(1);
-                }
-                return "";
-        }
-        private static string SetupUser()
-        {
-                return "<user></user>";
-        }
-        private static string SetupAsset()
-        {
-                return "<asset></asset>";
-        }
-        private static string SetupRegion()
-        {
-                string regionname;
-                ulong regionlocx;
-                ulong regionlocy;
-                string default_terrain;
-                uint terrain_multiplier;
-                uint baseport;
-                string listenaddr;
-                string simconfigxml;
-                LLUUID SimUUID;
-        Console.WriteLine("Setting up region servers");
-                Console.Write("Please specify a path to store your region data (e.g /etc/opensim/regions: ");
-                string regionpath=Console.ReadLine();
-                
-                Console.Write("How many regions would you like to configure now? ");
-                int numofregions=Convert.ToInt16(Console.ReadLine());   
-                Console.Write("What port should the region servers start listening at (first region is normally 9000, then 9001 the second etc, both TCP+UDP): ");
-                baseport=Convert.ToUInt16(Console.ReadLine());  
-                
-                listenaddr=Console.ReadLine();
-        Console.WriteLine("Now ready to configure regions, please answer the questions about each region in turn");
-                for(int i=0; i<=numofregions; i++) {
-            Console.WriteLine("Configuring region number " + i.ToString());
-                        
-                        Console.Write("Region name: ");
-                        regionname=Console.ReadLine();
-                        
-                        Console.Write("Region location X: ");
-                        regionlocx=(ulong)Convert.ToUInt32(Console.ReadLine());
-        
-                        Console.Write("Region location Y: ");
-                        regionlocy=(ulong)Convert.ToUInt32(Console.ReadLine());
-                        Console.Write("Default terrain file: ");
-                        default_terrain=Console.ReadLine();
-                        terrain_multiplier=Convert.ToUInt16(Console.ReadLine());
-                        SimUUID=LLUUID.Random();
-        
-                        simconfigxml="<Root><Config SimUUID=\"" + SimUUID.ToString() + "\" SimName=\"" + regionname + "\" SimLocationX=\"" + regionlocx.ToString() + "\" SimLocationY=\"" + regionlocy.ToString() + "\" Datastore=\"" + Path.Combine(regionpath,(SimUUID.ToString()+"localworld.yap")) + "\" SimListenPort=\"" + (baseport+i).ToString() + "\" SimListenAddress=\"" + listenaddr + "\" TerrainFile=\"" + default_terrain + "\" TerrainMultiplier=\"" + terrain_multiplier.ToString() + "\" GridServerURL=\"\" GridSendKey=\"\" GridRecvKey=\"\" AssetServerURL=\"\" /></Root>";
-        
-                }
-                return "<regions></regions>";
-        }
-        public static void InitSetup()
-        {
-                string choice="";
-                
-                string GridInfo;
-                string UserInfo;
-                string AssetInfo;
-                string RegionInfo;
-                bool grid=false;
-                bool user=false;
-                bool asset=false;
-                bool region=false;
-                while(choice!="OK")
-                {
-                        Console.Clear();
-                    Console.WriteLine("Please select the components you would like to run on this server:\n");
-                    Console.WriteLine("1 - [" + (grid ? "X" : " ") + "] Grid server   - this service handles co-ordinates of regions/sims on the grid");
-                    Console.WriteLine("2 - [" + (user ? "X" : " ") + "] User server   - this service handles user login, profiles, inventory and IM");
-                    Console.WriteLine("3 - [" + (asset ? "X" : " ") + "] Asset server  - this service handles storage of assets such as textures, objects, sounds, scripts");
-                    Console.WriteLine("4 - [" + (region ? "X" : " ") + "] Region server - this is the main opensim server and can run without the above services, it handles physics simulation, terrain, building and other such features");
-                
-                        Console.Write("Type a number to toggle a choice or type OK to accept your current choices: ");
-                        choice = Console.ReadLine();
-                        switch(choice)
-                        {
-                                case "1":
-                                        grid = (!grid);
-                                break;
-                                case "2":
-                                        user = (!user);
-                                break;
-                                case "3":
-                                        asset = (!asset);
-                                break;
-                                case "4":
-                                        region = (!region);
-                                break;
-                        }
-                }
-                if(grid) GridInfo     = SetupGrid();
-                if(user) UserInfo     = SetupUser();
-                if(asset) AssetInfo   = SetupAsset();
-                if(region) RegionInfo = SetupRegion();
-        }       
-        public static void Main()
-        {
-                if(!File.Exists("opengrid-master-cfg.xml")) 
-                {
-            Console.WriteLine("Could not find a config file, running initial setup");
-                        InitSetup();
-                }
-        Console.WriteLine("Starting up OGS master service");
-                try {
-                        ServiceBase.Run(new OpenGridMasterService());
-                } catch(Exception e) {
-            Console.WriteLine("An error occured while initialising OGS master service.");
-                        Console.WriteLine(e.ToString());
-                }
-        }
-}
diff --git a/OpenGridServices/ServiceManager/ServiceManager.csproj b/OpenGridServices/ServiceManager/ServiceManager.csproj
deleted file mode 100644
index e07e5be..0000000
--- a/OpenGridServices/ServiceManager/ServiceManager.csproj
+++ /dev/null
@@ -1,107 +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>{E141F4EE-0000-0000-0000-000000000000}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>
-    </ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>ServiceManager</AssemblyName>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>
-    </AppDesignerFolder>
-    <RootNamespace>ServiceManager</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="OpenSim.Framework.dll">
-      <HintPath>..\..\bin\OpenSim.Framework.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="OpenSim.GenericConfig.Xml">
-      <HintPath>OpenSim.GenericConfig.Xml.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System">
-      <HintPath>System.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.ServiceProcess">
-      <HintPath>System.ServiceProcess.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="ServiceManager.cs">
-      <SubType>Component</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/OpenGridServices/ServiceManager/ServiceManager.exe.build b/OpenGridServices/ServiceManager/ServiceManager.exe.build
deleted file mode 100644
index e0502c6..0000000
--- a/OpenGridServices/ServiceManager/ServiceManager.exe.build
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" ?>
-<project name="ServiceManager" 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="exe" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe">
-            <resources prefix="ServiceManager" dynamicprefix="true" >
-            </resources>
-            <sources failonempty="true">
-                <include name="ServiceManager.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.GenericConfig.Xml.dll" />
-                <include name="System.dll" />
-                <include name="System.ServiceProcess.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/OpenSim.FxCop b/OpenSim.FxCop
deleted file mode 100644
index 1e2ea2d..0000000
--- a/OpenSim.FxCop
+++ /dev/null
@@ -1,7241 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FxCopProject Version="1.35" Name="OpenSim">
- <ProjectOptions>
-  <SharedProject>True</SharedProject>
-  <Stylesheet Apply="False">http://www.gotdotnet.com/team/fxcop//xsl/1.35/FxCopReport.xsl</Stylesheet>
-  <SaveMessages>
-   <Project Status="Active, Excluded" NewOnly="False" />
-   <Report Status="Active" NewOnly="False" />
-  </SaveMessages>
-  <ProjectFile Compress="True" DefaultTargetCheck="True" DefaultRuleCheck="True" SaveByRuleGroup="" Deterministic="True" />
-  <EnableMultithreadedLoad>True</EnableMultithreadedLoad>
-  <EnableMultithreadedAnalysis>True</EnableMultithreadedAnalysis>
-  <SourceLookup>True</SourceLookup>
-  <AnalysisExceptionsThreshold>10</AnalysisExceptionsThreshold>
-  <RuleExceptionsThreshold>1</RuleExceptionsThreshold>
-  <Spelling Locale="en-us" />
-  <VersionAware>False</VersionAware>
-  <OverrideRuleVisibilities>False</OverrideRuleVisibilities>
-  <CustomDictionaries SearchFxCopDir="True" SearchUserProfile="True" SearchProjectDir="True" />
-  <SearchGlobalAssemblyCache>False</SearchGlobalAssemblyCache>
-  <DeadlockDetectionTimeout>120</DeadlockDetectionTimeout>
- </ProjectOptions>
- <Targets>
-  <AssemblyReferenceDirectories>
-   <Directory>$(ProjectDir)/lib/</Directory>
-  </AssemblyReferenceDirectories>
-  <Target Name="$(ProjectDir)/bin/OpenGridServices.ServerConsole.dll" Analyze="True" AnalyzeAllChildren="True" />
-  <Target Name="$(ProjectDir)/bin/OpenSim.Config.SimConfigDb4o.dll" Analyze="True" AnalyzeAllChildren="True" />
-  <Target Name="$(ProjectDir)/bin/OpenSim.exe" Analyze="True" AnalyzeAllChildren="True" />
-  <Target Name="$(ProjectDir)/bin/OpenSim.Framework.Console.dll" Analyze="True" AnalyzeAllChildren="True" />
-  <Target Name="$(ProjectDir)/bin/OpenSim.Framework.dll" Analyze="True" AnalyzeAllChildren="True" />
-  <Target Name="$(ProjectDir)/bin/OpenSim.GridInterfaces.Local.dll" Analyze="True" AnalyzeAllChildren="True" />
-  <Target Name="$(ProjectDir)/bin/OpenSim.GridInterfaces.Remote.dll" Analyze="True" AnalyzeAllChildren="True" />
-  <Target Name="$(ProjectDir)/bin/OpenSim.Physics.Manager.dll" Analyze="True" AnalyzeAllChildren="True" />
-  <Target Name="$(ProjectDir)/bin/OpenSim.RegionServer.dll" Analyze="True" AnalyzeAllChildren="True" />
-  <Target Name="$(ProjectDir)/bin/OpenSim.Storage.LocalStorageDb4o.dll" Analyze="True" AnalyzeAllChildren="True" />
-  <Target Name="$(ProjectDir)/bin/Physics/OpenSim.Physics.BasicPhysicsPlugin.dll" Analyze="True" AnalyzeAllChildren="True" />
-  <Target Name="$(ProjectDir)/bin/Physics/OpenSim.Physics.OdePlugin.dll" Analyze="True" AnalyzeAllChildren="True" />
-  <Target Name="$(ProjectDir)/bin/Physics/OpenSim.Physics.PhysXPlugin.dll" Analyze="True" AnalyzeAllChildren="True" />
- </Targets>
- <Rules>
-  <RuleFiles>
-   <RuleFile Name="$(FxCopDir)\Rules\DesignRules.dll" Enabled="True" AllRulesEnabled="True" />
-   <RuleFile Name="$(FxCopDir)\Rules\GlobalizationRules.dll" Enabled="True" AllRulesEnabled="True" />
-   <RuleFile Name="$(FxCopDir)\Rules\InteroperabilityRules.dll" Enabled="True" AllRulesEnabled="True" />
-   <RuleFile Name="$(FxCopDir)\Rules\MobilityRules.dll" Enabled="True" AllRulesEnabled="True" />
-   <RuleFile Name="$(FxCopDir)\Rules\NamingRules.dll" Enabled="True" AllRulesEnabled="True" />
-   <RuleFile Name="$(FxCopDir)\Rules\PerformanceRules.dll" Enabled="True" AllRulesEnabled="True" />
-   <RuleFile Name="$(FxCopDir)\Rules\PortabilityRules.dll" Enabled="True" AllRulesEnabled="True" />
-   <RuleFile Name="$(FxCopDir)\Rules\SecurityRules.dll" Enabled="True" AllRulesEnabled="True" />
-   <RuleFile Name="$(FxCopDir)\Rules\UsageRules.dll" Enabled="True" AllRulesEnabled="True" />
-  </RuleFiles>
-  <Groups />
-  <Settings />
- </Rules>
- <FxCopReport Version="1.35">
-  <Namespaces>
-   <Namespace Name="OpenSim">
-    <Messages>
-     <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-      <Issue Name="Namespace">
-       <Item>Sim</Item>
-       <Item>OpenSim</Item>
-      </Issue>
-     </Message>
-    </Messages>
-   </Namespace>
-   <Namespace Name="OpenSim.Assets">
-    <Messages>
-     <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-      <Issue Name="Namespace">
-       <Item>Sim</Item>
-       <Item>OpenSim.Assets</Item>
-      </Issue>
-     </Message>
-    </Messages>
-   </Namespace>
-   <Namespace Name="OpenSim.CAPS">
-    <Messages>
-     <Message TypeName="AvoidNamespacesWithFewTypes" Category="Microsoft.Design" CheckId="CA1020" Created="2007-03-27 04:29:04Z">
-      <Issue>
-       <Item>OpenSim.CAPS</Item>
-      </Issue>
-     </Message>
-     <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-      <Issue Name="Namespace">
-       <Item>Sim</Item>
-       <Item>OpenSim.CAPS</Item>
-      </Issue>
-     </Message>
-     <Message TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2007-03-27 04:29:04Z">
-      <Issue Name="Namespace">
-       <Item>OpenSim.CAPS</Item>
-      </Issue>
-     </Message>
-    </Messages>
-   </Namespace>
-   <Namespace Name="OpenSim.Config.SimConfigDb4o">
-    <Messages>
-     <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-      <Issue Name="Namespace">
-       <Item>Sim</Item>
-       <Item>OpenSim.Config.SimConfigDb4o</Item>
-      </Issue>
-      <Issue Name="Namespace">
-       <Item>Sim</Item>
-       <Item>OpenSim.Config.SimConfigDb4o</Item>
-      </Issue>
-     </Message>
-    </Messages>
-   </Namespace>
-   <Namespace Name="OpenSim.Framework.Assets">
-    <Messages>
-     <Message TypeName="AvoidNamespacesWithFewTypes" Category="Microsoft.Design" CheckId="CA1020" Created="2007-03-27 04:29:04Z">
-      <Issue>
-       <Item>OpenSim.Framework.Assets</Item>
-      </Issue>
-     </Message>
-     <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-      <Issue Name="Namespace">
-       <Item>Sim</Item>
-       <Item>OpenSim.Framework.Assets</Item>
-      </Issue>
-     </Message>
-    </Messages>
-   </Namespace>
-   <Namespace Name="OpenSim.Framework.Console">
-    <Messages>
-     <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-      <Issue Name="Namespace">
-       <Item>Sim</Item>
-       <Item>OpenSim.Framework.Console</Item>
-      </Issue>
-     </Message>
-    </Messages>
-   </Namespace>
-   <Namespace Name="OpenSim.Framework.Grid">
-    <Messages>
-     <Message TypeName="AvoidNamespacesWithFewTypes" Category="Microsoft.Design" CheckId="CA1020" Created="2007-03-27 04:29:04Z">
-      <Issue>
-       <Item>OpenSim.Framework.Grid</Item>
-      </Issue>
-     </Message>
-     <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-      <Issue Name="Namespace">
-       <Item>Sim</Item>
-       <Item>OpenSim.Framework.Grid</Item>
-      </Issue>
-     </Message>
-    </Messages>
-   </Namespace>
-   <Namespace Name="OpenSim.Framework.Interfaces">
-    <Messages>
-     <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-      <Issue Name="Namespace">
-       <Item>Sim</Item>
-       <Item>OpenSim.Framework.Interfaces</Item>
-      </Issue>
-     </Message>
-    </Messages>
-   </Namespace>
-   <Namespace Name="OpenSim.Framework.Inventory">
-    <Messages>
-     <Message TypeName="AvoidNamespacesWithFewTypes" Category="Microsoft.Design" CheckId="CA1020" Created="2007-03-27 04:29:04Z">
-      <Issue>
-       <Item>OpenSim.Framework.Inventory</Item>
-      </Issue>
-     </Message>
-     <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-      <Issue Name="Namespace">
-       <Item>Sim</Item>
-       <Item>OpenSim.Framework.Inventory</Item>
-      </Issue>
-     </Message>
-    </Messages>
-   </Namespace>
-   <Namespace Name="OpenSim.Framework.Sims">
-    <Messages>
-     <Message TypeName="AvoidNamespacesWithFewTypes" Category="Microsoft.Design" CheckId="CA1020" Created="2007-03-27 04:29:04Z">
-      <Issue>
-       <Item>OpenSim.Framework.Sims</Item>
-      </Issue>
-     </Message>
-     <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-      <Issue Name="Namespace">
-       <Item>Sim</Item>
-       <Item>OpenSim.Framework.Sims</Item>
-      </Issue>
-     </Message>
-    </Messages>
-   </Namespace>
-   <Namespace Name="OpenSim.Framework.Terrain">
-    <Messages>
-     <Message TypeName="AvoidNamespacesWithFewTypes" Category="Microsoft.Design" CheckId="CA1020" Created="2007-03-27 04:29:04Z">
-      <Issue>
-       <Item>OpenSim.Framework.Terrain</Item>
-      </Issue>
-     </Message>
-     <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-      <Issue Name="Namespace">
-       <Item>Sim</Item>
-       <Item>OpenSim.Framework.Terrain</Item>
-      </Issue>
-     </Message>
-    </Messages>
-   </Namespace>
-   <Namespace Name="OpenSim.Framework.User">
-    <Messages>
-     <Message TypeName="AvoidNamespacesWithFewTypes" Category="Microsoft.Design" CheckId="CA1020" Created="2007-03-27 04:29:04Z">
-      <Issue>
-       <Item>OpenSim.Framework.User</Item>
-      </Issue>
-     </Message>
-     <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-      <Issue Name="Namespace">
-       <Item>Sim</Item>
-       <Item>OpenSim.Framework.User</Item>
-      </Issue>
-     </Message>
-    </Messages>
-   </Namespace>
-   <Namespace Name="OpenSim.Framework.Utilities">
-    <Messages>
-     <Message TypeName="AvoidNamespacesWithFewTypes" Category="Microsoft.Design" CheckId="CA1020" Created="2007-03-27 04:29:04Z">
-      <Issue>
-       <Item>OpenSim.Framework.Utilities</Item>
-      </Issue>
-     </Message>
-     <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-      <Issue Name="Namespace">
-       <Item>Sim</Item>
-       <Item>OpenSim.Framework.Utilities</Item>
-      </Issue>
-     </Message>
-    </Messages>
-   </Namespace>
-   <Namespace Name="OpenSim.GridInterfaces.Local">
-    <Messages>
-     <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-      <Issue Name="Namespace">
-       <Item>Sim</Item>
-       <Item>OpenSim.GridInterfaces.Local</Item>
-      </Issue>
-     </Message>
-    </Messages>
-   </Namespace>
-   <Namespace Name="OpenSim.GridInterfaces.Remote">
-    <Messages>
-     <Message TypeName="AvoidNamespacesWithFewTypes" Category="Microsoft.Design" CheckId="CA1020" Created="2007-03-27 04:29:04Z">
-      <Issue>
-       <Item>OpenSim.GridInterfaces.Remote</Item>
-      </Issue>
-     </Message>
-     <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-      <Issue Name="Namespace">
-       <Item>Sim</Item>
-       <Item>OpenSim.GridInterfaces.Remote</Item>
-      </Issue>
-     </Message>
-    </Messages>
-   </Namespace>
-   <Namespace Name="OpenSim.Physics.BasicPhysicsPlugin">
-    <Messages>
-     <Message Id="Plugin" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-      <Issue Name="Namespace">
-       <Item>Plugin</Item>
-       <Item>OpenSim.Physics.BasicPhysicsPlugin</Item>
-      </Issue>
-     </Message>
-     <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-      <Issue Name="Namespace">
-       <Item>Sim</Item>
-       <Item>OpenSim.Physics.BasicPhysicsPlugin</Item>
-      </Issue>
-     </Message>
-    </Messages>
-   </Namespace>
-   <Namespace Name="OpenSim.Physics.Manager">
-    <Messages>
-     <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-      <Issue Name="Namespace">
-       <Item>Sim</Item>
-       <Item>OpenSim.Physics.Manager</Item>
-      </Issue>
-     </Message>
-    </Messages>
-   </Namespace>
-   <Namespace Name="OpenSim.Physics.OdePlugin">
-    <Messages>
-     <Message TypeName="AvoidNamespacesWithFewTypes" Category="Microsoft.Design" CheckId="CA1020" Created="2007-03-27 04:29:04Z">
-      <Issue>
-       <Item>OpenSim.Physics.OdePlugin</Item>
-      </Issue>
-     </Message>
-     <Message Id="Plugin" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-      <Issue Name="Namespace">
-       <Item>Plugin</Item>
-       <Item>OpenSim.Physics.OdePlugin</Item>
-      </Issue>
-     </Message>
-     <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-      <Issue Name="Namespace">
-       <Item>Sim</Item>
-       <Item>OpenSim.Physics.OdePlugin</Item>
-      </Issue>
-     </Message>
-    </Messages>
-   </Namespace>
-   <Namespace Name="OpenSim.Physics.PhysXPlugin">
-    <Messages>
-     <Message TypeName="AvoidNamespacesWithFewTypes" Category="Microsoft.Design" CheckId="CA1020" Created="2007-03-27 04:29:04Z">
-      <Issue>
-       <Item>OpenSim.Physics.PhysXPlugin</Item>
-      </Issue>
-     </Message>
-     <Message Id="Plugin" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-      <Issue Name="Namespace">
-       <Item>Plugin</Item>
-       <Item>OpenSim.Physics.PhysXPlugin</Item>
-      </Issue>
-     </Message>
-     <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-      <Issue Name="Namespace">
-       <Item>Sim</Item>
-       <Item>OpenSim.Physics.PhysXPlugin</Item>
-      </Issue>
-     </Message>
-    </Messages>
-   </Namespace>
-   <Namespace Name="OpenSim.Storage.LocalStorageDb4o">
-    <Messages>
-     <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-      <Issue Name="Namespace">
-       <Item>Sim</Item>
-       <Item>OpenSim.Storage.LocalStorageDb4o</Item>
-      </Issue>
-     </Message>
-    </Messages>
-   </Namespace>
-   <Namespace Name="OpenSim.types">
-    <Messages>
-     <Message TypeName="AvoidNamespacesWithFewTypes" Category="Microsoft.Design" CheckId="CA1020" Created="2007-03-27 04:29:04Z">
-      <Issue>
-       <Item>OpenSim.types</Item>
-      </Issue>
-     </Message>
-     <Message TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
-      <Issue Name="Namespace">
-       <Item>OpenSim.types</Item>
-      </Issue>
-     </Message>
-     <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-      <Issue Name="Namespace">
-       <Item>Sim</Item>
-       <Item>OpenSim.types</Item>
-      </Issue>
-     </Message>
-    </Messages>
-   </Namespace>
-   <Namespace Name="OpenSim.UserServer">
-    <Messages>
-     <Message TypeName="AvoidNamespacesWithFewTypes" Category="Microsoft.Design" CheckId="CA1020" Created="2007-03-27 04:29:04Z">
-      <Issue>
-       <Item>OpenSim.UserServer</Item>
-      </Issue>
-     </Message>
-     <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-      <Issue Name="Namespace">
-       <Item>Sim</Item>
-       <Item>OpenSim.UserServer</Item>
-      </Issue>
-     </Message>
-    </Messages>
-   </Namespace>
-   <Namespace Name="OpenSim.world">
-    <Messages>
-     <Message TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
-      <Issue Name="Namespace">
-       <Item>OpenSim.world</Item>
-      </Issue>
-     </Message>
-     <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-      <Issue Name="Namespace">
-       <Item>Sim</Item>
-       <Item>OpenSim.world</Item>
-      </Issue>
-     </Message>
-    </Messages>
-   </Namespace>
-   <Namespace Name="OpenSim.world.scripting">
-    <Messages>
-     <Message TypeName="AvoidNamespacesWithFewTypes" Category="Microsoft.Design" CheckId="CA1020" Created="2007-03-27 04:29:04Z">
-      <Issue>
-       <Item>OpenSim.world.scripting</Item>
-      </Issue>
-     </Message>
-     <Message TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
-      <Issue Name="Namespace">
-       <Item>OpenSim.world.scripting</Item>
-      </Issue>
-      <Issue Name="Namespace">
-       <Item>OpenSim.world.scripting</Item>
-      </Issue>
-     </Message>
-     <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-      <Issue Name="Namespace">
-       <Item>Sim</Item>
-       <Item>OpenSim.world.scripting</Item>
-      </Issue>
-     </Message>
-    </Messages>
-   </Namespace>
-  </Namespaces>
-  <Targets>
-   <Target Name="$(ProjectDir)/bin/OpenGridServices.ServerConsole.dll">
-    <Modules>
-     <Module Name="opengridservices.serverconsole.dll">
-      <Messages>
-       <Message TypeName="AssembliesShouldDeclareMinimumSecurity" Category="Microsoft.Usage" CheckId="CA2209" Created="2007-03-27 04:29:04Z">
-        <Issue>
-         <Item>OpenGridServices.ServerConsole</Item>
-        </Issue>
-       </Message>
-       <Message TypeName="AssembliesShouldHaveValidStrongNames" Category="Microsoft.Design" CheckId="CA2210" Created="2007-03-27 04:29:04Z">
-        <Issue Name="NoStrongName">
-         <Item>OpenGridServices.ServerConsole</Item>
-        </Issue>
-       </Message>
-       <Message TypeName="MarkAssembliesWithClsCompliant" Category="Microsoft.Design" CheckId="CA1014" Created="2007-03-27 04:29:04Z">
-        <Issue Name="NoAttr">
-         <Item>OpenGridServices.ServerConsole</Item>
-        </Issue>
-       </Message>
-      </Messages>
-      <Namespaces>
-       <Namespace Name="ServerConsole">
-        <Types>
-         <Type Name="conscmd_callback">
-          <Messages>
-           <Message TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
-            <Issue Name="Type">
-             <Item>conscmd_callback</Item>
-            </Issue>
-           </Message>
-           <Message Id="conscmd" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-            <Issue Name="Type">
-             <Item>conscmd</Item>
-             <Item>ServerConsole.conscmd_callback</Item>
-            </Issue>
-           </Message>
-           <Message TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2007-03-27 04:29:04Z">
-            <Issue Name="Type">
-             <Item>conscmd_callback</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="RunCmd(System.String,System.String[]):System.Void">
-            <Messages>
-             <Message Id="1#cmdparams" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>conscmd_callback.RunCmd(String, String[]):Void</Item>
-               <Item>cmdparams</Item>
-               <Item>cmdparams</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="Show(System.String):System.Void">
-            <Messages>
-             <Message Id="0#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>ShowWhat</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="ConsoleBase">
-          <Members>
-           <Member Name="CmdPrompt(System.String,System.String):System.String">
-            <Messages>
-             <Message Id="1#defaultresponse" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>ConsoleBase.CmdPrompt(String, String):String</Item>
-               <Item>defaultresponse</Item>
-               <Item>defaultresponse</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="CmdPrompt(System.String,System.String,System.String,System.String):System.String">
-            <Messages>
-             <Message Id="2#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>OptionA</Item>
-              </Issue>
-             </Message>
-             <Message Id="3#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>OptionB</Item>
-              </Issue>
-             </Message>
-             <Message Id="1#defaultresponse" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>ConsoleBase.CmdPrompt(String, String, String, String):String</Item>
-               <Item>defaultresponse</Item>
-               <Item>defaultresponse</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="PasswdPrompt(System.String):System.String">
-            <Messages>
-             <Message Id="Passwd" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>Passwd</Item>
-               <Item>ConsoleBase.PasswdPrompt(String):String</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="RunCmd(System.String,System.String[]):System.Object">
-            <Messages>
-             <Message Id="0#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>Cmd</Item>
-              </Issue>
-             </Message>
-             <Message Id="1#cmdparams" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>ConsoleBase.RunCmd(String, String[]):Object</Item>
-               <Item>cmdparams</Item>
-               <Item>cmdparams</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="ShowCommands(System.String):System.Void">
-            <Messages>
-             <Message Id="0#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>ShowWhat</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="Write(System.String):System.Void">
-            <Messages>
-             <Message Id="0#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>Line</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="WriteLine(System.String):System.Void">
-            <Messages>
-             <Message Id="0#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>Line</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="ConsoleBase+ConsoleType">
-          <Members>
-           <Member Name="SimChat">
-            <Messages>
-             <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>Sim</Item>
-               <Item>ConsoleType.SimChat</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="TCP">
-            <Messages>
-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>ConsoleType.TCP</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="MainConsole">
-          <Messages>
-           <Message TypeName="StaticHolderTypesShouldNotHaveConstructors" Category="Microsoft.Design" CheckId="CA1053" Created="2007-03-27 04:29:04Z">
-            <Issue>
-             <Item>MainConsole</Item>
-            </Issue>
-           </Message>
-          </Messages>
-         </Type>
-        </Types>
-       </Namespace>
-      </Namespaces>
-     </Module>
-    </Modules>
-   </Target>
-   <Target Name="$(ProjectDir)/bin/OpenSim.Config.SimConfigDb4o.dll">
-    <Modules>
-     <Module Name="opensim.config.simconfigdb4o.dll">
-      <Messages>
-       <Message TypeName="AssembliesShouldDeclareMinimumSecurity" Category="Microsoft.Usage" CheckId="CA2209" Created="2007-03-27 04:29:04Z">
-        <Issue>
-         <Item>OpenSim.Config.SimConfigDb4o</Item>
-        </Issue>
-       </Message>
-       <Message TypeName="AssembliesShouldHaveValidStrongNames" Category="Microsoft.Design" CheckId="CA2210" Created="2007-03-27 04:29:04Z">
-        <Issue Name="NoStrongName">
-         <Item>OpenSim.Config.SimConfigDb4o</Item>
-        </Issue>
-       </Message>
-       <Message TypeName="MarkAssembliesWithClsCompliant" Category="Microsoft.Design" CheckId="CA1014" Created="2007-03-27 04:29:04Z">
-        <Issue Name="NoAttr">
-         <Item>OpenSim.Config.SimConfigDb4o</Item>
-        </Issue>
-       </Message>
-      </Messages>
-      <Namespaces>
-       <Namespace Name="OpenSim.Config.SimConfigDb4o">
-        <Types>
-         <Type Name="Db40ConfigPlugin">
-          <Messages>
-           <Message Id="Plugin" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-            <Issue Name="Type">
-             <Item>Plugin</Item>
-             <Item>OpenSim.Config.SimConfigDb4o.Db40ConfigPlugin</Item>
-            </Issue>
-           </Message>
-          </Messages>
-         </Type>
-         <Type Name="DbSimConfig">
-          <Messages>
-           <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-            <Issue Name="Type">
-             <Item>Sim</Item>
-             <Item>OpenSim.Config.SimConfigDb4o.DbSimConfig</Item>
-            </Issue>
-           </Message>
-           <Message TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2007-03-27 04:29:04Z">
-            <Issue Name="Type">
-             <Item>Db</Item>
-             <Item>OpenSim.Config.SimConfigDb4o.DbSimConfig</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="InitConfig(System.Boolean):System.Void">
-            <Messages>
-             <Message TypeName="DoNotCatchGeneralExceptionTypes" Category="Microsoft.Design" CheckId="CA1031" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>DbSimConfig.InitConfig(Boolean):Void</Item>
-               <Item>System.Exception</Item>
-              </Issue>
-             </Message>
-             <Message Id="System.UInt32.ToString" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>DbSimConfig.InitConfig(Boolean):Void</Item>
-               <Item>System.UInt32.ToString</Item>
-               <Item>System.UInt32.ToString(System.IFormatProvider)</Item>
-              </Issue>
-             </Message>
-             <Message Id="System.UInt64.ToString" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>DbSimConfig.InitConfig(Boolean):Void</Item>
-               <Item>System.UInt64.ToString</Item>
-               <Item>System.UInt64.ToString(System.IFormatProvider)</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="LoadDefaults():System.Void">
-            <Messages>
-             <Message Id="System.Convert.ToInt32(System.String)" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>DbSimConfig.LoadDefaults():Void</Item>
-               <Item>System.Convert.ToInt32(System.String)</Item>
-               <Item>System.Convert.ToInt32(System.String,System.IFormatProvider)</Item>
-              </Issue>
-              <Issue>
-               <Item>DbSimConfig.LoadDefaults():Void</Item>
-               <Item>System.Convert.ToInt32(System.String)</Item>
-               <Item>System.Convert.ToInt32(System.String,System.IFormatProvider)</Item>
-              </Issue>
-              <Issue>
-               <Item>DbSimConfig.LoadDefaults():Void</Item>
-               <Item>System.Convert.ToInt32(System.String)</Item>
-               <Item>System.Convert.ToInt32(System.String,System.IFormatProvider)</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="MapStorage">
-          <Members>
-           <Member Name="Map">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>Map</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-        </Types>
-       </Namespace>
-      </Namespaces>
-     </Module>
-    </Modules>
-   </Target>
-   <Target Name="$(ProjectDir)/bin/OpenSim.exe">
-    <Modules>
-     <Module Name="opensim.exe">
-      <Messages>
-       <Message TypeName="AssembliesShouldDeclareMinimumSecurity" Category="Microsoft.Usage" CheckId="CA2209" Created="2007-03-27 04:29:04Z">
-        <Issue>
-         <Item>OpenSim</Item>
-        </Issue>
-       </Message>
-       <Message TypeName="AssembliesShouldHaveValidStrongNames" Category="Microsoft.Design" CheckId="CA2210" Created="2007-03-27 04:29:04Z">
-        <Issue Name="NoStrongName">
-         <Item>OpenSim</Item>
-        </Issue>
-       </Message>
-       <Message TypeName="MarkAssembliesWithAssemblyVersion" Category="Microsoft.Design" CheckId="CA1016" Created="2007-03-27 04:29:04Z">
-        <Issue>
-         <Item>OpenSim</Item>
-        </Issue>
-       </Message>
-       <Message TypeName="MarkAssembliesWithClsCompliant" Category="Microsoft.Design" CheckId="CA1014" Created="2007-03-27 04:29:04Z">
-        <Issue Name="NoAttr">
-         <Item>OpenSim</Item>
-        </Issue>
-       </Message>
-       <Message TypeName="MarkAssembliesWithComVisible" Category="Microsoft.Design" CheckId="CA1017" Created="2007-03-27 04:29:04Z">
-        <Issue Name="NoAttribute" Level="CriticalError">
-         <Item>OpenSim</Item>
-        </Issue>
-       </Message>
-      </Messages>
-      <Namespaces>
-       <Namespace Name="OpenSim">
-        <Types>
-         <Type Name="RegionServer">
-          <Members>
-           <Member Name="Main(System.String[]):System.Void">
-            <Messages>
-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>'args'</Item>
-               <Item>RegionServer.Main(String[]):Void</Item>
-              </Issue>
-              <Issue>
-               <Item>'args'</Item>
-               <Item>RegionServer.Main(String[]):Void</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-        </Types>
-       </Namespace>
-      </Namespaces>
-     </Module>
-    </Modules>
-   </Target>
-   <Target Name="$(ProjectDir)/bin/OpenSim.Framework.Console.dll">
-    <Modules>
-     <Module Name="opensim.framework.console.dll">
-      <Messages>
-       <Message TypeName="AssembliesShouldDeclareMinimumSecurity" Category="Microsoft.Usage" CheckId="CA2209" Created="2007-03-27 04:29:04Z">
-        <Issue>
-         <Item>OpenSim.Framework.Console</Item>
-        </Issue>
-       </Message>
-       <Message TypeName="AssembliesShouldHaveValidStrongNames" Category="Microsoft.Design" CheckId="CA2210" Created="2007-03-27 04:29:04Z">
-        <Issue Name="NoStrongName">
-         <Item>OpenSim.Framework.Console</Item>
-        </Issue>
-       </Message>
-       <Message TypeName="MarkAssembliesWithClsCompliant" Category="Microsoft.Design" CheckId="CA1014" Created="2007-03-27 04:29:04Z">
-        <Issue Name="NoAttr">
-         <Item>OpenSim.Framework.Console</Item>
-        </Issue>
-       </Message>
-      </Messages>
-      <Namespaces>
-       <Namespace Name="OpenSim.Framework.Console">
-        <Types>
-         <Type Name="ConsoleBase">
-          <Members>
-           <Member Name="CmdPrompt(System.String,System.String):System.String">
-            <Messages>
-             <Message Id="1#defaultresponse" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>ConsoleBase.CmdPrompt(String, String):String</Item>
-               <Item>defaultresponse</Item>
-               <Item>defaultresponse</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="CmdPrompt(System.String,System.String,System.String,System.String):System.String">
-            <Messages>
-             <Message Id="2#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>OptionA</Item>
-              </Issue>
-             </Message>
-             <Message Id="3#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>OptionB</Item>
-              </Issue>
-             </Message>
-             <Message Id="1#defaultresponse" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>ConsoleBase.CmdPrompt(String, String, String, String):String</Item>
-               <Item>defaultresponse</Item>
-               <Item>defaultresponse</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="RunCmd(System.String,System.String[]):System.Object">
-            <Messages>
-             <Message Id="0#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>Cmd</Item>
-              </Issue>
-             </Message>
-             <Message Id="1#cmdparams" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>ConsoleBase.RunCmd(String, String[]):Object</Item>
-               <Item>cmdparams</Item>
-               <Item>cmdparams</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="ShowCommands(System.String):System.Void">
-            <Messages>
-             <Message Id="0#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>ShowWhat</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="ConsoleBase+ConsoleType">
-          <Members>
-           <Member Name="SimChat">
-            <Messages>
-             <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>Sim</Item>
-               <Item>ConsoleType.SimChat</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="TCP">
-            <Messages>
-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>ConsoleType.TCP</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="MainConsole">
-          <Messages>
-           <Message TypeName="StaticHolderTypesShouldNotHaveConstructors" Category="Microsoft.Design" CheckId="CA1053" Created="2007-03-27 04:29:04Z">
-            <Issue>
-             <Item>MainConsole</Item>
-            </Issue>
-           </Message>
-          </Messages>
-         </Type>
-        </Types>
-       </Namespace>
-      </Namespaces>
-     </Module>
-    </Modules>
-   </Target>
-   <Target Name="$(ProjectDir)/bin/OpenSim.Framework.dll">
-    <Modules>
-     <Module Name="opensim.framework.dll">
-      <Messages>
-       <Message TypeName="AssembliesShouldDeclareMinimumSecurity" Category="Microsoft.Usage" CheckId="CA2209" Created="2007-03-27 04:29:04Z">
-        <Issue>
-         <Item>OpenSim.Framework</Item>
-        </Issue>
-       </Message>
-       <Message TypeName="AssembliesShouldHaveValidStrongNames" Category="Microsoft.Design" CheckId="CA2210" Created="2007-03-27 04:29:04Z">
-        <Issue Name="NoStrongName">
-         <Item>OpenSim.Framework</Item>
-        </Issue>
-       </Message>
-       <Message TypeName="MarkAssembliesWithClsCompliant" Category="Microsoft.Design" CheckId="CA1014" Created="2007-03-27 04:29:04Z">
-        <Issue Name="NoAttr">
-         <Item>OpenSim.Framework</Item>
-        </Issue>
-       </Message>
-      </Messages>
-      <Namespaces>
-       <Namespace Name="OpenSim.Framework.Assets">
-        <Types>
-         <Type Name="AssetBase">
-          <Members>
-           <Member Name="Data">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>Data</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="Description">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>Description</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="FullID">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>FullID</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="InvType">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>InvType</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="Name">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>Name</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="Type">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>Type</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="PrimData">
-          <Members>
-           <Member Name=".ctor()">
-            <Messages>
-             <Message TypeName="DoNotInitializeUnnecessarily" Category="Microsoft.Performance" CheckId="CA1805" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>PrimData.PrimData()</Item>
-               <Item>ParentID</Item>
-               <Item>System.UInt32</Item>
-               <Item>0</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="FullID">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>FullID</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="LocalID">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>LocalID</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="OwnerID">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>OwnerID</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="ParentID">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>ParentID</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="PathBegin">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>PathBegin</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="PathCurve">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>PathCurve</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="PathEnd">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>PathEnd</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="PathRadiusOffset">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>PathRadiusOffset</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="PathRevolutions">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>PathRevolutions</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="PathScaleX">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>PathScaleX</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="PathScaleY">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>PathScaleY</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="PathShearX">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>PathShearX</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="PathShearY">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>PathShearY</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="PathSkew">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>PathSkew</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="PathTaperX">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>PathTaperX</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="PathTaperY">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>PathTaperY</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="PathTwist">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>PathTwist</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="PathTwistBegin">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>PathTwistBegin</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="PCode">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>PCode</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="Position">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>Position</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="ProfileBegin">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>ProfileBegin</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="ProfileCurve">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>ProfileCurve</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="ProfileEnd">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>ProfileEnd</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="ProfileHollow">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>ProfileHollow</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="Rotation">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>Rotation</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="Scale">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>Scale</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="Texture">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>Texture</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-        </Types>
-       </Namespace>
-       <Namespace Name="OpenSim.Framework.Grid">
-        <Types>
-         <Type Name="LoginService">
-          <Messages>
-           <Message Id="Login" TypeName="UsePreferredTerms" Category="Microsoft.Naming" CheckId="CA1726" Created="2007-03-27 04:29:04Z">
-            <Issue Name="Type">
-             <Item>Login</Item>
-             <Item>LoginService</Item>
-             <Item>LogOn</Item>
-            </Issue>
-           </Message>
-          </Messages>
-         </Type>
-        </Types>
-       </Namespace>
-       <Namespace Name="OpenSim.Framework.Interfaces">
-        <Types>
-         <Type Name="AgentCircuitData">
-          <Members>
-           <Member Name="AgentID">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>AgentID</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="circuitcode">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>circuitcode</Item>
-              </Issue>
-             </Message>
-             <Message Id="circuitcode" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>circuitcode</Item>
-               <Item>AgentCircuitData.circuitcode</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="firstname">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>firstname</Item>
-              </Issue>
-             </Message>
-             <Message Id="firstname" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>firstname</Item>
-               <Item>AgentCircuitData.firstname</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="lastname">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>lastname</Item>
-              </Issue>
-             </Message>
-             <Message Id="lastname" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>lastname</Item>
-               <Item>AgentCircuitData.lastname</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="SecureSessionID">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>SecureSessionID</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="SessionID">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>SessionID</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="ARequest">
-          <Messages>
-           <Message TypeName="OverrideEqualsAndOperatorEqualsOnValueTypes" Category="Microsoft.Performance" CheckId="CA1815" Created="2007-03-27 04:29:04Z">
-            <Issue Name="Equals">
-             <Item>OpenSim.Framework.Interfaces.ARequest</Item>
-            </Issue>
-            <Issue Name="op_Equality">
-             <Item>OpenSim.Framework.Interfaces.ARequest</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="AssetID">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>AssetID</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="IsTexture">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>IsTexture</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="AuthenticateResponse">
-          <Members>
-           <Member Name="Authorised">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>Authorised</Item>
-              </Issue>
-             </Message>
-             <Message Id="Authorised" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>Authorised</Item>
-               <Item>AuthenticateResponse.Authorised</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="LoginInfo">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>LoginInfo</Item>
-              </Issue>
-             </Message>
-             <Message Id="Login" TypeName="UsePreferredTerms" Category="Microsoft.Naming" CheckId="CA1726" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>Login</Item>
-               <Item>LoginInfo</Item>
-               <Item>LogOn</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="IAssetPlugin">
-          <Messages>
-           <Message Id="Plugin" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-            <Issue Name="Type">
-             <Item>Plugin</Item>
-             <Item>OpenSim.Framework.Interfaces.IAssetPlugin</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="GetAssetServer():OpenSim.Framework.Interfaces.IAssetServer">
-            <Messages>
-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2007-03-27 04:29:04Z">
-              <Issue Certainty="50">
-               <Item>GetAssetServer</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="IAssetReceiver">
-          <Members>
-           <Member Name="AssetReceived(OpenSim.Framework.Assets.AssetBase,System.Boolean):System.Void">
-            <Messages>
-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>IsTexture</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="IAssetServer">
-          <Members>
-           <Member Name="RequestAsset(libsecondlife.LLUUID,System.Boolean):System.Void">
-            <Messages>
-             <Message Id="0#" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2007-03-27 04:29:04Z">
-              <Issue Name="ParameterId">
-               <Item>ID</Item>
-               <Item>assetID</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="SetServerInfo(System.String,System.String):System.Void">
-            <Messages>
-             <Message Id="0#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>ServerUrl</Item>
-              </Issue>
-             </Message>
-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>ServerKey</Item>
-              </Issue>
-             </Message>
-             <Message Id="0#" TypeName="UriParametersShouldNotBeStrings" Category="Microsoft.Design" CheckId="CA1054" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>ServerUrl</Item>
-               <Item>IAssetServer.SetServerInfo(String, String):Void</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="IGridPlugin">
-          <Messages>
-           <Message Id="Plugin" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-            <Issue Name="Type">
-             <Item>Plugin</Item>
-             <Item>OpenSim.Framework.Interfaces.IGridPlugin</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="GetGridServer():OpenSim.Framework.Interfaces.IGridServer">
-            <Messages>
-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2007-03-27 04:29:04Z">
-              <Issue Certainty="50">
-               <Item>GetGridServer</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="IGridServer">
-          <Members>
-           <Member Name="AuthenticateSession(libsecondlife.LLUUID,libsecondlife.LLUUID,System.UInt32):OpenSim.Framework.Interfaces.AuthenticateResponse">
-            <Messages>
-             <Message Id="0#" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2007-03-27 04:29:04Z">
-              <Issue Name="ParameterId">
-               <Item>ID</Item>
-               <Item>sessionID</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-             <Message Id="1#" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2007-03-27 04:29:04Z">
-              <Issue Name="ParameterId">
-               <Item>ID</Item>
-               <Item>agentID</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="GetName():System.String">
-            <Messages>
-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2007-03-27 04:29:04Z">
-              <Issue Certainty="50">
-               <Item>GetName</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="LogoutSession(libsecondlife.LLUUID,libsecondlife.LLUUID,System.UInt32):System.Boolean">
-            <Messages>
-             <Message Id="0#" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2007-03-27 04:29:04Z">
-              <Issue Name="ParameterId">
-               <Item>ID</Item>
-               <Item>sessionID</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-             <Message Id="1#" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2007-03-27 04:29:04Z">
-              <Issue Name="ParameterId">
-               <Item>ID</Item>
-               <Item>agentID</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-             <Message Id="Logout" TypeName="UsePreferredTerms" Category="Microsoft.Naming" CheckId="CA1726" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>Logout</Item>
-               <Item>LogoutSession</Item>
-               <Item>LogOff</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="RequestNeighbours():OpenSim.Framework.Interfaces.NeighbourInfo[]">
-            <Messages>
-             <Message Id="Neighbours" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>Neighbours</Item>
-               <Item>IGridServer.RequestNeighbours():NeighbourInfo[]</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="RequestUUIDBlock():OpenSim.Framework.Interfaces.UUIDBlock">
-            <Messages>
-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>IGridServer.RequestUUIDBlock():UUIDBlock</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="SetServerInfo(System.String,System.String,System.String):System.Void">
-            <Messages>
-             <Message Id="0#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>ServerUrl</Item>
-              </Issue>
-             </Message>
-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>SendKey</Item>
-              </Issue>
-             </Message>
-             <Message Id="2#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>RecvKey</Item>
-              </Issue>
-             </Message>
-             <Message Id="2#Recv" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>IGridServer.SetServerInfo(String, String, String):Void</Item>
-               <Item>Recv</Item>
-               <Item>RecvKey</Item>
-              </Issue>
-             </Message>
-             <Message Id="0#" TypeName="UriParametersShouldNotBeStrings" Category="Microsoft.Design" CheckId="CA1054" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>ServerUrl</Item>
-               <Item>IGridServer.SetServerInfo(String, String, String):Void</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="ILocalStorage">
-          <Members>
-           <Member Name="RemovePrim(libsecondlife.LLUUID):System.Void">
-            <Messages>
-             <Message Id="0#" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2007-03-27 04:29:04Z">
-              <Issue Name="ParameterId">
-               <Item>ID</Item>
-               <Item>primID</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="ShutDown():System.Void">
-            <Messages>
-             <Message Id="ShutDown" TypeName="CompoundWordsShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1702" Created="2007-03-27 04:29:04Z">
-              <Issue Name="ShouldBeDiscreteTerm">
-               <Item>ShutDown</Item>
-               <Item>method</Item>
-               <Item>ShutDown</Item>
-               <Item>Shutdown</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="ISimConfig">
-          <Messages>
-           <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-            <Issue Name="Type">
-             <Item>Sim</Item>
-             <Item>OpenSim.Framework.Interfaces.ISimConfig</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="GetConfigObject():OpenSim.Framework.Interfaces.SimConfig">
-            <Messages>
-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2007-03-27 04:29:04Z">
-              <Issue Certainty="50">
-               <Item>GetConfigObject</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="IUserServer">
-          <Members>
-           <Member Name="RequestAgentsInventory(libsecondlife.LLUUID):OpenSim.Framework.Inventory.AgentInventory">
-            <Messages>
-             <Message Id="0#" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2007-03-27 04:29:04Z">
-              <Issue Name="ParameterId">
-               <Item>ID</Item>
-               <Item>agentID</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="SetServerInfo(System.String,System.String,System.String):System.Void">
-            <Messages>
-             <Message Id="0#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>ServerUrl</Item>
-              </Issue>
-             </Message>
-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>SendKey</Item>
-              </Issue>
-             </Message>
-             <Message Id="2#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>RecvKey</Item>
-              </Issue>
-             </Message>
-             <Message Id="2#Recv" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>IUserServer.SetServerInfo(String, String, String):Void</Item>
-               <Item>Recv</Item>
-               <Item>RecvKey</Item>
-              </Issue>
-             </Message>
-             <Message Id="0#" TypeName="UriParametersShouldNotBeStrings" Category="Microsoft.Design" CheckId="CA1054" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>ServerUrl</Item>
-               <Item>IUserServer.SetServerInfo(String, String, String):Void</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="LocalGridBase">
-          <Members>
-           <Member Name="LogoutSession(libsecondlife.LLUUID,libsecondlife.LLUUID,System.UInt32):System.Boolean">
-            <Messages>
-             <Message Id="Logout" TypeName="UsePreferredTerms" Category="Microsoft.Naming" CheckId="CA1726" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>Logout</Item>
-               <Item>LogoutSession</Item>
-               <Item>LogOff</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="Login">
-          <Messages>
-           <Message Id="Login" TypeName="UsePreferredTerms" Category="Microsoft.Naming" CheckId="CA1726" Created="2007-03-27 04:29:04Z">
-            <Issue Name="Type">
-             <Item>Login</Item>
-             <Item>Login</Item>
-             <Item>LogOn</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="Agent">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>Agent</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="BaseFolder">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>BaseFolder</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="First">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>First</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="InventoryFolder">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>InventoryFolder</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="Last">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>Last</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="SecureSession">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>SecureSession</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="Session">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>Session</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="NeighbourInfo">
-          <Messages>
-           <Message Id="Neighbour" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-            <Issue Name="Type">
-             <Item>Neighbour</Item>
-             <Item>OpenSim.Framework.Interfaces.NeighbourInfo</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="regionhandle">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>regionhandle</Item>
-              </Issue>
-             </Message>
-             <Message Id="regionhandle" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>regionhandle</Item>
-               <Item>NeighbourInfo.regionhandle</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="RegionLocX">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>RegionLocX</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="RegionLocY">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>RegionLocY</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="sim_ip">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>sim_ip</Item>
-              </Issue>
-             </Message>
-             <Message Id="sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>sim</Item>
-               <Item>NeighbourInfo.sim_ip</Item>
-              </Issue>
-             </Message>
-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>sim_ip</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="sim_port">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>sim_port</Item>
-              </Issue>
-             </Message>
-             <Message Id="sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>sim</Item>
-               <Item>NeighbourInfo.sim_port</Item>
-              </Issue>
-             </Message>
-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>sim_port</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="RemoteGridBase">
-          <Members>
-           <Member Name="agentcircuits">
-            <Messages>
-             <Message TypeName="CollectionPropertiesShouldBeReadOnly" Category="Microsoft.Usage" CheckId="CA2227" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>agentcircuits</Item>
-              </Issue>
-             </Message>
-             <Message Id="Member" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>agentcircuits</Item>
-              </Issue>
-             </Message>
-             <Message Id="agentcircuits" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>agentcircuits</Item>
-               <Item>RemoteGridBase.agentcircuits:Dictionary`2&lt;System.UInt32,OpenSim.Framework.Interfaces.AgentCircuitData&gt;</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="LogoutSession(libsecondlife.LLUUID,libsecondlife.LLUUID,System.UInt32):System.Boolean">
-            <Messages>
-             <Message Id="Logout" TypeName="UsePreferredTerms" Category="Microsoft.Naming" CheckId="CA1726" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>Logout</Item>
-               <Item>LogoutSession</Item>
-               <Item>LogOff</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="SimConfig">
-          <Messages>
-           <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-            <Issue Name="Type">
-             <Item>Sim</Item>
-             <Item>OpenSim.Framework.Interfaces.SimConfig</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="AssetSendKey">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>AssetSendKey</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="AssetURL">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>AssetURL</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="GridRecvKey">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>GridRecvKey</Item>
-              </Issue>
-             </Message>
-             <Message Id="Recv" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>Recv</Item>
-               <Item>SimConfig.GridRecvKey</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="GridSendKey">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>GridSendKey</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="GridURL">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>GridURL</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="IPListenAddr">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>IPListenAddr</Item>
-              </Issue>
-             </Message>
-             <Message Id="Addr" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>Addr</Item>
-               <Item>SimConfig.IPListenAddr</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="IPListenPort">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>IPListenPort</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="RegionHandle">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>RegionHandle</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="RegionLocX">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>RegionLocX</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="RegionLocY">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>RegionLocY</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="RegionName">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>RegionName</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="SaveMap(System.Single[]):System.Void">
-            <Messages>
-             <Message Id="0#heightmap" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>SimConfig.SaveMap(Single[]):Void</Item>
-               <Item>heightmap</Item>
-               <Item>heightmap</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="UserRecvKey">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>UserRecvKey</Item>
-              </Issue>
-             </Message>
-             <Message Id="Recv" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>Recv</Item>
-               <Item>SimConfig.UserRecvKey</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="UserSendKey">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>UserSendKey</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="UserURL">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>UserURL</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="UUIDBlock">
-          <Messages>
-           <Message TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2007-03-27 04:29:04Z">
-            <Issue Name="Type">
-             <Item>UUIDBlock</Item>
-            </Issue>
-           </Message>
-           <Message TypeName="OverrideEqualsAndOperatorEqualsOnValueTypes" Category="Microsoft.Performance" CheckId="CA1815" Created="2007-03-27 04:29:04Z">
-            <Issue Name="Equals">
-             <Item>OpenSim.Framework.Interfaces.UUIDBlock</Item>
-            </Issue>
-            <Issue Name="op_Equality">
-             <Item>OpenSim.Framework.Interfaces.UUIDBlock</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="BlockEnd">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>BlockEnd</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="BlockStart">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>BlockStart</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-        </Types>
-       </Namespace>
-       <Namespace Name="OpenSim.Framework.Inventory">
-        <Types>
-         <Type Name="AgentInventory">
-          <Members>
-           <Member Name=".ctor()">
-            <Messages>
-             <Message TypeName="DoNotCallOverridableMethodsInConstructors" Category="Microsoft.Usage" CheckId="CA2214" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>AgentInventory.AgentInventory()</Item>
-               <Item>&#xD;&#xA;&#xD;&#xA;AgentInventory.AgentInventory()&#xD;&#xA;AgentInventory.Initialise():Void</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="AddToInventory(libsecondlife.LLUUID,OpenSim.Framework.Assets.AssetBase):libsecondlife.LLUUID">
-            <Messages>
-             <Message Id="0#" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2007-03-27 04:29:04Z">
-              <Issue Name="ParameterId">
-               <Item>ID</Item>
-               <Item>folderID</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="AgentID">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>AgentID</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="CreateNewFolder(libsecondlife.LLUUID,System.UInt16):System.Boolean">
-            <Messages>
-             <Message Id="0#" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2007-03-27 04:29:04Z">
-              <Issue Name="ParameterId">
-               <Item>ID</Item>
-               <Item>folderID</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="Initialise():System.Void">
-            <Messages>
-             <Message Id="Initialise" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>Initialise</Item>
-               <Item>AgentInventory.Initialise():Void</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="InventoryFolders">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>InventoryFolders</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="InventoryItems">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>InventoryItems</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="InventoryRoot">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>InventoryRoot</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="LastCached">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>LastCached</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="UpdateItem(libsecondlife.LLUUID,OpenSim.Framework.Assets.AssetBase):System.Boolean">
-            <Messages>
-             <Message Id="0#" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2007-03-27 04:29:04Z">
-              <Issue Name="ParameterId">
-               <Item>ID</Item>
-               <Item>itemID</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="Wearables">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>Wearables</Item>
-              </Issue>
-             </Message>
-             <Message Id="Wearables" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>Wearables</Item>
-               <Item>AgentInventory.Wearables</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="AvatarWearable">
-          <Members>
-           <Member Name="AssetID">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>AssetID</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="ItemID">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>ItemID</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="InventoryFolder">
-          <Members>
-           <Member Name="DefaultType">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>DefaultType</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="FolderID">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>FolderID</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="FolderName">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>FolderName</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="Items">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>Items</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>System.Collections.Generic.List`1&lt;OpenSim.Framework.Inventory.InventoryItem&gt;</Item>
-               <Item>InventoryFolder.Items</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="OwnerID">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>OwnerID</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="ParentID">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>ParentID</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="Version">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>Version</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="InventoryItem">
-          <Members>
-           <Member Name="AssetID">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>AssetID</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="CreatorID">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>CreatorID</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="Description">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>Description</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="FolderID">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>FolderID</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="InvType">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>InvType</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="ItemID">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>ItemID</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="Name">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>Name</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="OwnerID">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>OwnerID</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="Type">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>Type</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-        </Types>
-       </Namespace>
-       <Namespace Name="OpenSim.Framework.Sims">
-        <Types>
-         <Type Name="SimProfile">
-          <Messages>
-           <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-            <Issue Name="Type">
-             <Item>Sim</Item>
-             <Item>OpenSim.Framework.Sims.SimProfile</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="LoadFromGrid(System.UInt64,System.String,System.String,System.String):OpenSim.Framework.Sims.SimProfile">
-            <Messages>
-             <Message TypeName="DoNotCatchGeneralExceptionTypes" Category="Microsoft.Design" CheckId="CA1031" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>SimProfile.LoadFromGrid(UInt64, String, String, String):SimProfile</Item>
-               <Item>System.Exception</Item>
-              </Issue>
-             </Message>
-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>GridURL</Item>
-              </Issue>
-             </Message>
-             <Message Id="2#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>SendKey</Item>
-              </Issue>
-             </Message>
-             <Message Id="3#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>RecvKey</Item>
-              </Issue>
-             </Message>
-             <Message Id="3#Recv" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>SimProfile.LoadFromGrid(UInt64, String, String, String):SimProfile</Item>
-               <Item>Recv</Item>
-               <Item>RecvKey</Item>
-              </Issue>
-             </Message>
-             <Message Id="0#" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>region_handle</Item>
-              </Issue>
-             </Message>
-             <Message Id="1#" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>GridURL</Item>
-              </Issue>
-             </Message>
-             <Message Id="RecvKey" TypeName="ReviewUnusedParameters" Category="Microsoft.Usage" CheckId="CA1801" Created="2007-03-27 04:29:04Z" FixCategory="Breaking">
-              <Issue>
-               <Item>RecvKey</Item>
-               <Item>SimProfile.LoadFromGrid(UInt64, String, String, String):SimProfile</Item>
-              </Issue>
-             </Message>
-             <Message Id="System.Convert.ToUInt16(System.Object)" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>SimProfile.LoadFromGrid(UInt64, String, String, String):SimProfile</Item>
-               <Item>System.Convert.ToUInt16(System.Object)</Item>
-               <Item>System.Convert.ToUInt16(System.Object,System.IFormatProvider)</Item>
-              </Issue>
-             </Message>
-             <Message Id="System.Convert.ToUInt32(System.Object)" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>SimProfile.LoadFromGrid(UInt64, String, String, String):SimProfile</Item>
-               <Item>System.Convert.ToUInt32(System.Object)</Item>
-               <Item>System.Convert.ToUInt32(System.Object,System.IFormatProvider)</Item>
-              </Issue>
-              <Issue>
-               <Item>SimProfile.LoadFromGrid(UInt64, String, String, String):SimProfile</Item>
-               <Item>System.Convert.ToUInt32(System.Object)</Item>
-               <Item>System.Convert.ToUInt32(System.Object,System.IFormatProvider)</Item>
-              </Issue>
-             </Message>
-             <Message Id="System.Convert.ToUInt64(System.Object)" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>SimProfile.LoadFromGrid(UInt64, String, String, String):SimProfile</Item>
-               <Item>System.Convert.ToUInt64(System.Object)</Item>
-               <Item>System.Convert.ToUInt64(System.Object,System.IFormatProvider)</Item>
-              </Issue>
-             </Message>
-             <Message Id="System.UInt64.ToString" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>SimProfile.LoadFromGrid(UInt64, String, String, String):SimProfile</Item>
-               <Item>System.UInt64.ToString</Item>
-               <Item>System.UInt64.ToString(System.IFormatProvider)</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="SimProfileBase">
-          <Messages>
-           <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-            <Issue Name="Type">
-             <Item>Sim</Item>
-             <Item>OpenSim.Framework.Sims.SimProfileBase</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="caps_url">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>caps_url</Item>
-              </Issue>
-             </Message>
-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>caps_url</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="recvkey">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>recvkey</Item>
-              </Issue>
-             </Message>
-             <Message Id="recvkey" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>recvkey</Item>
-               <Item>SimProfileBase.recvkey</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="regionhandle">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>regionhandle</Item>
-              </Issue>
-             </Message>
-             <Message Id="regionhandle" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>regionhandle</Item>
-               <Item>SimProfileBase.regionhandle</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="RegionLocX">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>RegionLocX</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="RegionLocY">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>RegionLocY</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="regionname">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>regionname</Item>
-              </Issue>
-             </Message>
-             <Message Id="regionname" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>regionname</Item>
-               <Item>SimProfileBase.regionname</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="sendkey">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>sendkey</Item>
-              </Issue>
-             </Message>
-             <Message Id="sendkey" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>sendkey</Item>
-               <Item>SimProfileBase.sendkey</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="sim_ip">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>sim_ip</Item>
-              </Issue>
-             </Message>
-             <Message Id="sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>sim</Item>
-               <Item>SimProfileBase.sim_ip</Item>
-              </Issue>
-             </Message>
-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>sim_ip</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="sim_port">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>sim_port</Item>
-              </Issue>
-             </Message>
-             <Message Id="sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>sim</Item>
-               <Item>SimProfileBase.sim_port</Item>
-              </Issue>
-             </Message>
-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>sim_port</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="UUID">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>UUID</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-        </Types>
-       </Namespace>
-       <Namespace Name="OpenSim.Framework.Terrain">
-        <Types>
-         <Type Name="HeightmapGenHills">
-          <Messages>
-           <Message Id="Heightmap" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-            <Issue Name="Type">
-             <Item>Heightmap</Item>
-             <Item>OpenSim.Framework.Terrain.HeightmapGenHills</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="GenerateHeightmap(System.Int32,System.Single,System.Single,System.Boolean):System.Single[]">
-            <Messages>
-             <Message Id="0#num" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>HeightmapGenHills.GenerateHeightmap(Int32, Single, Single, Boolean):Single[]</Item>
-               <Item>num</Item>
-               <Item>numHills</Item>
-              </Issue>
-             </Message>
-             <Message Id="Heightmap" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>Heightmap</Item>
-               <Item>HeightmapGenHills.GenerateHeightmap(Int32, Single, Single, Boolean):Single[]</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="NumHills">
-            <Messages>
-             <Message TypeName="AvoidUnusedPrivateFields" Category="Microsoft.Performance" CheckId="CA1823" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>HeightmapGenHills.NumHills</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-        </Types>
-       </Namespace>
-       <Namespace Name="OpenSim.Framework.User">
-        <Types>
-         <Type Name="UserProfile">
-          <Members>
-           <Member Name=".ctor()">
-            <Messages>
-             <Message TypeName="DoNotInitializeUnnecessarily" Category="Microsoft.Performance" CheckId="CA1805" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>UserProfile.UserProfile()</Item>
-               <Item>IsGridGod</Item>
-               <Item>System.Boolean</Item>
-               <Item>false</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="AddSimCircuit(System.UInt32,libsecondlife.LLUUID):System.Void">
-            <Messages>
-             <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>Sim</Item>
-               <Item>UserProfile.AddSimCircuit(UInt32, LLUUID):Void</Item>
-              </Issue>
-             </Message>
-             <Message Id="1#" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>regionUUID</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="AssetURL">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>AssetURL</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="Circuits">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>Circuits</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="CurrentSecureSessionID">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>CurrentSecureSessionID</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="CurrentSessionID">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>CurrentSessionID</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="firstname">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>firstname</Item>
-              </Issue>
-             </Message>
-             <Message Id="firstname" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>firstname</Item>
-               <Item>UserProfile.firstname</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="homelookat">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>homelookat</Item>
-              </Issue>
-             </Message>
-             <Message Id="homelookat" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>homelookat</Item>
-               <Item>UserProfile.homelookat</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="homepos">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>homepos</Item>
-              </Issue>
-             </Message>
-             <Message Id="homepos" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>homepos</Item>
-               <Item>UserProfile.homepos</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="homeregionhandle">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>homeregionhandle</Item>
-              </Issue>
-             </Message>
-             <Message Id="homeregionhandle" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>homeregionhandle</Item>
-               <Item>UserProfile.homeregionhandle</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="Inventory">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>Inventory</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="IsGridGod">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>IsGridGod</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="IsLocal">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>IsLocal</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="lastname">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>lastname</Item>
-              </Issue>
-             </Message>
-             <Message Id="lastname" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>lastname</Item>
-               <Item>UserProfile.lastname</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="MD5passwd">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>MD5passwd</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="UUID">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>UUID</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="UserProfileManager">
-          <Members>
-           <Member Name="CustomiseResponse(System.Collections.Hashtable&amp;,OpenSim.Framework.User.UserProfile):System.Void">
-            <Messages>
-             <Message Id="0#" TypeName="DoNotPassTypesByReference" Category="Microsoft.Design" CheckId="CA1045" Created="2007-03-27 04:29:04Z">
-              <Issue Level="CriticalWarning">
-               <Item>response</Item>
-              </Issue>
-             </Message>
-             <Message Id="Customise" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>Customise</Item>
-               <Item>UserProfileManager.CustomiseResponse(Hashtable&amp;, UserProfile):Void</Item>
-              </Issue>
-             </Message>
-             <Message Id="GridResp" TypeName="RemoveUnusedLocals" Category="Microsoft.Performance" CheckId="CA1804" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>UserProfileManager.CustomiseResponse(Hashtable&amp;, UserProfile):Void</Item>
-               <Item>GridResp</Item>
-               <Item>Nwc.XmlRpc.XmlRpcResponse</Item>
-              </Issue>
-             </Message>
-             <Message Id="System.Single.ToString" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>UserProfileManager.CustomiseResponse(Hashtable&amp;, UserProfile):Void</Item>
-               <Item>System.Single.ToString</Item>
-               <Item>System.Single.ToString(System.IFormatProvider)</Item>
-              </Issue>
-              <Issue>
-               <Item>UserProfileManager.CustomiseResponse(Hashtable&amp;, UserProfile):Void</Item>
-               <Item>System.Single.ToString</Item>
-               <Item>System.Single.ToString(System.IFormatProvider)</Item>
-              </Issue>
-              <Issue>
-               <Item>UserProfileManager.CustomiseResponse(Hashtable&amp;, UserProfile):Void</Item>
-               <Item>System.Single.ToString</Item>
-               <Item>System.Single.ToString(System.IFormatProvider)</Item>
-              </Issue>
-              <Issue>
-               <Item>UserProfileManager.CustomiseResponse(Hashtable&amp;, UserProfile):Void</Item>
-               <Item>System.Single.ToString</Item>
-               <Item>System.Single.ToString(System.IFormatProvider)</Item>
-              </Issue>
-              <Issue>
-               <Item>UserProfileManager.CustomiseResponse(Hashtable&amp;, UserProfile):Void</Item>
-               <Item>System.Single.ToString</Item>
-               <Item>System.Single.ToString(System.IFormatProvider)</Item>
-              </Issue>
-              <Issue>
-               <Item>UserProfileManager.CustomiseResponse(Hashtable&amp;, UserProfile):Void</Item>
-               <Item>System.Single.ToString</Item>
-               <Item>System.Single.ToString(System.IFormatProvider)</Item>
-              </Issue>
-             </Message>
-             <Message Id="System.UInt32.ToString" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>UserProfileManager.CustomiseResponse(Hashtable&amp;, UserProfile):Void</Item>
-               <Item>System.UInt32.ToString</Item>
-               <Item>System.UInt32.ToString(System.IFormatProvider)</Item>
-              </Issue>
-              <Issue>
-               <Item>UserProfileManager.CustomiseResponse(Hashtable&amp;, UserProfile):Void</Item>
-               <Item>System.UInt32.ToString</Item>
-               <Item>System.UInt32.ToString(System.IFormatProvider)</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="DefaultStartupMsg">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>DefaultStartupMsg</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="GridRecvKey">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>GridRecvKey</Item>
-              </Issue>
-             </Message>
-             <Message Id="Recv" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>Recv</Item>
-               <Item>UserProfileManager.GridRecvKey</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="GridSendKey">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>GridSendKey</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="GridURL">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>GridURL</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="ParseXMLRPC(System.String):System.String">
-            <Messages>
-             <Message TypeName="DoNotCatchGeneralExceptionTypes" Category="Microsoft.Design" CheckId="CA1031" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>UserProfileManager.ParseXMLRPC(String):String</Item>
-               <Item>System.Exception</Item>
-              </Issue>
-             </Message>
-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>UserProfileManager.ParseXMLRPC(String):String</Item>
-              </Issue>
-             </Message>
-             <Message Id="System.Int32.ToString" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>UserProfileManager.ParseXMLRPC(String):String</Item>
-               <Item>System.Int32.ToString</Item>
-               <Item>System.Int32.ToString(System.IFormatProvider)</Item>
-              </Issue>
-              <Issue>
-               <Item>UserProfileManager.ParseXMLRPC(String):String</Item>
-               <Item>System.Int32.ToString</Item>
-               <Item>System.Int32.ToString(System.IFormatProvider)</Item>
-              </Issue>
-             </Message>
-             <Message Id="System.Single.ToString" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>UserProfileManager.ParseXMLRPC(String):String</Item>
-               <Item>System.Single.ToString</Item>
-               <Item>System.Single.ToString(System.IFormatProvider)</Item>
-              </Issue>
-              <Issue>
-               <Item>UserProfileManager.ParseXMLRPC(String):String</Item>
-               <Item>System.Single.ToString</Item>
-               <Item>System.Single.ToString(System.IFormatProvider)</Item>
-              </Issue>
-              <Issue>
-               <Item>UserProfileManager.ParseXMLRPC(String):String</Item>
-               <Item>System.Single.ToString</Item>
-               <Item>System.Single.ToString(System.IFormatProvider)</Item>
-              </Issue>
-              <Issue>
-               <Item>UserProfileManager.ParseXMLRPC(String):String</Item>
-               <Item>System.Single.ToString</Item>
-               <Item>System.Single.ToString(System.IFormatProvider)</Item>
-              </Issue>
-              <Issue>
-               <Item>UserProfileManager.ParseXMLRPC(String):String</Item>
-               <Item>System.Single.ToString</Item>
-               <Item>System.Single.ToString(System.IFormatProvider)</Item>
-              </Issue>
-              <Issue>
-               <Item>UserProfileManager.ParseXMLRPC(String):String</Item>
-               <Item>System.Single.ToString</Item>
-               <Item>System.Single.ToString(System.IFormatProvider)</Item>
-              </Issue>
-              <Issue>
-               <Item>UserProfileManager.ParseXMLRPC(String):String</Item>
-               <Item>System.Single.ToString</Item>
-               <Item>System.Single.ToString(System.IFormatProvider)</Item>
-              </Issue>
-              <Issue>
-               <Item>UserProfileManager.ParseXMLRPC(String):String</Item>
-               <Item>System.Single.ToString</Item>
-               <Item>System.Single.ToString(System.IFormatProvider)</Item>
-              </Issue>
-              <Issue>
-               <Item>UserProfileManager.ParseXMLRPC(String):String</Item>
-               <Item>System.Single.ToString</Item>
-               <Item>System.Single.ToString(System.IFormatProvider)</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="SetKeys(System.String,System.String,System.String,System.String):System.Void">
-            <Messages>
-             <Message Id="1#recv" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>UserProfileManager.SetKeys(String, String, String, String):Void</Item>
-               <Item>recv</Item>
-               <Item>recvKey</Item>
-              </Issue>
-             </Message>
-             <Message Id="2#" TypeName="UriParametersShouldNotBeStrings" Category="Microsoft.Design" CheckId="CA1054" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>url</Item>
-               <Item>UserProfileManager.SetKeys(String, String, String, String):Void</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="UserProfileManagerBase">
-          <Members>
-           <Member Name="AuthenticateUser(System.String,System.String,System.String):System.Boolean">
-            <Messages>
-             <Message Id="0#firstname" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>UserProfileManagerBase.AuthenticateUser(String, String, String):Boolean</Item>
-               <Item>firstname</Item>
-               <Item>firstname</Item>
-              </Issue>
-             </Message>
-             <Message Id="1#lastname" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>UserProfileManagerBase.AuthenticateUser(String, String, String):Boolean</Item>
-               <Item>lastname</Item>
-               <Item>lastname</Item>
-              </Issue>
-             </Message>
-             <Message Id="2#passwd" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>UserProfileManagerBase.AuthenticateUser(String, String, String):Boolean</Item>
-               <Item>passwd</Item>
-               <Item>passwd</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="CreateNewProfile(System.String,System.String,System.String):OpenSim.Framework.User.UserProfile">
-            <Messages>
-             <Message Id="2#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>MD5passwd</Item>
-              </Issue>
-             </Message>
-             <Message Id="0#firstname" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>UserProfileManagerBase.CreateNewProfile(String, String, String):UserProfile</Item>
-               <Item>firstname</Item>
-               <Item>firstname</Item>
-              </Issue>
-             </Message>
-             <Message Id="1#lastname" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>UserProfileManagerBase.CreateNewProfile(String, String, String):UserProfile</Item>
-               <Item>lastname</Item>
-               <Item>lastname</Item>
-              </Issue>
-             </Message>
-             <Message Id="2#M" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>UserProfileManagerBase.CreateNewProfile(String, String, String):UserProfile</Item>
-               <Item>M</Item>
-               <Item>MD5passwd</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="GetProfileByLLUUID(libsecondlife.LLUUID):OpenSim.Framework.User.UserProfile">
-            <Messages>
-             <Message Id="0#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>ProfileLLUUID</Item>
-              </Issue>
-             </Message>
-             <Message Id="0#" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>ProfileLLUUID</Item>
-              </Issue>
-             </Message>
-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>UserProfileManagerBase.GetProfileByLLUUID(LLUUID):UserProfile</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="GetProfileByName(System.String,System.String):OpenSim.Framework.User.UserProfile">
-            <Messages>
-             <Message Id="0#firstname" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>UserProfileManagerBase.GetProfileByName(String, String):UserProfile</Item>
-               <Item>firstname</Item>
-               <Item>firstname</Item>
-              </Issue>
-             </Message>
-             <Message Id="1#lastname" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>UserProfileManagerBase.GetProfileByName(String, String):UserProfile</Item>
-               <Item>lastname</Item>
-               <Item>lastname</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="GetUsersInventory(libsecondlife.LLUUID):OpenSim.Framework.Inventory.AgentInventory">
-            <Messages>
-             <Message Id="0#" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2007-03-27 04:29:04Z">
-              <Issue Name="ParameterId">
-               <Item>ID</Item>
-               <Item>agentID</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="SetGod(libsecondlife.LLUUID):System.Void">
-            <Messages>
-             <Message Id="0#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>GodID</Item>
-              </Issue>
-             </Message>
-             <Message Id="0#" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2007-03-27 04:29:04Z">
-              <Issue Name="ParameterId">
-               <Item>ID</Item>
-               <Item>GodID</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="UserProfiles">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>UserProfiles</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-        </Types>
-       </Namespace>
-       <Namespace Name="OpenSim.Framework.Utilities">
-        <Types>
-         <Type Name="BlockingQueue`1">
-          <Messages>
-           <Message TypeName="IdentifiersShouldNotHaveIncorrectSuffix" Category="Microsoft.Naming" CheckId="CA1711" Created="2007-03-27 04:29:04Z">
-            <Issue>
-             <Item>OpenSim.Framework.Utilities.BlockingQueue`1</Item>
-             <Item>Queue</Item>
-            </Issue>
-           </Message>
-          </Messages>
-         </Type>
-         <Type Name="Util">
-          <Messages>
-           <Message Id="Util" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-            <Issue Name="Type">
-             <Item>Util</Item>
-             <Item>OpenSim.Framework.Utilities.Util</Item>
-            </Issue>
-           </Message>
-           <Message TypeName="StaticHolderTypesShouldNotHaveConstructors" Category="Microsoft.Design" CheckId="CA1053" Created="2007-03-27 04:29:04Z">
-            <Issue>
-             <Item>Util</Item>
-            </Issue>
-           </Message>
-           <Message TypeName="TypeNamesShouldNotMatchNamespaces" Category="Microsoft.Naming" CheckId="CA1724" Created="2007-03-27 04:29:04Z">
-            <Issue>
-             <Item>Util</Item>
-             <Item>System.Web.Util</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="GetNextXferID():System.UInt32">
-            <Messages>
-             <Message Id="Xfer" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>Xfer</Item>
-               <Item>Util.GetNextXferID():UInt32</Item>
-              </Issue>
-             </Message>
-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2007-03-27 04:29:04Z">
-              <Issue Name="MemberId">
-               <Item>Util.GetNextXferID():UInt32</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>GetNextXferID</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="UIntsToLong(System.UInt32,System.UInt32):System.UInt64">
-            <Messages>
-             <Message Id="0#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>X</Item>
-              </Issue>
-             </Message>
-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>Y</Item>
-              </Issue>
-             </Message>
-             <Message Id="0#X" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="ParameterOneLetter">
-               <Item>Util.UIntsToLong(UInt32, UInt32):UInt64</Item>
-               <Item>X</Item>
-              </Issue>
-             </Message>
-             <Message Id="1#Y" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="ParameterOneLetter">
-               <Item>Util.UIntsToLong(UInt32, UInt32):UInt64</Item>
-               <Item>Y</Item>
-              </Issue>
-             </Message>
-             <Message Id="Ints" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>Ints</Item>
-               <Item>Util.UIntsToLong(UInt32, UInt32):UInt64</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-        </Types>
-       </Namespace>
-      </Namespaces>
-     </Module>
-    </Modules>
-   </Target>
-   <Target Name="$(ProjectDir)/bin/OpenSim.GridInterfaces.Local.dll">
-    <Modules>
-     <Module Name="opensim.gridinterfaces.local.dll">
-      <Messages>
-       <Message TypeName="AssembliesShouldDeclareMinimumSecurity" Category="Microsoft.Usage" CheckId="CA2209" Created="2007-03-27 04:29:04Z">
-        <Issue>
-         <Item>OpenSim.GridInterfaces.Local</Item>
-        </Issue>
-       </Message>
-       <Message TypeName="AssembliesShouldHaveValidStrongNames" Category="Microsoft.Design" CheckId="CA2210" Created="2007-03-27 04:29:04Z">
-        <Issue Name="NoStrongName">
-         <Item>OpenSim.GridInterfaces.Local</Item>
-        </Issue>
-       </Message>
-       <Message TypeName="MarkAssembliesWithClsCompliant" Category="Microsoft.Design" CheckId="CA1014" Created="2007-03-27 04:29:04Z">
-        <Issue Name="NoAttr">
-         <Item>OpenSim.GridInterfaces.Local</Item>
-        </Issue>
-       </Message>
-      </Messages>
-      <Namespaces>
-       <Namespace Name="OpenSim.GridInterfaces.Local">
-        <Types>
-         <Type Name="AssetStorage">
-          <Members>
-           <Member Name="Data">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>Data</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="Name">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>Name</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="Type">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>Type</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="UUID">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>UUID</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="AssetUUIDQuery">
-          <Messages>
-           <Message TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2007-03-27 04:29:04Z">
-            <Issue Name="Type">
-             <Item>AssetUUIDQuery</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="Match(OpenSim.GridInterfaces.Local.AssetStorage):System.Boolean">
-            <Messages>
-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>'asset'</Item>
-               <Item>AssetUUIDQuery.Match(AssetStorage):Boolean</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="LocalAssetPlugin">
-          <Messages>
-           <Message Id="Plugin" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-            <Issue Name="Type">
-             <Item>Plugin</Item>
-             <Item>OpenSim.GridInterfaces.Local.LocalAssetPlugin</Item>
-            </Issue>
-           </Message>
-          </Messages>
-         </Type>
-         <Type Name="LocalAssetServer">
-          <Members>
-           <Member Name=".ctor()">
-            <Messages>
-             <Message TypeName="DoNotCatchGeneralExceptionTypes" Category="Microsoft.Design" CheckId="CA1031" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>LocalAssetServer.LocalAssetServer()</Item>
-               <Item>System.Exception</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="LoadAsset(OpenSim.Framework.Assets.AssetBase,System.Boolean,System.String):System.Void">
-            <Messages>
-             <Message TypeName="MarkMembersAsStatic" Category="Microsoft.Performance" CheckId="CA1822" Created="2007-03-27 04:29:04Z" FixCategory="NonBreaking">
-              <Issue>
-               <Item>LocalAssetServer.LoadAsset(AssetBase, Boolean, String):Void</Item>
-              </Issue>
-             </Message>
-             <Message Id="image" TypeName="ReviewUnusedParameters" Category="Microsoft.Usage" CheckId="CA1801" Created="2007-03-27 04:29:04Z" FixCategory="NonBreaking">
-              <Issue>
-               <Item>image</Item>
-               <Item>LocalAssetServer.LoadAsset(AssetBase, Boolean, String):Void</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="UploadNewAsset(OpenSim.Framework.Assets.AssetBase):System.Void">
-            <Messages>
-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>'asset'</Item>
-               <Item>LocalAssetServer.UploadNewAsset(AssetBase):Void</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="LocalGridPlugin">
-          <Messages>
-           <Message Id="Plugin" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-            <Issue Name="Type">
-             <Item>Plugin</Item>
-             <Item>OpenSim.GridInterfaces.Local.LocalGridPlugin</Item>
-            </Issue>
-           </Message>
-          </Messages>
-         </Type>
-         <Type Name="LocalGridServer">
-          <Members>
-           <Member Name="LogoutSession(libsecondlife.LLUUID,libsecondlife.LLUUID,System.UInt32):System.Boolean">
-            <Messages>
-             <Message Id="Logout" TypeName="UsePreferredTerms" Category="Microsoft.Naming" CheckId="CA1726" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>Logout</Item>
-               <Item>LogoutSession</Item>
-               <Item>LogOff</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="Sessions">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>Sessions</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>System.Collections.Generic.List`1&lt;OpenSim.Framework.Interfaces.Login&gt;</Item>
-               <Item>LocalGridServer.Sessions</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-        </Types>
-       </Namespace>
-      </Namespaces>
-     </Module>
-    </Modules>
-   </Target>
-   <Target Name="$(ProjectDir)/bin/OpenSim.GridInterfaces.Remote.dll">
-    <Modules>
-     <Module Name="opensim.gridinterfaces.remote.dll">
-      <Messages>
-       <Message TypeName="AssembliesShouldDeclareMinimumSecurity" Category="Microsoft.Usage" CheckId="CA2209" Created="2007-03-27 04:29:04Z">
-        <Issue>
-         <Item>OpenSim.GridInterfaces.Remote</Item>
-        </Issue>
-       </Message>
-       <Message TypeName="AssembliesShouldHaveValidStrongNames" Category="Microsoft.Design" CheckId="CA2210" Created="2007-03-27 04:29:04Z">
-        <Issue Name="NoStrongName">
-         <Item>OpenSim.GridInterfaces.Remote</Item>
-        </Issue>
-       </Message>
-       <Message TypeName="MarkAssembliesWithClsCompliant" Category="Microsoft.Design" CheckId="CA1014" Created="2007-03-27 04:29:04Z">
-        <Issue Name="NoAttr">
-         <Item>OpenSim.GridInterfaces.Remote</Item>
-        </Issue>
-       </Message>
-      </Messages>
-      <Namespaces>
-       <Namespace Name="OpenSim.GridInterfaces.Remote">
-        <Types>
-         <Type Name="RemoteAssetPlugin">
-          <Messages>
-           <Message Id="Plugin" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-            <Issue Name="Type">
-             <Item>Plugin</Item>
-             <Item>OpenSim.GridInterfaces.Remote.RemoteAssetPlugin</Item>
-            </Issue>
-           </Message>
-          </Messages>
-         </Type>
-         <Type Name="RemoteGridPlugin">
-          <Messages>
-           <Message Id="Plugin" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-            <Issue Name="Type">
-             <Item>Plugin</Item>
-             <Item>OpenSim.GridInterfaces.Remote.RemoteGridPlugin</Item>
-            </Issue>
-           </Message>
-          </Messages>
-         </Type>
-         <Type Name="RemoteGridServer">
-          <Members>
-           <Member Name="agentcircuits">
-            <Messages>
-             <Message TypeName="CollectionPropertiesShouldBeReadOnly" Category="Microsoft.Usage" CheckId="CA2227" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>agentcircuits</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="AuthenticateSession(libsecondlife.LLUUID,libsecondlife.LLUUID,System.UInt32):OpenSim.Framework.Interfaces.AuthenticateResponse">
-            <Messages>
-             <Message Id="2#" TypeName="ParameterNamesShouldMatchBaseDeclaration" Category="Microsoft.Naming" CheckId="CA1725" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>circuitcode</Item>
-               <Item>RemoteGridServer.AuthenticateSession(LLUUID, LLUUID, UInt32):AuthenticateResponse</Item>
-               <Item>circuitCode</Item>
-               <Item>IGridServer.AuthenticateSession(LLUUID, LLUUID, UInt32):AuthenticateResponse</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="GridRecvKey">
-            <Messages>
-             <Message TypeName="AvoidUnusedPrivateFields" Category="Microsoft.Performance" CheckId="CA1823" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>RemoteGridServer.GridRecvKey</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="GridSendKey">
-            <Messages>
-             <Message TypeName="AvoidUnusedPrivateFields" Category="Microsoft.Performance" CheckId="CA1823" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>RemoteGridServer.GridSendKey</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="LogoutSession(libsecondlife.LLUUID,libsecondlife.LLUUID,System.UInt32):System.Boolean">
-            <Messages>
-             <Message TypeName="PassSystemUriObjectsInsteadOfStrings" Category="Microsoft.Usage" CheckId="CA2234" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>RemoteGridServer.LogoutSession(LLUUID, LLUUID, UInt32):Boolean</Item>
-               <Item>WebRequest.Create(Uri):WebRequest</Item>
-               <Item>WebRequest.Create(String):WebRequest</Item>
-              </Issue>
-             </Message>
-             <Message Id="GridResponse" TypeName="RemoveUnusedLocals" Category="Microsoft.Performance" CheckId="CA1804" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>RemoteGridServer.LogoutSession(LLUUID, LLUUID, UInt32):Boolean</Item>
-               <Item>GridResponse</Item>
-               <Item>System.String</Item>
-              </Issue>
-             </Message>
-             <Message Id="Logout" TypeName="UsePreferredTerms" Category="Microsoft.Naming" CheckId="CA1726" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>Logout</Item>
-               <Item>LogoutSession</Item>
-               <Item>LogOff</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>'sessionID'</Item>
-               <Item>RemoteGridServer.LogoutSession(LLUUID, LLUUID, UInt32):Boolean</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-        </Types>
-       </Namespace>
-      </Namespaces>
-     </Module>
-    </Modules>
-   </Target>
-   <Target Name="$(ProjectDir)/bin/OpenSim.Physics.Manager.dll">
-    <Modules>
-     <Module Name="opensim.physics.manager.dll">
-      <Messages>
-       <Message TypeName="AssembliesShouldDeclareMinimumSecurity" Category="Microsoft.Usage" CheckId="CA2209" Created="2007-03-27 04:29:04Z">
-        <Issue>
-         <Item>OpenSim.Physics.Manager</Item>
-        </Issue>
-       </Message>
-       <Message TypeName="AssembliesShouldHaveValidStrongNames" Category="Microsoft.Design" CheckId="CA2210" Created="2007-03-27 04:29:04Z">
-        <Issue Name="NoStrongName">
-         <Item>OpenSim.Physics.Manager</Item>
-        </Issue>
-       </Message>
-       <Message TypeName="MarkAssembliesWithClsCompliant" Category="Microsoft.Design" CheckId="CA1014" Created="2007-03-27 04:29:04Z">
-        <Issue Name="NoAttr">
-         <Item>OpenSim.Physics.Manager</Item>
-        </Issue>
-       </Message>
-      </Messages>
-      <Namespaces>
-       <Namespace Name="OpenSim.Physics.Manager">
-        <Types>
-         <Type Name="IPhysicsPlugin">
-          <Messages>
-           <Message Id="Plugin" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-            <Issue Name="Type">
-             <Item>Plugin</Item>
-             <Item>OpenSim.Physics.Manager.IPhysicsPlugin</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="GetName():System.String">
-            <Messages>
-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2007-03-27 04:29:04Z">
-              <Issue Certainty="50">
-               <Item>GetName</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="GetScene():OpenSim.Physics.Manager.PhysicsScene">
-            <Messages>
-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2007-03-27 04:29:04Z">
-              <Issue Certainty="50">
-               <Item>GetScene</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="NullPhysicsScene">
-          <Members>
-           <Member Name="SetTerrain(System.Single[]):System.Void">
-            <Messages>
-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>'heightMap'</Item>
-               <Item>NullPhysicsScene.SetTerrain(Single[]):Void</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="Simulate(System.Single):System.Void">
-            <Messages>
-             <Message Id="System.Int32.ToString" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>NullPhysicsScene.Simulate(Single):Void</Item>
-               <Item>System.Int32.ToString</Item>
-               <Item>System.Int32.ToString(System.IFormatProvider)</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="PhysicsActor">
-          <Members>
-           <Member Name="Kinematic">
-            <Messages>
-             <Message Id="Kinematic" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>Kinematic</Item>
-               <Item>PhysicsActor.Kinematic:Boolean</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="PhysicsManager">
-          <Members>
-           <Member Name="GetPhysicsScene(System.String):OpenSim.Physics.Manager.PhysicsScene">
-            <Messages>
-             <Message Id="System.String.Format(System.String,System.Object)" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>PhysicsManager.GetPhysicsScene(String):PhysicsScene</Item>
-               <Item>System.String.Format(System.String,System.Object)</Item>
-               <Item>System.String.Format(System.IFormatProvider,System.String,System.Object[])</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="LoadPlugins():System.Void">
-            <Messages>
-             <Message Id="Plugins" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>Plugins</Item>
-               <Item>PhysicsManager.LoadPlugins():Void</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="PhysicsVector">
-          <Members>
-           <Member Name=".ctor(System.Single,System.Single,System.Single)">
-            <Messages>
-             <Message Id="0#x" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="ParameterOneLetter">
-               <Item>PhysicsVector.PhysicsVector(Single, Single, Single)</Item>
-               <Item>x</Item>
-              </Issue>
-             </Message>
-             <Message Id="1#y" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="ParameterOneLetter">
-               <Item>PhysicsVector.PhysicsVector(Single, Single, Single)</Item>
-               <Item>y</Item>
-              </Issue>
-             </Message>
-             <Message Id="2#z" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="ParameterOneLetter">
-               <Item>PhysicsVector.PhysicsVector(Single, Single, Single)</Item>
-               <Item>z</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="X">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>X</Item>
-              </Issue>
-             </Message>
-             <Message Id="X" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="MemberOneLetter">
-               <Item>X</Item>
-               <Item>PhysicsVector.X</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="Y">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>Y</Item>
-              </Issue>
-             </Message>
-             <Message Id="Y" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="MemberOneLetter">
-               <Item>Y</Item>
-               <Item>PhysicsVector.Y</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="Z">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>Z</Item>
-              </Issue>
-             </Message>
-             <Message Id="Z" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="MemberOneLetter">
-               <Item>Z</Item>
-               <Item>PhysicsVector.Z</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="Zero">
-            <Messages>
-             <Message TypeName="DoNotDeclareReadOnlyMutableReferenceTypes" Category="Microsoft.Security" CheckId="CA2104" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>PhysicsVector.Zero</Item>
-               <Item>OpenSim.Physics.Manager.PhysicsVector</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-        </Types>
-       </Namespace>
-      </Namespaces>
-     </Module>
-    </Modules>
-   </Target>
-   <Target Name="$(ProjectDir)/bin/OpenSim.RegionServer.dll">
-    <Modules>
-     <Module Name="opensim.regionserver.dll">
-      <Messages>
-       <Message TypeName="AssembliesShouldDeclareMinimumSecurity" Category="Microsoft.Usage" CheckId="CA2209" Created="2007-03-27 04:29:04Z">
-        <Issue>
-         <Item>OpenSim.RegionServer</Item>
-        </Issue>
-       </Message>
-       <Message TypeName="AssembliesShouldHaveValidStrongNames" Category="Microsoft.Design" CheckId="CA2210" Created="2007-03-27 04:29:04Z">
-        <Issue Name="NoStrongName">
-         <Item>OpenSim.RegionServer</Item>
-        </Issue>
-       </Message>
-       <Message TypeName="MarkAssembliesWithAssemblyVersion" Category="Microsoft.Design" CheckId="CA1016" Created="2007-03-27 04:29:04Z">
-        <Issue>
-         <Item>OpenSim.RegionServer</Item>
-        </Issue>
-       </Message>
-       <Message TypeName="MarkAssembliesWithClsCompliant" Category="Microsoft.Design" CheckId="CA1014" Created="2007-03-27 04:29:04Z">
-        <Issue Name="NoAttr">
-         <Item>OpenSim.RegionServer</Item>
-        </Issue>
-       </Message>
-       <Message TypeName="MarkAssembliesWithComVisible" Category="Microsoft.Design" CheckId="CA1017" Created="2007-03-27 04:29:04Z">
-        <Issue Name="NoAttribute" Level="CriticalError">
-         <Item>OpenSim.RegionServer</Item>
-        </Issue>
-       </Message>
-      </Messages>
-      <Namespaces>
-       <Namespace Name="OpenSim">
-        <Types>
-         <Type Name="AgentAssetUpload">
-          <Members>
-           <Member Name="AddUpload(libsecondlife.LLUUID,OpenSim.Framework.Assets.AssetBase):System.Void">
-            <Messages>
-             <Message Id="0#" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2007-03-27 04:29:04Z">
-              <Issue Name="ParameterId">
-               <Item>ID</Item>
-               <Item>transactionID</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="AddUploadToAssetCache(libsecondlife.LLUUID):OpenSim.Framework.Assets.AssetBase">
-            <Messages>
-             <Message Id="0#" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2007-03-27 04:29:04Z">
-              <Issue Name="ParameterId">
-               <Item>ID</Item>
-               <Item>transactionID</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="GetUpload(libsecondlife.LLUUID):OpenSim.Framework.Assets.AssetBase">
-            <Messages>
-             <Message Id="0#" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2007-03-27 04:29:04Z">
-              <Issue Name="ParameterId">
-               <Item>ID</Item>
-               <Item>transactionID</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="HandleUploadPacket(libsecondlife.Packets.AssetUploadRequestPacket,libsecondlife.LLUUID):System.Void">
-            <Messages>
-             <Message Id="1#" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2007-03-27 04:29:04Z">
-              <Issue Name="ParameterId">
-               <Item>ID</Item>
-               <Item>assetID</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-             <Message Id="System.Int32.ToString(System.String)" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>AgentAssetUpload.HandleUploadPacket(AssetUploadRequestPacket, LLUUID):Void</Item>
-               <Item>System.Int32.ToString(System.String)</Item>
-               <Item>System.Int32.ToString(System.String,System.IFormatProvider)</Item>
-              </Issue>
-              <Issue>
-               <Item>AgentAssetUpload.HandleUploadPacket(AssetUploadRequestPacket, LLUUID):Void</Item>
-               <Item>System.Int32.ToString(System.String)</Item>
-               <Item>System.Int32.ToString(System.String,System.IFormatProvider)</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>'assetID'</Item>
-               <Item>AgentAssetUpload.HandleUploadPacket(AssetUploadRequestPacket, LLUUID):Void</Item>
-              </Issue>
-              <Issue>
-               <Item>'pack'</Item>
-               <Item>AgentAssetUpload.HandleUploadPacket(AssetUploadRequestPacket, LLUUID):Void</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="HandleXferPacket(libsecondlife.Packets.SendXferPacketPacket):System.Void">
-            <Messages>
-             <Message Id="0#xfer" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>AgentAssetUpload.HandleXferPacket(SendXferPacketPacket):Void</Item>
-               <Item>xfer</Item>
-               <Item>xferPacket</Item>
-              </Issue>
-             </Message>
-             <Message Id="Xfer" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>Xfer</Item>
-               <Item>AgentAssetUpload.HandleXferPacket(SendXferPacketPacket):Void</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="AssetTransaction">
-          <Members>
-           <Member Name=".ctor()">
-            <Messages>
-             <Message TypeName="DoNotInitializeUnnecessarily" Category="Microsoft.Performance" CheckId="CA1805" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>AssetTransaction.AssetTransaction()</Item>
-               <Item>UploadComplete</Item>
-               <Item>System.Boolean</Item>
-               <Item>false</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="AddToInventory">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>AddToInventory</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="Asset">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>Asset</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="InventFolder">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>InventFolder</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="TransactionID">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>TransactionID</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="UploadComplete">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>UploadComplete</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="XferID">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>XferID</Item>
-              </Issue>
-             </Message>
-             <Message Id="Xfer" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>Xfer</Item>
-               <Item>AssetTransaction.XferID</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="Grid">
-          <Messages>
-           <Message TypeName="TypeNamesShouldNotMatchNamespaces" Category="Microsoft.Naming" CheckId="CA1724" Created="2007-03-27 04:29:04Z">
-            <Issue>
-             <Item>Grid</Item>
-             <Item>OpenSim.Framework.Grid</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="AssetDll">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>AssetDll</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="AssetServer">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>AssetServer</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="GridDll">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>GridDll</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="GridServer">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>GridServer</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="Initialise():System.Void">
-            <Messages>
-             <Message Id="Initialise" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>Initialise</Item>
-               <Item>Grid.Initialise():Void</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="LoadAssetDll(System.String):OpenSim.Framework.Interfaces.IAssetServer">
-            <Messages>
-             <Message TypeName="MarkMembersAsStatic" Category="Microsoft.Performance" CheckId="CA1822" Created="2007-03-27 04:29:04Z" FixCategory="NonBreaking">
-              <Issue>
-               <Item>Grid.LoadAssetDll(String):IAssetServer</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="LoadGridDll(System.String):OpenSim.Framework.Interfaces.IGridServer">
-            <Messages>
-             <Message TypeName="MarkMembersAsStatic" Category="Microsoft.Performance" CheckId="CA1822" Created="2007-03-27 04:29:04Z" FixCategory="NonBreaking">
-              <Issue>
-               <Item>Grid.LoadGridDll(String):IGridServer</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="OpenSimApplication">
-          <Messages>
-           <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-            <Issue Name="Type">
-             <Item>Sim</Item>
-             <Item>OpenSim.OpenSimApplication</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="RemoveClientCircuit(System.UInt32):System.Void">
-            <Messages>
-             <Message Id="0#circuitcode" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>OpenSimApplication.RemoveClientCircuit(UInt32):Void</Item>
-               <Item>circuitcode</Item>
-               <Item>circuitcode</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="SendPacketTo(System.Byte[],System.Int32,System.Net.Sockets.SocketFlags,System.UInt32):System.Void">
-            <Messages>
-             <Message Id="3#circuitcode" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>OpenSimApplication.SendPacketTo(Byte[], Int32, SocketFlags, UInt32):Void</Item>
-               <Item>circuitcode</Item>
-               <Item>circuitcode</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="StartUp():System.Void">
-            <Messages>
-             <Message Id="StartUp" TypeName="CompoundWordsShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1702" Created="2007-03-27 04:29:04Z">
-              <Issue Name="ShouldBeDiscreteTerm">
-               <Item>StartUp</Item>
-               <Item>method</Item>
-               <Item>StartUp</Item>
-               <Item>Startup</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="OpenSimMain">
-          <Messages>
-           <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-            <Issue Name="Type">
-             <Item>Sim</Item>
-             <Item>OpenSim.OpenSimMain</Item>
-            </Issue>
-           </Message>
-           <Message TypeName="TypesThatOwnDisposableFieldsShouldBeDisposable" Category="Microsoft.Design" CheckId="CA1001" Created="2007-03-27 04:29:04Z" FixCategory="Breaking">
-            <Issue>
-             <Item>OpenSim.OpenSimMain</Item>
-             <Item>System.Timers.Timer, System.Net.Sockets.Socket</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name=".ctor()">
-            <Messages>
-             <Message TypeName="DoNotInitializeUnnecessarily" Category="Microsoft.Performance" CheckId="CA1805" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>OpenSimMain.OpenSimMain()</Item>
-               <Item>loginserver</Item>
-               <Item>System.Boolean</Item>
-               <Item>false</Item>
-              </Issue>
-              <Issue>
-               <Item>OpenSimMain.OpenSimMain()</Item>
-               <Item>sandbox</Item>
-               <Item>System.Boolean</Item>
-               <Item>false</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="_physicsEngine">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>_physicsEngine</Item>
-              </Issue>
-             </Message>
-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>_physicsEngine</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="LoadConfigDll(System.String):OpenSim.Framework.Interfaces.SimConfig">
-            <Messages>
-             <Message TypeName="MarkMembersAsStatic" Category="Microsoft.Performance" CheckId="CA1822" Created="2007-03-27 04:29:04Z" FixCategory="NonBreaking">
-              <Issue>
-               <Item>OpenSimMain.LoadConfigDll(String):SimConfig</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="loginserver">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>loginserver</Item>
-              </Issue>
-             </Message>
-             <Message Id="loginserver" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>loginserver</Item>
-               <Item>OpenSimMain.loginserver</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="sandbox">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>sandbox</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="Server">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>Server</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="StartUp():System.Void">
-            <Messages>
-             <Message TypeName="DoNotUseTimersThatPreventPowerStateChanges" Category="Microsoft.Mobility" CheckId="CA1601" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>Timer.set_Interval(Double):Void</Item>
-               <Item>OpenSimMain.StartUp():Void</Item>
-              </Issue>
-             </Message>
-             <Message Id="System.UInt32.ToString" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>OpenSimMain.StartUp():Void</Item>
-               <Item>System.UInt32.ToString</Item>
-               <Item>System.UInt32.ToString(System.IFormatProvider)</Item>
-              </Issue>
-              <Issue>
-               <Item>OpenSimMain.StartUp():Void</Item>
-               <Item>System.UInt32.ToString</Item>
-               <Item>System.UInt32.ToString(System.IFormatProvider)</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="OpenSimRoot">
-          <Messages>
-           <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-            <Issue Name="Type">
-             <Item>Sim</Item>
-             <Item>OpenSim.OpenSimRoot</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name=".ctor()">
-            <Messages>
-             <Message TypeName="DoNotInitializeUnnecessarily" Category="Microsoft.Performance" CheckId="CA1805" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>OpenSimRoot.OpenSimRoot()</Item>
-               <Item>Sandbox</Item>
-               <Item>System.Boolean</Item>
-               <Item>false</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="Application">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>Application</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="AssetCache">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>AssetCache</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="Cfg">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>Cfg</Item>
-              </Issue>
-             </Message>
-             <Message Id="Cfg" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>Cfg</Item>
-               <Item>OpenSimRoot.Cfg</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="ClientThreads">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>ClientThreads</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="GridServers">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>GridServers</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="HttpServer">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>HttpServer</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="InventoryCache">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>InventoryCache</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="LocalWorld">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>LocalWorld</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="Sandbox">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>Sandbox</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="StartUp():System.Void">
-            <Messages>
-             <Message Id="StartUp" TypeName="CompoundWordsShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1702" Created="2007-03-27 04:29:04Z">
-              <Issue Name="ShouldBeDiscreteTerm">
-               <Item>StartUp</Item>
-               <Item>method</Item>
-               <Item>StartUp</Item>
-               <Item>Startup</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="startuptime">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>startuptime</Item>
-              </Issue>
-             </Message>
-             <Message Id="startuptime" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>startuptime</Item>
-               <Item>OpenSimRoot.startuptime</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="QueItem">
-          <Messages>
-           <Message Id="Que" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-            <Issue Name="Type">
-             <Item>Que</Item>
-             <Item>OpenSim.QueItem</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="Incoming">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>Incoming</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="Packet">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>Packet</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="SimClient">
-          <Messages>
-           <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-            <Issue Name="Type">
-             <Item>Sim</Item>
-             <Item>OpenSim.SimClient</Item>
-            </Issue>
-           </Message>
-           <Message TypeName="TypesThatOwnDisposableFieldsShouldBeDisposable" Category="Microsoft.Design" CheckId="CA1001" Created="2007-03-27 04:29:04Z" FixCategory="Breaking">
-            <Issue>
-             <Item>OpenSim.SimClient</Item>
-             <Item>System.Timers.Timer</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name=".ctor(System.Net.EndPoint,libsecondlife.Packets.UseCircuitCodePacket)">
-            <Messages>
-             <Message TypeName="DoNotInitializeUnnecessarily" Category="Microsoft.Performance" CheckId="CA1805" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>SimClient.SimClient(EndPoint, UseCircuitCodePacket)</Item>
-               <Item>Sequence</Item>
-               <Item>System.UInt32</Item>
-               <Item>0</Item>
-              </Issue>
-              <Issue>
-               <Item>SimClient.SimClient(EndPoint, UseCircuitCodePacket)</Item>
-               <Item>debug</Item>
-               <Item>System.Boolean</Item>
-               <Item>false</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="DoNotUseTimersThatPreventPowerStateChanges" Category="Microsoft.Mobility" CheckId="CA1601" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>Timer.Timer(Double)</Item>
-               <Item>SimClient.SimClient(EndPoint, UseCircuitCodePacket)</Item>
-              </Issue>
-             </Message>
-             <Message Id="1#initialcirpack" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>SimClient.SimClient(EndPoint, UseCircuitCodePacket)</Item>
-               <Item>initialcirpack</Item>
-               <Item>initialcirpack</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="AgentID">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>AgentID</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="CircuitCode">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>CircuitCode</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="ClientAvatar">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>ClientAvatar</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="InPacket(libsecondlife.Packets.Packet):System.Void">
-            <Messages>
-             <Message Id="0#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>NewPack</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="newAssetFolder">
-            <Messages>
-             <Message TypeName="AvoidUnusedPrivateFields" Category="Microsoft.Performance" CheckId="CA1823" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>SimClient.newAssetFolder</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="OutPacket(libsecondlife.Packets.Packet):System.Void">
-            <Messages>
-             <Message Id="0#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>NewPack</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="ProcessInPacket(libsecondlife.Packets.Packet):System.Void">
-            <Messages>
-             <Message Id="0#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>Pack</Item>
-              </Issue>
-             </Message>
-             <Message Id="wear" TypeName="RemoveUnusedLocals" Category="Microsoft.Performance" CheckId="CA1804" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>SimClient.ProcessInPacket(Packet):Void</Item>
-               <Item>wear</Item>
-               <Item>libsecondlife.Packets.AgentIsNowWearingPacket</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="TestForEmptyStringsUsingStringLength" Category="Microsoft.Performance" CheckId="CA1820" Created="2007-03-27 04:29:04Z">
-              <Issue Name="IsNullOrEmpty">
-               <Item>op_Equality</Item>
-               <Item>""</Item>
-               <Item>SimClient.ProcessInPacket(Packet):Void</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="ProcessOutPacket(libsecondlife.Packets.Packet):System.Void">
-            <Messages>
-             <Message TypeName="DoNotCatchGeneralExceptionTypes" Category="Microsoft.Design" CheckId="CA1031" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>SimClient.ProcessOutPacket(Packet):Void</Item>
-               <Item>System.Exception</Item>
-              </Issue>
-             </Message>
-             <Message Id="0#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>Pack</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="SecureSessionID">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>SecureSessionID</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="SessionID">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>SessionID</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="userEP">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>userEP</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="SimConsole">
-          <Messages>
-           <Message TypeName="ComVisibleTypeBaseTypesShouldBeComVisible" Category="Microsoft.Interoperability" CheckId="CA1405" Created="2007-03-27 04:29:04Z">
-            <Issue>
-             <Item>OpenSim.SimConsole</Item>
-             <Item> OpenSim.Framework.Console.ConsoleBase</Item>
-            </Issue>
-           </Message>
-           <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-            <Issue Name="Type">
-             <Item>Sim</Item>
-             <Item>OpenSim.SimConsole</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name=".ctor(OpenSim.Framework.Console.ConsoleBase+ConsoleType,System.String,System.Int32)">
-            <Messages>
-             <Message Id="0#constype" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>SimConsole.SimConsole(ConsoleType, String, Int32)</Item>
-               <Item>constype</Item>
-               <Item>constype</Item>
-              </Issue>
-             </Message>
-             <Message Id="1#sparam" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>SimConsole.SimConsole(ConsoleType, String, Int32)</Item>
-               <Item>sparam</Item>
-               <Item>sparam</Item>
-              </Issue>
-             </Message>
-             <Message Id="2#iparam" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>SimConsole.SimConsole(ConsoleType, String, Int32)</Item>
-               <Item>iparam</Item>
-               <Item>iparam</Item>
-              </Issue>
-             </Message>
-             <Message Id="iparam" TypeName="ReviewUnusedParameters" Category="Microsoft.Usage" CheckId="CA1801" Created="2007-03-27 04:29:04Z" FixCategory="Breaking">
-              <Issue>
-               <Item>iparam</Item>
-               <Item>SimConsole.SimConsole(ConsoleType, String, Int32)</Item>
-              </Issue>
-             </Message>
-             <Message Id="sparam" TypeName="ReviewUnusedParameters" Category="Microsoft.Usage" CheckId="CA1801" Created="2007-03-27 04:29:04Z" FixCategory="Breaking">
-              <Issue>
-               <Item>sparam</Item>
-               <Item>SimConsole.SimConsole(ConsoleType, String, Int32)</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="CmdPrompt(System.String,System.String):System.String">
-            <Messages>
-             <Message TypeName="TestForEmptyStringsUsingStringLength" Category="Microsoft.Performance" CheckId="CA1820" Created="2007-03-27 04:29:04Z">
-              <Issue Name="IsNullOrEmpty">
-               <Item>op_Equality</Item>
-               <Item>""</Item>
-               <Item>SimConsole.CmdPrompt(String, String):String</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="ConsType">
-            <Messages>
-             <Message TypeName="AvoidUnusedPrivateFields" Category="Microsoft.Performance" CheckId="CA1823" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>SimConsole.ConsType</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="MainConsolePrompt():System.Void">
-            <Messages>
-             <Message Id="System.UInt64.ToString" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>SimConsole.MainConsolePrompt():Void</Item>
-               <Item>System.UInt64.ToString</Item>
-               <Item>System.UInt64.ToString(System.IFormatProvider)</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="RunCmd(System.String,System.String[]):System.Object">
-            <Messages>
-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>'cmdparams'</Item>
-               <Item>SimConsole.RunCmd(String, String[]):Object</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="ShowCommands(System.String):System.Void">
-            <Messages>
-             <Message Id="System.String.Format(System.String,System.Object[])" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>SimConsole.ShowCommands(String):Void</Item>
-               <Item>System.String.Format(System.String,System.Object[])</Item>
-               <Item>System.String.Format(System.IFormatProvider,System.String,System.Object[])</Item>
-              </Issue>
-              <Issue>
-               <Item>SimConsole.ShowCommands(String):Void</Item>
-               <Item>System.String.Format(System.String,System.Object[])</Item>
-               <Item>System.String.Format(System.IFormatProvider,System.String,System.Object[])</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="VersionInfo">
-          <Members>
-           <Member Name="Version">
-            <Messages>
-             <Message TypeName="NonConstantFieldsShouldNotBeVisible" Category="Microsoft.Usage" CheckId="CA2211" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>Version</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-        </Types>
-       </Namespace>
-       <Namespace Name="OpenSim.Assets">
-        <Types>
-         <Type Name="AssetCache">
-          <Members>
-           <Member Name="AddTextureRequest(OpenSim.SimClient,libsecondlife.LLUUID):System.Void">
-            <Messages>
-             <Message Id="1#" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2007-03-27 04:29:04Z">
-              <Issue Name="ParameterId">
-               <Item>ID</Item>
-               <Item>imageID</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="AssetRequests">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>AssetRequests</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>System.Collections.Generic.List`1&lt;OpenSim.Assets.AssetRequest&gt;</Item>
-               <Item>AssetCache.AssetRequests</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="Assets">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>Assets</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="CloneAsset(libsecondlife.LLUUID,OpenSim.Assets.AssetInfo):OpenSim.Assets.AssetInfo">
-            <Messages>
-             <Message TypeName="ConsiderPassingBaseTypesAsParameters" Category="Microsoft.Design" CheckId="CA1011" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>sourceAsset</Item>
-               <Item>AssetCache.CloneAsset(LLUUID, AssetInfo):AssetInfo</Item>
-               <Item>OpenSim.Assets.AssetInfo</Item>
-               <Item>OpenSim.Framework.Assets.AssetBase</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="MarkMembersAsStatic" Category="Microsoft.Performance" CheckId="CA1822" Created="2007-03-27 04:29:04Z" FixCategory="Breaking">
-              <Issue>
-               <Item>AssetCache.CloneAsset(LLUUID, AssetInfo):AssetInfo</Item>
-              </Issue>
-             </Message>
-             <Message Id="newOwner" TypeName="ReviewUnusedParameters" Category="Microsoft.Usage" CheckId="CA1801" Created="2007-03-27 04:29:04Z" FixCategory="Breaking">
-              <Issue>
-               <Item>newOwner</Item>
-               <Item>AssetCache.CloneAsset(LLUUID, AssetInfo):AssetInfo</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>'sourceAsset'</Item>
-               <Item>AssetCache.CloneAsset(LLUUID, AssetInfo):AssetInfo</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="CloneImage(libsecondlife.LLUUID,OpenSim.Assets.TextureImage):OpenSim.Assets.TextureImage">
-            <Messages>
-             <Message TypeName="ConsiderPassingBaseTypesAsParameters" Category="Microsoft.Design" CheckId="CA1011" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>source</Item>
-               <Item>AssetCache.CloneImage(LLUUID, TextureImage):TextureImage</Item>
-               <Item>OpenSim.Assets.TextureImage</Item>
-               <Item>OpenSim.Framework.Assets.AssetBase</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="MarkMembersAsStatic" Category="Microsoft.Performance" CheckId="CA1822" Created="2007-03-27 04:29:04Z" FixCategory="Breaking">
-              <Issue>
-               <Item>AssetCache.CloneImage(LLUUID, TextureImage):TextureImage</Item>
-              </Issue>
-             </Message>
-             <Message Id="newOwner" TypeName="ReviewUnusedParameters" Category="Microsoft.Usage" CheckId="CA1801" Created="2007-03-27 04:29:04Z" FixCategory="Breaking">
-              <Issue>
-               <Item>newOwner</Item>
-               <Item>AssetCache.CloneImage(LLUUID, TextureImage):TextureImage</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>'source'</Item>
-               <Item>AssetCache.CloneImage(LLUUID, TextureImage):TextureImage</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="CreateNewInventorySet(libsecondlife.LLUUID):OpenSim.Framework.Assets.AssetBase[]">
-            <Messages>
-             <Message Id="0#" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2007-03-27 04:29:04Z">
-              <Issue Name="ParameterId">
-               <Item>ID</Item>
-               <Item>agentID</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="GetAsset(libsecondlife.LLUUID):OpenSim.Framework.Assets.AssetBase">
-            <Messages>
-             <Message Id="0#" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2007-03-27 04:29:04Z">
-              <Issue Name="ParameterId">
-               <Item>ID</Item>
-               <Item>assetID</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="RequestedAssets">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>RequestedAssets</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="RequestedTextures">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>RequestedTextures</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="RunAssetManager():System.Void">
-            <Messages>
-             <Message TypeName="DoNotCatchGeneralExceptionTypes" Category="Microsoft.Design" CheckId="CA1031" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>AssetCache.RunAssetManager():Void</Item>
-               <Item>System.Exception</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="TextureRequests">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>TextureRequests</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>System.Collections.Generic.List`1&lt;OpenSim.Assets.AssetRequest&gt;</Item>
-               <Item>AssetCache.TextureRequests</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="Textures">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>Textures</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="AssetInfo">
-          <Messages>
-           <Message TypeName="ComVisibleTypeBaseTypesShouldBeComVisible" Category="Microsoft.Interoperability" CheckId="CA1405" Created="2007-03-27 04:29:04Z">
-            <Issue>
-             <Item>OpenSim.Assets.AssetInfo</Item>
-             <Item> OpenSim.Framework.Assets.AssetBase</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name=".ctor(OpenSim.Framework.Assets.AssetBase)">
-            <Messages>
-             <Message Id="0#a" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>AssetInfo.AssetInfo(AssetBase)</Item>
-               <Item>a</Item>
-               <Item>aBase</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>'aBase'</Item>
-               <Item>AssetInfo.AssetInfo(AssetBase)</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="AssetRequest">
-          <Members>
-           <Member Name=".ctor()">
-            <Messages>
-             <Message TypeName="DoNotInitializeUnnecessarily" Category="Microsoft.Performance" CheckId="CA1805" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>AssetRequest.AssetRequest()</Item>
-               <Item>DataPointer</Item>
-               <Item>System.Int64</Item>
-               <Item>0</Item>
-              </Issue>
-              <Issue>
-               <Item>AssetRequest.AssetRequest()</Item>
-               <Item>NumPackets</Item>
-               <Item>System.Int32</Item>
-               <Item>0</Item>
-              </Issue>
-              <Issue>
-               <Item>AssetRequest.AssetRequest()</Item>
-               <Item>PacketCounter</Item>
-               <Item>System.Int32</Item>
-               <Item>0</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="AssetInf">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>AssetInf</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="DataPointer">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>DataPointer</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="ImageInfo">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>ImageInfo</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="IsTextureRequest">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>IsTextureRequest</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="NumPackets">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>NumPackets</Item>
-              </Issue>
-             </Message>
-             <Message Id="Num" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>Num</Item>
-               <Item>AssetRequest.NumPackets</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="PacketCounter">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>PacketCounter</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="RequestAssetID">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>RequestAssetID</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="RequestUser">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>RequestUser</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="TransferRequestID">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>TransferRequestID</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="InventoryCache">
-          <Members>
-           <Member Name="AddNewInventoryItem(OpenSim.SimClient,libsecondlife.LLUUID,OpenSim.Framework.Assets.AssetBase):libsecondlife.LLUUID">
-            <Messages>
-             <Message Id="1#" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2007-03-27 04:29:04Z">
-              <Issue Name="ParameterId">
-               <Item>ID</Item>
-               <Item>folderID</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="ClientLeaving(libsecondlife.LLUUID):System.Void">
-            <Messages>
-             <Message Id="0#" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2007-03-27 04:29:04Z">
-              <Issue Name="ParameterId">
-               <Item>ID</Item>
-               <Item>clientID</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="CreateNewInventoryFolder(OpenSim.SimClient,libsecondlife.LLUUID):System.Boolean">
-            <Messages>
-             <Message Id="1#" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2007-03-27 04:29:04Z">
-              <Issue Name="ParameterId">
-               <Item>ID</Item>
-               <Item>folderID</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="CreateNewInventoryFolder(OpenSim.SimClient,libsecondlife.LLUUID,System.UInt16):System.Boolean">
-            <Messages>
-             <Message Id="1#" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2007-03-27 04:29:04Z">
-              <Issue Name="ParameterId">
-               <Item>ID</Item>
-               <Item>folderID</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="FetchInventory(OpenSim.SimClient,libsecondlife.Packets.FetchInventoryPacket):System.Void">
-            <Messages>
-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>FetchItems</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="FetchInventoryDescendents(OpenSim.SimClient,libsecondlife.Packets.FetchInventoryDescendentsPacket):System.Void">
-            <Messages>
-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>FetchDescend</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="GetAgentsInventory(libsecondlife.LLUUID):OpenSim.Framework.Inventory.AgentInventory">
-            <Messages>
-             <Message Id="0#" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2007-03-27 04:29:04Z">
-              <Issue Name="ParameterId">
-               <Item>ID</Item>
-               <Item>agentID</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="UpdateInventoryItem(OpenSim.SimClient,libsecondlife.LLUUID,OpenSim.Framework.Assets.AssetBase):System.Boolean">
-            <Messages>
-             <Message Id="1#" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2007-03-27 04:29:04Z">
-              <Issue Name="ParameterId">
-               <Item>ID</Item>
-               <Item>itemID</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="TextureImage">
-          <Messages>
-           <Message TypeName="ComVisibleTypeBaseTypesShouldBeComVisible" Category="Microsoft.Interoperability" CheckId="CA1405" Created="2007-03-27 04:29:04Z">
-            <Issue>
-             <Item>OpenSim.Assets.TextureImage</Item>
-             <Item> OpenSim.Framework.Assets.AssetBase</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name=".ctor(OpenSim.Framework.Assets.AssetBase)">
-            <Messages>
-             <Message Id="0#a" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>TextureImage.TextureImage(AssetBase)</Item>
-               <Item>a</Item>
-               <Item>aBase</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>'aBase'</Item>
-               <Item>TextureImage.TextureImage(AssetBase)</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-        </Types>
-       </Namespace>
-       <Namespace Name="OpenSim.CAPS">
-        <Types>
-         <Type Name="SimCAPSHTTPServer">
-          <Messages>
-           <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-            <Issue Name="Type">
-             <Item>Sim</Item>
-             <Item>OpenSim.CAPS.SimCAPSHTTPServer</Item>
-            </Issue>
-           </Message>
-           <Message TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2007-03-27 04:29:04Z">
-            <Issue Name="Type">
-             <Item>SimCAPSHTTPServer</Item>
-            </Issue>
-           </Message>
-           <Message TypeName="TypesThatOwnDisposableFieldsShouldBeDisposable" Category="Microsoft.Design" CheckId="CA1001" Created="2007-03-27 04:29:04Z" FixCategory="Breaking">
-            <Issue>
-             <Item>OpenSim.CAPS.SimCAPSHTTPServer</Item>
-             <Item>System.Net.HttpListener</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="HandleRequest(System.Object):System.Void">
-            <Messages>
-             <Message Id="0#stateinfo" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>SimCAPSHTTPServer.HandleRequest(Object):Void</Item>
-               <Item>stateinfo</Item>
-               <Item>stateinfo</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="HTTPD">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>HTTPD</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="Listener">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>Listener</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="LoadAdminPage():System.Void">
-            <Messages>
-             <Message TypeName="DoNotCatchGeneralExceptionTypes" Category="Microsoft.Design" CheckId="CA1031" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>SimCAPSHTTPServer.LoadAdminPage():Void</Item>
-               <Item>System.Exception</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="ParseLLSDXML(System.String):System.String">
-            <Messages>
-             <Message TypeName="MarkMembersAsStatic" Category="Microsoft.Performance" CheckId="CA1822" Created="2007-03-27 04:29:04Z" FixCategory="NonBreaking">
-              <Issue>
-               <Item>SimCAPSHTTPServer.ParseLLSDXML(String):String</Item>
-              </Issue>
-             </Message>
-             <Message Id="requestBody" TypeName="ReviewUnusedParameters" Category="Microsoft.Usage" CheckId="CA1801" Created="2007-03-27 04:29:04Z" FixCategory="NonBreaking">
-              <Issue>
-               <Item>requestBody</Item>
-               <Item>SimCAPSHTTPServer.ParseLLSDXML(String):String</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="ParseREST(System.String,System.String,System.String):System.String">
-            <Messages>
-             <Message TypeName="DoNotCatchGeneralExceptionTypes" Category="Microsoft.Design" CheckId="CA1031" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>SimCAPSHTTPServer.ParseREST(String, String, String):String</Item>
-               <Item>System.Exception</Item>
-              </Issue>
-             </Message>
-             <Message Id="System.String.Format(System.String,System.Object[])" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>SimCAPSHTTPServer.ParseREST(String, String, String):String</Item>
-               <Item>System.String.Format(System.String,System.Object[])</Item>
-               <Item>System.String.Format(System.IFormatProvider,System.String,System.Object[])</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="ParseXMLRPC(System.String):System.String">
-            <Messages>
-             <Message TypeName="DoNotCatchGeneralExceptionTypes" Category="Microsoft.Design" CheckId="CA1031" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>SimCAPSHTTPServer.ParseXMLRPC(String):String</Item>
-               <Item>System.Exception</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="MarkMembersAsStatic" Category="Microsoft.Performance" CheckId="CA1822" Created="2007-03-27 04:29:04Z" FixCategory="NonBreaking">
-              <Issue>
-               <Item>SimCAPSHTTPServer.ParseXMLRPC(String):String</Item>
-              </Issue>
-             </Message>
-             <Message Id="System.Convert.ToUInt32(System.Object)" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>SimCAPSHTTPServer.ParseXMLRPC(String):String</Item>
-               <Item>System.Convert.ToUInt32(System.Object)</Item>
-               <Item>System.Convert.ToUInt32(System.Object,System.IFormatProvider)</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="StartHTTP():System.Void">
-            <Messages>
-             <Message TypeName="DoNotCatchGeneralExceptionTypes" Category="Microsoft.Design" CheckId="CA1031" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>SimCAPSHTTPServer.StartHTTP():Void</Item>
-               <Item>System.Exception</Item>
-              </Issue>
-             </Message>
-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>SimCAPSHTTPServer.StartHTTP():Void</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-        </Types>
-       </Namespace>
-       <Namespace Name="OpenSim.types">
-        <Types>
-         <Type Name="Mesh">
-          <Members>
-           <Member Name="mesh">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>mesh</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>System.Collections.Generic.List`1&lt;OpenSim.types.Triangle&gt;</Item>
-               <Item>Mesh.mesh</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="op_Addition(OpenSim.types.Mesh,OpenSim.types.Mesh):OpenSim.types.Mesh">
-            <Messages>
-             <Message Id="0#a" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="ParameterOneLetter">
-               <Item>Mesh.op_Addition(Mesh, Mesh):Mesh</Item>
-               <Item>a</Item>
-              </Issue>
-             </Message>
-             <Message Id="1#b" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="ParameterOneLetter">
-               <Item>Mesh.op_Addition(Mesh, Mesh):Mesh</Item>
-               <Item>b</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="OperatorOverloadsHaveNamedAlternates" Category="Microsoft.Usage" CheckId="CA2225" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>Add</Item>
-               <Item>Mesh.op_Addition(Mesh, Mesh):Mesh</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="OverloadOperatorEqualsOnOverloadingAddAndSubtract" Category="Microsoft.Design" CheckId="CA1013" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>Mesh</Item>
-               <Item>Mesh.op_Addition(Mesh, Mesh):Mesh</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="Triangle">
-          <Members>
-           <Member Name=".ctor(Axiom.MathLib.Vector3,Axiom.MathLib.Vector3,Axiom.MathLib.Vector3)">
-            <Messages>
-             <Message Id="0#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>A</Item>
-              </Issue>
-             </Message>
-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>B</Item>
-              </Issue>
-             </Message>
-             <Message Id="2#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>C</Item>
-              </Issue>
-             </Message>
-             <Message Id="0#A" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="ParameterOneLetter">
-               <Item>Triangle.Triangle(Vector3, Vector3, Vector3)</Item>
-               <Item>A</Item>
-              </Issue>
-             </Message>
-             <Message Id="1#B" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="ParameterOneLetter">
-               <Item>Triangle.Triangle(Vector3, Vector3, Vector3)</Item>
-               <Item>B</Item>
-              </Issue>
-             </Message>
-             <Message Id="2#C" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="ParameterOneLetter">
-               <Item>Triangle.Triangle(Vector3, Vector3, Vector3)</Item>
-               <Item>C</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-        </Types>
-       </Namespace>
-       <Namespace Name="OpenSim.UserServer">
-        <Types>
-         <Type Name="LocalUserProfileManager">
-          <Members>
-           <Member Name="CustomiseResponse(System.Collections.Hashtable&amp;,OpenSim.Framework.User.UserProfile):System.Void">
-            <Messages>
-             <Message Id="System.Int32.ToString" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>LocalUserProfileManager.CustomiseResponse(Hashtable&amp;, UserProfile):Void</Item>
-               <Item>System.Int32.ToString</Item>
-               <Item>System.Int32.ToString(System.IFormatProvider)</Item>
-              </Issue>
-              <Issue>
-               <Item>LocalUserProfileManager.CustomiseResponse(Hashtable&amp;, UserProfile):Void</Item>
-               <Item>System.Int32.ToString</Item>
-               <Item>System.Int32.ToString(System.IFormatProvider)</Item>
-              </Issue>
-             </Message>
-             <Message Id="System.Single.ToString" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>LocalUserProfileManager.CustomiseResponse(Hashtable&amp;, UserProfile):Void</Item>
-               <Item>System.Single.ToString</Item>
-               <Item>System.Single.ToString(System.IFormatProvider)</Item>
-              </Issue>
-              <Issue>
-               <Item>LocalUserProfileManager.CustomiseResponse(Hashtable&amp;, UserProfile):Void</Item>
-               <Item>System.Single.ToString</Item>
-               <Item>System.Single.ToString(System.IFormatProvider)</Item>
-              </Issue>
-              <Issue>
-               <Item>LocalUserProfileManager.CustomiseResponse(Hashtable&amp;, UserProfile):Void</Item>
-               <Item>System.Single.ToString</Item>
-               <Item>System.Single.ToString(System.IFormatProvider)</Item>
-              </Issue>
-              <Issue>
-               <Item>LocalUserProfileManager.CustomiseResponse(Hashtable&amp;, UserProfile):Void</Item>
-               <Item>System.Single.ToString</Item>
-               <Item>System.Single.ToString(System.IFormatProvider)</Item>
-              </Issue>
-              <Issue>
-               <Item>LocalUserProfileManager.CustomiseResponse(Hashtable&amp;, UserProfile):Void</Item>
-               <Item>System.Single.ToString</Item>
-               <Item>System.Single.ToString(System.IFormatProvider)</Item>
-              </Issue>
-              <Issue>
-               <Item>LocalUserProfileManager.CustomiseResponse(Hashtable&amp;, UserProfile):Void</Item>
-               <Item>System.Single.ToString</Item>
-               <Item>System.Single.ToString(System.IFormatProvider)</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="LoginServer">
-          <Messages>
-           <Message TypeName="ComVisibleTypeBaseTypesShouldBeComVisible" Category="Microsoft.Interoperability" CheckId="CA1405" Created="2007-03-27 04:29:04Z">
-            <Issue>
-             <Item>OpenSim.UserServer.LoginServer</Item>
-             <Item> OpenSim.Framework.Grid.LoginService</Item>
-            </Issue>
-           </Message>
-           <Message TypeName="TypesThatOwnDisposableFieldsShouldBeDisposable" Category="Microsoft.Design" CheckId="CA1001" Created="2007-03-27 04:29:04Z" FixCategory="Breaking">
-            <Issue>
-             <Item>OpenSim.UserServer.LoginServer</Item>
-             <Item>System.Net.Sockets.Socket</Item>
-            </Issue>
-           </Message>
-           <Message Id="Login" TypeName="UsePreferredTerms" Category="Microsoft.Naming" CheckId="CA1726" Created="2007-03-27 04:29:04Z">
-            <Issue Name="Type">
-             <Item>Login</Item>
-             <Item>LoginServer</Item>
-             <Item>LogOn</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name=".ctor(OpenSim.Framework.Interfaces.IGridServer)">
-            <Messages>
-             <Message TypeName="DoNotInitializeUnnecessarily" Category="Microsoft.Performance" CheckId="CA1805" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>LoginServer.LoginServer(IGridServer)</Item>
-               <Item>_needPasswd</Item>
-               <Item>System.Boolean</Item>
-               <Item>false</Item>
-              </Issue>
-              <Issue>
-               <Item>LoginServer.LoginServer(IGridServer)</Item>
-               <Item>userAccounts</Item>
-               <Item>System.Boolean</Item>
-               <Item>false</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="Authenticate(System.String,System.String,System.String):System.Boolean">
-            <Messages>
-             <Message Id="2#passwd" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>LoginServer.Authenticate(String, String, String):Boolean</Item>
-               <Item>passwd</Item>
-               <Item>passwd</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="clientAddress">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>clientAddress</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="CustomiseLoginResponse(System.Collections.Hashtable,System.String,System.String):System.Void">
-            <Messages>
-             <Message Id="Customise" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>Customise</Item>
-               <Item>LoginServer.CustomiseLoginResponse(Hashtable, String, String):Void</Item>
-              </Issue>
-             </Message>
-             <Message Id="Login" TypeName="UsePreferredTerms" Category="Microsoft.Naming" CheckId="CA1726" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>Login</Item>
-               <Item>CustomiseLoginResponse</Item>
-               <Item>LogOn</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="EncodePassword(System.String):System.String">
-            <Messages>
-             <Message Id="System.String.ToLower" TypeName="SpecifyCultureInfo" Category="Microsoft.Globalization" CheckId="CA1304" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>LoginServer.EncodePassword(String):String</Item>
-               <Item>System.String.ToLower</Item>
-               <Item>System.String.ToLower(System.Globalization.CultureInfo)</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="GetAgentId(System.String,System.String):libsecondlife.LLUUID">
-            <Messages>
-             <Message Id="System.Int32.ToString(System.String)" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>LoginServer.GetAgentId(String, String):LLUUID</Item>
-               <Item>System.Int32.ToString(System.String)</Item>
-               <Item>System.Int32.ToString(System.String,System.IFormatProvider)</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="InitializeLogin():System.Void">
-            <Messages>
-             <Message Id="OpenSim.Framework.User.UserProfileManager.SetKeys(System.String,System.String,System.String,System.String)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>LoginServer.InitializeLogin():Void</Item>
-               <Item>4</Item>
-               <Item>UserProfileManager.SetKeys(String, String, String, String):Void</Item>
-               <Item>Welcome to OpenSim</Item>
-              </Issue>
-             </Message>
-             <Message Id="Sim" TypeName="LiteralsShouldBeSpelledCorrectly" Category="Microsoft.Usage" CheckId="CA2204" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>Sim</Item>
-               <Item>OpenSim</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="LoginRequest(System.IO.StreamReader,System.IO.StreamWriter):System.Void">
-            <Messages>
-             <Message TypeName="DoNotRaiseReservedExceptionTypes" Category="Microsoft.Usage" CheckId="CA2201" Created="2007-03-27 04:29:04Z">
-              <Issue Name="TooGeneric">
-               <Item>LoginServer.LoginRequest(StreamReader, StreamWriter):Void</Item>
-               <Item>System.Exception</Item>
-              </Issue>
-             </Message>
-             <Message Id="System.Convert.ToInt32(System.String)" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>LoginServer.LoginRequest(StreamReader, StreamWriter):Void</Item>
-               <Item>System.Convert.ToInt32(System.String)</Item>
-               <Item>System.Convert.ToInt32(System.String,System.IFormatProvider)</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="TestForEmptyStringsUsingStringLength" Category="Microsoft.Performance" CheckId="CA1820" Created="2007-03-27 04:29:04Z">
-              <Issue Name="IsNullOrEmpty">
-               <Item>op_Inequality</Item>
-               <Item>""</Item>
-               <Item>LoginServer.LoginRequest(StreamReader, StreamWriter):Void</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="ProcessXmlRequest(Nwc.XmlRpc.XmlRpcRequest,System.IO.StreamWriter):System.Boolean">
-            <Messages>
-             <Message TypeName="ConsiderPassingBaseTypesAsParameters" Category="Microsoft.Design" CheckId="CA1011" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>writer</Item>
-               <Item>LoginServer.ProcessXmlRequest(XmlRpcRequest, StreamWriter):Boolean</Item>
-               <Item>System.IO.StreamWriter</Item>
-               <Item>System.IO.TextWriter</Item>
-              </Issue>
-             </Message>
-             <Message Id="System.Int32.ToString" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>LoginServer.ProcessXmlRequest(XmlRpcRequest, StreamWriter):Boolean</Item>
-               <Item>System.Int32.ToString</Item>
-               <Item>System.Int32.ToString(System.IFormatProvider)</Item>
-              </Issue>
-             </Message>
-             <Message Id="System.Int32.ToString(System.String)" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>LoginServer.ProcessXmlRequest(XmlRpcRequest, StreamWriter):Boolean</Item>
-               <Item>System.Int32.ToString(System.String)</Item>
-               <Item>System.Int32.ToString(System.String,System.IFormatProvider)</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>'request'</Item>
-               <Item>LoginServer.ProcessXmlRequest(XmlRpcRequest, StreamWriter):Boolean</Item>
-              </Issue>
-              <Issue>
-               <Item>'writer'</Item>
-               <Item>LoginServer.ProcessXmlRequest(XmlRpcRequest, StreamWriter):Boolean</Item>
-              </Issue>
-              <Issue>
-               <Item>'writer'</Item>
-               <Item>LoginServer.ProcessXmlRequest(XmlRpcRequest, StreamWriter):Boolean</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="remoteAddress">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>remoteAddress</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="RunLogin():System.Void">
-            <Messages>
-             <Message TypeName="DoNotCatchGeneralExceptionTypes" Category="Microsoft.Design" CheckId="CA1031" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>LoginServer.RunLogin():Void</Item>
-               <Item>System.Exception</Item>
-              </Issue>
-              <Issue>
-               <Item>LoginServer.RunLogin():Void</Item>
-               <Item>System.Exception</Item>
-              </Issue>
-             </Message>
-             <Message Id="clientEndPoint" TypeName="RemoveUnusedLocals" Category="Microsoft.Performance" CheckId="CA1804" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>LoginServer.RunLogin():Void</Item>
-               <Item>clientEndPoint</Item>
-               <Item>System.Net.IPEndPoint</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-        </Types>
-       </Namespace>
-       <Namespace Name="OpenSim.world">
-        <Types>
-         <Type Name="Avatar">
-          <Members>
-           <Member Name=".cctor()">
-            <Messages>
-             <Message TypeName="DoNotInitializeUnnecessarily" Category="Microsoft.Performance" CheckId="CA1805" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>Avatar.Avatar()</Item>
-               <Item>PhysicsEngineFlying</Item>
-               <Item>System.Boolean</Item>
-               <Item>false</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name=".ctor(OpenSim.SimClient)">
-            <Messages>
-             <Message TypeName="DoNotInitializeUnnecessarily" Category="Microsoft.Performance" CheckId="CA1805" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>Avatar.Avatar(SimClient)</Item>
-               <Item>_updateCount</Item>
-               <Item>System.Int16</Item>
-               <Item>0</Item>
-              </Issue>
-              <Issue>
-               <Item>Avatar.Avatar(SimClient)</Item>
-               <Item>avatarAppearanceTexture</Item>
-               <Item>libsecondlife.LLObject+TextureEntry</Item>
-               <Item>null</Item>
-              </Issue>
-              <Issue>
-               <Item>Avatar.Avatar(SimClient)</Item>
-               <Item>movementflag</Item>
-               <Item>System.Byte</Item>
-               <Item>0</Item>
-              </Issue>
-              <Issue>
-               <Item>Avatar.Avatar(SimClient)</Item>
-               <Item>updateflag</Item>
-               <Item>System.Boolean</Item>
-               <Item>false</Item>
-              </Issue>
-             </Message>
-             <Message Id="0#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>TheClient</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="anim_seq">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>anim_seq</Item>
-              </Issue>
-             </Message>
-             <Message Id="anim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>anim</Item>
-               <Item>Avatar.anim_seq</Item>
-              </Issue>
-             </Message>
-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>anim_seq</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="Animations">
-            <Messages>
-             <Message TypeName="NonConstantFieldsShouldNotBeVisible" Category="Microsoft.Usage" CheckId="CA2211" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>Animations</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="CompleteMovement(OpenSim.world.World):System.Void">
-            <Messages>
-             <Message Id="0#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>RegionInfo</Item>
-              </Issue>
-             </Message>
-             <Message Id="RegionInfo" TypeName="ReviewUnusedParameters" Category="Microsoft.Usage" CheckId="CA1801" Created="2007-03-27 04:29:04Z" FixCategory="Breaking">
-              <Issue>
-               <Item>RegionInfo</Item>
-               <Item>Avatar.CompleteMovement(World):Void</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="ControllingClient">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>ControllingClient</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="current_anim">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>current_anim</Item>
-              </Issue>
-             </Message>
-             <Message Id="anim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>anim</Item>
-               <Item>Avatar.current_anim</Item>
-              </Issue>
-             </Message>
-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>current_anim</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="firstname">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>firstname</Item>
-              </Issue>
-             </Message>
-             <Message Id="firstname" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>firstname</Item>
-               <Item>Avatar.firstname</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="lastname">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>lastname</Item>
-              </Issue>
-             </Message>
-             <Message Id="lastname" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>lastname</Item>
-               <Item>Avatar.lastname</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="LoadAnims():System.Void">
-            <Messages>
-             <Message Id="Anims" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>Anims</Item>
-               <Item>Avatar.LoadAnims():Void</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="PhysActor">
-            <Messages>
-             <Message TypeName="PropertiesShouldNotBeWriteOnly" Category="Microsoft.Design" CheckId="CA1044" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>PhysActor</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="PhysicsEngineFlying">
-            <Messages>
-             <Message TypeName="NonConstantFieldsShouldNotBeVisible" Category="Microsoft.Usage" CheckId="CA2211" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>PhysicsEngineFlying</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="SendAnimPack():System.Void">
-            <Messages>
-             <Message Id="Anim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>Anim</Item>
-               <Item>Avatar.SendAnimPack():Void</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="SendAppearanceToOtherAgent(OpenSim.SimClient):System.Void">
-            <Messages>
-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>'userInfo'</Item>
-               <Item>Avatar.SendAppearanceToOtherAgent(SimClient):Void</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="SendRegionHandshake(OpenSim.world.World):System.Void">
-            <Messages>
-             <Message Id="0#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>RegionInfo</Item>
-              </Issue>
-             </Message>
-             <Message Id="RegionInfo" TypeName="ReviewUnusedParameters" Category="Microsoft.Usage" CheckId="CA1801" Created="2007-03-27 04:29:04Z" FixCategory="Breaking">
-              <Issue>
-               <Item>RegionInfo</Item>
-               <Item>Avatar.SendRegionHandshake(World):Void</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="AvatarAnimations">
-          <Members>
-           <Member Name="AnimsLLUUID">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>AnimsLLUUID</Item>
-              </Issue>
-             </Message>
-             <Message Id="Anims" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>Anims</Item>
-               <Item>AvatarAnimations.AnimsLLUUID</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="AnimsNames">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>AnimsNames</Item>
-              </Issue>
-             </Message>
-             <Message Id="Anims" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>Anims</Item>
-               <Item>AvatarAnimations.AnimsNames</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="LoadAnims():System.Void">
-            <Messages>
-             <Message Id="Anims" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>Anims</Item>
-               <Item>AvatarAnimations.LoadAnims():Void</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="Entity">
-          <Members>
-           <Member Name=".ctor()">
-            <Messages>
-             <Message TypeName="DoNotInitializeUnnecessarily" Category="Microsoft.Performance" CheckId="CA1805" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>Entity.Entity()</Item>
-               <Item>localid</Item>
-               <Item>System.UInt32</Item>
-               <Item>0</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="addForces():System.Void">
-            <Messages>
-             <Message Id="Member" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>addForces</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="BackUp():System.Void">
-            <Messages>
-             <Message Id="BackUp" TypeName="CompoundWordsShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1702" Created="2007-03-27 04:29:04Z">
-              <Issue Name="ShouldBeDiscreteTerm">
-               <Item>BackUp</Item>
-               <Item>method</Item>
-               <Item>BackUp</Item>
-               <Item>Backup</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="children">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>children</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>System.Collections.Generic.List`1&lt;OpenSim.world.Entity&gt;</Item>
-               <Item>Entity.children</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="getMesh():OpenSim.types.Mesh">
-            <Messages>
-             <Message Id="Member" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>getMesh</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="getName():System.String">
-            <Messages>
-             <Message Id="Member" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>getName</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="localid">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>localid</Item>
-              </Issue>
-             </Message>
-             <Message Id="localid" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>localid</Item>
-               <Item>Entity.localid</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="name">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>name</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="position">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>position</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="rotation">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>rotation</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="update():System.Void">
-            <Messages>
-             <Message Id="Member" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>update</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="uuid">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>uuid</Item>
-              </Issue>
-             </Message>
-             <Message Id="uuid" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>uuid</Item>
-               <Item>Entity.uuid</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="velocity">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>velocity</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="NewForce">
-          <Members>
-           <Member Name="X">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>X</Item>
-              </Issue>
-             </Message>
-             <Message Id="X" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="MemberOneLetter">
-               <Item>X</Item>
-               <Item>NewForce.X</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="Y">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>Y</Item>
-              </Issue>
-             </Message>
-             <Message Id="Y" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="MemberOneLetter">
-               <Item>Y</Item>
-               <Item>NewForce.Y</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="Z">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>Z</Item>
-              </Issue>
-             </Message>
-             <Message Id="Z" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="MemberOneLetter">
-               <Item>Z</Item>
-               <Item>NewForce.Z</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="Primitive">
-          <Messages>
-           <Message TypeName="IdentifiersShouldDifferByMoreThanCase" Category="Microsoft.Naming" CheckId="CA1708" Created="2007-03-27 04:29:04Z">
-            <Issue Name="Member">
-             <Item>'UpdateFlag'</Item>
-             <Item>updateFlag</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name=".ctor()">
-            <Messages>
-             <Message TypeName="DoNotInitializeUnnecessarily" Category="Microsoft.Performance" CheckId="CA1805" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>Primitive.Primitive()</Item>
-               <Item>dirtyFlag</Item>
-               <Item>System.Boolean</Item>
-               <Item>false</Item>
-              </Issue>
-              <Issue>
-               <Item>Primitive.Primitive()</Item>
-               <Item>mesh_cutbegin</Item>
-               <Item>System.Single</Item>
-               <Item>0.0</Item>
-              </Issue>
-              <Issue>
-               <Item>Primitive.Primitive()</Item>
-               <Item>newPrimFlag</Item>
-               <Item>System.Boolean</Item>
-               <Item>false</Item>
-              </Issue>
-              <Issue>
-               <Item>Primitive.Primitive()</Item>
-               <Item>physicsEnabled</Item>
-               <Item>System.Boolean</Item>
-               <Item>false</Item>
-              </Issue>
-              <Issue>
-               <Item>Primitive.Primitive()</Item>
-               <Item>physicstest</Item>
-               <Item>System.Boolean</Item>
-               <Item>false</Item>
-              </Issue>
-              <Issue>
-               <Item>Primitive.Primitive()</Item>
-               <Item>updateFlag</Item>
-               <Item>System.Boolean</Item>
-               <Item>false</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="CreateFromPacket(libsecondlife.Packets.ObjectAddPacket,libsecondlife.LLUUID,System.UInt32):System.Void">
-            <Messages>
-             <Message Id="localID-702000" TypeName="OperationsShouldNotOverflow" Category="Microsoft.Usage" CheckId="CA2233" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>localID-702000</Item>
-               <Item>Primitive.CreateFromPacket(ObjectAddPacket, LLUUID, UInt32):Void</Item>
-              </Issue>
-             </Message>
-             <Message Id="1#" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2007-03-27 04:29:04Z">
-              <Issue Name="ParameterId">
-               <Item>ID</Item>
-               <Item>agentID</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-             <Message Id="2#" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2007-03-27 04:29:04Z">
-              <Issue Name="ParameterId">
-               <Item>ID</Item>
-               <Item>localID</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-             <Message Id="System.UInt32.ToString(System.String)" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>Primitive.CreateFromPacket(ObjectAddPacket, LLUUID, UInt32):Void</Item>
-               <Item>System.UInt32.ToString(System.String)</Item>
-               <Item>System.UInt32.ToString(System.String,System.IFormatProvider)</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>'addPacket'</Item>
-               <Item>Primitive.CreateFromPacket(ObjectAddPacket, LLUUID, UInt32):Void</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="CreateFromStorage(OpenSim.Framework.Assets.PrimData):System.Void">
-            <Messages>
-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>'store'</Item>
-               <Item>Primitive.CreateFromStorage(PrimData):Void</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="dirtyFlag">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>dirtyFlag</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="mesh_cutbegin">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>mesh_cutbegin</Item>
-              </Issue>
-             </Message>
-             <Message Id="cutbegin" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>cutbegin</Item>
-               <Item>Primitive.mesh_cutbegin</Item>
-              </Issue>
-             </Message>
-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>mesh_cutbegin</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="mesh_cutend">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>mesh_cutend</Item>
-              </Issue>
-             </Message>
-             <Message Id="cutend" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>cutend</Item>
-               <Item>Primitive.mesh_cutend</Item>
-              </Issue>
-             </Message>
-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>mesh_cutend</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="newPrimFlag">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>newPrimFlag</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="PhysActor">
-            <Messages>
-             <Message TypeName="PropertiesShouldNotBeWriteOnly" Category="Microsoft.Design" CheckId="CA1044" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>PhysActor</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="primData">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>primData</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="UpdateClient(OpenSim.SimClient):System.Void">
-            <Messages>
-             <Message Id="0#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>RemoteClient</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>'RemoteClient'</Item>
-               <Item>Primitive.UpdateClient(SimClient):Void</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="updateFlag">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>updateFlag</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="UpdateObjectFlags(libsecondlife.Packets.ObjectFlagUpdatePacket):System.Void">
-            <Messages>
-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>'pack'</Item>
-               <Item>Primitive.UpdateObjectFlags(ObjectFlagUpdatePacket):Void</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="UpdateShape(libsecondlife.Packets.ObjectShapePacket+ObjectDataBlock):System.Void">
-            <Messages>
-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>'addPacket'</Item>
-               <Item>Primitive.UpdateShape(ObjectDataBlock):Void</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="ScriptEngine">
-          <Members>
-           <Member Name=".ctor(OpenSim.world.World)">
-            <Messages>
-             <Message Id="0#env" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>ScriptEngine.ScriptEngine(World)</Item>
-               <Item>env</Item>
-               <Item>env</Item>
-              </Issue>
-             </Message>
-             <Message Id="env" TypeName="ReviewUnusedParameters" Category="Microsoft.Usage" CheckId="CA1801" Created="2007-03-27 04:29:04Z" FixCategory="Breaking">
-              <Issue>
-               <Item>env</Item>
-               <Item>ScriptEngine.ScriptEngine(World)</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="LoadScript():System.Void">
-            <Messages>
-             <Message TypeName="MarkMembersAsStatic" Category="Microsoft.Performance" CheckId="CA1822" Created="2007-03-27 04:29:04Z" FixCategory="Breaking">
-              <Issue>
-               <Item>ScriptEngine.LoadScript():Void</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="SurfacePatch">
-          <Members>
-           <Member Name="HeightMap">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>HeightMap</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="World">
-          <Messages>
-           <Message TypeName="TypeNamesShouldNotMatchNamespaces" Category="Microsoft.Naming" CheckId="CA1724" Created="2007-03-27 04:29:04Z">
-            <Issue>
-             <Item>World</Item>
-             <Item>OpenSim.world</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name=".ctor()">
-            <Messages>
-             <Message TypeName="DoNotInitializeUnnecessarily" Category="Microsoft.Performance" CheckId="CA1805" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>World.World()</Item>
-               <Item>_localNumber</Item>
-               <Item>System.UInt32</Item>
-               <Item>0</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="_localNumber">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>_localNumber</Item>
-              </Issue>
-             </Message>
-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>_localNumber</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="AddNewPrim(libsecondlife.Packets.ObjectAddPacket,OpenSim.SimClient):System.Void">
-            <Messages>
-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>AgentClient</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="AddViewerAgent(OpenSim.SimClient):System.Void">
-            <Messages>
-             <Message Id="0#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>AgentClient</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="DeRezObject(libsecondlife.Packets.DeRezObjectPacket,OpenSim.SimClient):System.Void">
-            <Messages>
-             <Message Id="0#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>DeRezPacket</Item>
-              </Issue>
-             </Message>
-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>AgentClient</Item>
-              </Issue>
-             </Message>
-             <Message Id="0#Rez" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>World.DeRezObject(DeRezObjectPacket, SimClient):Void</Item>
-               <Item>Rez</Item>
-               <Item>DeRezPacket</Item>
-              </Issue>
-             </Message>
-             <Message Id="Rez" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>Rez</Item>
-               <Item>World.DeRezObject(DeRezObjectPacket, SimClient):Void</Item>
-              </Issue>
-             </Message>
-             <Message Id="AgentClient" TypeName="ReviewUnusedParameters" Category="Microsoft.Usage" CheckId="CA1801" Created="2007-03-27 04:29:04Z" FixCategory="Breaking">
-              <Issue>
-               <Item>AgentClient</Item>
-               <Item>World.DeRezObject(DeRezObjectPacket, SimClient):Void</Item>
-              </Issue>
-             </Message>
-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>De</Item>
-               <Item>World.DeRezObject(DeRezObjectPacket, SimClient):Void</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="Entities">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>Entities</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="GetInitialPrims(OpenSim.SimClient):System.Void">
-            <Messages>
-             <Message Id="0#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>RemoteClient</Item>
-              </Issue>
-             </Message>
-             <Message Id="Prims" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>Prims</Item>
-               <Item>World.GetInitialPrims(SimClient):Void</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="LandMap">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>LandMap</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="LoadPrimsFromStorage():System.Void">
-            <Messages>
-             <Message Id="Prims" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>Prims</Item>
-               <Item>World.LoadPrimsFromStorage():Void</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="LoadStorageDLL(System.String):System.Boolean">
-            <Messages>
-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Member">
-               <Item>World.LoadStorageDLL(String):Boolean</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="localStorage">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>localStorage</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="Rand">
-            <Messages>
-             <Message TypeName="AvoidUnusedPrivateFields" Category="Microsoft.Performance" CheckId="CA1823" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>World.Rand</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="Scripts">
-            <Messages>
-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>Scripts</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="SendLayerData(OpenSim.SimClient):System.Void">
-            <Messages>
-             <Message Id="0#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>RemoteClient</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>'RemoteClient'</Item>
-               <Item>World.SendLayerData(SimClient):Void</Item>
-              </Issue>
-              <Issue>
-               <Item>'RemoteClient'</Item>
-               <Item>World.SendLayerData(SimClient):Void</Item>
-              </Issue>
-              <Issue>
-               <Item>'RemoteClient'</Item>
-               <Item>World.SendLayerData(SimClient):Void</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-        </Types>
-       </Namespace>
-       <Namespace Name="OpenSim.world.scripting">
-        <Types>
-         <Type Name="IScriptHost">
-          <Members>
-           <Member Name="Register(OpenSim.world.scripting.IScript):System.Boolean">
-            <Messages>
-             <Message Id="0#iscript" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>IScriptHost.Register(IScript):Boolean</Item>
-               <Item>iscript</Item>
-               <Item>iscript</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-        </Types>
-       </Namespace>
-      </Namespaces>
-     </Module>
-    </Modules>
-   </Target>
-   <Target Name="$(ProjectDir)/bin/OpenSim.Storage.LocalStorageDb4o.dll">
-    <Modules>
-     <Module Name="opensim.storage.localstoragedb4o.dll">
-      <Messages>
-       <Message TypeName="AssembliesShouldDeclareMinimumSecurity" Category="Microsoft.Usage" CheckId="CA2209" Created="2007-03-27 04:29:04Z">
-        <Issue>
-         <Item>OpenSim.Storage.LocalStorageDb4o</Item>
-        </Issue>
-       </Message>
-       <Message TypeName="AssembliesShouldHaveValidStrongNames" Category="Microsoft.Design" CheckId="CA2210" Created="2007-03-27 04:29:04Z">
-        <Issue Name="NoStrongName">
-         <Item>OpenSim.Storage.LocalStorageDb4o</Item>
-        </Issue>
-       </Message>
-       <Message TypeName="MarkAssembliesWithClsCompliant" Category="Microsoft.Design" CheckId="CA1014" Created="2007-03-27 04:29:04Z">
-        <Issue Name="NoAttr">
-         <Item>OpenSim.Storage.LocalStorageDb4o</Item>
-        </Issue>
-       </Message>
-      </Messages>
-      <Namespaces>
-       <Namespace Name="OpenSim.Storage.LocalStorageDb4o">
-        <Types>
-         <Type Name="Db4LocalStorage">
-          <Members>
-           <Member Name=".ctor()">
-            <Messages>
-             <Message TypeName="DoNotCatchGeneralExceptionTypes" Category="Microsoft.Design" CheckId="CA1031" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>Db4LocalStorage.Db4LocalStorage()</Item>
-               <Item>System.Exception</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="LoadPrimitives(OpenSim.Framework.Interfaces.ILocalStorageReceiver):System.Void">
-            <Messages>
-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>'receiver'</Item>
-               <Item>Db4LocalStorage.LoadPrimitives(ILocalStorageReceiver):Void</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="StorePrim(OpenSim.Framework.Assets.PrimData):System.Void">
-            <Messages>
-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>'prim'</Item>
-               <Item>Db4LocalStorage.StorePrim(PrimData):Void</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="UUIDQuery">
-          <Messages>
-           <Message TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2007-03-27 04:29:04Z">
-            <Issue Name="Type">
-             <Item>UUIDQuery</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="Match(OpenSim.Framework.Assets.PrimData):System.Boolean">
-            <Messages>
-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>'prim'</Item>
-               <Item>UUIDQuery.Match(PrimData):Boolean</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-        </Types>
-       </Namespace>
-      </Namespaces>
-     </Module>
-    </Modules>
-   </Target>
-   <Target Name="$(ProjectDir)/bin/Physics/OpenSim.Physics.BasicPhysicsPlugin.dll">
-    <Modules>
-     <Module Name="opensim.physics.basicphysicsplugin.dll">
-      <Messages>
-       <Message TypeName="AssembliesShouldDeclareMinimumSecurity" Category="Microsoft.Usage" CheckId="CA2209" Status="Excluded" Created="2007-03-27 04:29:04Z">
-        <Issue>
-         <Item>OpenSim.Physics.BasicPhysicsPlugin</Item>
-        </Issue>
-        <Notes>
-         <User Name="Stefan">
-          <Note Id="2" />
-         </User>
-        </Notes>
-       </Message>
-       <Message TypeName="AssembliesShouldHaveValidStrongNames" Category="Microsoft.Design" CheckId="CA2210" Status="Excluded" Created="2007-03-27 04:29:04Z">
-        <Issue Name="NoStrongName">
-         <Item>OpenSim.Physics.BasicPhysicsPlugin</Item>
-        </Issue>
-        <Notes>
-         <User Name="Stefan">
-          <Note Id="0" />
-         </User>
-        </Notes>
-       </Message>
-       <Message TypeName="MarkAssembliesWithClsCompliant" Category="Microsoft.Design" CheckId="CA1014" Status="Excluded" Created="2007-03-27 04:29:04Z">
-        <Issue Name="NoAttr">
-         <Item>OpenSim.Physics.BasicPhysicsPlugin</Item>
-        </Issue>
-        <Notes>
-         <User Name="Stefan">
-          <Note Id="1" />
-         </User>
-        </Notes>
-       </Message>
-      </Messages>
-      <Namespaces>
-       <Namespace Name="OpenSim.Physics.BasicPhysicsPlugin">
-        <Types>
-         <Type Name="BasicActor">
-          <Members>
-           <Member Name="flying">
-            <Messages>
-             <Message TypeName="AvoidUnusedPrivateFields" Category="Microsoft.Performance" CheckId="CA1823" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>BasicActor.flying</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="SetAcceleration(OpenSim.Physics.Manager.PhysicsVector):System.Void">
-            <Messages>
-             <Message Id="0#accel" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>BasicActor.SetAcceleration(PhysicsVector):Void</Item>
-               <Item>accel</Item>
-               <Item>accel</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="BasicPhysicsPlugin">
-          <Messages>
-           <Message Id="Plugin" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-            <Issue Name="Type">
-             <Item>Plugin</Item>
-             <Item>OpenSim.Physics.BasicPhysicsPlugin.BasicPhysicsPlugin</Item>
-            </Issue>
-           </Message>
-           <Message TypeName="TypeNamesShouldNotMatchNamespaces" Category="Microsoft.Naming" CheckId="CA1724" Created="2007-03-27 04:29:04Z">
-            <Issue>
-             <Item>BasicPhysicsPlugin</Item>
-             <Item>OpenSim.Physics.BasicPhysicsPlugin</Item>
-            </Issue>
-           </Message>
-          </Messages>
-         </Type>
-        </Types>
-       </Namespace>
-      </Namespaces>
-     </Module>
-    </Modules>
-   </Target>
-   <Target Name="$(ProjectDir)/bin/Physics/OpenSim.Physics.OdePlugin.dll">
-    <Modules>
-     <Module Name="opensim.physics.odeplugin.dll">
-      <Messages>
-       <Message TypeName="AssembliesShouldDeclareMinimumSecurity" Category="Microsoft.Usage" CheckId="CA2209" Created="2007-03-27 04:29:04Z">
-        <Issue>
-         <Item>OpenSim.Physics.OdePlugin</Item>
-        </Issue>
-       </Message>
-       <Message TypeName="AssembliesShouldHaveValidStrongNames" Category="Microsoft.Design" CheckId="CA2210" Created="2007-03-27 04:29:04Z">
-        <Issue Name="NoStrongName">
-         <Item>OpenSim.Physics.OdePlugin</Item>
-        </Issue>
-       </Message>
-       <Message TypeName="MarkAssembliesWithClsCompliant" Category="Microsoft.Design" CheckId="CA1014" Created="2007-03-27 04:29:04Z">
-        <Issue Name="NoAttr">
-         <Item>OpenSim.Physics.OdePlugin</Item>
-        </Issue>
-       </Message>
-      </Messages>
-      <Namespaces>
-       <Namespace Name="OpenSim.Physics.OdePlugin">
-        <Types>
-         <Type Name="OdeCharacter">
-          <Messages>
-           <Message TypeName="TypesThatOwnNativeResourcesShouldBeDisposable" Category="Microsoft.Design" CheckId="CA1049" Created="2007-03-27 04:29:04Z">
-            <Issue>
-             <Item>OdeCharacter</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name=".ctor(OpenSim.Physics.OdePlugin.OdeScene,OpenSim.Physics.Manager.PhysicsVector)">
-            <Messages>
-             <Message Id="parent_scene" TypeName="ReviewUnusedParameters" Category="Microsoft.Usage" CheckId="CA1801" Created="2007-03-27 04:29:04Z" FixCategory="Breaking">
-              <Issue>
-               <Item>parent_scene</Item>
-               <Item>OdeCharacter.OdeCharacter(OdeScene, PhysicsVector)</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>'pos'</Item>
-               <Item>OdeCharacter.OdeCharacter(OdeScene, PhysicsVector)</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="capsule_geom">
-            <Messages>
-             <Message TypeName="AvoidUnusedPrivateFields" Category="Microsoft.Performance" CheckId="CA1823" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>OdeCharacter.capsule_geom</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="gravityAccel">
-            <Messages>
-             <Message TypeName="AvoidUnusedPrivateFields" Category="Microsoft.Performance" CheckId="CA1823" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>OdeCharacter.gravityAccel</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="SetAcceleration(OpenSim.Physics.Manager.PhysicsVector):System.Void">
-            <Messages>
-             <Message Id="0#accel" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>OdeCharacter.SetAcceleration(PhysicsVector):Void</Item>
-               <Item>accel</Item>
-               <Item>accel</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="OdePlugin">
-          <Messages>
-           <Message Id="Plugin" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-            <Issue Name="Type">
-             <Item>Plugin</Item>
-             <Item>OpenSim.Physics.OdePlugin.OdePlugin</Item>
-            </Issue>
-           </Message>
-           <Message TypeName="TypeNamesShouldNotMatchNamespaces" Category="Microsoft.Naming" CheckId="CA1724" Created="2007-03-27 04:29:04Z">
-            <Issue>
-             <Item>OdePlugin</Item>
-             <Item>OpenSim.Physics.OdePlugin</Item>
-            </Issue>
-           </Message>
-          </Messages>
-         </Type>
-         <Type Name="OdePrim">
-          <Members>
-           <Member Name="_position">
-            <Messages>
-             <Message TypeName="AvoidUnusedPrivateFields" Category="Microsoft.Performance" CheckId="CA1823" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>OdePrim._position</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="SetAcceleration(OpenSim.Physics.Manager.PhysicsVector):System.Void">
-            <Messages>
-             <Message Id="0#accel" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>OdePrim.SetAcceleration(PhysicsVector):Void</Item>
-               <Item>accel</Item>
-               <Item>accel</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="OdeScene">
-          <Members>
-           <Member Name="AddPrim(OpenSim.Physics.Manager.PhysicsVector,OpenSim.Physics.Manager.PhysicsVector):OpenSim.Physics.Manager.PhysicsActor">
-            <Messages>
-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>'position'</Item>
-               <Item>OdeScene.AddPrim(PhysicsVector, PhysicsVector):PhysicsActor</Item>
-              </Issue>
-              <Issue>
-               <Item>'size'</Item>
-               <Item>OdeScene.AddPrim(PhysicsVector, PhysicsVector):PhysicsActor</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="Land">
-            <Messages>
-             <Message TypeName="AvoidUnusedPrivateFields" Category="Microsoft.Performance" CheckId="CA1823" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>OdeScene.Land</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="LandGeom">
-            <Messages>
-             <Message TypeName="AvoidUnusedPrivateFields" Category="Microsoft.Performance" CheckId="CA1823" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>OdeScene.LandGeom</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="SetTerrain(System.Single[]):System.Void">
-            <Messages>
-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>'heightMap'</Item>
-               <Item>OdeScene.SetTerrain(Single[]):Void</Item>
-              </Issue>
-              <Issue>
-               <Item>'heightMap'</Item>
-               <Item>OdeScene.SetTerrain(Single[]):Void</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="space">
-            <Messages>
-             <Message TypeName="NonConstantFieldsShouldNotBeVisible" Category="Microsoft.Usage" CheckId="CA2211" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>space</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="PointersShouldNotBeVisible" Category="Microsoft.Security" CheckId="CA2111" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>space</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="world">
-            <Messages>
-             <Message TypeName="NonConstantFieldsShouldNotBeVisible" Category="Microsoft.Usage" CheckId="CA2211" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>world</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="PointersShouldNotBeVisible" Category="Microsoft.Security" CheckId="CA2111" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>world</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-        </Types>
-       </Namespace>
-      </Namespaces>
-     </Module>
-    </Modules>
-   </Target>
-   <Target Name="$(ProjectDir)/bin/Physics/OpenSim.Physics.PhysXPlugin.dll">
-    <Modules>
-     <Module Name="opensim.physics.physxplugin.dll">
-      <Messages>
-       <Message TypeName="AssembliesShouldDeclareMinimumSecurity" Category="Microsoft.Usage" CheckId="CA2209" Created="2007-03-27 04:29:04Z">
-        <Issue>
-         <Item>OpenSim.Physics.PhysXPlugin</Item>
-        </Issue>
-       </Message>
-       <Message TypeName="AssembliesShouldHaveValidStrongNames" Category="Microsoft.Design" CheckId="CA2210" Created="2007-03-27 04:29:04Z">
-        <Issue Name="NoStrongName">
-         <Item>OpenSim.Physics.PhysXPlugin</Item>
-        </Issue>
-       </Message>
-       <Message TypeName="MarkAssembliesWithClsCompliant" Category="Microsoft.Design" CheckId="CA1014" Created="2007-03-27 04:29:04Z">
-        <Issue Name="NoAttr">
-         <Item>OpenSim.Physics.PhysXPlugin</Item>
-        </Issue>
-       </Message>
-      </Messages>
-      <Namespaces>
-       <Namespace Name="OpenSim.Physics.PhysXPlugin">
-        <Types>
-         <Type Name="PhysXCharacter">
-          <Members>
-           <Member Name="SetAcceleration(OpenSim.Physics.Manager.PhysicsVector):System.Void">
-            <Messages>
-             <Message Id="0#accel" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>PhysXCharacter.SetAcceleration(PhysicsVector):Void</Item>
-               <Item>accel</Item>
-               <Item>accel</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="PhysXPlugin">
-          <Messages>
-           <Message Id="Plugin" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-            <Issue Name="Type">
-             <Item>Plugin</Item>
-             <Item>OpenSim.Physics.PhysXPlugin.PhysXPlugin</Item>
-            </Issue>
-           </Message>
-           <Message TypeName="TypeNamesShouldNotMatchNamespaces" Category="Microsoft.Naming" CheckId="CA1724" Created="2007-03-27 04:29:04Z">
-            <Issue>
-             <Item>PhysXPlugin</Item>
-             <Item>OpenSim.Physics.PhysXPlugin</Item>
-            </Issue>
-           </Message>
-          </Messages>
-         </Type>
-         <Type Name="PhysXPrim">
-          <Members>
-           <Member Name="_position">
-            <Messages>
-             <Message TypeName="AvoidUnusedPrivateFields" Category="Microsoft.Performance" CheckId="CA1823" Created="2007-03-27 04:29:04Z">
-              <Issue>
-               <Item>PhysXPrim._position</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="SetAcceleration(OpenSim.Physics.Manager.PhysicsVector):System.Void">
-            <Messages>
-             <Message Id="0#accel" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
-              <Issue Name="Parameter">
-               <Item>PhysXPrim.SetAcceleration(PhysicsVector):Void</Item>
-               <Item>accel</Item>
-               <Item>accel</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-        </Types>
-       </Namespace>
-      </Namespaces>
-     </Module>
-    </Modules>
-   </Target>
-  </Targets>
-  <Notes>
-   <User Name="Stefan">
-    <Note Id="0" Modified="2007-03-27 04:30:24Z">Save it for a rainy day.</Note>
-    <Note Id="1" Modified="2007-03-27 04:30:31Z">Save it for a rainy day.</Note>
-    <Note Id="2" Modified="2007-03-27 04:30:38Z">Save it for a rainy day.</Note>
-   </User>
-  </Notes>
-  <Rules>
-   <Rule TypeName="AssembliesShouldDeclareMinimumSecurity" Category="Microsoft.Usage" CheckId="CA2209">
-    <Resolution Name="Default">No valid permission requests were found for assembly '{0}'. You should always specify the minimum security permissions using SecurityAction.RequestMinimum.</Resolution>
-   </Rule>
-   <Rule TypeName="AssembliesShouldHaveValidStrongNames" Category="Microsoft.Design" CheckId="CA2210">
-    <Resolution Name="NoStrongName">Sign '{0}' with a strong name key.</Resolution>
-   </Rule>
-   <Rule TypeName="AvoidNamespacesWithFewTypes" Category="Microsoft.Design" CheckId="CA1020">
-    <Resolution Name="Default">Consider merging the types defined in '{0}' with another namespace.</Resolution>
-   </Rule>
-   <Rule TypeName="AvoidUnusedPrivateFields" Category="Microsoft.Performance" CheckId="CA1823">
-    <Resolution Name="Default">It appears that field '{0}' is never used or is only ever assigned to. Use this field or remove it.</Resolution>
-   </Rule>
-   <Rule TypeName="CollectionPropertiesShouldBeReadOnly" Category="Microsoft.Usage" CheckId="CA2227">
-    <Resolution Name="Default">Change '{0}' to be read-only by removing the property setter.</Resolution>
-   </Rule>
-   <Rule TypeName="CompoundWordsShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1702">
-    <Resolution Name="ShouldBeDiscreteTerm">The compound word '{0}' in {1} '{2}' exists as a discrete term. If your usage is intended to be single word, case it as '{3}'.</Resolution>
-   </Rule>
-   <Rule TypeName="ComVisibleTypeBaseTypesShouldBeComVisible" Category="Microsoft.Interoperability" CheckId="CA1405">
-    <Resolution Name="Default">'{0}' is marked ComVisible(true) but has the following ComVisible(false) types in its object hierarchy: {1}</Resolution>
-   </Rule>
-   <Rule TypeName="ConsiderPassingBaseTypesAsParameters" Category="Microsoft.Design" CheckId="CA1011">
-    <Resolution Name="Default">Consider changing the type of parameter '{0}' in {1} from {2} to its base type {3}. This method appears to only require base class members in its implementation. Suppress this violation if there is a compelling reason to require the more derived type in the method signature.</Resolution>
-   </Rule>
-   <Rule TypeName="DoNotCallOverridableMethodsInConstructors" Category="Microsoft.Usage" CheckId="CA2214">
-    <Resolution Name="Default">'{0}' contains a call chain that results in a call to a virtual method defined by the class. Review the following call stack for unintended consequences: {1}</Resolution>
-   </Rule>
-   <Rule TypeName="DoNotCatchGeneralExceptionTypes" Category="Microsoft.Design" CheckId="CA1031">
-    <Resolution Name="Default">Modify '{0}' to catch a more specific exception than '{1}' or rethrow the exception.</Resolution>
-   </Rule>
-   <Rule TypeName="DoNotDeclareReadOnlyMutableReferenceTypes" Category="Microsoft.Security" CheckId="CA2104">
-    <Resolution Name="Default">Remove the readonly declaration from '{0}' or change the field to one that is an immutable reference type. If the reference type '{1}' is, in fact, immutable, exclude this message.</Resolution>
-   </Rule>
-   <Rule TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051">
-    <Resolution Name="Default">Make '{0}' private or internal (Friend in VB, public private in C++) and provide a public or protected property to access it.</Resolution>
-   </Rule>
-   <Rule TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002">
-    <Resolution Name="Default">Change '{0}' in {1} to use Collection&lt;T&gt;, ReadOnlyCollection&lt;T&gt; or KeyedCollection&lt;K,V&gt;</Resolution>
-   </Rule>
-   <Rule TypeName="DoNotInitializeUnnecessarily" Category="Microsoft.Performance" CheckId="CA1805">
-    <Resolution Name="Default">{0} initializes field {1} of type {2} to {3}. Remove this initialization as it will be done automatically by the runtime.</Resolution>
-   </Rule>
-   <Rule TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303">
-    <Resolution Name="Default">{0} passes a literal as parameter {1} of a call to {2}. Retrieve the following string argument from a resource table instead: '{3}'</Resolution>
-   </Rule>
-   <Rule TypeName="DoNotPassTypesByReference" Category="Microsoft.Design" CheckId="CA1045">
-    <Resolution Name="Default">Consider a design that does not require that '{0}' be a reference parameter.</Resolution>
-   </Rule>
-   <Rule TypeName="DoNotRaiseReservedExceptionTypes" Category="Microsoft.Usage" CheckId="CA2201">
-    <Resolution Name="TooGeneric">{0} creates an exception of type '{1}', an exception type that is not sufficiently specific and should never be raised by user code. If this exception instance might be thrown, use a different exception type.</Resolution>
-   </Rule>
-   <Rule TypeName="DoNotUseTimersThatPreventPowerStateChanges" Category="Microsoft.Mobility" CheckId="CA1601">
-    <Resolution Name="Default">Modify the call to {0} in method {1} to set the timer interval to a value that's greater than or equal to one second.</Resolution>
-   </Rule>
-   <Rule TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709">
-    <Resolution Name="Member">Correct the casing of member name '{0}'.</Resolution>
-    <Resolution Name="Namespace">Correct the casing of namespace name '{0}'.</Resolution>
-    <Resolution Name="Parameter">Correct the casing of parameter name '{0}'.</Resolution>
-    <Resolution Name="Type">Correct the casing of type name '{0}'.</Resolution>
-   </Rule>
-   <Rule TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704">
-    <Resolution Name="Member">Correct the spelling of the unrecognized token '{0}' in member name '{1}'.</Resolution>
-    <Resolution Name="MemberOneLetter">Consider providing a more meaningful name than the one-letter token '{0}' in member name '{1}'.</Resolution>
-    <Resolution Name="Namespace">Correct the spelling of the unrecognized token '{0}' in namespace '{1}'.</Resolution>
-    <Resolution Name="Parameter">In method {0}, correct the spelling of the unrecognized token '{1}' in parameter name '{2}' or strip it entirely if it represents any sort of hungarian notation.</Resolution>
-    <Resolution Name="ParameterOneLetter">In method {0}, consider providing a more meaningful name than the one-letter parameter name '{1}'.</Resolution>
-    <Resolution Name="Type">Correct the spelling of the unrecognized token '{0}' in type name '{1}'.</Resolution>
-   </Rule>
-   <Rule TypeName="IdentifiersShouldDifferByMoreThanCase" Category="Microsoft.Naming" CheckId="CA1708">
-    <Resolution Name="Member">Change member names {0} and '{1}' so that they differ by more than case.</Resolution>
-   </Rule>
-   <Rule TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707">
-    <Resolution Name="Member">Remove all underscores from member '{0}'.</Resolution>
-    <Resolution Name="Parameter">Remove all underscores from parameter '{0}'.</Resolution>
-    <Resolution Name="Type">Remove all underscores from type '{0}'.</Resolution>
-   </Rule>
-   <Rule TypeName="IdentifiersShouldNotHaveIncorrectSuffix" Category="Microsoft.Naming" CheckId="CA1711">
-    <Resolution Name="Default">Rename '{0}' so that it does not end in '{1}'.</Resolution>
-   </Rule>
-   <Rule TypeName="LiteralsShouldBeSpelledCorrectly" Category="Microsoft.Usage" CheckId="CA2204">
-    <Resolution Name="Default">Correct the spelling of the unrecognized token '{0}' in the literal '{1}'.</Resolution>
-   </Rule>
-   <Rule TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705">
-    <Resolution Name="Member">Correct the capitalization of member name '{0}'.</Resolution>
-    <Resolution Name="Namespace">Correct the capitalization of namespace name '{0}'.</Resolution>
-    <Resolution Name="Parameter">Correct the capitalization of parameter name '{0}'.</Resolution>
-    <Resolution Name="Type">Correct the capitalization of type name '{0}'.</Resolution>
-   </Rule>
-   <Rule TypeName="MarkAssembliesWithAssemblyVersion" Category="Microsoft.Design" CheckId="CA1016">
-    <Resolution Name="Default">Add an AssemblyVersion attribute to '{0}'.</Resolution>
-   </Rule>
-   <Rule TypeName="MarkAssembliesWithClsCompliant" Category="Microsoft.Design" CheckId="CA1014">
-    <Resolution Name="NoAttr">'{0}' should be marked with CLSCompliantAttribute and its value should be true.</Resolution>
-   </Rule>
-   <Rule TypeName="MarkAssembliesWithComVisible" Category="Microsoft.Design" CheckId="CA1017">
-    <Resolution Name="NoAttribute">Mark '{0}' as ComVisible(false) at the assembly level, then mark all types within the assembly that should be exposed to Com clients as ComVisible(true).</Resolution>
-   </Rule>
-   <Rule TypeName="MarkMembersAsStatic" Category="Microsoft.Performance" CheckId="CA1822">
-    <Resolution Name="Default">The 'this' parameter (or 'Me' in VB) of {0} is never used. Mark the member as static (or Shared in VB) or use 'this'/'Me' in the method body or at least one property accessor, if appropriate.</Resolution>
-   </Rule>
-   <Rule TypeName="NonConstantFieldsShouldNotBeVisible" Category="Microsoft.Usage" CheckId="CA2211">
-    <Resolution Name="Default">Consider making '{0}' non-public or a constant.</Resolution>
-   </Rule>
-   <Rule TypeName="OperationsShouldNotOverflow" Category="Microsoft.Usage" CheckId="CA2233">
-    <Resolution Name="Default">Correct the potential overflow in the operation '{0}' in '{1}'.</Resolution>
-   </Rule>
-   <Rule TypeName="OperatorOverloadsHaveNamedAlternates" Category="Microsoft.Usage" CheckId="CA2225">
-    <Resolution Name="Default">Provide a method named '{0}' as a friendly alternate for operator {1}.</Resolution>
-   </Rule>
-   <Rule TypeName="OverloadOperatorEqualsOnOverloadingAddAndSubtract" Category="Microsoft.Design" CheckId="CA1013">
-    <Resolution Name="Default">Consider adding an overload of the equality operator for '{0}' that takes the same parameters as {1}.</Resolution>
-   </Rule>
-   <Rule TypeName="OverrideEqualsAndOperatorEqualsOnValueTypes" Category="Microsoft.Performance" CheckId="CA1815">
-    <Resolution Name="Equals">'{0}' should override Equals.</Resolution>
-    <Resolution Name="op_Equality">'{0}' should override the equality (==) and inequality (!=) operators.</Resolution>
-   </Rule>
-   <Rule TypeName="ParameterNamesShouldMatchBaseDeclaration" Category="Microsoft.Naming" CheckId="CA1725">
-    <Resolution Name="Default">Change parameter name '{0}' of method {1} to '{2}' in order to match the identifier as it has been declared in {3}.</Resolution>
-   </Rule>
-   <Rule TypeName="PassSystemUriObjectsInsteadOfStrings" Category="Microsoft.Usage" CheckId="CA2234">
-    <Resolution Name="Default">Modify {0} to call {1} instead of {2}.</Resolution>
-   </Rule>
-   <Rule TypeName="PointersShouldNotBeVisible" Category="Microsoft.Security" CheckId="CA2111">
-    <Resolution Name="Default">Make '{0}' private.</Resolution>
-   </Rule>
-   <Rule TypeName="PropertiesShouldNotBeWriteOnly" Category="Microsoft.Design" CheckId="CA1044">
-    <Resolution Name="Default">Add a property getter to '{0}'.</Resolution>
-   </Rule>
-   <Rule TypeName="RemoveUnusedLocals" Category="Microsoft.Performance" CheckId="CA1804">
-    <Resolution Name="Default">{0} declares a local, '{1}', of type {2}, which is never used or is only assigned to. Use this local or remove it.</Resolution>
-   </Rule>
-   <Rule TypeName="ReviewUnusedParameters" Category="Microsoft.Usage" CheckId="CA1801">
-    <Resolution Name="Default">Parameter '{0}' of {1} is never used. Remove the parameter or use it in the method body.</Resolution>
-   </Rule>
-   <Rule TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706">
-    <Resolution Name="Member">Correct the capitalization of '{0}' in member name '{1}'.</Resolution>
-    <Resolution Name="MemberId">'Id' is an abbreviation and therefore is not subject to acronym casing guidelines. Correct the capitalization of 'ID' in member name '{0}' by changing it to 'Id'.</Resolution>
-    <Resolution Name="ParameterId">'Id' is an abbreviation and therefore is not subject to acronym casing guidelines. Correct the capitalization of '{0}' in parameter name '{1}' by changing it to '{2}'.</Resolution>
-    <Resolution Name="Type">Correct the capitalization of '{0}' in type name '{1}'.</Resolution>
-   </Rule>
-   <Rule TypeName="SpecifyCultureInfo" Category="Microsoft.Globalization" CheckId="CA1304">
-    <Resolution Name="Default">{0} makes a call to {1} that does not explicitly provide a CultureInfo. This should be replaced with a call to {2}.</Resolution>
-   </Rule>
-   <Rule TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305">
-    <Resolution Name="Default">{0} makes a call to {1} that does not explicitly provide an IFormatProvider. This should be replaced with a call to {2}.</Resolution>
-   </Rule>
-   <Rule TypeName="StaticHolderTypesShouldNotHaveConstructors" Category="Microsoft.Design" CheckId="CA1053">
-    <Resolution Name="Default">Remove the public constructors from '{0}'.</Resolution>
-   </Rule>
-   <Rule TypeName="TestForEmptyStringsUsingStringLength" Category="Microsoft.Performance" CheckId="CA1820">
-    <Resolution Name="IsNullOrEmpty">Replace the call to String.{0}({1}) in '{2}' with a call to String.IsNullOrEmpty.</Resolution>
-   </Rule>
-   <Rule TypeName="TypeNamesShouldNotMatchNamespaces" Category="Microsoft.Naming" CheckId="CA1724">
-    <Resolution Name="Default">The type name '{0}' conflicts in whole or in part with the namespace name '{1}'. Change either name to eliminate the conflict.</Resolution>
-   </Rule>
-   <Rule TypeName="TypesThatOwnDisposableFieldsShouldBeDisposable" Category="Microsoft.Design" CheckId="CA1001">
-    <Resolution Name="Default">Implement IDisposable on '{0}' as it instantiates members of the following IDisposable types: {1}</Resolution>
-   </Rule>
-   <Rule TypeName="TypesThatOwnNativeResourcesShouldBeDisposable" Category="Microsoft.Design" CheckId="CA1049">
-    <Resolution Name="Default">Implement IDisposable on '{0}'.</Resolution>
-   </Rule>
-   <Rule TypeName="UriParametersShouldNotBeStrings" Category="Microsoft.Design" CheckId="CA1054">
-    <Resolution Name="Default">Change the type of parameter '{0}' of method {1} from string to System.Uri, or provide an overload of {1}, that allows '{0}' to be passed as a System.Uri object.</Resolution>
-   </Rule>
-   <Rule TypeName="UsePreferredTerms" Category="Microsoft.Naming" CheckId="CA1726">
-    <Resolution Name="Member">Replace the term '{0}' in member name '{1}' with the preferred alternate '{2}'.</Resolution>
-    <Resolution Name="Type">Replace the term '{0}' in type name '{1}' with the preferred alternate '{2}'.</Resolution>
-   </Rule>
-   <Rule TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024">
-    <Resolution Name="Default">Change '{0}' to a property if appropriate.</Resolution>
-   </Rule>
-   <Rule TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062">
-    <Resolution Name="Default">Validate parameter {0} passed to externally visible method {1}.</Resolution>
-   </Rule>
-  </Rules>
- </FxCopReport>
-</FxCopProject>
diff --git a/OpenSim.build b/OpenSim.build
deleted file mode 100644
index 87dc0de..0000000
--- a/OpenSim.build
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" ?>
-<project name="OpenSim" default="build">
-    <echo message="Using '${nant.settings.currentframework}' Framework"/>
-    <property name="bin.dir" value="bin" />
-    <property name="obj.dir" value="obj" />
-    <property name="doc.dir" value="doc" />
-    <property name="project.main.dir" value="${project::get-base-directory()}" />
-    <target name="Debug" description="">
-        <property name="project.config" value="Debug" />
-        <property name="build.debug" value="true" />
-    </target>
-    <property name="project.config" value="Release" />
-    <target name="Release" description="">
-        <property name="project.config" value="Release" />
-        <property name="build.debug" value="false" />
-    </target>
-    <target name="net-1.1" description="Sets framework to .NET 1.1">
-        <property name="nant.settings.currentframework" value="net-1.1" />
-    </target>
-    <target name="net-2.0" description="Sets framework to .NET 2.0">
-        <property name="nant.settings.currentframework" value="net-2.0" />
-    </target>
-    <target name="mono-2.0" description="Sets framework to mono 2.0">
-        <property name="nant.settings.currentframework" value="mono-2.0" />
-    </target>
-    <target name="mono-1.0" description="Sets framework to mono 1.0">
-        <property name="nant.settings.currentframework" value="mono-1.0" />
-    </target>
-    <target name="init" description="">
-        <call target="${project.config}" />
-        <sysinfo />
-        <echo message="Platform ${sys.os.platform}" />
-        <property name="build.dir" value="${bin.dir}/${project.config}" />
-    </target>
-    <target name="clean" description="">
-        <echo message="Deleting all builds from all configurations" />
-        <delete dir="${bin.dir}" failonerror="false" />
-        <delete dir="${obj.dir}" failonerror="false" />
-        <nant buildfile="OpenSim/OpenSim/OpenSim.exe.build" target="clean" />
-        <nant buildfile="Common/OpenSim.Framework/OpenSim.Framework.dll.build" target="clean" />
-        <nant buildfile="Common/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="clean" />
-        <nant buildfile="Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build" target="clean" />
-        <nant buildfile="OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="clean" />
-        <nant buildfile="OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="clean" />
-        <nant buildfile="OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="clean" />
-        <nant buildfile="OpenSim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="clean" />
-        <nant buildfile="OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="clean" />
-        <nant buildfile="OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="clean" />
-        <nant buildfile="OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="clean" />
-        <nant buildfile="OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build" target="clean" />
-        <nant buildfile="Common/OpenSim.Servers/OpenSim.Servers.dll.build" target="clean" />
-        <nant buildfile="OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build" target="clean" />
-        <nant buildfile="OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="clean" />
-        <nant buildfile="OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build" target="clean" />
-        <nant buildfile="OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build" target="clean" />
-        <nant buildfile="Common/XmlRpcCS/XMLRPC.dll.build" target="clean" />
-    </target>
-    <target name="build" depends="init" description="">
-        <nant buildfile="Common/XmlRpcCS/XMLRPC.dll.build" target="build" />
-        <nant buildfile="Common/OpenSim.Framework/OpenSim.Framework.dll.build" target="build" />
-        <nant buildfile="Common/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="build" />
-        <nant buildfile="Common/OpenSim.Servers/OpenSim.Servers.dll.build" target="build" />
-        <nant buildfile="OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="build" />
-        <nant buildfile="OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build" target="build" />
-        <nant buildfile="OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build" target="build" />
-        <nant buildfile="OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="build" />
-        <nant buildfile="OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="build" />
-        <nant buildfile="OpenSim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="build" />
-        <nant buildfile="OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="build" />
-        <nant buildfile="OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="build" />
-        <nant buildfile="OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="build" />
-        <nant buildfile="Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build" target="build" />
-        <nant buildfile="OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build" target="build" />
-        <nant buildfile="OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build" target="build" />
-        <nant buildfile="OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="build" />
-        <nant buildfile="OpenSim/OpenSim/OpenSim.exe.build" target="build" />
-    </target>
-    <target name="build-release" depends="Release, init, build" description="Builds in Release mode" />
-    <target name="build-debug" depends="Debug, init, build" description="Builds in Debug mode" />
-    <target name="package" depends="clean, doc" description="Builds all" />
-    <target name="doc" depends="build-release">
-        <echo message="Generating all documentation from all builds" />
-        <nant buildfile="OpenSim/OpenSim/OpenSim.exe.build" target="doc" />
-        <nant buildfile="Common/OpenSim.Framework/OpenSim.Framework.dll.build" target="doc" />
-        <nant buildfile="Common/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="doc" />
-        <nant buildfile="Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build" target="doc" />
-        <nant buildfile="OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="doc" />
-        <nant buildfile="OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="doc" />
-        <nant buildfile="OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="doc" />
-        <nant buildfile="OpenSim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="doc" />
-        <nant buildfile="OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="doc" />
-        <nant buildfile="OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="doc" />
-        <nant buildfile="OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="doc" />
-        <nant buildfile="OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build" target="doc" />
-        <nant buildfile="Common/OpenSim.Servers/OpenSim.Servers.dll.build" target="doc" />
-        <nant buildfile="OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build" target="doc" />
-        <nant buildfile="OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="doc" />
-        <nant buildfile="OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build" target="doc" />
-        <nant buildfile="OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build" target="doc" />
-        <nant buildfile="Common/XmlRpcCS/XMLRPC.dll.build" target="doc" />
-    </target>
-</project>
diff --git a/OpenSim.sln b/OpenSim.sln
deleted file mode 100644
index ed2eac9..0000000
--- a/OpenSim.sln
+++ /dev/null
@@ -1,121 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim", "OpenSim\OpenSim\OpenSim.csproj", "{438A9556-0000-0000-0000-000000000000}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework", "Common\OpenSim.Framework\OpenSim.Framework.csproj", "{8ACA2445-0000-0000-0000-000000000000}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Console", "Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj", "{A7CD0630-0000-0000-0000-000000000000}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GenericConfig.Xml", "Common\OpenSim.GenericConfig\Xml\OpenSim.GenericConfig.Xml.csproj", "{E88EF749-0000-0000-0000-000000000000}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Local", "OpenSim\OpenSim.GridInterfaces\Local\OpenSim.GridInterfaces.Local.csproj", "{546099CD-0000-0000-0000-000000000000}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Remote", "OpenSim\OpenSim.GridInterfaces\Remote\OpenSim.GridInterfaces.Remote.csproj", "{B55C0B5D-0000-0000-0000-000000000000}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.BasicPhysicsPlugin", "OpenSim\OpenSim.Physics\BasicPhysicsPlugin\OpenSim.Physics.BasicPhysicsPlugin.csproj", "{4F874463-0000-0000-0000-000000000000}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.Manager", "OpenSim\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj", "{8BE16150-0000-0000-0000-000000000000}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.OdePlugin", "OpenSim\OpenSim.Physics\OdePlugin\OpenSim.Physics.OdePlugin.csproj", "{63A05FE9-0000-0000-0000-000000000000}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.PhysXPlugin", "OpenSim\OpenSim.Physics\PhysXPlugin\OpenSim.Physics.PhysXPlugin.csproj", "{988F0AC4-0000-0000-0000-000000000000}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.RegionServer", "OpenSim\OpenSim.RegionServer\OpenSim.RegionServer.csproj", "{632E1BFD-0000-0000-0000-000000000000}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Scripting.EmbeddedJVM", "OpenSim\OpenSim.Scripting\EmbeddedJVM\OpenSim.Scripting.EmbeddedJVM.csproj", "{97A82740-0000-0000-0000-000000000000}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Servers", "Common\OpenSim.Servers\OpenSim.Servers.csproj", "{8BB20F0A-0000-0000-0000-000000000000}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageBerkeleyDB", "OpenSim\OpenSim.Storage\LocalStorageBerkeleyDB\OpenSim.Storage.LocalStorageBerkeleyDB.csproj", "{EE9E5D96-0000-0000-0000-000000000000}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageDb4o", "OpenSim\OpenSim.Storage\LocalStorageDb4o\OpenSim.Storage.LocalStorageDb4o.csproj", "{E1B79ECF-0000-0000-0000-000000000000}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageSQLite", "OpenSim\OpenSim.Storage\LocalStorageSQLite\OpenSim.Storage.LocalStorageSQLite.csproj", "{6B20B603-0000-0000-0000-000000000000}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Terrain.BasicTerrain", "OpenSim\OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj", "{2270B8FE-0000-0000-0000-000000000000}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XMLRPC", "Common\XmlRpcCS\XMLRPC.csproj", "{8E81D43C-0000-0000-0000-000000000000}"
-EndProject
-Global
-        GlobalSection(SolutionConfigurationPlatforms) = preSolution
-                Debug|Any CPU = Debug|Any CPU
-                Release|Any CPU = Release|Any CPU
-        EndGlobalSection
-        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-                {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-                {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-                {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-                {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-                {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-                {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-                {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-                {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-                {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-                {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-                {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-                {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-                {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-                {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-                {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-                {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-                {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-                {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-        EndGlobalSection
-        GlobalSection(SolutionProperties) = preSolution
-                HideSolutionNode = FALSE
-        EndGlobalSection
-EndGlobal
diff --git a/OpenSim/OpenSim.GridInterfaces/Local/AssemblyInfo.cs b/OpenSim/OpenSim.GridInterfaces/Local/AssemblyInfo.cs
deleted file mode 100644
index 52ecd6b..0000000
--- a/OpenSim/OpenSim.GridInterfaces/Local/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("LocalGridServers")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("LocalGridServers")]
-[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/OpenSim/OpenSim.GridInterfaces/Local/LocalAssetServer.cs b/OpenSim/OpenSim.GridInterfaces/Local/LocalAssetServer.cs
deleted file mode 100644
index ea4cbc7..0000000
--- a/OpenSim/OpenSim.GridInterfaces/Local/LocalAssetServer.cs
+++ /dev/null
@@ -1,298 +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.Threading;
-using System.IO;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Utilities;
-using OpenSim.Framework.Console;
-using libsecondlife;
-using Db4objects.Db4o;
-using Db4objects.Db4o.Query;
-namespace OpenSim.GridInterfaces.Local
-{
-    public class LocalAssetPlugin : IAssetPlugin
-    {
-        public LocalAssetPlugin()
-        {
-        }
-        public IAssetServer GetAssetServer()
-        {
-            return (new LocalAssetServer());
-        }
-    }
-    public class LocalAssetServer : IAssetServer
-    {
-        private IAssetReceiver _receiver;
-        private BlockingQueue<ARequest> _assetRequests;
-        private IObjectContainer db;
-        private Thread _localAssetServerThread;
-        public LocalAssetServer()
-        {
-            bool yapfile;
-            this._assetRequests = new BlockingQueue<ARequest>();
-            yapfile = System.IO.File.Exists("assets.yap");
-            MainConsole.Instance.Verbose("Local Asset Server class created");
-            try
-            {
-                db = Db4oFactory.OpenFile("assets.yap");
-                MainConsole.Instance.Verbose("Db4 Asset database  creation");
-            }
-            catch (Exception e)
-            {
-                db.Close();
-                MainConsole.Instance.Warn("Db4 Asset server :Constructor - Exception occured");
-                MainConsole.Instance.Warn(e.ToString());
-            }
-            if (!yapfile)
-            {
-                this.SetUpAssetDatabase();
-            }
-            this._localAssetServerThread = new Thread(new ThreadStart(RunRequests));
-            this._localAssetServerThread.IsBackground = true;
-            this._localAssetServerThread.Start();
-        }
-        public void SetReceiver(IAssetReceiver receiver)
-        {
-            this._receiver = receiver;
-        }
-        public void RequestAsset(LLUUID assetID, bool isTexture)
-        {
-            ARequest req = new ARequest();
-            req.AssetID = assetID;
-            req.IsTexture = isTexture;
-            this._assetRequests.Enqueue(req);
-        }
-        public void UpdateAsset(AssetBase asset)
-        {
-        }
-        public void UploadNewAsset(AssetBase asset)
-        {
-            AssetStorage store = new AssetStorage();
-            store.Data = asset.Data;
-            store.Name = asset.Name;
-            store.UUID = asset.FullID;
-            db.Set(store);
-            db.Commit();
-        }
-        public void SetServerInfo(string ServerUrl, string ServerKey)
-        {
-        }
-        public void Close()
-        {
-            if (db != null)
-            {
-                MainConsole.Instance.Verbose( "Closing local asset server database");
-                db.Close();
-            }
-        }
-        private void RunRequests()
-        {
-            while (true)
-            {
-                byte[] idata = null;
-                bool found = false;
-                AssetStorage foundAsset = null;
-                ARequest req = this._assetRequests.Dequeue();
-                IObjectSet result = db.Query(new AssetUUIDQuery(req.AssetID));
-                if (result.Count > 0)
-                {
-                    foundAsset = (AssetStorage)result.Next();
-                    found = true;
-                }
-                AssetBase asset = new AssetBase();
-                if (found)
-                {
-                    asset.FullID = foundAsset.UUID;
-                    asset.Type = foundAsset.Type;
-                    asset.InvType = foundAsset.Type;
-                    asset.Name = foundAsset.Name;
-                    idata = foundAsset.Data;
-                }
-                else
-                {
-                    asset.FullID = LLUUID.Zero;
-                }
-                asset.Data = idata;
-                _receiver.AssetReceived(asset, req.IsTexture);
-            }
-        }
-        private void SetUpAssetDatabase()
-        {
-            try
-            {
-                MainConsole.Instance.Verbose( "Setting up asset database");
-                AssetBase Image = new AssetBase();
-                Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000001");
-                Image.Name = "Bricks";
-                this.LoadAsset(Image, true, "bricks.jp2");
-                AssetStorage store = new AssetStorage();
-                store.Data = Image.Data;
-                store.Name = Image.Name;
-                store.UUID = Image.FullID;
-                db.Set(store);
-                db.Commit();
-                Image = new AssetBase();
-                Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000002");
-                Image.Name = "Plywood";
-                this.LoadAsset(Image, true, "plywood.jp2");
-                store = new AssetStorage();
-                store.Data = Image.Data;
-                store.Name = Image.Name;
-                store.UUID = Image.FullID;
-                db.Set(store);
-                db.Commit();
-                Image = new AssetBase();
-                Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000003");
-                Image.Name = "Rocks";
-                this.LoadAsset(Image, true, "rocks.jp2");
-                store = new AssetStorage();
-                store.Data = Image.Data;
-                store.Name = Image.Name;
-                store.UUID = Image.FullID;
-                db.Set(store);
-                db.Commit();
-                Image = new AssetBase();
-                Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000004");
-                Image.Name = "Granite";
-                this.LoadAsset(Image, true, "granite.jp2");
-                store = new AssetStorage();
-                store.Data = Image.Data;
-                store.Name = Image.Name;
-                store.UUID = Image.FullID;
-                db.Set(store);
-                db.Commit();
-                Image = new AssetBase();
-                Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000005");
-                Image.Name = "Hardwood";
-                this.LoadAsset(Image, true, "hardwood.jp2");
-                store = new AssetStorage();
-                store.Data = Image.Data;
-                store.Name = Image.Name;
-                store.UUID = Image.FullID;
-                db.Set(store);
-                db.Commit();
-                Image = new AssetBase();
-                Image.FullID = new LLUUID("00000000-0000-0000-5005-000000000005");
-                Image.Name = "Prim Base Texture";
-                this.LoadAsset(Image, true, "plywood.jp2");
-                store = new AssetStorage();
-                store.Data = Image.Data;
-                store.Name = Image.Name;
-                store.UUID = Image.FullID;
-                db.Set(store);
-                db.Commit();
-                Image = new AssetBase();
-                Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000006");
-                Image.Name = "Map Base Texture";
-                this.LoadAsset(Image, true, "map_base.jp2");
-                store = new AssetStorage();
-                store.Data = Image.Data;
-                store.Name = Image.Name;
-                store.UUID = Image.FullID;
-                db.Set(store);
-                db.Commit();
-                Image = new AssetBase();
-                Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000007");
-                Image.Name = "Map Texture";
-                this.LoadAsset(Image, true, "map1.jp2");
-                store = new AssetStorage();
-                store.Data = Image.Data;
-                store.Name = Image.Name;
-                store.UUID = Image.FullID;
-                db.Set(store);
-                db.Commit();
-                Image = new AssetBase();
-                Image.FullID = new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73");
-                Image.Name = "Shape";
-                this.LoadAsset(Image, false, "base_shape.dat");
-                store = new AssetStorage();
-                store.Data = Image.Data;
-                store.Name = Image.Name;
-                store.UUID = Image.FullID;
-                db.Set(store);
-                db.Commit();
-            }
-            catch (Exception e)
-            {
-                MainConsole.Instance.Error(e.Message);
-            }
-        }
-        private void LoadAsset(AssetBase info, bool image, string filename)
-        {
-            //should request Asset from storage manager
-            //but for now read from file
-            string dataPath = Path.Combine(System.AppDomain.CurrentDomain.BaseDirectory, "assets"); //+ folder;
-            string fileName = Path.Combine(dataPath, filename);
-            FileInfo fInfo = new FileInfo(fileName);
-            long numBytes = fInfo.Length;
-            FileStream fStream = new FileStream(fileName, FileMode.Open, FileAccess.Read);
-            byte[] idata = new byte[numBytes];
-            BinaryReader br = new BinaryReader(fStream);
-            idata = br.ReadBytes((int)numBytes);
-            br.Close();
-            fStream.Close();
-            info.Data = idata;
-            //info.loaded=true;
-        }
-    }
-}
diff --git a/OpenSim/OpenSim.GridInterfaces/Local/LocalGridServer.cs b/OpenSim/OpenSim.GridInterfaces/Local/LocalGridServer.cs
deleted file mode 100644
index 9b6a9ff..0000000
--- a/OpenSim/OpenSim.GridInterfaces/Local/LocalGridServer.cs
+++ /dev/null
@@ -1,158 +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.Threading;
-using System.IO;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Console;
-using libsecondlife;
-using Db4objects.Db4o;
-using Db4objects.Db4o.Query;
-using System.Collections;
-namespace OpenSim.GridInterfaces.Local
-{
-        /// <summary>
-        /// 
-        /// </summary>
-        /// 
-        public class LocalGridPlugin : IGridPlugin
-        {
-                public LocalGridPlugin()
-                {
-                        
-                }
-                
-                public IGridServer GetGridServer()
-                {
-                        return(new LocalGridServer());
-                }
-        }
-        
-        public class LocalGridServer : LocalGridBase
-        {
-                public List<Login> Sessions = new List<Login>();  
-                
-                public LocalGridServer()
-                {
-                        Sessions = new List<Login>();
-                        MainConsole.Instance.Verbose("Local Grid Server class created");
-                }
-                
-                public override bool RequestConnection(LLUUID SimUUID, string sim_ip, uint sim_port)
-                {
-                        return true;
-                }
-        public override string GetName()
-        {
-            return "Local";
-        }
-                public override AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode)
-                {
-                        //we are running local
-                        AuthenticateResponse user = new AuthenticateResponse();
-                        
-                        lock(this.Sessions)
-                        {
-                                
-                                for(int i = 0; i < Sessions.Count; i++)
-                                {
-                                        if((Sessions[i].Agent == agentID) && (Sessions[i].Session == sessionID))
-                                        {
-                                                user.Authorised = true;
-                                                user.LoginInfo = Sessions[i];
-                                        }
-                                }
-                        }
-                        return(user);
-                }
-                
-                public override bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode)
-                {
-                        return(true);
-                }
-                
-                public override UUIDBlock RequestUUIDBlock()
-                {
-                        UUIDBlock uuidBlock = new UUIDBlock();
-                        return(uuidBlock);
-                }
-        public override NeighbourInfo[] RequestNeighbours()
-                {
-                        return null;
-                }
-        public override void SetServerInfo(string ServerUrl, string SendKey, string RecvKey)
-                {
-                        
-                }
-        public override IList RequestMapBlocks(int minX, int minY, int maxX, int maxY)
-        {
-            return new ArrayList();
-        }
-                
-                public override void Close()
-                {
-                        
-                }
-                /// <summary>
-                /// used by the local login server to inform us of new sessions
-                /// </summary>
-                /// <param name="session"></param>
-                public override void AddNewSession(Login session)
-                {
-                        lock(this.Sessions)
-                        {
-                                this.Sessions.Add(session);
-                        }
-                }
-        }
-        public class AssetUUIDQuery : Predicate
-        {
-                private LLUUID _findID;
-                
-                public AssetUUIDQuery(LLUUID find)
-                {
-                        _findID = find;
-                }
-                public bool Match(AssetStorage asset)
-                {
-                        return (asset.UUID == _findID);
-                }
-        }
-                
-}
diff --git a/OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj b/OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj
deleted file mode 100644
index 1acd1b5..0000000
--- a/OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj
+++ /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>{546099CD-0000-0000-0000-000000000000}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon></ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>OpenSim.GridInterfaces.Local</AssemblyName>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenSim.GridInterfaces.Local</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="..\..\..\Common\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="..\..\..\Common\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>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LocalAssetServer.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LocalGridServer.cs">
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
diff --git a/OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build b/OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build
deleted file mode 100644
index c3c4ae4..0000000
--- a/OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" ?>
-<project name="OpenSim.GridInterfaces.Local" 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.GridInterfaces.Local" dynamicprefix="true" >
-            </resources>
-            <sources failonempty="true">
-                <include name="AssemblyInfo.cs" />
-                <include name="LocalAssetServer.cs" />
-                <include name="LocalGridServer.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.dll" />
-                <include name="../../../bin/OpenSim.Framework.Console.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/OpenSim/OpenSim.GridInterfaces/Remote/AssemblyInfo.cs b/OpenSim/OpenSim.GridInterfaces/Remote/AssemblyInfo.cs
deleted file mode 100644
index 51596d0..0000000
--- a/OpenSim/OpenSim.GridInterfaces/Remote/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("RemoteGridServers")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("RemoteGridServers")]
-[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/OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj b/OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj
deleted file mode 100644
index 11aacac..0000000
--- a/OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.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>{B55C0B5D-0000-0000-0000-000000000000}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon></ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>OpenSim.GridInterfaces.Remote</AssemblyName>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenSim.GridInterfaces.Remote</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="..\..\..\Common\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="..\..\..\Common\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="..\..\..\Common\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="AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="RemoteAssetServer.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="RemoteGridServer.cs">
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
diff --git a/OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build b/OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build
deleted file mode 100644
index 860251f..0000000
--- a/OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" ?>
-<project name="OpenSim.GridInterfaces.Remote" 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.GridInterfaces.Remote" dynamicprefix="true" >
-            </resources>
-            <sources failonempty="true">
-                <include name="AssemblyInfo.cs" />
-                <include name="RemoteAssetServer.cs" />
-                <include name="RemoteGridServer.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/OpenSim/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs b/OpenSim/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs
deleted file mode 100644
index 550fec6..0000000
--- a/OpenSim/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs
+++ /dev/null
@@ -1,135 +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.Threading;
-using System.Net;
-using System.Net.Sockets;
-using System.IO;
-using libsecondlife;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Utilities;
-namespace OpenSim.GridInterfaces.Remote
-{
-    public class RemoteAssetServer : IAssetServer
-    {
-        private IAssetReceiver _receiver;
-        private BlockingQueue<ARequest> _assetRequests;
-        private Thread _remoteAssetServerThread;
-        private string AssetServerUrl;
-        private string AssetSendKey;
-        public RemoteAssetServer()
-        {
-            this._assetRequests = new BlockingQueue<ARequest>();
-            this._remoteAssetServerThread = new Thread(new ThreadStart(RunRequests));
-            this._remoteAssetServerThread.IsBackground = true;
-            this._remoteAssetServerThread.Start();
-            OpenSim.Framework.Console.MainConsole.Instance.Verbose("Remote Asset Server class created");
-        }
-        public void SetReceiver(IAssetReceiver receiver)
-        {
-            this._receiver = receiver;
-        }
-        public void RequestAsset(LLUUID assetID, bool isTexture)
-        {
-            ARequest req = new ARequest();
-            req.AssetID = assetID;
-            req.IsTexture = isTexture;
-            this._assetRequests.Enqueue(req);
-        }
-        public void UpdateAsset(AssetBase asset)
-        {
-        }
-        public void UploadNewAsset(AssetBase asset)
-        {
-            Encoding Windows1252Encoding = Encoding.GetEncoding(1252);
-            string ret = Windows1252Encoding.GetString(asset.Data);
-            byte[] buffer = Windows1252Encoding.GetBytes(ret);
-            WebClient client = new WebClient();
-            client.UploadData(this.AssetServerUrl + "assets/" + asset.FullID, buffer);
-        }
-        public void SetServerInfo(string ServerUrl, string ServerKey)
-        {
-            this.AssetServerUrl = ServerUrl;
-            this.AssetSendKey = ServerKey;
-        }
-        private void RunRequests()
-        {
-            while (true)
-            {
-                //we need to add support for the asset server not knowing about a requested asset
-                // 404... THE MAGIC FILE NOT FOUND ERROR, very useful for telling you things such as a file (or asset ;) ) not being found!!!!!!!!!!! it's 2:22AM
-                ARequest req = this._assetRequests.Dequeue();
-                LLUUID assetID = req.AssetID;
-              //  OpenSim.Framework.Console.MainConsole.Instance.Verbose(" RemoteAssetServer- Got a AssetServer request, processing it - " + this.AssetServerUrl + "assets/" + assetID);
-                WebRequest AssetLoad = WebRequest.Create(this.AssetServerUrl + "assets/" + assetID);
-                WebResponse AssetResponse = AssetLoad.GetResponse();
-                byte[] idata = new byte[(int)AssetResponse.ContentLength];
-                BinaryReader br = new BinaryReader(AssetResponse.GetResponseStream());
-                idata = br.ReadBytes((int)AssetResponse.ContentLength);
-                br.Close();
-                
-                AssetBase asset = new AssetBase();
-                asset.FullID = assetID;
-                asset.Data = idata;
-                _receiver.AssetReceived(asset, req.IsTexture);
-            }
-        }
-        public void Close()
-        {
-        }
-    }
-    public class RemoteAssetPlugin : IAssetPlugin
-    {
-        public RemoteAssetPlugin()
-        {
-        }
-        public IAssetServer GetAssetServer()
-        {
-            return (new RemoteAssetServer());
-        }
-    }
-}
diff --git a/OpenSim/OpenSim.GridInterfaces/Remote/RemoteGridServer.cs b/OpenSim/OpenSim.GridInterfaces/Remote/RemoteGridServer.cs
deleted file mode 100644
index 7c93d43..0000000
--- a/OpenSim/OpenSim.GridInterfaces/Remote/RemoteGridServer.cs
+++ /dev/null
@@ -1,212 +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.Threading;
-using System.Net;
-using System.Net.Sockets;
-using System.IO;
-using libsecondlife;
-using Nwc.XmlRpc;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Console;
-namespace OpenSim.GridInterfaces.Remote
-{
-    public class RemoteGridServer : RemoteGridBase
-    {
-        private string GridServerUrl;
-        private string GridSendKey;
-        private string GridRecvKey;
-        private Dictionary<uint, AgentCircuitData> AgentCircuits = new Dictionary<uint, AgentCircuitData>();
-        private ArrayList simneighbours = new ArrayList();
-        private Hashtable griddatahash;
-        public override Dictionary<uint, AgentCircuitData> agentcircuits
-        {
-            get { return AgentCircuits; }
-            set { AgentCircuits = value; }
-        }
-        public override ArrayList neighbours
-        {
-            get { return simneighbours; }
-            set { simneighbours = value; }
-        }
-        public override Hashtable GridData
-        {
-            get { return griddatahash; }
-            set { griddatahash = value; }
-        }
-        public RemoteGridServer()
-        {
-            MainConsole.Instance.Notice("Remote Grid Server class created");
-        }
-        public override bool RequestConnection(LLUUID SimUUID, string sim_ip, uint sim_port)
-        {
-            Hashtable GridParams = new Hashtable();
-            GridParams["authkey"] = GridSendKey;
-            GridParams["UUID"] = SimUUID.ToString();
-            GridParams["sim_ip"] = sim_ip;
-            GridParams["sim_port"] = sim_port.ToString();
-            ArrayList SendParams = new ArrayList();
-            SendParams.Add(GridParams);
-            XmlRpcRequest GridReq = new XmlRpcRequest("simulator_login", SendParams);
-            XmlRpcResponse GridResp = GridReq.Send(this.GridServerUrl, 3000);
-            Hashtable GridRespData = (Hashtable)GridResp.Value;
-            this.griddatahash = GridRespData;
-            if (GridRespData.ContainsKey("error"))
-            {
-                string errorstring = (string)GridRespData["error"];
-                MainConsole.Instance.Warn("Error connecting to grid:");
-                MainConsole.Instance.Warn(errorstring);
-                return false;
-            }
-            this.neighbours = (ArrayList)GridRespData["neighbours"];
-            Console.WriteLine(simneighbours.Count);
-            return true;
-        }
-        public override 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))
-            {
-                // YAY! Valid login
-                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;
-            }
-            else
-            {
-                // Invalid
-                user.Authorised = false;
-            }
-            return (user);
-        }
-        public override bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode)
-        {
-            WebRequest DeleteSession = WebRequest.Create(GridServerUrl + "/usersessions/" + sessionID.ToString());
-            DeleteSession.Method = "DELETE";
-            DeleteSession.ContentType = "text/plaintext";
-            DeleteSession.ContentLength = 0;
-            StreamWriter stOut = new StreamWriter(DeleteSession.GetRequestStream(), System.Text.Encoding.ASCII);
-            stOut.Write("");
-            stOut.Close();
-            StreamReader stIn = new StreamReader(DeleteSession.GetResponse().GetResponseStream());
-            string GridResponse = stIn.ReadToEnd();
-            stIn.Close();
-            return (true);
-        }
-        public override UUIDBlock RequestUUIDBlock()
-        {
-            UUIDBlock uuidBlock = new UUIDBlock();
-            return (uuidBlock);
-        }
-        public override NeighbourInfo[] RequestNeighbours()
-        {
-            return null;
-        }
-        public override IList RequestMapBlocks(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(GridServerUrl, 3000);
-            Hashtable respData = (Hashtable)resp.Value;
-            return (IList)respData["sim-profiles"];
-        }
-        public override void SetServerInfo(string ServerUrl, string SendKey, string RecvKey)
-        {
-            this.GridServerUrl = ServerUrl;
-            this.GridSendKey = SendKey;
-            this.GridRecvKey = RecvKey;
-        }
-        public override string GetName()
-        {
-            return "Remote";
-        }
-        public override void Close()
-        {
-        }
-    }
-    public class RemoteGridPlugin : IGridPlugin
-    {
-        public RemoteGridPlugin()
-        {
-        }
-        public IGridServer GetGridServer()
-        {
-            return (new RemoteGridServer());
-        }
-    }
-}
diff --git a/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/AssemblyInfo.cs b/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/AssemblyInfo.cs
deleted file mode 100644
index 177c49d..0000000
--- a/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/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("PhysXplugin")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("PhysXplugin")]
-[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/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs b/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs
deleted file mode 100644
index 3d8c9aa..0000000
--- a/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs
+++ /dev/null
@@ -1,278 +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 OpenSim.Physics.Manager;
-namespace OpenSim.Physics.BasicPhysicsPlugin
-{
-        /// <summary>
-        /// Will be the PhysX plugin but for now will be a very basic physics engine
-        /// </summary>
-        public class BasicPhysicsPlugin : IPhysicsPlugin
-        {
-                private BasicScene _mScene;
-                
-                public BasicPhysicsPlugin()
-                {
-                        
-                }
-                
-                public bool Init()
-                {
-                        return true;
-                }
-                
-                public PhysicsScene GetScene()
-                {
-                        if(_mScene == null)
-                        {
-                                _mScene = new BasicScene();
-                        }
-                        return(_mScene);
-                }
-                
-                public string GetName()
-                {
-                        return("basicphysics");
-                }
-                
-                public void Dispose()
-                {
-                        
-                }
-        }
-        
-        public class BasicScene :PhysicsScene
-        {
-                private List<BasicActor> _actors = new List<BasicActor>();
-                private float[] _heightMap;
-                
-                public BasicScene()
-                {
-                        
-                }
-                
-                public override PhysicsActor AddAvatar(PhysicsVector position)
-                {
-                        BasicActor act = new BasicActor();
-                        act.Position = position;
-                        _actors.Add(act);
-                        return act;
-                }
-        public override void RemoveAvatar(PhysicsActor actor)
-        {
-            BasicActor act = (BasicActor)actor;
-            if(_actors.Contains(act))
-            {
-                _actors.Remove(act);
-            }
-        }
-                public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size)
-                {
-                        return null;
-                }
-                
-                public override void Simulate(float timeStep)
-                {
-                        foreach (BasicActor actor in _actors)
-                        {
-                                actor.Position.X = actor.Position.X + (actor.Velocity.X * timeStep);
-                                actor.Position.Y = actor.Position.Y + (actor.Velocity.Y * timeStep);
-                                actor.Position.Z = actor.Position.Z + (actor.Velocity.Z * timeStep);
-                                /*if(actor.Flying)
-                                {
-                                        actor.Position.Z = actor.Position.Z + (actor.Velocity.Z * timeStep);
-                                }
-                                else
-                                {
-                                        actor.Position.Z = actor.Position.Z + ((-9.8f + actor.Velocity.Z) * timeStep);
-                                }
-                                if(actor.Position.Z < (_heightMap[(int)actor.Position.Y * 256 + (int)actor.Position.X]+1))
-                                {*/
-                if ((actor.Position.Y > 0 && actor.Position.Y < 256) && (actor.Position.X > 0 && actor.Position.X < 256))
-                {
-                    actor.Position.Z = _heightMap[(int)actor.Position.Y * 256 + (int)actor.Position.X] + 1;
-                }
-                                //}
-                                // This code needs sorting out - border crossings etc
-/*                              if(actor.Position.X<0)
-                                {
-                                        ControllingClient.CrossSimBorder(new LLVector3(this.Position.X,this.Position.Y,this.Position.Z));
-                                        actor.Position.X = 0;
-                                        actor.Velocity.X = 0;
-                                }
-                                if(actor.Position.Y < 0)
-                                {
-                                        ControllingClient.CrossSimBorder(new LLVector3(this.Position.X,this.Position.Y,this.Position.Z));
-                                        actor.Position.Y = 0;
-                                        actor.Velocity.Y = 0;
-                                }
-                                if(actor.Position.X > 255)
-                                {
-                                        ControllingClient.CrossSimBorder(new LLVector3(this.Position.X,this.Position.Y,this.Position.Z));
-                                        actor.Position.X = 255;
-                                        actor.Velocity.X = 0;
-                                }
-                                if(actor.Position.Y > 255) 
-                                {
-                                        ControllingClient.CrossSimBorder(new LLVector3(this.Position.X,this.Position.Y,this.Position.Z));
-                                        actor.Position.Y = 255;
-                                        actor.Velocity.X = 0;
-                                }*/
-                        }
-                }
-                
-                public override void GetResults()
-                {
-                
-                }
-                
-                public override bool IsThreaded
-                {
-                        get
-                        {
-                                return(false); // for now we won't be multithreaded
-                        }
-                }
-                
-                public override void SetTerrain(float[] heightMap)
-                {
-                        this._heightMap = heightMap;
-                }
-        public override void DeleteTerrain()
-        {
-        }
-        }
-        
-        public  class BasicActor : PhysicsActor
-        {
-                private PhysicsVector _position;
-                private PhysicsVector _velocity;
-                private PhysicsVector _acceleration;
-                private bool flying;
-                public BasicActor()
-                {
-                        _velocity = new PhysicsVector();
-                        _position = new PhysicsVector();
-                        _acceleration = new PhysicsVector();
-                }
-                
-                public override bool Flying
-                {
-                        get
-                        {
-                                return false;
-                        }
-                        set
-                        {
-                                flying= value;
-                        }
-                }
-                
-                public override PhysicsVector Position
-                {
-                        get
-                        {
-                                return _position;
-                        }
-                        set
-                        {
-                                _position = value;
-                        }
-                }
-                
-                public override PhysicsVector Velocity
-                {
-                        get
-                        {
-                                return _velocity;
-                        }
-                        set
-                        {
-                                _velocity = value;
-                        }
-                }
-                
-                public override Axiom.MathLib.Quaternion Orientation
-                {
-                        get
-                        {
-                                return Axiom.MathLib.Quaternion.Identity;
-                        }
-                        set
-                        {
-                                
-                        }
-                }
-                
-                public override PhysicsVector Acceleration
-                {
-                        get
-                        {
-                                return _acceleration;
-                        }
-                        
-                }
-                
-                public override bool Kinematic
-                {
-                        get
-                        {
-                                return true;
-                        }
-                        set
-                        {
-                                
-                        }
-                }
-                public void SetAcceleration (PhysicsVector accel)
-                {
-                        this._acceleration = accel;
-                }
-                
-                public override void AddForce(PhysicsVector force)
-                {
-                        
-                }
-                
-                public override void SetMomentum(PhysicsVector momentum)
-                {
-                        
-                }
-        }
-}
diff --git a/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj b/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj
deleted file mode 100644
index f88eb32..0000000
--- a/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.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>{4F874463-0000-0000-0000-000000000000}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon></ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>OpenSim.Physics.BasicPhysicsPlugin</AssemblyName>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenSim.Physics.BasicPhysicsPlugin</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\Physics\</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\Physics\</OutputPath>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <RemoveIntegerChecks>False</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Axiom.MathLib.dll" >
-      <HintPath>..\..\..\bin\Axiom.MathLib.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System" >
-      <HintPath>System.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Manager\OpenSim.Physics.Manager.csproj">
-      <Name>OpenSim.Physics.Manager</Name>
-      <Project>{8BE16150-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-                        <Private>False</Private>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="BasicPhysicsPlugin.cs">
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
diff --git a/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build b/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build
deleted file mode 100644
index 00ca3f9..0000000
--- a/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" ?>
-<project name="OpenSim.Physics.BasicPhysicsPlugin" 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.Physics.BasicPhysicsPlugin" dynamicprefix="true" >
-            </resources>
-            <sources failonempty="true">
-                <include name="AssemblyInfo.cs" />
-                <include name="BasicPhysicsPlugin.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/Axiom.MathLib.dll" />
-                <include name="../../../bin/OpenSim.Physics.Manager.dll" />
-                <include name="System.dll" />
-            </references>
-        </csc>
-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/Physics/" />
-        <mkdir dir="${project::get-base-directory()}/../../../bin/Physics/"/>
-        <copy todir="${project::get-base-directory()}/../../../bin/Physics/">
-            <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/OpenSim/OpenSim.Physics/Manager/AssemblyInfo.cs b/OpenSim/OpenSim.Physics/Manager/AssemblyInfo.cs
deleted file mode 100644
index 132f64a..0000000
--- a/OpenSim/OpenSim.Physics/Manager/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("PhysicsManager")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("PhysicsManager")]
-[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/OpenSim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj b/OpenSim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj
deleted file mode 100644
index 347a649..0000000
--- a/OpenSim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.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>{8BE16150-0000-0000-0000-000000000000}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon></ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>OpenSim.Physics.Manager</AssemblyName>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenSim.Physics.Manager</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="Axiom.MathLib.dll" >
-      <HintPath>..\..\..\bin\Axiom.MathLib.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="..\..\..\Common\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="..\..\..\Common\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>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="PhysicsActor.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="PhysicsManager.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="PhysicsScene.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="PhysicsVector.cs">
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
diff --git a/OpenSim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build b/OpenSim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build
deleted file mode 100644
index fc3e1e6..0000000
--- a/OpenSim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" ?>
-<project name="OpenSim.Physics.Manager" 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.Physics.Manager" dynamicprefix="true" >
-            </resources>
-            <sources failonempty="true">
-                <include name="AssemblyInfo.cs" />
-                <include name="PhysicsActor.cs" />
-                <include name="PhysicsManager.cs" />
-                <include name="PhysicsScene.cs" />
-                <include name="PhysicsVector.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/Axiom.MathLib.dll" />
-                <include name="../../../bin/OpenSim.Framework.dll" />
-                <include name="../../../bin/OpenSim.Framework.Console.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/OpenSim/OpenSim.Physics/Manager/PhysicsActor.cs b/OpenSim/OpenSim.Physics/Manager/PhysicsActor.cs
deleted file mode 100644
index 9ff94c4..0000000
--- a/OpenSim/OpenSim.Physics/Manager/PhysicsActor.cs
+++ /dev/null
@@ -1,162 +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.Physics.Manager
-{
-    public abstract class PhysicsActor
-    {
-        public static PhysicsActor Null
-        {
-            get
-            {
-                return new NullPhysicsActor();
-            }
-        }
-        public abstract PhysicsVector Position
-        {
-            get;
-            set;
-        }
-        public abstract PhysicsVector Velocity
-        {
-            get;
-            set;
-        }
-        public abstract PhysicsVector Acceleration
-        {
-            get;
-        }
-        public abstract Axiom.MathLib.Quaternion Orientation
-        {
-            get;
-            set;
-        }
-        public abstract bool Flying
-        {
-            get;
-            set;
-        }
-        public abstract bool Kinematic
-        {
-            get;
-            set;
-        }
-        public abstract void AddForce(PhysicsVector force);
-        public abstract void SetMomentum(PhysicsVector momentum);
-    }
-    public class NullPhysicsActor : PhysicsActor
-    {
-        public override PhysicsVector Position
-        {
-            get
-            {
-                return PhysicsVector.Zero;
-            }
-            set
-            {
-                return;
-            }
-        }
-        public override PhysicsVector Velocity
-        {
-            get
-            {
-                return PhysicsVector.Zero;
-            }
-            set
-            {
-                return;
-            }
-        }
-        public override Axiom.MathLib.Quaternion Orientation
-        {
-            get
-            {
-                return Axiom.MathLib.Quaternion.Identity;
-            }
-            set
-            {
-            }
-        }
-        public override PhysicsVector Acceleration
-        {
-            get { return PhysicsVector.Zero; }
-        }
-        public override bool Flying
-        {
-            get
-            {
-                return false;
-            }
-            set
-            {
-                return;
-            }
-        }
-        public override bool Kinematic
-        {
-            get
-            {
-                return true;
-            }
-            set
-            {
-                return;
-            }
-        }
-        public override void AddForce(PhysicsVector force)
-        {
-            return;
-        }
-        public override void SetMomentum(PhysicsVector momentum)
-        {
-            return;
-        }
-    }
-}
diff --git a/OpenSim/OpenSim.Physics/Manager/PhysicsManager.cs b/OpenSim/OpenSim.Physics/Manager/PhysicsManager.cs
deleted file mode 100644
index f85c098..0000000
--- a/OpenSim/OpenSim.Physics/Manager/PhysicsManager.cs
+++ /dev/null
@@ -1,117 +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.IO;
-using System.Reflection;
-using Axiom.MathLib;
-using OpenSim.Framework.Console;
-namespace OpenSim.Physics.Manager
-{
-        /// <summary>
-        /// Description of MyClass.
-        /// </summary>
-        public class PhysicsManager
-        {
-                private Dictionary<string, IPhysicsPlugin> _plugins=new Dictionary<string, IPhysicsPlugin>();
-                
-                public PhysicsManager()
-                {
-                        
-                }
-                
-                public PhysicsScene GetPhysicsScene(string engineName)
-                {
-            if (String.IsNullOrEmpty(engineName))
-            {
-                return new NullPhysicsScene();
-            }
-                        if(_plugins.ContainsKey(engineName))
-                        {
-                                MainConsole.Instance.Notice("creating "+engineName);
-                                return _plugins[engineName].GetScene();
-                        }
-                        else
-            {
-                MainConsole.Instance.Warn("couldn't find physicsEngine: {0}",engineName);
-                throw new ArgumentException(String.Format("couldn't find physicsEngine: {0}",engineName));
-                        }
-                }
-                
-                public void LoadPlugins()
-                {
-                        string path = Path.Combine(System.AppDomain.CurrentDomain.BaseDirectory ,"Physics");
-                string[] pluginFiles = Directory.GetFiles(path, "*.dll");
-        
-                for(int i= 0; i<pluginFiles.Length; i++)
-                {
-                        this.AddPlugin(pluginFiles[i]);
-                }
-        }
-                
-                private void AddPlugin(string FileName)
-                {
-                        Assembly pluginAssembly = Assembly.LoadFrom(FileName);
-                        
-                        foreach (Type pluginType in pluginAssembly.GetTypes())
-                        {
-                                if (pluginType.IsPublic) 
-                                {
-                                        if (!pluginType.IsAbstract)  
-                                        {
-                                                Type typeInterface = pluginType.GetInterface("IPhysicsPlugin", true);
-                                                
-                                                if (typeInterface != null)
-                                                {
-                                                        IPhysicsPlugin plug = (IPhysicsPlugin)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
-                                                        plug.Init();
-                                                        this._plugins.Add(plug.GetName(),plug);
-                                                        
-                                                }       
-                                                
-                                                typeInterface = null;                   
-                                        }                               
-                                }                       
-                        }
-                        
-                        pluginAssembly = null; 
-                }
-        }
-        public interface IPhysicsPlugin
-        {
-                bool Init();
-                PhysicsScene GetScene();
-                string GetName();
-                void Dispose();
-        }
-}
diff --git a/OpenSim/OpenSim.Physics/Manager/PhysicsScene.cs b/OpenSim/OpenSim.Physics/Manager/PhysicsScene.cs
deleted file mode 100644
index 8128457..0000000
--- a/OpenSim/OpenSim.Physics/Manager/PhysicsScene.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;
-using OpenSim.Framework.Console;
-namespace OpenSim.Physics.Manager
-{
-    public abstract class PhysicsScene
-    {
-        public static PhysicsScene Null
-        {
-            get
-            {
-                return new NullPhysicsScene();
-            }
-        }
-        public abstract PhysicsActor AddAvatar(PhysicsVector position);
-        public abstract void RemoveAvatar(PhysicsActor actor);
-        public abstract PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size);
-        public abstract void Simulate(float timeStep);
-        public abstract void GetResults();
-        public abstract void SetTerrain(float[] heightMap);
-        
-        public abstract void DeleteTerrain();
-        public abstract bool IsThreaded
-        {
-            get;
-        }
-    }
-    public class NullPhysicsScene : PhysicsScene
-    {
-        private static int m_workIndicator;
-        public override PhysicsActor AddAvatar(PhysicsVector position)
-        {
-            MainConsole.Instance.Verbose("NullPhysicsScene : AddAvatar({0})", position);
-            return PhysicsActor.Null;
-        }
-        public override void RemoveAvatar(PhysicsActor actor)
-        {
-        }
-        public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size)
-        {
-            MainConsole.Instance.Verbose( "NullPhysicsScene : AddPrim({0},{1})", position, size);
-            return PhysicsActor.Null;
-        }
-        public override void Simulate(float timeStep)
-        {
-            m_workIndicator = (m_workIndicator + 1) % 10;
-            //OpenSim.Framework.Console.MainConsole.Instance.SetStatus(m_workIndicator.ToString());
-        }
-        public override void GetResults()
-        {
-            MainConsole.Instance.Verbose( "NullPhysicsScene : GetResults()");
-        }
-        public override void SetTerrain(float[] heightMap)
-        {
-            MainConsole.Instance.Verbose( "NullPhysicsScene : SetTerrain({0} items)", heightMap.Length);
-        }
-        public override void DeleteTerrain()
-        {
-        }
-        public override bool IsThreaded
-        {
-            get { return false; }
-        }
-    }
-}
diff --git a/OpenSim/OpenSim.Physics/Manager/PhysicsVector.cs b/OpenSim/OpenSim.Physics/Manager/PhysicsVector.cs
deleted file mode 100644
index 8f3514f..0000000
--- a/OpenSim/OpenSim.Physics/Manager/PhysicsVector.cs
+++ /dev/null
@@ -1,55 +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.Physics.Manager
-{
-    public class PhysicsVector
-    {
-        public float X;
-        public float Y;
-        public float Z;
-        public PhysicsVector()
-        {
-        }
-        public PhysicsVector(float x, float y, float z)
-        {
-            X = x;
-            Y = y;
-            Z = z;
-        }
-        public static readonly PhysicsVector Zero = new PhysicsVector(0f, 0f, 0f);
-    }
-}
diff --git a/OpenSim/OpenSim.Physics/OdePlugin/AssemblyInfo.cs b/OpenSim/OpenSim.Physics/OdePlugin/AssemblyInfo.cs
deleted file mode 100644
index b49c8da..0000000
--- a/OpenSim/OpenSim.Physics/OdePlugin/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("RealPhysXplugin")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("RealPhysXplugin")]
-[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/OpenSim/OpenSim.Physics/OdePlugin/OdePlugin.cs b/OpenSim/OpenSim.Physics/OdePlugin/OdePlugin.cs
deleted file mode 100644
index 6758f76..0000000
--- a/OpenSim/OpenSim.Physics/OdePlugin/OdePlugin.cs
+++ /dev/null
@@ -1,457 +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 OpenSim.Physics.Manager;
-using Ode.NET;
-namespace OpenSim.Physics.OdePlugin
-{
-    /// <summary>
-    /// ODE plugin 
-    /// </summary>
-    public class OdePlugin : IPhysicsPlugin
-    {
-        private OdeScene _mScene;
-        public OdePlugin()
-        {
-        }
-        public bool Init()
-        {
-            return true;
-        }
-        public PhysicsScene GetScene()
-        {
-            if (_mScene == null)
-            {
-                _mScene = new OdeScene();
-            }
-            return (_mScene);
-        }
-        public string GetName()
-        {
-            return ("OpenDynamicsEngine");
-        }
-        public void Dispose()
-        {
-        }
-    }
-    public class OdeScene : PhysicsScene
-    {
-        static public IntPtr world;
-        static public IntPtr space;
-        static private IntPtr contactgroup;
-        static private IntPtr LandGeom;
-        //static private IntPtr Land;
-        private double[] _heightmap;
-        static private d.NearCallback nearCallback = near;
-        private List<OdeCharacter> _characters = new List<OdeCharacter>();
-        private static d.ContactGeom[] contacts = new d.ContactGeom[30];
-        private static d.Contact contact;
-        public OdeScene()
-        {
-            contact.surface.mode |= d.ContactFlags.Approx1 | d.ContactFlags.SoftCFM | d.ContactFlags.SoftERP;
-            contact.surface.mu = 10.0f;
-            contact.surface.bounce = 0.9f;
-            contact.surface.soft_erp = 0.005f;
-            contact.surface.soft_cfm = 0.00003f;
-            world = d.WorldCreate();
-            space = d.HashSpaceCreate(IntPtr.Zero);
-            contactgroup = d.JointGroupCreate(0);
-            d.WorldSetGravity(world, 0.0f, 0.0f, -10.0f);   
-            d.WorldSetAutoDisableFlag(world, false);
-            d.WorldSetContactSurfaceLayer(world, 0.001f);
-            this._heightmap = new double[65536];
-        }
-        // This function blatantly ripped off from BoxStack.cs
-        static private void near(IntPtr space, IntPtr g1, IntPtr g2)
-        {
-            IntPtr b1 = d.GeomGetBody(g1);
-            IntPtr b2 = d.GeomGetBody(g2);
-            if (b1 != IntPtr.Zero && b2 != IntPtr.Zero && d.AreConnectedExcluding(b1, b2, d.JointType.Contact))
-                return;
-            int count = d.Collide(g1, g2, 500, contacts, d.ContactGeom.SizeOf);
-            for (int i = 0; i < count; ++i)
-            {
-                contact.geom = contacts[i];
-                IntPtr joint = d.JointCreateContact(world, contactgroup, ref contact);
-                d.JointAttach(joint, b1, b2);
-            }
-        }
-        public override PhysicsActor AddAvatar(PhysicsVector position)
-        {
-            PhysicsVector pos = new PhysicsVector();
-            pos.X = position.X;
-            pos.Y = position.Y;
-            pos.Z = position.Z + 20;
-            OdeCharacter newAv = new OdeCharacter(this, pos);
-            this._characters.Add(newAv);
-            return newAv;
-        }
-        public override void RemoveAvatar(PhysicsActor actor)
-        {
-        }
-        public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size)
-        {
-            PhysicsVector pos = new PhysicsVector();
-            pos.X = position.X;
-            pos.Y = position.Y;
-            pos.Z = position.Z;
-            PhysicsVector siz = new PhysicsVector();
-            siz.X = size.X;
-            siz.Y = size.Y;
-            siz.Z = size.Z;
-            return new OdePrim();
-        }
-        public override void Simulate(float timeStep)
-        {
-            foreach (OdeCharacter actor in _characters)
-            {
-                actor.Move(timeStep);
-            }
-            d.SpaceCollide(space, IntPtr.Zero, nearCallback);
-            for (int i = 0; i < 50; i++)
-            {
-                d.WorldQuickStep(world, timeStep * 0.02f);
-            }
-            d.JointGroupEmpty(contactgroup);
-            foreach (OdeCharacter actor in _characters)
-            {
-                actor.UpdatePosition();
-            }
-        }
-        public override void GetResults()
-        {
-        }
-        public override bool IsThreaded
-        {
-            get
-            {
-                return (false); // for now we won't be multithreaded
-            }
-        }
-        public override void SetTerrain(float[] heightMap)
-        {
-            for (int i = 0; i < 65536; i++)
-            {
-                // this._heightmap[i] = (double)heightMap[i];
-                // dbm (danx0r) -- heightmap x,y must be swapped for Ode (should fix ODE, but for now...)
-                int x = i & 0xff;
-                int y = i >> 8;
-                this._heightmap[i] = (double)heightMap[x * 256 + y];
-            }
-            IntPtr HeightmapData = d.GeomHeightfieldDataCreate();
-            d.GeomHeightfieldDataBuildDouble(HeightmapData, _heightmap, 0, 256, 256, 256, 256, 1.0f, 0.0f, 2.0f, 0);
-            d.GeomHeightfieldDataSetBounds(HeightmapData, 256, 256);
-            LandGeom = d.CreateHeightfield(space, HeightmapData, 1);
-            d.Matrix3 R = new d.Matrix3();
-            
-            Axiom.MathLib.Quaternion q1 =Axiom.MathLib.Quaternion.FromAngleAxis(1.5707f, new Axiom.MathLib.Vector3(1,0,0));
-            Axiom.MathLib.Quaternion q2 =Axiom.MathLib.Quaternion.FromAngleAxis(1.5707f, new Axiom.MathLib.Vector3(0,1,0));
-           //Axiom.MathLib.Quaternion q3 = Axiom.MathLib.Quaternion.FromAngleAxis(3.14f, new Axiom.MathLib.Vector3(0, 0, 1));
-            
-            q1 = q1 * q2;
-            //q1 = q1 * q3;
-            Axiom.MathLib.Vector3 v3 = new Axiom.MathLib.Vector3();
-            float angle = 0;
-            q1.ToAngleAxis(ref angle, ref v3);
-            d.RFromAxisAndAngle(out R, v3.x, v3.y, v3.z, angle);
-            d.GeomSetRotation(LandGeom, ref R); 
-            d.GeomSetPosition(LandGeom, 128, 128, 0); 
-        }
-        public override void DeleteTerrain()
-        {
-        }
-    }
-    public class OdeCharacter : PhysicsActor
-    {
-        private PhysicsVector _position;
-        private PhysicsVector _velocity;
-        private PhysicsVector _acceleration;
-        private bool flying = false;
-        //private float gravityAccel;
-        private IntPtr BoundingCapsule;
-        IntPtr capsule_geom;
-        d.Mass capsule_mass;
-        public OdeCharacter(OdeScene parent_scene, PhysicsVector pos)
-        {
-            _velocity = new PhysicsVector();
-            _position = pos;
-            _acceleration = new PhysicsVector();
-            d.MassSetCapsule(out capsule_mass, 50.0f, 3, 0.5f, 2f);
-            capsule_geom = d.CreateSphere(OdeScene.space, 1.0f);        /// not a typo!  Spheres roll, capsules tumble
-            this.BoundingCapsule = d.BodyCreate(OdeScene.world);
-            d.BodySetMass(BoundingCapsule, ref capsule_mass);
-            d.BodySetPosition(BoundingCapsule, pos.X, pos.Y, pos.Z);
-            d.GeomSetBody(capsule_geom, BoundingCapsule);
-        }
-        public override bool Flying
-        {
-            get
-            {
-                return flying;
-            }
-            set
-            {
-                flying = value;
-            }
-        }
-        public override PhysicsVector Position
-        {
-            get
-            {
-                return _position;
-            }
-            set
-            {
-                _position = value;
-            }
-        }
-        public override PhysicsVector Velocity
-        {
-            get
-            {
-                return _velocity;
-            }
-            set
-            {
-                _velocity = value;
-            }
-        }
-        public override bool Kinematic
-        {
-            get
-            {
-                return false;
-            }
-            set
-            {
-            }
-        }
-        public override Axiom.MathLib.Quaternion Orientation
-        {
-            get
-            {
-                return Axiom.MathLib.Quaternion.Identity;
-            }
-            set
-            {
-            }
-        }
-        public override PhysicsVector Acceleration
-        {
-            get
-            {
-                return _acceleration;
-            }
-        }
-        public void SetAcceleration(PhysicsVector accel)
-        {
-            this._acceleration = accel;
-        }
-        public override void AddForce(PhysicsVector force)
-        {
-        }
-        public override void SetMomentum(PhysicsVector momentum)
-        {
-        }
-        public void Move(float timeStep)
-        {
-            PhysicsVector vec = new PhysicsVector();
-            d.Vector3 vel = d.BodyGetLinearVel(BoundingCapsule);
-            vec.X = (vel.X - this._velocity.X) * -75000.0f;
-            vec.Y = (vel.Y - this._velocity.Y) * -75000.0f;
-            if (flying)
-            {
-                vec.Z = (vel.Z - this._velocity.Z) * -75000.0f;
-            }
-            d.BodyAddForce(this.BoundingCapsule, vec.X, vec.Y, vec.Z);
-        }
-        public void UpdatePosition()
-        {
-            d.Vector3 vec = d.BodyGetPosition(BoundingCapsule);
-            this._position.X = vec.X;
-            this._position.Y = vec.Y;
-            this._position.Z = vec.Z;
-        }
-    }
-    public class OdePrim : PhysicsActor
-    {
-        private PhysicsVector _position;
-        private PhysicsVector _velocity;
-        private PhysicsVector _acceleration;
-        public OdePrim()
-        {
-            _velocity = new PhysicsVector();
-            _position = new PhysicsVector();
-            _acceleration = new PhysicsVector();
-        }
-        public override bool Flying
-        {
-            get
-            {
-                return false; //no flying prims for you
-            }
-            set
-            {
-            }
-        }
-        public override PhysicsVector Position
-        {
-            get
-            {
-                PhysicsVector pos = new PhysicsVector();
-                //      PhysicsVector vec = this._prim.Position;
-                //pos.X = vec.X;
-                //pos.Y = vec.Y;
-                //pos.Z = vec.Z;
-                return pos;
-            }
-            set
-            {
-                /*PhysicsVector vec = value;
-                PhysicsVector pos = new PhysicsVector();
-                pos.X = vec.X;
-                pos.Y = vec.Y;
-                pos.Z = vec.Z;
-                this._prim.Position = pos;*/
-            }
-        }
-        public override PhysicsVector Velocity
-        {
-            get
-            {
-                return _velocity;
-            }
-            set
-            {
-                _velocity = value;
-            }
-        }
-        public override bool Kinematic
-        {
-            get
-            {
-                return false;
-                //return this._prim.Kinematic;
-            }
-            set
-            {
-                //this._prim.Kinematic = value;
-            }
-        }
-        public override Axiom.MathLib.Quaternion Orientation
-        {
-            get
-            {
-                Axiom.MathLib.Quaternion res = new Axiom.MathLib.Quaternion();
-                return res;
-            }
-            set
-            {
-            }
-        }
-        public override PhysicsVector Acceleration
-        {
-            get
-            {
-                return _acceleration;
-            }
-        }
-        public void SetAcceleration(PhysicsVector accel)
-        {
-            this._acceleration = accel;
-        }
-        public override void AddForce(PhysicsVector force)
-        {
-        }
-        public override void SetMomentum(PhysicsVector momentum)
-        {
-        }
-    }
-}
diff --git a/OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj b/OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj
deleted file mode 100644
index 08f54aa..0000000
--- a/OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj
+++ /dev/null
@@ -1,97 +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>{63A05FE9-0000-0000-0000-000000000000}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon></ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>OpenSim.Physics.OdePlugin</AssemblyName>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenSim.Physics.OdePlugin</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\Physics\</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\Physics\</OutputPath>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <RemoveIntegerChecks>False</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Axiom.MathLib.dll" >
-      <HintPath>..\..\..\bin\Axiom.MathLib.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Ode.NET.dll" >
-      <HintPath>..\..\..\bin\Ode.NET.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System" >
-      <HintPath>System.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Manager\OpenSim.Physics.Manager.csproj">
-      <Name>OpenSim.Physics.Manager</Name>
-      <Project>{8BE16150-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-                        <Private>False</Private>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="OdePlugin.cs">
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
diff --git a/OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build b/OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build
deleted file mode 100644
index c93c0c2..0000000
--- a/OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" ?>
-<project name="OpenSim.Physics.OdePlugin" 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.Physics.OdePlugin" dynamicprefix="true" >
-            </resources>
-            <sources failonempty="true">
-                <include name="AssemblyInfo.cs" />
-                <include name="OdePlugin.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/Axiom.MathLib.dll" />
-                <include name="../../../bin/Ode.NET.dll" />
-                <include name="../../../bin/OpenSim.Physics.Manager.dll" />
-                <include name="System.dll" />
-            </references>
-        </csc>
-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/Physics/" />
-        <mkdir dir="${project::get-base-directory()}/../../../bin/Physics/"/>
-        <copy todir="${project::get-base-directory()}/../../../bin/Physics/">
-            <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/OpenSim/OpenSim.Physics/PhysXPlugin/AssemblyInfo.cs b/OpenSim/OpenSim.Physics/PhysXPlugin/AssemblyInfo.cs
deleted file mode 100644
index b49c8da..0000000
--- a/OpenSim/OpenSim.Physics/PhysXPlugin/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("RealPhysXplugin")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("RealPhysXplugin")]
-[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/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj b/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj
deleted file mode 100644
index aa89cc1..0000000
--- a/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj
+++ /dev/null
@@ -1,97 +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>{988F0AC4-0000-0000-0000-000000000000}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon></ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>OpenSim.Physics.PhysXPlugin</AssemblyName>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenSim.Physics.PhysXPlugin</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\Physics\</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\Physics\</OutputPath>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <RemoveIntegerChecks>False</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Axiom.MathLib.dll" >
-      <HintPath>..\..\..\bin\Axiom.MathLib.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="PhysX_Wrapper_Dotnet.dll" >
-      <HintPath>..\..\..\bin\PhysX_Wrapper_Dotnet.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System" >
-      <HintPath>System.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Manager\OpenSim.Physics.Manager.csproj">
-      <Name>OpenSim.Physics.Manager</Name>
-      <Project>{8BE16150-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-                        <Private>False</Private>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="PhysXPlugin.cs">
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
diff --git a/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build b/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build
deleted file mode 100644
index be7a847..0000000
--- a/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" ?>
-<project name="OpenSim.Physics.PhysXPlugin" 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.Physics.PhysXPlugin" dynamicprefix="true" >
-            </resources>
-            <sources failonempty="true">
-                <include name="AssemblyInfo.cs" />
-                <include name="PhysXPlugin.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/Axiom.MathLib.dll" />
-                <include name="../../../bin/OpenSim.Physics.Manager.dll" />
-                <include name="../../../bin/PhysX_Wrapper_Dotnet.dll" />
-                <include name="System.dll" />
-            </references>
-        </csc>
-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/Physics/" />
-        <mkdir dir="${project::get-base-directory()}/../../../bin/Physics/"/>
-        <copy todir="${project::get-base-directory()}/../../../bin/Physics/">
-            <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/OpenSim/OpenSim.Physics/PhysXPlugin/PhysXPlugin.cs b/OpenSim/OpenSim.Physics/PhysXPlugin/PhysXPlugin.cs
deleted file mode 100644
index 802f983..0000000
--- a/OpenSim/OpenSim.Physics/PhysXPlugin/PhysXPlugin.cs
+++ /dev/null
@@ -1,424 +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 OpenSim.Physics.Manager;
-using PhysXWrapper;
-namespace OpenSim.Physics.PhysXPlugin
-{
-        /// <summary>
-        /// Will be the PhysX plugin but for now will be a very basic physics engine
-        /// </summary>
-        public class PhysXPlugin : IPhysicsPlugin
-        {
-                private PhysXScene _mScene;
-                
-                public PhysXPlugin()
-                {
-                        
-                }
-                
-                public bool Init()
-                {
-                        return true;
-                }
-                
-                public PhysicsScene GetScene()
-                {
-                        if(_mScene == null)
-                        {
-                                _mScene = new PhysXScene();
-                        }
-                        return(_mScene);
-                }
-                
-                public string GetName()
-                {
-                        return("RealPhysX");
-                }
-                
-                public void Dispose()
-                {
-                        
-                }
-        }
-        
-        public class PhysXScene :PhysicsScene
-        {
-                private List<PhysXCharacter> _characters = new List<PhysXCharacter>();
-                private List<PhysXPrim> _prims = new List<PhysXPrim>();
-                private float[] _heightMap = null;
-                private NxPhysicsSDK mySdk;
-                private NxScene scene;
-                
-                public PhysXScene()
-                {
-                        mySdk = NxPhysicsSDK.CreateSDK();
-                        Console.WriteLine("Sdk created - now creating scene");
-                        scene = mySdk.CreateScene();
-                
-                }
-                
-                public override PhysicsActor AddAvatar(PhysicsVector position)
-                {
-                        Vec3 pos = new Vec3();
-                        pos.X = position.X;
-                        pos.Y = position.Y;
-                        pos.Z = position.Z;
-                        PhysXCharacter act = new PhysXCharacter( scene.AddCharacter(pos));
-                        act.Position = position;
-                        _characters.Add(act);
-                        return act;
-                }
-        public override void RemoveAvatar(PhysicsActor actor)
-        {
-        }
-                
-                public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size)
-                {
-                        Vec3 pos = new Vec3();
-                        pos.X = position.X;
-                        pos.Y = position.Y;
-                        pos.Z = position.Z;
-                        Vec3 siz = new Vec3();
-                        siz.X = size.X;
-                        siz.Y = size.Y;
-                        siz.Z = size.Z;
-                        PhysXPrim act = new PhysXPrim( scene.AddNewBox(pos, siz));
-                        _prims.Add(act);
-                        return act;
-                }
-                public override void Simulate(float timeStep)
-                {
-            try
-            {
-                foreach (PhysXCharacter actor in _characters)
-                {
-                    actor.Move(timeStep);
-                }
-                scene.Simulate(timeStep);
-                scene.FetchResults();
-                scene.UpdateControllers();
-                foreach (PhysXCharacter actor in _characters)
-                {
-                    actor.UpdatePosition();
-                }
-            }
-            catch (Exception e)
-            {
-                Console.WriteLine(e.Message);
-            }
-                                
-                }
-                
-                public override void GetResults()
-                {
-                
-                }
-                
-                public override bool IsThreaded
-                {
-                        get
-                        {
-                                return(false); // for now we won't be multithreaded
-                        }
-                }
-                
-                public override void SetTerrain(float[] heightMap)
-                {
-            if (this._heightMap != null)
-            {
-                Console.WriteLine("PhysX - deleting old terrain");
-                this.scene.DeleteTerrain();
-            }
-                        this._heightMap = heightMap;
-                        this.scene.AddTerrain(heightMap);
-                }
-        public override void DeleteTerrain()
-        {
-            this.scene.DeleteTerrain();
-        }       
-    }
-        
-        public  class PhysXCharacter : PhysicsActor
-        {
-                private PhysicsVector _position;
-                private PhysicsVector _velocity;
-                private PhysicsVector _acceleration;
-                private NxCharacter _character;
-                private bool flying;
-                private float gravityAccel;
-                
-                public PhysXCharacter(NxCharacter character)
-                {
-                        _velocity = new PhysicsVector();
-                        _position = new PhysicsVector();
-                        _acceleration = new PhysicsVector();
-                        _character = character;
-                }
-                
-                public override bool Flying
-                {
-                        get
-                        {
-                                return flying;
-                        }
-                        set
-                        {
-                                flying = value;
-                        }
-                }
-                
-                public override PhysicsVector Position
-                {
-                        get
-                        {
-                                return _position;
-                        }
-                        set
-                        {
-                                _position = value;
-                Vec3 ps = new Vec3();
-                ps.X = value.X;
-                ps.Y = value.Y;
-                ps.Z = value.Z;
-                this._character.Position = ps;
-                        }
-                }
-                
-                public override PhysicsVector Velocity
-                {
-                        get
-                        {
-                                return _velocity;
-                        }
-                        set
-                        {
-                                _velocity = value;
-                        }
-                }
-                
-                public override bool Kinematic
-                {
-                        get
-                        {
-                                return false;
-                        }
-                        set
-                        {
-                                
-                        }
-                }
-                
-                public override Axiom.MathLib.Quaternion Orientation
-                {
-                        get
-                        {
-                                return Axiom.MathLib.Quaternion.Identity;
-                        }
-                        set
-                        {
-                                
-                        }
-                }
-                
-                public override PhysicsVector Acceleration
-                {
-                        get
-                        {
-                                return _acceleration;
-                        }
-                        
-                }
-                public void SetAcceleration (PhysicsVector accel)
-                {
-                        this._acceleration = accel;
-                }
-                
-                public override void AddForce(PhysicsVector force)
-                {
-                        
-                }
-                
-                public override void SetMomentum(PhysicsVector momentum)
-                {
-                        
-                }
-                
-                public void Move(float timeStep)
-                {
-                        Vec3 vec = new Vec3();
-                        vec.X = this._velocity.X * timeStep;
-                        vec.Y = this._velocity.Y * timeStep;
-                        if(flying)
-                        {
-                                vec.Z = ( this._velocity.Z) * timeStep;
-                        }
-                        else
-                        {
-                                gravityAccel+= -9.8f;
-                                vec.Z = (gravityAccel + this._velocity.Z) * timeStep;
-                        }
-                        int res = this._character.Move(vec);
-                        if(res == 1)
-                        {
-                                gravityAccel = 0;
-                        }
-                }
-                
-                public void UpdatePosition()
-                {
-                        Vec3 vec = this._character.Position;
-                        this._position.X = vec.X;
-                        this._position.Y = vec.Y;
-                        this._position.Z = vec.Z;
-                }
-        }
-        
-        public  class PhysXPrim : PhysicsActor
-        {
-                private PhysicsVector _position;
-                private PhysicsVector _velocity;
-                private PhysicsVector _acceleration;
-                private NxActor _prim;
-                
-                public PhysXPrim(NxActor prim)
-                {
-                        _velocity = new PhysicsVector();
-                        _position = new PhysicsVector();
-                        _acceleration = new PhysicsVector();
-                        _prim = prim;
-                }
-                public override bool Flying
-                {
-                        get
-                        {
-                                return false; //no flying prims for you
-                        }
-                        set
-                        {
-                                
-                        }
-                }
-                public override PhysicsVector Position
-                {
-                        get
-                        {
-                                PhysicsVector pos = new PhysicsVector();
-                                Vec3 vec = this._prim.Position;
-                                pos.X = vec.X;
-                                pos.Y = vec.Y;
-                                pos.Z = vec.Z;
-                                return pos;
-                                
-                        }
-                        set
-                        {
-                                PhysicsVector vec = value;
-                                Vec3 pos = new Vec3();
-                                pos.X = vec.X;
-                                pos.Y = vec.Y;
-                                pos.Z = vec.Z;
-                                this._prim.Position = pos;
-                        }
-                }
-                
-                public override PhysicsVector Velocity
-                {
-                        get
-                        {
-                                return _velocity;
-                        }
-                        set
-                        {
-                                _velocity = value;
-                        }
-                }
-                
-                public override bool Kinematic
-                {
-                        get
-                        {
-                                return this._prim.Kinematic;
-                        }
-                        set
-                        {
-                                this._prim.Kinematic = value;
-                        }
-                }
-                
-                public override Axiom.MathLib.Quaternion Orientation
-                {
-                        get
-                        {
-                                Axiom.MathLib.Quaternion res = new Axiom.MathLib.Quaternion();
-                                PhysXWrapper.Quaternion quat = this._prim.GetOrientation();
-                                res.w = quat.W;
-                                res.x = quat.X;
-                                res.y = quat.Y;
-                                res.z = quat.Z;
-                                return res;
-                        }
-                        set
-                        {
-                                
-                        }
-                }
-                
-                public override PhysicsVector Acceleration
-                {
-                        get
-                        {
-                                return _acceleration;
-                        }
-                        
-                }
-                public void SetAcceleration (PhysicsVector accel)
-                {
-                        this._acceleration = accel;
-                }
-                
-                public override void AddForce(PhysicsVector force)
-                {
-                        
-                }
-                
-                public override void SetMomentum(PhysicsVector momentum)
-                {
-                        
-                }
-                
-                
-        }
-}
diff --git a/OpenSim/OpenSim.RegionServer/AgentAssetUpload.cs b/OpenSim/OpenSim.RegionServer/AgentAssetUpload.cs
deleted file mode 100644
index 6781781..0000000
--- a/OpenSim/OpenSim.RegionServer/AgentAssetUpload.cs
+++ /dev/null
@@ -1,259 +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.RegionServer.Assets;
-using OpenSim.RegionServer.Client;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Utilities;
-using libsecondlife;
-using libsecondlife.Packets;
-namespace OpenSim.RegionServer
-{
-    public class AgentAssetUpload
-    {
-        private Dictionary<LLUUID, AssetTransaction> transactions = new Dictionary<LLUUID, AssetTransaction>();
-        private ClientView ourClient;
-        private AssetCache m_assetCache;
-        private InventoryCache m_inventoryCache;
-        public AgentAssetUpload(ClientView client, AssetCache assetCache, InventoryCache inventoryCache)
-        {
-            this.ourClient = client;
-            m_assetCache = assetCache;
-            m_inventoryCache = inventoryCache;
-        }
-        public void AddUpload(LLUUID transactionID, AssetBase asset)
-        {
-            AssetTransaction upload = new AssetTransaction();
-            lock (this.transactions)
-            {
-                upload.Asset = asset;
-                upload.TransactionID = transactionID;
-                this.transactions.Add(transactionID, upload);
-            }
-            if (upload.Asset.Data.Length > 2)
-            {
-                //is complete
-                upload.UploadComplete = true;
-                AssetUploadCompletePacket response = new AssetUploadCompletePacket();
-                response.AssetBlock.Type = asset.Type;
-                response.AssetBlock.Success = true;
-                response.AssetBlock.UUID = transactionID.Combine(this.ourClient.SecureSessionID);
-                this.ourClient.OutPacket(response);
-                m_assetCache.AddAsset(asset);
-            }
-            else
-            {
-                upload.UploadComplete = false;
-                upload.XferID = Util.GetNextXferID();
-                RequestXferPacket xfer = new RequestXferPacket();
-                xfer.XferID.ID = upload.XferID;
-                xfer.XferID.VFileType = upload.Asset.Type;
-                xfer.XferID.VFileID = transactionID.Combine(this.ourClient.SecureSessionID);
-                xfer.XferID.FilePath = 0;
-                xfer.XferID.Filename = new byte[0];
-                this.ourClient.OutPacket(xfer);
-            }
-        }
-        public AssetBase GetUpload(LLUUID transactionID)
-        {
-            if (this.transactions.ContainsKey(transactionID))
-            {
-                return this.transactions[transactionID].Asset;
-            }
-            return null;
-        }
-        public void HandleUploadPacket(AssetUploadRequestPacket pack, LLUUID assetID)
-        {
-           // Console.Write("asset upload request , type = " + pack.AssetBlock.Type.ToString());
-            AssetBase asset = null;
-            if (pack.AssetBlock.Type == 0)
-            {
-                //first packet for transaction
-                asset = new AssetBase();
-                asset.FullID = assetID;
-                asset.Type = pack.AssetBlock.Type;
-                asset.InvType = asset.Type;
-                asset.Name = "UploadedTexture" + Util.RandomClass.Next(1, 1000).ToString("000");
-                asset.Data = pack.AssetBlock.AssetData;
-            }
-            else if (pack.AssetBlock.Type == 13 | pack.AssetBlock.Type == 5 | pack.AssetBlock.Type == 7)
-            {
-                asset = new AssetBase();
-                asset.FullID = assetID;
-                asset.Type = pack.AssetBlock.Type;
-                asset.InvType = asset.Type;
-                asset.Name = "NewClothing" + Util.RandomClass.Next(1, 1000).ToString("000");
-                asset.Data = pack.AssetBlock.AssetData;
-            }
-            if (asset != null)
-            {
-                this.AddUpload(pack.AssetBlock.TransactionID, asset);
-            }
-            else
-            {
-                //currently we don't support this asset type 
-                //so lets just tell the client that the upload is complete
-                AssetUploadCompletePacket response = new AssetUploadCompletePacket();
-                response.AssetBlock.Type = pack.AssetBlock.Type;
-                response.AssetBlock.Success = true;
-                response.AssetBlock.UUID = pack.AssetBlock.TransactionID.Combine(this.ourClient.SecureSessionID);
-                this.ourClient.OutPacket(response);
-            }
-        }
-        #region Xfer packet system for larger uploads
-        public void HandleXferPacket(SendXferPacketPacket xferPacket)
-        {
-            lock (this.transactions)
-            {
-                foreach (AssetTransaction trans in this.transactions.Values)
-                {
-                    if (trans.XferID == xferPacket.XferID.ID)
-                    {
-                        if (trans.Asset.Data.Length > 1)
-                        {
-                            byte[] newArray = new byte[trans.Asset.Data.Length + xferPacket.DataPacket.Data.Length];
-                            Array.Copy(trans.Asset.Data, 0, newArray, 0, trans.Asset.Data.Length);
-                            Array.Copy(xferPacket.DataPacket.Data, 0, newArray, trans.Asset.Data.Length, xferPacket.DataPacket.Data.Length);
-                            trans.Asset.Data = newArray;
-                        }
-                        else
-                        {
-                            byte[] newArray = new byte[xferPacket.DataPacket.Data.Length - 4];
-                            Array.Copy(xferPacket.DataPacket.Data, 4, newArray, 0, xferPacket.DataPacket.Data.Length - 4);
-                            trans.Asset.Data = newArray;
-                        }
-                        if ((xferPacket.XferID.Packet & 2147483648) != 0)
-                        {
-                            //end of transfer
-                            trans.UploadComplete = true;
-                            AssetUploadCompletePacket response = new AssetUploadCompletePacket();
-                            response.AssetBlock.Type = trans.Asset.Type;
-                            response.AssetBlock.Success = true;
-                            response.AssetBlock.UUID = trans.TransactionID.Combine(this.ourClient.SecureSessionID);
-                            this.ourClient.OutPacket(response);
-                            m_assetCache.AddAsset(trans.Asset);
-                            //check if we should add it to inventory 
-                            if (trans.AddToInventory)
-                            {
-                                // m_assetCache.AddAsset(trans.Asset);
-                                m_inventoryCache.AddNewInventoryItem(this.ourClient, trans.InventFolder, trans.Asset);
-                            }
-                        }
-                        break;
-                    }
-                }
-            }
-            ConfirmXferPacketPacket confirmXfer = new ConfirmXferPacketPacket();
-            confirmXfer.XferID.ID = xferPacket.XferID.ID;
-            confirmXfer.XferID.Packet = xferPacket.XferID.Packet;
-            this.ourClient.OutPacket(confirmXfer);
-        }
-        #endregion
-        public AssetBase AddUploadToAssetCache(LLUUID transactionID)
-        {
-            AssetBase asset = null;
-            if (this.transactions.ContainsKey(transactionID))
-            {
-                AssetTransaction trans = this.transactions[transactionID];
-                if (trans.UploadComplete)
-                {
-                    m_assetCache.AddAsset(trans.Asset);
-                    asset = trans.Asset;
-                }
-            }
-            return asset;
-        }
-        public void CreateInventoryItem(CreateInventoryItemPacket packet)
-        {
-            if (this.transactions.ContainsKey(packet.InventoryBlock.TransactionID))
-            {
-                AssetTransaction trans = this.transactions[packet.InventoryBlock.TransactionID];
-                trans.Asset.Description = Util.FieldToString(packet.InventoryBlock.Description);
-                trans.Asset.Name = Util.FieldToString(packet.InventoryBlock.Name);
-                trans.Asset.Type = packet.InventoryBlock.Type;
-                trans.Asset.InvType = packet.InventoryBlock.InvType;
-                if (trans.UploadComplete)
-                {
-                    //already complete so we can add it to the inventory
-                    //m_assetCache.AddAsset(trans.Asset);
-                    m_inventoryCache.AddNewInventoryItem(this.ourClient, packet.InventoryBlock.FolderID, trans.Asset);
-                }
-                else
-                {
-                    trans.AddToInventory = true;
-                    trans.InventFolder = packet.InventoryBlock.FolderID;
-                }
-            }
-        }
-        private class AssetTransaction
-        {
-            public uint XferID;
-            public AssetBase Asset;
-            public bool AddToInventory;
-            public LLUUID InventFolder = LLUUID.Zero;
-            public bool UploadComplete = false;
-            public LLUUID TransactionID = LLUUID.Zero;
-            public AssetTransaction()
-            {
-            }
-        }
-    }
-}
diff --git a/OpenSim/OpenSim.RegionServer/Assets/AssetCache.cs b/OpenSim/OpenSim.RegionServer/Assets/AssetCache.cs
deleted file mode 100644
index 466f9f9..0000000
--- a/OpenSim/OpenSim.RegionServer/Assets/AssetCache.cs
+++ /dev/null
@@ -1,572 +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.Threading;
-using libsecondlife;
-using libsecondlife.Packets;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Utilities;
-using OpenSim.Framework.Console;
-using OpenSim.RegionServer.Client;
-namespace OpenSim.RegionServer.Assets
-{
-    /// <summary>
-    /// Manages local cache of assets and their sending to viewers.
-    /// </summary>
-    public class AssetCache : IAssetReceiver
-    {
-        public Dictionary<libsecondlife.LLUUID, AssetInfo> Assets;
-        public Dictionary<libsecondlife.LLUUID, TextureImage> Textures;
-        public List<AssetRequest> AssetRequests = new List<AssetRequest>();  //assets ready to be sent to viewers
-        public List<AssetRequest> TextureRequests = new List<AssetRequest>(); //textures ready to be sent
-        public Dictionary<LLUUID, AssetRequest> RequestedAssets = new Dictionary<LLUUID, AssetRequest>(); //Assets requested from the asset server
-        public Dictionary<LLUUID, AssetRequest> RequestedTextures = new Dictionary<LLUUID, AssetRequest>(); //Textures requested from the asset server
-        private IAssetServer _assetServer;
-        private Thread _assetCacheThread;
-        private LLUUID[] textureList = new LLUUID[5];
-        /// <summary>
-        /// 
-        /// </summary>
-        public AssetCache(IAssetServer assetServer)
-        {
-            MainConsole.Instance.Verbose("Creating Asset cache");
-            _assetServer = assetServer;
-            _assetServer.SetReceiver(this);
-            Assets = new Dictionary<libsecondlife.LLUUID, AssetInfo>();
-            Textures = new Dictionary<libsecondlife.LLUUID, TextureImage>();
-            this._assetCacheThread = new Thread(new ThreadStart(RunAssetManager));
-            this._assetCacheThread.IsBackground = true;
-            this._assetCacheThread.Start();
-        }
-        /// <summary>
-        /// 
-        /// </summary>
-        public void RunAssetManager()
-        {
-            while (true)
-            {
-                try
-                {
-                    this.ProcessAssetQueue();
-                    this.ProcessTextureQueue();
-                    Thread.Sleep(500);
-                }
-                catch (Exception e)
-                {
-                    MainConsole.Instance.Error(e.Message);
-                }
-            }
-        }
-        public void LoadDefaultTextureSet()
-        {
-            //hack: so we can give each user a set of textures
-            textureList[0] = new LLUUID("00000000-0000-0000-9999-000000000001");
-           textureList[1] = new LLUUID("00000000-0000-0000-9999-000000000002");
-            textureList[2] = new LLUUID("00000000-0000-0000-9999-000000000003");
-            textureList[3] = new LLUUID("00000000-0000-0000-9999-000000000004");
-            textureList[4] = new LLUUID("00000000-0000-0000-9999-000000000005");
-            for (int i = 0; i < textureList.Length; i++)
-            {
-                this._assetServer.RequestAsset(textureList[i], true);
-            }
-        }
-        public AssetBase[] CreateNewInventorySet(LLUUID agentID)
-        {
-            AssetBase[] inventorySet = new AssetBase[this.textureList.Length];
-            for (int i = 0; i < textureList.Length; i++)
-            {
-                if (this.Textures.ContainsKey(textureList[i]))
-                {
-                    inventorySet[i] = this.CloneImage(agentID, this.Textures[textureList[i]]);
-                    TextureImage image = new TextureImage(inventorySet[i]);
-                    this.Textures.Add(image.FullID, image);
-                    this._assetServer.UploadNewAsset(image); //save the asset to the asset server
-                }
-            }
-            return inventorySet;
-        }
-        public AssetBase GetAsset(LLUUID assetID)
-        {
-            AssetBase asset = null;
-            if(this.Textures.ContainsKey(assetID))
-            {
-                asset = this.Textures[assetID];
-            }
-            else if (this.Assets.ContainsKey(assetID))
-            {
-                asset = this.Assets[assetID];
-            }
-            return asset;
-        }
-        public void AddAsset(AssetBase asset)
-        {
-            if (asset.Type == 0)
-            {
-                if (!this.Textures.ContainsKey(asset.FullID))
-                { //texture
-                    TextureImage textur = new TextureImage(asset);
-                    this.Textures.Add(textur.FullID, textur);
-                    this._assetServer.UploadNewAsset(asset);
-                }
-            }
-            else
-            {
-                if (!this.Assets.ContainsKey(asset.FullID))
-                {
-                    AssetInfo assetInf = new AssetInfo(asset);
-                    this.Assets.Add(assetInf.FullID, assetInf);
-                    this._assetServer.UploadNewAsset(asset);
-                }
-            }
-        }
-        /// <summary>
-        /// 
-        /// </summary>
-        private void ProcessTextureQueue()
-        {
-            if (this.TextureRequests.Count == 0)
-            {
-                //no requests waiting
-                return;
-            }
-            int num;
-            if (this.TextureRequests.Count < 5)
-            {
-                //lower than 5 so do all of them
-                num = this.TextureRequests.Count;
-            }
-            else
-            {
-                num = 5;
-            }
-            AssetRequest req;
-            for (int i = 0; i < num; i++)
-            {
-                req = (AssetRequest)this.TextureRequests[i];
-                if (req.PacketCounter != req.NumPackets)
-                {
-                    // if (req.ImageInfo.FullID == new LLUUID("00000000-0000-0000-5005-000000000005"))
-                    if (req.PacketCounter == 0)
-                    {
-                        //first time for this request so send imagedata packet
-                        if (req.NumPackets == 1)
-                        {
-                            //only one packet so send whole file
-                            ImageDataPacket im = new ImageDataPacket();
-                            im.ImageID.Packets = 1;
-                            im.ImageID.ID = req.ImageInfo.FullID;
-                            im.ImageID.Size = (uint)req.ImageInfo.Data.Length;
-                            im.ImageData.Data = req.ImageInfo.Data;
-                            im.ImageID.Codec = 2;
-                            req.RequestUser.OutPacket(im);
-                            req.PacketCounter++;
-                            //req.ImageInfo.l= time;
-                        }
-                        else
-                        {
-                            //more than one packet so split file up
-                            ImageDataPacket im = new ImageDataPacket();
-                            im.ImageID.Packets = (ushort)req.NumPackets;
-                            im.ImageID.ID = req.ImageInfo.FullID;
-                            im.ImageID.Size = (uint)req.ImageInfo.Data.Length;
-                            im.ImageData.Data = new byte[600];
-                            Array.Copy(req.ImageInfo.Data, 0, im.ImageData.Data, 0, 600);
-                            im.ImageID.Codec = 2;
-                            req.RequestUser.OutPacket(im);
-                            req.PacketCounter++;
-                            //req.ImageInfo.last_used = time;
-                        }
-                    }
-                    else
-                    {
-                         //send imagepacket
-                        //more than one packet so split file up
-                        ImagePacketPacket im = new ImagePacketPacket();
-                        im.ImageID.Packet = (ushort)req.PacketCounter;
-                        im.ImageID.ID = req.ImageInfo.FullID;
-                        int size = req.ImageInfo.Data.Length - 600 - 1000 * (req.PacketCounter - 1);
-                        if (size > 1000) size = 1000;
-                        im.ImageData.Data = new byte[size];
-                        Array.Copy(req.ImageInfo.Data, 600 + 1000 * (req.PacketCounter - 1), im.ImageData.Data, 0, size);
-                        req.RequestUser.OutPacket(im);
-                        req.PacketCounter++;
-                        //req.ImageInfo.last_used = time;
-                    }
-                }
-            }
-            //remove requests that have been completed
-            int count = 0;
-            for (int i = 0; i < num; i++)
-            {
-                if (this.TextureRequests.Count > count)
-                {
-                    req = (AssetRequest)this.TextureRequests[count];
-                    if (req.PacketCounter == req.NumPackets)
-                    {
-                        this.TextureRequests.Remove(req);
-                    }
-                    else
-                    {
-                        count++;
-                    }
-                }
-            }
-        }
-        public void AssetReceived(AssetBase asset, bool IsTexture)
-        {
-            if (asset.FullID != LLUUID.Zero)  // if it is set to zero then the asset wasn't found by the server
-            {
-                //check if it is a texture or not
-                //then add to the correct cache list
-                //then check for waiting requests for this asset/texture (in the Requested lists)
-                //and move those requests into the Requests list.
-                if (IsTexture)
-                {
-                    TextureImage image = new TextureImage(asset);
-                    this.Textures.Add(image.FullID, image);
-                    if (this.RequestedTextures.ContainsKey(image.FullID))
-                    {
-                        AssetRequest req = this.RequestedTextures[image.FullID];
-                        req.ImageInfo = image;
-                        if (image.Data.LongLength > 600)
-                        {
-                            //over 600 bytes so split up file
-                            req.NumPackets = 1 + (int)(image.Data.Length - 600 + 999) / 1000;
-                        }
-                        else
-                        {
-                            req.NumPackets = 1;
-                        }
-                        this.RequestedTextures.Remove(image.FullID);
-                        this.TextureRequests.Add(req);
-                    }
-                }
-                else
-                {
-                    AssetInfo assetInf = new AssetInfo(asset);
-                    this.Assets.Add(assetInf.FullID, assetInf);
-                    if (this.RequestedAssets.ContainsKey(assetInf.FullID))
-                    {
-                        AssetRequest req = this.RequestedAssets[assetInf.FullID];
-                        req.AssetInf = assetInf;
-                        if (assetInf.Data.LongLength > 600)
-                        {
-                            //over 600 bytes so split up file
-                            req.NumPackets = 1 + (int)(assetInf.Data.Length - 600 + 999) / 1000;
-                        }
-                        else
-                        {
-                            req.NumPackets = 1;
-                        }
-                        this.RequestedAssets.Remove(assetInf.FullID);
-                        this.AssetRequests.Add(req);
-                    }
-                }
-            }
-        }
-        public void AssetNotFound(AssetBase asset)
-        {
-            //the asset server had no knowledge of requested asset
-        }
-        #region Assets
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="userInfo"></param>
-        /// <param name="transferRequest"></param>
-        public void AddAssetRequest(ClientView userInfo, TransferRequestPacket transferRequest)
-        {
-            LLUUID requestID = new LLUUID(transferRequest.TransferInfo.Params, 0);
-            //check to see if asset is in local cache, if not we need to request it from asset server.
-            if (!this.Assets.ContainsKey(requestID))
-            {
-                //not found asset       
-                // so request from asset server
-                if (!this.RequestedAssets.ContainsKey(requestID))
-                {
-                    AssetRequest request = new AssetRequest();
-                    request.RequestUser = userInfo;
-                    request.RequestAssetID = requestID;
-                    request.TransferRequestID = transferRequest.TransferInfo.TransferID;
-                    this.RequestedAssets.Add(requestID, request);
-                    this._assetServer.RequestAsset(requestID, false);
-                }
-                return;
-            }
-            //it is in our cache 
-             AssetInfo asset = this.Assets[requestID];
-            //work out how many packets it  should be sent in 
-            // and add to the AssetRequests list
-            AssetRequest req = new AssetRequest();
-            req.RequestUser = userInfo;
-            req.RequestAssetID = requestID;
-            req.TransferRequestID = transferRequest.TransferInfo.TransferID;
-            req.AssetInf = asset;
-            if (asset.Data.LongLength > 600)
-            {
-                //over 600 bytes so split up file
-                req.NumPackets = 1 + (int)(asset.Data.Length - 600 + 999) / 1000;
-            }
-            else
-            {
-                req.NumPackets = 1;
-            }
-            this.AssetRequests.Add(req);
-        }
-        /// <summary>
-        /// 
-        /// </summary>
-        private void ProcessAssetQueue()
-        {
-            if (this.AssetRequests.Count == 0)
-            {
-                //no requests waiting
-                return;
-            }
-            int num;
-            if (this.AssetRequests.Count < 5)
-            {
-                //lower than 5 so do all of them
-                num = this.AssetRequests.Count;
-            }
-            else
-            {
-                num = 5;
-            }
-            AssetRequest req;
-            for (int i = 0; i < num; i++)
-            {
-                req = (AssetRequest)this.AssetRequests[i];
-                TransferInfoPacket Transfer = new TransferInfoPacket();
-                Transfer.TransferInfo.ChannelType = 2;
-                Transfer.TransferInfo.Status = 0;
-                Transfer.TransferInfo.TargetType = 0;
-                Transfer.TransferInfo.Params = req.RequestAssetID.GetBytes();
-                Transfer.TransferInfo.Size = (int)req.AssetInf.Data.Length;
-                Transfer.TransferInfo.TransferID = req.TransferRequestID;
-                req.RequestUser.OutPacket(Transfer);
-                if (req.NumPackets == 1)
-                {
-                    TransferPacketPacket TransferPacket = new TransferPacketPacket();
-                    TransferPacket.TransferData.Packet = 0;
-                    TransferPacket.TransferData.ChannelType = 2;
-                    TransferPacket.TransferData.TransferID = req.TransferRequestID;
-                    TransferPacket.TransferData.Data = req.AssetInf.Data;
-                    TransferPacket.TransferData.Status = 1;
-                    req.RequestUser.OutPacket(TransferPacket);
-                }
-                else
-                {
-                    //more than one packet so split file up , for now it can't be bigger than 2000 bytes
-                    TransferPacketPacket TransferPacket = new TransferPacketPacket();
-                    TransferPacket.TransferData.Packet = 0;
-                    TransferPacket.TransferData.ChannelType = 2;
-                    TransferPacket.TransferData.TransferID = req.TransferRequestID;
-                    byte[] chunk = new byte[1000];
-                    Array.Copy(req.AssetInf.Data, chunk, 1000);
-                    TransferPacket.TransferData.Data = chunk;
-                    TransferPacket.TransferData.Status = 0;
-                    req.RequestUser.OutPacket(TransferPacket);
-                    TransferPacket = new TransferPacketPacket();
-                    TransferPacket.TransferData.Packet = 1;
-                    TransferPacket.TransferData.ChannelType = 2;
-                    TransferPacket.TransferData.TransferID = req.TransferRequestID;
-                    byte[] chunk1 = new byte[(req.AssetInf.Data.Length - 1000)];
-                    Array.Copy(req.AssetInf.Data, 1000, chunk1, 0, chunk1.Length);
-                    TransferPacket.TransferData.Data = chunk1;
-                    TransferPacket.TransferData.Status = 1;
-                    req.RequestUser.OutPacket(TransferPacket);
-                }
-            }
-            //remove requests that have been completed
-            for (int i = 0; i < num; i++)
-            {
-                this.AssetRequests.RemoveAt(0);
-            }
-        }
-        public AssetInfo CloneAsset(LLUUID newOwner, AssetInfo sourceAsset)
-        {
-            AssetInfo newAsset = new AssetInfo();
-            newAsset.Data = new byte[sourceAsset.Data.Length];
-            Array.Copy(sourceAsset.Data, newAsset.Data, sourceAsset.Data.Length);
-            newAsset.FullID = LLUUID.Random();
-            newAsset.Type = sourceAsset.Type;
-            newAsset.InvType = sourceAsset.InvType;
-            return (newAsset);
-        }
-        #endregion
-        #region Textures
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="userInfo"></param>
-        /// <param name="imageID"></param>
-        public void AddTextureRequest(ClientView userInfo, LLUUID imageID)
-        {
-            //check to see if texture is in local cache, if not request from asset server
-            if (!this.Textures.ContainsKey(imageID))
-            {
-                if (!this.RequestedTextures.ContainsKey(imageID))
-                {
-                    //not is cache so request from asset server
-                    AssetRequest request = new AssetRequest();
-                    request.RequestUser = userInfo;
-                    request.RequestAssetID = imageID;
-                    request.IsTextureRequest = true;
-                    this.RequestedTextures.Add(imageID, request);
-                    this._assetServer.RequestAsset(imageID, true);
-                }
-                return;
-            }
-            TextureImage imag = this.Textures[imageID];
-            AssetRequest req = new AssetRequest();
-            req.RequestUser = userInfo;
-            req.RequestAssetID = imageID;
-            req.IsTextureRequest = true;
-            req.ImageInfo = imag;
-            if (imag.Data.LongLength > 600)
-            {
-                //over 600 bytes so split up file
-                req.NumPackets = 1 + (int)(imag.Data.Length - 600 + 999) / 1000;
-            }
-            else
-            {
-                req.NumPackets = 1;
-            }
-            this.TextureRequests.Add(req);
-        }
-        public TextureImage CloneImage(LLUUID newOwner, TextureImage source)
-        {
-            TextureImage newImage = new TextureImage();
-            newImage.Data = new byte[source.Data.Length];
-            Array.Copy(source.Data, newImage.Data, source.Data.Length);
-            //newImage.filename = source.filename;
-            newImage.FullID = LLUUID.Random();
-            newImage.Name = source.Name;
-            return (newImage);
-        }
-        #endregion
-    }
-    public class AssetRequest
-    {
-        public ClientView RequestUser;
-        public LLUUID RequestAssetID;
-        public AssetInfo AssetInf;
-        public TextureImage ImageInfo;
-        public LLUUID TransferRequestID;
-        public long DataPointer = 0;
-        public int NumPackets = 0;
-        public int PacketCounter = 0;
-        public bool IsTextureRequest;
-        //public bool AssetInCache;
-        //public int TimeRequested; 
-        public AssetRequest()
-        {
-        }
-    }
-    public class AssetInfo : AssetBase
-    {
-        public AssetInfo()
-        {
-        }
-        public AssetInfo(AssetBase aBase)
-        {
-            Data = aBase.Data;
-            FullID = aBase.FullID;
-            Type = aBase.Type;
-            InvType = aBase.InvType;
-            Name = aBase.Name;
-            Description = aBase.Description;
-        }
-    }
-    public class TextureImage : AssetBase
-    {
-        public TextureImage()
-        {
-        }
-        public TextureImage(AssetBase aBase)
-        {
-            Data = aBase.Data;
-            FullID = aBase.FullID;
-            Type = aBase.Type;
-            InvType = aBase.InvType;
-            Name = aBase.Name;
-            Description = aBase.Description;
-        }
-    }
-}
diff --git a/OpenSim/OpenSim.RegionServer/Assets/InventoryCache.cs b/OpenSim/OpenSim.RegionServer/Assets/InventoryCache.cs
deleted file mode 100644
index 9ed5dcb..0000000
--- a/OpenSim/OpenSim.RegionServer/Assets/InventoryCache.cs
+++ /dev/null
@@ -1,338 +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 libsecondlife;
-using OpenSim;
-using libsecondlife.Packets;
-using OpenSim.Framework.Inventory;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Interfaces;
-using OpenSim.RegionServer.Client;
-namespace OpenSim.RegionServer.Assets
-{
-    /// <summary>
-    /// Description of InventoryManager.
-    /// </summary>
-    public class InventoryCache
-    {
-        private Dictionary<LLUUID, AgentInventory> _agentsInventory;
-        private List<UserServerRequest> _serverRequests; //list of requests made to user server.
-        private System.Text.Encoding _enc = System.Text.Encoding.ASCII;
-        private const uint FULL_MASK_PERMISSIONS = 2147483647;
-        public InventoryCache()
-        {
-            _agentsInventory = new Dictionary<LLUUID, AgentInventory>();
-            _serverRequests = new List<UserServerRequest>();
-        }
-        public void AddNewAgentsInventory(AgentInventory agentInventory)
-        {
-            if (!this._agentsInventory.ContainsKey(agentInventory.AgentID))
-            {
-                this._agentsInventory.Add(agentInventory.AgentID, agentInventory);
-            }
-        }
-        public AgentInventory FetchAgentsInventory(LLUUID agentID, IUserServer userserver)
-        {
-            AgentInventory res = null;
-            if (!this._agentsInventory.ContainsKey(agentID))
-            {
-                res = userserver.RequestAgentsInventory(agentID);
-                this._agentsInventory.Add(agentID,res);
-            }
-            return res;
-        }
-        public AgentInventory GetAgentsInventory(LLUUID agentID)
-        {
-            if (this._agentsInventory.ContainsKey(agentID))
-            {
-                return this._agentsInventory[agentID];
-            }
-            return null;
-        }
-        public void ClientLeaving(LLUUID clientID, IUserServer userserver)
-        { 
-            if (this._agentsInventory.ContainsKey(clientID))
-            {
-                if (userserver != null)
-                {
-                    userserver.UpdateAgentsInventory(clientID, this._agentsInventory[clientID]);
-                }
-                this._agentsInventory.Remove(clientID);
-            }
-        }
-        public bool CreateNewInventoryFolder(ClientView remoteClient, LLUUID folderID)
-        {
-            return this.CreateNewInventoryFolder(remoteClient, folderID, 0);
-        }
-        public bool CreateNewInventoryFolder(ClientView remoteClient, LLUUID folderID, ushort type)
-        {
-            bool res = false;
-            if (folderID != LLUUID.Zero)  //don't create a folder with a zero id
-            {
-                if (this._agentsInventory.ContainsKey(remoteClient.AgentID))
-                {
-                    res = this._agentsInventory[remoteClient.AgentID].CreateNewFolder(folderID, type);
-                }
-            }
-            return res;
-        }
-        public bool CreateNewInventoryFolder(ClientView remoteClient, LLUUID folderID, ushort type, string folderName, LLUUID parent)
-        {
-            bool res = false;
-            if (folderID != LLUUID.Zero)  //don't create a folder with a zero id
-            {
-                if (this._agentsInventory.ContainsKey(remoteClient.AgentID))
-                {
-                    res = this._agentsInventory[remoteClient.AgentID].CreateNewFolder(folderID, type, folderName, parent);
-                }
-            }
-            return res;
-        }
-        public LLUUID AddNewInventoryItem(ClientView remoteClient, LLUUID folderID, OpenSim.Framework.Types.AssetBase asset)
-        {
-            LLUUID newItem = null;
-            if (this._agentsInventory.ContainsKey(remoteClient.AgentID))
-            {
-                newItem = this._agentsInventory[remoteClient.AgentID].AddToInventory(folderID, asset);
-                if (newItem != null)
-                {
-                    InventoryItem Item = this._agentsInventory[remoteClient.AgentID].InventoryItems[newItem];
-                    this.SendItemUpdateCreate(remoteClient, Item);
-                }
-            }
-            return newItem;
-        }
-        public bool DeleteInventoryItem(ClientView remoteClient, LLUUID itemID)
-        {
-            bool res = false;
-            if (this._agentsInventory.ContainsKey(remoteClient.AgentID))
-            {
-                res = this._agentsInventory[remoteClient.AgentID].DeleteFromInventory(itemID);
-                if (res)
-                {
-                    RemoveInventoryItemPacket remove = new RemoveInventoryItemPacket();
-                    remove.AgentData.AgentID = remoteClient.AgentID;
-                    remove.AgentData.SessionID = remoteClient.SessionID;
-                    remove.InventoryData = new RemoveInventoryItemPacket.InventoryDataBlock[1];
-                    remove.InventoryData[0] = new RemoveInventoryItemPacket.InventoryDataBlock();
-                    remove.InventoryData[0].ItemID = itemID;
-                    remoteClient.OutPacket(remove);
-                }
-            }
-            return res;
-        }
-        public bool UpdateInventoryItemAsset(ClientView remoteClient, LLUUID itemID, OpenSim.Framework.Types.AssetBase asset)
-        {
-            if (this._agentsInventory.ContainsKey(remoteClient.AgentID))
-            {
-                bool res = _agentsInventory[remoteClient.AgentID].UpdateItemAsset(itemID, asset);
-                if (res)
-                {
-                    InventoryItem Item = this._agentsInventory[remoteClient.AgentID].InventoryItems[itemID];
-                    this.SendItemUpdateCreate(remoteClient, Item);
-                }
-                return res;
-            }
-            return false;
-        }
-        public bool UpdateInventoryItemDetails(ClientView remoteClient, LLUUID itemID, UpdateInventoryItemPacket.InventoryDataBlock packet)
-        {
-            if (this._agentsInventory.ContainsKey(remoteClient.AgentID))
-            {
-                bool res = _agentsInventory[remoteClient.AgentID].UpdateItemDetails(itemID, packet);
-                if (res)
-                {
-                    InventoryItem Item = this._agentsInventory[remoteClient.AgentID].InventoryItems[itemID];
-                    this.SendItemUpdateCreate(remoteClient, Item);
-                }
-                return res;
-            }
-            return false;
-        }
-        public void FetchInventoryDescendents(ClientView userInfo, FetchInventoryDescendentsPacket FetchDescend)
-        {
-            if (this._agentsInventory.ContainsKey(userInfo.AgentID))
-            {
-                AgentInventory agentInventory = this._agentsInventory[userInfo.AgentID];
-                if (FetchDescend.InventoryData.FetchItems)
-                {
-                    if (agentInventory.InventoryFolders.ContainsKey(FetchDescend.InventoryData.FolderID))
-                    {
-                        InventoryFolder Folder = agentInventory.InventoryFolders[FetchDescend.InventoryData.FolderID];
-                        InventoryDescendentsPacket Descend = new InventoryDescendentsPacket();
-                        Descend.AgentData.AgentID = userInfo.AgentID;
-                        Descend.AgentData.OwnerID = Folder.OwnerID;
-                        Descend.AgentData.FolderID = FetchDescend.InventoryData.FolderID;
-                        Descend.AgentData.Descendents = Folder.Items.Count;
-                        Descend.AgentData.Version = Folder.Items.Count;
-                        Descend.ItemData = new InventoryDescendentsPacket.ItemDataBlock[Folder.Items.Count];
-                        for (int i = 0; i < Folder.Items.Count; i++)
-                        {
-                            InventoryItem Item = Folder.Items[i];
-                            Descend.ItemData[i] = new InventoryDescendentsPacket.ItemDataBlock();
-                            Descend.ItemData[i].ItemID = Item.ItemID;
-                            Descend.ItemData[i].AssetID = Item.AssetID;
-                            Descend.ItemData[i].CreatorID = Item.CreatorID;
-                            Descend.ItemData[i].BaseMask = FULL_MASK_PERMISSIONS;
-                            Descend.ItemData[i].CreationDate = 1000;
-                            Descend.ItemData[i].Description = _enc.GetBytes(Item.Description + "\0");
-                            Descend.ItemData[i].EveryoneMask = FULL_MASK_PERMISSIONS;
-                            Descend.ItemData[i].Flags = 1;
-                            Descend.ItemData[i].FolderID = Item.FolderID;
-                            Descend.ItemData[i].GroupID = new LLUUID("00000000-0000-0000-0000-000000000000");
-                            Descend.ItemData[i].GroupMask = FULL_MASK_PERMISSIONS;
-                            Descend.ItemData[i].InvType = Item.InvType;
-                            Descend.ItemData[i].Name = _enc.GetBytes(Item.Name + "\0");
-                            Descend.ItemData[i].NextOwnerMask = FULL_MASK_PERMISSIONS;
-                            Descend.ItemData[i].OwnerID = Item.OwnerID;
-                            Descend.ItemData[i].OwnerMask = FULL_MASK_PERMISSIONS;
-                            Descend.ItemData[i].SalePrice = 100;
-                            Descend.ItemData[i].SaleType = 0;
-                            Descend.ItemData[i].Type = Item.Type;
-                            Descend.ItemData[i].CRC = libsecondlife.Helpers.InventoryCRC(1000, 0, Descend.ItemData[i].InvType, Descend.ItemData[i].Type, Descend.ItemData[i].AssetID, Descend.ItemData[i].GroupID, 100, Descend.ItemData[i].OwnerID, Descend.ItemData[i].CreatorID, Descend.ItemData[i].ItemID, Descend.ItemData[i].FolderID, FULL_MASK_PERMISSIONS, 1, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS);
-                        }
-                        
-                        userInfo.OutPacket(Descend);
-                    }
-                }
-                else
-                {
-                    Console.WriteLine("fetch subfolders");
-                }
-            }
-        }
-        public void FetchInventory(ClientView userInfo, FetchInventoryPacket FetchItems)
-        {
-            if (this._agentsInventory.ContainsKey(userInfo.AgentID))
-            {
-                AgentInventory agentInventory = this._agentsInventory[userInfo.AgentID];
-                for (int i = 0; i < FetchItems.InventoryData.Length; i++)
-                {
-                    if (agentInventory.InventoryItems.ContainsKey(FetchItems.InventoryData[i].ItemID))
-                    {
-                        InventoryItem Item = agentInventory.InventoryItems[FetchItems.InventoryData[i].ItemID];
-                        FetchInventoryReplyPacket InventoryReply = new FetchInventoryReplyPacket();
-                        InventoryReply.AgentData.AgentID = userInfo.AgentID;
-                        InventoryReply.InventoryData = new FetchInventoryReplyPacket.InventoryDataBlock[1];
-                        InventoryReply.InventoryData[0] = new FetchInventoryReplyPacket.InventoryDataBlock();
-                        InventoryReply.InventoryData[0].ItemID = Item.ItemID;
-                        InventoryReply.InventoryData[0].AssetID = Item.AssetID;
-                        InventoryReply.InventoryData[0].CreatorID = Item.CreatorID;
-                        InventoryReply.InventoryData[0].BaseMask = FULL_MASK_PERMISSIONS;
-                        InventoryReply.InventoryData[0].CreationDate = (int)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;
-                        InventoryReply.InventoryData[0].Description = _enc.GetBytes(Item.Description + "\0");
-                        InventoryReply.InventoryData[0].EveryoneMask = FULL_MASK_PERMISSIONS;
-                        InventoryReply.InventoryData[0].Flags = 0;
-                        InventoryReply.InventoryData[0].FolderID = Item.FolderID;
-                        InventoryReply.InventoryData[0].GroupID = new LLUUID("00000000-0000-0000-0000-000000000000");
-                        InventoryReply.InventoryData[0].GroupMask = FULL_MASK_PERMISSIONS;
-                        InventoryReply.InventoryData[0].InvType = Item.InvType;
-                        InventoryReply.InventoryData[0].Name = _enc.GetBytes(Item.Name + "\0");
-                        InventoryReply.InventoryData[0].NextOwnerMask = FULL_MASK_PERMISSIONS;
-                        InventoryReply.InventoryData[0].OwnerID = Item.OwnerID;
-                        InventoryReply.InventoryData[0].OwnerMask = FULL_MASK_PERMISSIONS;
-                        InventoryReply.InventoryData[0].SalePrice = 100;
-                        InventoryReply.InventoryData[0].SaleType = 0;
-                        InventoryReply.InventoryData[0].Type = Item.Type;
-                        InventoryReply.InventoryData[0].CRC = libsecondlife.Helpers.InventoryCRC(1000, 0, InventoryReply.InventoryData[0].InvType, InventoryReply.InventoryData[0].Type, InventoryReply.InventoryData[0].AssetID, InventoryReply.InventoryData[0].GroupID, 100, InventoryReply.InventoryData[0].OwnerID, InventoryReply.InventoryData[0].CreatorID, InventoryReply.InventoryData[0].ItemID, InventoryReply.InventoryData[0].FolderID, FULL_MASK_PERMISSIONS, 1, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS);
-                        userInfo.OutPacket(InventoryReply);
-                    }
-                }
-            }
-        }
-        private void SendItemUpdateCreate(ClientView remoteClient, InventoryItem Item)
-        {
-            UpdateCreateInventoryItemPacket InventoryReply = new UpdateCreateInventoryItemPacket();
-            InventoryReply.AgentData.AgentID = remoteClient.AgentID;
-            InventoryReply.AgentData.SimApproved = true;
-            InventoryReply.InventoryData = new UpdateCreateInventoryItemPacket.InventoryDataBlock[1];
-            InventoryReply.InventoryData[0] = new UpdateCreateInventoryItemPacket.InventoryDataBlock();
-            InventoryReply.InventoryData[0].ItemID = Item.ItemID;
-            InventoryReply.InventoryData[0].AssetID = Item.AssetID;
-            InventoryReply.InventoryData[0].CreatorID = Item.CreatorID;
-            InventoryReply.InventoryData[0].BaseMask = FULL_MASK_PERMISSIONS;
-            InventoryReply.InventoryData[0].CreationDate = 1000;
-            InventoryReply.InventoryData[0].Description = _enc.GetBytes(Item.Description + "\0");
-            InventoryReply.InventoryData[0].EveryoneMask = FULL_MASK_PERMISSIONS;
-            InventoryReply.InventoryData[0].Flags = 0;
-            InventoryReply.InventoryData[0].FolderID = Item.FolderID;
-            InventoryReply.InventoryData[0].GroupID = new LLUUID("00000000-0000-0000-0000-000000000000");
-            InventoryReply.InventoryData[0].GroupMask = FULL_MASK_PERMISSIONS;
-            InventoryReply.InventoryData[0].InvType = Item.InvType;
-            InventoryReply.InventoryData[0].Name = _enc.GetBytes(Item.Name + "\0");
-            InventoryReply.InventoryData[0].NextOwnerMask = FULL_MASK_PERMISSIONS;
-            InventoryReply.InventoryData[0].OwnerID = Item.OwnerID;
-            InventoryReply.InventoryData[0].OwnerMask = FULL_MASK_PERMISSIONS;
-            InventoryReply.InventoryData[0].SalePrice = 100;
-            InventoryReply.InventoryData[0].SaleType = 0;
-            InventoryReply.InventoryData[0].Type = Item.Type;
-            InventoryReply.InventoryData[0].CRC = libsecondlife.Helpers.InventoryCRC(1000, 0, InventoryReply.InventoryData[0].InvType, InventoryReply.InventoryData[0].Type, InventoryReply.InventoryData[0].AssetID, InventoryReply.InventoryData[0].GroupID, 100, InventoryReply.InventoryData[0].OwnerID, InventoryReply.InventoryData[0].CreatorID, InventoryReply.InventoryData[0].ItemID, InventoryReply.InventoryData[0].FolderID, FULL_MASK_PERMISSIONS, 1, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS);
-            remoteClient.OutPacket(InventoryReply);
-        }
-    }
-    public class UserServerRequest
-    {
-        public UserServerRequest()
-        {
-        }
-    }
-}
diff --git a/OpenSim/OpenSim.RegionServer/AuthenticateSessionsBase.cs b/OpenSim/OpenSim.RegionServer/AuthenticateSessionsBase.cs
deleted file mode 100644
index 6f80210..0000000
--- a/OpenSim/OpenSim.RegionServer/AuthenticateSessionsBase.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;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-namespace OpenSim.RegionServer
-{
-    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;
-            }
-        }
-        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;
-        }
-    }
-}
diff --git a/OpenSim/OpenSim.RegionServer/AuthenticateSessionsLocal.cs b/OpenSim/OpenSim.RegionServer/AuthenticateSessionsLocal.cs
deleted file mode 100644
index e0ffd71..0000000
--- a/OpenSim/OpenSim.RegionServer/AuthenticateSessionsLocal.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;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-using OpenSim.Framework.Types;
-namespace OpenSim.RegionServer
-{
-    public class AuthenticateSessionsLocal : AuthenticateSessionsBase
-    {
-        public AuthenticateSessionsLocal()
-        {
-        }
-        public void AddNewSession(Login loginData)
-        {
-            AgentCircuitData agent = new AgentCircuitData();
-            agent.AgentID = loginData.Agent;
-            agent.firstname = loginData.First;
-            agent.lastname = loginData.Last;
-            agent.SessionID = loginData.Session;
-            agent.SecureSessionID = loginData.SecureSession;
-            agent.circuitcode = loginData.CircuitCode;
-            agent.BaseFolder = loginData.BaseFolder;
-            agent.InventoryFolder = loginData.InventoryFolder;
-            agent.startpos = new LLVector3(128,128,70);
-            this.AddNewCircuit(agent.circuitcode, agent);
-        }
-    }
-}
diff --git a/OpenSim/OpenSim.RegionServer/AuthenticateSessionsRemote.cs b/OpenSim/OpenSim.RegionServer/AuthenticateSessionsRemote.cs
deleted file mode 100644
index 5747f8a..0000000
--- a/OpenSim/OpenSim.RegionServer/AuthenticateSessionsRemote.cs
+++ /dev/null
@@ -1,72 +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 System.Xml;
-using libsecondlife;
-using OpenSim.Framework.Types;
-using Nwc.XmlRpc;
-namespace OpenSim.RegionServer
-{
-    public class AuthenticateSessionsRemote : AuthenticateSessionsBase
-    {
-        public AuthenticateSessionsRemote()
-        {
-        }
-        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;
-          
-            }
-            this.AddNewCircuit(agentData.circuitcode, agentData);
-            return new XmlRpcResponse();
-        }
-    }
-}
diff --git a/OpenSim/OpenSim.RegionServer/CAPS/AdminWebFront.cs b/OpenSim/OpenSim.RegionServer/CAPS/AdminWebFront.cs
deleted file mode 100644
index ead902d..0000000
--- a/OpenSim/OpenSim.RegionServer/CAPS/AdminWebFront.cs
+++ /dev/null
@@ -1,281 +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 OpenSim.RegionServer.Simulator;
-using OpenSim.UserServer;
-using OpenSim.Servers;
-using OpenSim.RegionServer.Assets;
-using OpenSim.Framework.Inventory;
-using libsecondlife;
-using OpenSim.RegionServer.Scripting;
-using Avatar=libsecondlife.Avatar;
-namespace OpenSim.RegionServer.CAPS
-{
-    public class AdminWebFront
-    {
-        private string AdminPage;
-        private string NewAccountForm;
-        private string LoginForm;
-        private string passWord = "Admin";
-        private World m_world;
-        private LoginServer _userServer;
-        private InventoryCache _inventoryCache;
-        public AdminWebFront(string password, World world, InventoryCache inventoryCache, LoginServer userserver)
-        {
-            _inventoryCache = inventoryCache;
-            _userServer = userserver;
-            m_world = world;
-            passWord = password;
-            LoadAdminPage();
-        }
-        public void LoadMethods( BaseHttpServer server )
-        {
-            server.AddRestHandler("GET", "/Admin", GetAdminPage);
-            server.AddRestHandler("GET", "/Admin/Welcome", GetWelcomePage);
-            server.AddRestHandler("GET", "/Admin/Accounts", GetAccountsPage );
-            server.AddRestHandler("GET", "/Admin/Clients", GetConnectedClientsPage);
-            server.AddRestHandler("GET", "/Admin/Entities", GetEntitiesPage);
-            server.AddRestHandler("GET", "/Admin/Scripts", GetScriptsPage);
-            server.AddRestHandler("GET", "/Admin/AddTestScript", AddTestScript );
-            server.AddRestHandler("GET", "/ClientInventory", GetClientsInventory);
-            server.AddRestHandler("POST", "/Admin/NewAccount", PostNewAccount );
-            server.AddRestHandler("POST", "/Admin/Login", PostLogin );      
-        }
-        private string GetWelcomePage(string request, string path, string param)
-        {
-            string responseString;
-            responseString = "Welcome to the OpenSim Admin Page";
-            responseString += "<br><br><br> " + LoginForm;
-            return responseString;
-        }
-        private string PostLogin(string requestBody, string path, string param)
-        {
-            string responseString;
-            if (requestBody == passWord)
-            {
-                responseString = "<p> Login Successful </p>";
-            }
-            else
-            {
-                responseString = "<p> Password Error </p>";
-                responseString += "<p> Please Login with the correct password </p>";
-                responseString += "<br><br> " + LoginForm;
-            }
-            return responseString;
-        }
-        private string PostNewAccount(string requestBody, string path, string param)
-        {
-            string responseString;
-            string firstName = "";
-            string secondName = "";
-            string userPasswd = "";
-            string[] comp;
-            string[] passw;
-            string[] line;
-            string delimStr = "&";
-            char[] delimiter = delimStr.ToCharArray();
-            string delimStr2 = "=";
-            char[] delimiter2 = delimStr2.ToCharArray();
-            comp = requestBody.Split(delimiter);
-            passw = comp[3].Split(delimiter2);
-            if (passw[1] == passWord)  // check admin password is correct
-            {
-                                
-                line = comp[0].Split(delimiter2); //split firstname
-                if (line.Length > 1)
-                {
-                    firstName = line[1];
-                }
-                line = comp[1].Split(delimiter2); //split secondname
-                if (line.Length > 1)
-                {
-                    secondName = line[1];
-                }
-                line = comp[2].Split(delimiter2); //split user password
-                if (line.Length > 1)
-                {
-                    userPasswd = line[1];
-                }
-                if (this._userServer != null)
-                {
-                    this._userServer.CreateUserAccount(firstName, secondName, userPasswd);
-                }
-                responseString = "<p> New Account created </p>";
-            }
-            else
-            {
-                responseString = "<p> Admin password is incorrect, please login with the correct password</p>";
-                responseString += "<br><br>" + LoginForm;
-            }
-            return responseString;
-        }
-        private string GetConnectedClientsPage(string request, string path, string param)
-        {
-            string responseString;
-            responseString = " <p> Listing connected Clients </p>";
-            OpenSim.RegionServer.Simulator.Avatar TempAv;
-            foreach (libsecondlife.LLUUID UUID in m_world.Entities.Keys)
-            {
-                if (m_world.Entities[UUID].ToString() == "OpenSim.RegionServer.Simulator.Avatar")
-                {
-                    TempAv = (OpenSim.RegionServer.Simulator.Avatar)m_world.Entities[UUID];
-                    responseString += "<p> Client: ";
-                    responseString += TempAv.firstname + " , " + TempAv.lastname + " , <A HREF=\"javascript:loadXMLDoc('ClientInventory/" + UUID.ToString() + "')\">" + UUID + "</A> , " + TempAv.ControllingClient.SessionID + " ,  " + TempAv.ControllingClient.CircuitCode + " , " + TempAv.ControllingClient.userEP.ToString();
-                    responseString += "</p>";
-                }
-            }
-            return responseString;
-        }
-        private string AddTestScript(string request, string path, string param)
-        {
-            int index = path.LastIndexOf('/');
-            string lluidStr = path.Substring(index+1);
-            
-            LLUUID id;
-            
-            if( LLUUID.TryParse( lluidStr, out id ) )
-            {
-                // This is just here for concept purposes... Remove!
-                m_world.AddScript( m_world.Entities[id], new FollowRandomAvatar());
-                return String.Format("Added new script to object [{0}]", id);
-            }
-            else
-            {
-                return String.Format("Couldn't parse [{0}]", lluidStr );
-            }
-        }
-        private string GetScriptsPage(string request, string path, string param)
-        {
-            return String.Empty;
-        }
-        private string GetEntitiesPage(string request, string path, string param)
-        {
-            string responseString;
-            responseString = " <p> Listing current entities</p><ul>";
-            
-            foreach (Entity entity in m_world.Entities.Values)
-            {
-                string testScriptLink = "javascript:loadXMLDoc('Admin/AddTestScript/" + entity.uuid.ToString() + "');";
-                responseString += String.Format( "<li>[{0}] \"{1}\" @ {2} <a href=\"{3}\">add test script</a></li>", entity.uuid, entity.Name, entity.Pos, testScriptLink  );
-            }
-            responseString += "</ul>";
-            return responseString;
-        }
-        private string GetClientsInventory(string request, string path, string param)
-        {
-            string[] line;
-            string delimStr = "/";
-            char[] delimiter = delimStr.ToCharArray();
-            string responseString;
-            responseString = " <p> Listing Inventory </p>";
-            line = path.Split(delimiter);
-            if (line.Length > 2)
-            {
-                if (line[1] == "ClientInventory")
-                {
-                    AgentInventory inven = this._inventoryCache.GetAgentsInventory(new libsecondlife.LLUUID(line[2]));
-                    responseString += " <p> Client: " + inven.AgentID.ToStringHyphenated() +" </p>";
-                    if (inven != null)
-                    {
-                        foreach (InventoryItem item in inven.InventoryItems.Values)
-                        {
-                            responseString += "<p> InventoryItem: ";
-                            responseString +=  item.Name +" , "+ item.ItemID +" , "+ item.Type +" , "+ item.FolderID +" , "+ item.AssetID +" , "+ item.Description ; 
-                            responseString += "</p>";
-                        }
-                    }
-                }
-            }
-            return responseString;
-        }
-        private string GetCachedAssets(string request, string path, string param)
-        {
-            return "";
-        }
-        private string GetAccountsPage(string request, string path, string param)
-        {
-            string responseString;
-            responseString = "<p> Account management </p>";
-            responseString += "<br> ";
-            responseString += "<p> Create New Account </p>";
-            responseString += NewAccountForm;
-            return responseString;
-        }
-        private string GetAdminPage(string request, string path, string param)
-        {
-            return AdminPage;
-        }
-        private void LoadAdminPage()
-        {
-            try
-            {
-                StreamReader SR;
-                
-                SR = File.OpenText("testadmin.htm");
-                AdminPage = SR.ReadToEnd();                
-                SR.Close();
-                SR = File.OpenText("newaccountform.htm");
-                NewAccountForm = SR.ReadToEnd();
-                SR.Close();
-                SR = File.OpenText("login.htm");
-                LoginForm = SR.ReadToEnd();
-                SR.Close();
-            }
-            catch (Exception e)
-            {
-                Console.WriteLine(e.ToString());
-            }
-        }
-    }
-}
diff --git a/OpenSim/OpenSim.RegionServer/Client/ClientView.Grid.cs b/OpenSim/OpenSim.RegionServer/Client/ClientView.Grid.cs
deleted file mode 100644
index 0bccbc2..0000000
--- a/OpenSim/OpenSim.RegionServer/Client/ClientView.Grid.cs
+++ /dev/null
@@ -1,192 +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 libsecondlife;
-using libsecondlife.Packets;
-using Nwc.XmlRpc;
-using System.Net;
-using System.Net.Sockets;
-using System.IO;
-using System.Threading;
-using System.Timers;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Inventory;
-using OpenSim.Framework.Utilities;
-using OpenSim.RegionServer.Simulator;
-using OpenSim.RegionServer.Assets;
-using OpenSim.Framework.Console;
-namespace OpenSim.RegionServer.Client
-{
-    public partial class ClientView
-    {
-        public void EnableNeighbours()
-        {
-            if ((this.m_gridServer.GetName() == "Remote") && (!this.m_child))
-            {
-                Hashtable SimParams;
-                ArrayList SendParams;
-                XmlRpcRequest GridReq;
-                XmlRpcResponse GridResp;
-                List<Packet> enablePackets = new List<Packet>();
-                RemoteGridBase gridServer = (RemoteGridBase)this.m_gridServer;
-                foreach (Hashtable neighbour in gridServer.neighbours)
-                {
-                    try
-                    {
-                        string neighbourIPStr = (string)neighbour["sim_ip"];
-                        System.Net.IPAddress neighbourIP = System.Net.IPAddress.Parse(neighbourIPStr);
-                        ushort neighbourPort = (ushort)Convert.ToInt32(neighbour["sim_port"]);
-                        string reqUrl = "http://" + neighbourIPStr + ":" + neighbourPort.ToString();
-                        MainConsole.Instance.Verbose("Requesting " + reqUrl);
-                        SimParams = new Hashtable();
-                        SimParams["session_id"] = this.SessionID.ToString();
-                        SimParams["secure_session_id"] = this.SecureSessionID.ToString();
-                        SimParams["firstname"] = this.ClientAvatar.firstname;
-                        SimParams["lastname"] = this.ClientAvatar.lastname;
-                        SimParams["agent_id"] = this.AgentID.ToString();
-                        SimParams["circuit_code"] = (Int32)this.CircuitCode;
-                        SimParams["child_agent"] = "1";
-                        SendParams = new ArrayList();
-                        SendParams.Add(SimParams);
-                        GridReq = new XmlRpcRequest("expect_user", SendParams);
-                        GridResp = GridReq.Send(reqUrl, 3000);
-                        EnableSimulatorPacket enablesimpacket = new EnableSimulatorPacket();
-                        enablesimpacket.SimulatorInfo = new EnableSimulatorPacket.SimulatorInfoBlock();
-                        enablesimpacket.SimulatorInfo.Handle = Helpers.UIntsToLong((uint)(Convert.ToInt32(neighbour["region_locx"]) * 256), (uint)(Convert.ToInt32(neighbour["region_locy"]) * 256));
-                        byte[] byteIP = neighbourIP.GetAddressBytes();
-                        enablesimpacket.SimulatorInfo.IP = (uint)byteIP[3] << 24;
-                        enablesimpacket.SimulatorInfo.IP += (uint)byteIP[2] << 16;
-                        enablesimpacket.SimulatorInfo.IP += (uint)byteIP[1] << 8;
-                        enablesimpacket.SimulatorInfo.IP += (uint)byteIP[0];
-                        enablesimpacket.SimulatorInfo.Port = neighbourPort;
-                        enablePackets.Add(enablesimpacket);
-                    }
-                    catch
-                    {
-                        MainConsole.Instance.Notice("Could not connect to neighbour " + neighbour["sim_ip"] + ":" + neighbour["sim_port"] + ", continuing.");
-                    }
-                }
-                Thread.Sleep(3000);
-                foreach (Packet enable in enablePackets)
-                {
-                    this.OutPacket(enable);
-                }
-                enablePackets.Clear();
-            }
-        }
-        public void CrossSimBorder(LLVector3 avatarpos)
-        {               // VERY VERY BASIC
-            LLVector3 newpos = avatarpos;
-            uint neighbourx = this.m_regionData.RegionLocX;
-            uint neighboury = this.m_regionData.RegionLocY;
-            if (avatarpos.X < 0)
-            {
-                neighbourx -= 1;
-                newpos.X = 254;
-            }
-            if (avatarpos.X > 255)
-            {
-                neighbourx += 1;
-                newpos.X = 1;
-            }
-            if (avatarpos.Y < 0)
-            {
-                neighboury -= 1;
-                newpos.Y = 254;
-            }
-            if (avatarpos.Y > 255)
-            {
-                neighboury += 1;
-                newpos.Y = 1;
-            }
-            MainConsole.Instance.Notice("SimClient.cs:CrossSimBorder() - Crossing border to neighbouring sim at [" + neighbourx.ToString() + "," + neighboury.ToString() + "]");
-            Hashtable SimParams;
-            ArrayList SendParams;
-            XmlRpcRequest GridReq;
-            XmlRpcResponse GridResp;
-            foreach (Hashtable borderingSim in ((RemoteGridBase)m_gridServer).neighbours)
-            {
-                if (((string)borderingSim["region_locx"]).Equals(neighbourx.ToString()) && ((string)borderingSim["region_locy"]).Equals(neighboury.ToString()))
-                {
-                    SimParams = new Hashtable();
-                    SimParams["firstname"] = this.ClientAvatar.firstname;
-                    SimParams["lastname"] = this.ClientAvatar.lastname;
-                    SimParams["circuit_code"] = this.CircuitCode.ToString();
-                    SimParams["pos_x"] = newpos.X.ToString();
-                    SimParams["pos_y"] = newpos.Y.ToString();
-                    SimParams["pos_z"] = newpos.Z.ToString();
-                    SendParams = new ArrayList();
-                    SendParams.Add(SimParams);
-                    GridReq = new XmlRpcRequest("agent_crossing", SendParams);
-                    GridResp = GridReq.Send("http://" + borderingSim["sim_ip"] + ":" + borderingSim["sim_port"], 3000);
-                    CrossedRegionPacket NewSimPack = new CrossedRegionPacket();
-                    NewSimPack.AgentData = new CrossedRegionPacket.AgentDataBlock();
-                    NewSimPack.AgentData.AgentID = this.AgentID;
-                    NewSimPack.AgentData.SessionID = this.SessionID;
-                    NewSimPack.Info = new CrossedRegionPacket.InfoBlock();
-                    NewSimPack.Info.Position = newpos;
-                    NewSimPack.Info.LookAt = new LLVector3(0.99f, 0.042f, 0);   // copied from Avatar.cs - SHOULD BE DYNAMIC!!!!!!!!!!
-                    NewSimPack.RegionData = new libsecondlife.Packets.CrossedRegionPacket.RegionDataBlock();
-                    NewSimPack.RegionData.RegionHandle = Helpers.UIntsToLong((uint)(Convert.ToInt32(borderingSim["region_locx"]) * 256), (uint)(Convert.ToInt32(borderingSim["region_locy"]) * 256));
-                    System.Net.IPAddress neighbourIP = System.Net.IPAddress.Parse((string)borderingSim["sim_ip"]);
-                    byte[] byteIP = neighbourIP.GetAddressBytes();
-                    NewSimPack.RegionData.SimIP = (uint)byteIP[3] << 24;
-                    NewSimPack.RegionData.SimIP += (uint)byteIP[2] << 16;
-                    NewSimPack.RegionData.SimIP += (uint)byteIP[1] << 8;
-                    NewSimPack.RegionData.SimIP += (uint)byteIP[0];
-                    NewSimPack.RegionData.SimPort = (ushort)Convert.ToInt32(borderingSim["sim_port"]);
-                    NewSimPack.RegionData.SeedCapability = new byte[0];
-                    lock (PacketQueue)
-                    {
-                        ProcessOutPacket(NewSimPack);
-                        DowngradeClient();
-                    }
-                }
-            }
-        }
-   }
-}
diff --git a/OpenSim/OpenSim.RegionServer/Client/ClientView.PacketHandlers.cs b/OpenSim/OpenSim.RegionServer/Client/ClientView.PacketHandlers.cs
deleted file mode 100644
index 4af0485..0000000
--- a/OpenSim/OpenSim.RegionServer/Client/ClientView.PacketHandlers.cs
+++ /dev/null
@@ -1,196 +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 libsecondlife;
-using libsecondlife.Packets;
-using Nwc.XmlRpc;
-using System.Net;
-using System.Net.Sockets;
-using System.IO;
-using System.Threading;
-using System.Timers;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Inventory;
-using OpenSim.Framework.Utilities;
-using OpenSim.RegionServer.Simulator;
-using OpenSim.RegionServer.Assets;
-using OpenSim.Framework.Console;
-namespace OpenSim.RegionServer.Client
-{
-    public partial class ClientView
-    {
-        protected virtual void RegisterLocalPacketHandlers()
-        {
-            this.AddLocalPacketHandler(PacketType.LogoutRequest, this.Logout);
-            this.AddLocalPacketHandler(PacketType.AgentCachedTexture, this.AgentTextureCached);
-            this.AddLocalPacketHandler(PacketType.MultipleObjectUpdate, this.MultipleObjUpdate);
-        }
-        protected virtual bool Logout(ClientView simClient, Packet packet)
-        {
-            MainConsole.Instance.Notice("OpenSimClient.cs:ProcessInPacket() - Got a logout request");
-            //send reply to let the client logout
-            LogoutReplyPacket logReply = new LogoutReplyPacket();
-            logReply.AgentData.AgentID = this.AgentID;
-            logReply.AgentData.SessionID = this.SessionID;
-            logReply.InventoryData = new LogoutReplyPacket.InventoryDataBlock[1];
-            logReply.InventoryData[0] = new LogoutReplyPacket.InventoryDataBlock();
-            logReply.InventoryData[0].ItemID = LLUUID.Zero;
-            OutPacket(logReply);
-            //tell all clients to kill our object
-            KillObjectPacket kill = new KillObjectPacket();
-            kill.ObjectData = new KillObjectPacket.ObjectDataBlock[1];
-            kill.ObjectData[0] = new KillObjectPacket.ObjectDataBlock();
-            kill.ObjectData[0].ID = this.ClientAvatar.localid;
-            foreach (ClientView client in m_clientThreads.Values)
-            {
-                client.OutPacket(kill);
-            }
-            if (this.m_userServer != null)
-            {
-                this.m_inventoryCache.ClientLeaving(this.AgentID, this.m_userServer);
-            }
-            else
-            {
-                this.m_inventoryCache.ClientLeaving(this.AgentID, null);
-            }
-            m_gridServer.LogoutSession(this.SessionID, this.AgentID, this.CircuitCode);
-            /*lock (m_world.Entities)
-            {
-                m_world.Entities.Remove(this.AgentID);
-            }*/
-            m_world.RemoveViewerAgent(this);
-            //need to do other cleaning up here too
-            m_clientThreads.Remove(this.CircuitCode);
-            m_networkServer.RemoveClientCircuit(this.CircuitCode);
-            this.ClientThread.Abort();
-            return true;
-        }
-        protected bool AgentTextureCached(ClientView simclient, Packet packet)
-        {
-            AgentCachedTexturePacket chechedtex = (AgentCachedTexturePacket)packet;
-            AgentCachedTextureResponsePacket cachedresp = new AgentCachedTextureResponsePacket();
-            cachedresp.AgentData.AgentID = this.AgentID;
-            cachedresp.AgentData.SessionID = this.SessionID;
-            cachedresp.AgentData.SerialNum = this.cachedtextureserial;
-            this.cachedtextureserial++;
-            cachedresp.WearableData = new AgentCachedTextureResponsePacket.WearableDataBlock[chechedtex.WearableData.Length];
-            for (int i = 0; i < chechedtex.WearableData.Length; i++)
-            {
-                cachedresp.WearableData[i] = new AgentCachedTextureResponsePacket.WearableDataBlock();
-                cachedresp.WearableData[i].TextureIndex = chechedtex.WearableData[i].TextureIndex;
-                cachedresp.WearableData[i].TextureID = LLUUID.Zero;
-                cachedresp.WearableData[i].HostName = new byte[0];
-            }
-            this.OutPacket(cachedresp);
-            return true;
-        }
-        protected bool MultipleObjUpdate(ClientView simClient, Packet packet)
-        {
-            MultipleObjectUpdatePacket multipleupdate = (MultipleObjectUpdatePacket)packet;
-            for (int i = 0; i < multipleupdate.ObjectData.Length; i++)
-            {
-                if (multipleupdate.ObjectData[i].Type == 9) //change position
-                {
-                    libsecondlife.LLVector3 pos = new LLVector3(multipleupdate.ObjectData[i].Data, 0);
-                    OnUpdatePrimPosition(multipleupdate.ObjectData[i].ObjectLocalID, pos, this);
-                    //should update stored position of the prim
-                }
-                else if (multipleupdate.ObjectData[i].Type == 10)//rotation
-                {
-                    libsecondlife.LLQuaternion rot = new LLQuaternion(multipleupdate.ObjectData[i].Data, 0, true);
-                    OnUpdatePrimRotation(multipleupdate.ObjectData[i].ObjectLocalID, rot, this);
-                }
-                else if (multipleupdate.ObjectData[i].Type == 13)//scale
-                {
-                    libsecondlife.LLVector3 scale = new LLVector3(multipleupdate.ObjectData[i].Data, 12);
-                    OnUpdatePrimScale(multipleupdate.ObjectData[i].ObjectLocalID, scale, this);            
-                }
-            }
-            return true;
-        }
-        public void RequestMapLayer() //should be getting the map layer from the grid server
-        {
-            //send a layer covering the 800,800 - 1200,1200 area (should be covering the requested area)
-            MapLayerReplyPacket mapReply = new MapLayerReplyPacket();
-            mapReply.AgentData.AgentID = this.AgentID;
-            mapReply.AgentData.Flags = 0;
-            mapReply.LayerData = new MapLayerReplyPacket.LayerDataBlock[1];
-            mapReply.LayerData[0] = new MapLayerReplyPacket.LayerDataBlock();
-            mapReply.LayerData[0].Bottom = this.m_regionData.RegionLocY - 50;
-            mapReply.LayerData[0].Left = this.m_regionData.RegionLocX - 50;
-            mapReply.LayerData[0].Top = this.m_regionData.RegionLocY + 50;
-            mapReply.LayerData[0].Right = this.m_regionData.RegionLocX + 50;
-            mapReply.LayerData[0].ImageID = new LLUUID("00000000-0000-0000-9999-000000000005");
-            this.OutPacket(mapReply);
-        }
-        public void RequestMapBlocks(int minX, int minY, int maxX, int maxY)
-        {
-            IList simMapProfiles = m_gridServer.RequestMapBlocks(minX, minY, maxX, maxY);
-            int len;
-            if (simMapProfiles == null)
-                len = 0;
-            else
-                len = simMapProfiles.Count;
-            int i;
-            int mtu = 24; // Number of regions to send per packet. Will be more precise in future. ( TODO )
-            for (i = 0; i < len; i += mtu)
-            {
-                MapBlockReplyPacket mbReply = new MapBlockReplyPacket();
-                mbReply.AgentData.AgentID = this.AgentID;
-                mbReply.Data = new MapBlockReplyPacket.DataBlock[Math.Min(mtu, len - i)];
-                int j;
-                for (j = 0; (j < mtu) && ((i + j) < len); j++)
-                {
-                    Hashtable mp = (Hashtable)simMapProfiles[j];
-                    mbReply.Data[j] = new MapBlockReplyPacket.DataBlock();
-                    mbReply.Data[j].Name = libsecondlife.Helpers.StringToField((string)mp["name"]);
-                    mbReply.Data[j].Access = System.Convert.ToByte(mp["access"]);
-                    mbReply.Data[j].Agents = System.Convert.ToByte(mp["agents"]);
-                    mbReply.Data[j].MapImageID = new LLUUID((string)mp["map-image-id"]);
-                    mbReply.Data[j].RegionFlags = System.Convert.ToUInt32(mp["region-flags"]);
-                    mbReply.Data[j].WaterHeight = System.Convert.ToByte(mp["water-height"]);
-                    mbReply.Data[j].X = System.Convert.ToUInt16(mp["x"]);
-                    mbReply.Data[j].Y = System.Convert.ToUInt16(mp["y"]);
-                }
-                this.OutPacket(mbReply);
-            }
-        }
-    }
-}
diff --git a/OpenSim/OpenSim.RegionServer/Client/ClientView.ProcessPackets.cs b/OpenSim/OpenSim.RegionServer/Client/ClientView.ProcessPackets.cs
deleted file mode 100644
index 306bf63..0000000
--- a/OpenSim/OpenSim.RegionServer/Client/ClientView.ProcessPackets.cs
+++ /dev/null
@@ -1,523 +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 libsecondlife;
-using libsecondlife.Packets;
-using Nwc.XmlRpc;
-using System.Net;
-using System.Net.Sockets;
-using System.IO;
-using System.Threading;
-using System.Timers;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Inventory;
-using OpenSim.Framework.Utilities;
-using OpenSim.RegionServer.Simulator;
-using OpenSim.RegionServer.Assets;
-using OpenSim.Framework.Console;
-namespace OpenSim.RegionServer.Client
-{
-    public partial class ClientView
-    {
-        public delegate void GenericCall(ClientView 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, ClientView remoteClient);
-        public delegate void UpdateShape(uint localID, ObjectShapePacket.ObjectDataBlock shapeBlock);
-        public delegate void ObjectSelect(uint localID, ClientView remoteClient);
-        public delegate void UpdatePrimFlags(uint localID, Packet packet, ClientView remoteClient);
-        public delegate void UpdatePrimTexture(uint localID, byte[] texture, ClientView remoteClient);
-        public delegate void UpdatePrimVector(uint localID, LLVector3 pos, ClientView remoteClient);
-        public delegate void UpdatePrimRotation(uint localID, LLQuaternion rot, ClientView remoteClient);
-        public delegate void StatusChange(bool status);
-        public event ChatFromViewer OnChatFromViewer;
-        public event RezObject OnRezObject;
-        public event GenericCall4 OnDeRezObject;
-        public event ModifyTerrain OnModifyTerrain;
-        public event GenericCall OnRegionHandShakeReply;
-        public event GenericCall OnRequestWearables;
-        public event SetAppearance OnSetAppearance;
-        public event GenericCall2 OnCompleteMovementToRegion;
-        public event GenericCall3 OnAgentUpdate;
-        public event StartAnim OnStartAnim;
-        public event GenericCall OnRequestAvatarsData;
-        public event LinkObjects OnLinkObjects;
-        public event GenericCall4 OnAddPrim;
-        public event UpdateShape OnUpdatePrimShape;
-        public event ObjectSelect OnObjectSelect;
-        public event UpdatePrimFlags OnUpdatePrimFlags;
-        public event UpdatePrimTexture OnUpdatePrimTexture;
-        public event UpdatePrimVector OnUpdatePrimPosition;
-        public event UpdatePrimRotation OnUpdatePrimRotation;
-        public event UpdatePrimVector OnUpdatePrimScale;
-        public event StatusChange OnChildAgentStatus;
-        public event ParcelPropertiesRequest OnParcelPropertiesRequest;
-        public event ParcelDivideRequest OnParcelDivideRequest;
-        public event ParcelJoinRequest OnParcelJoinRequest;
-        public event ParcelPropertiesUpdateRequest OnParcelPropertiesUpdateRequest;
-        protected override void ProcessInPacket(Packet Pack)
-        {
-            ack_pack(Pack);
-            if (debug)
-            {
-                if (Pack.Type != PacketType.AgentUpdate)
-                {
-                    Console.WriteLine("IN: " + Pack.Type.ToString());
-                }
-            }
-            if (this.ProcessPacketMethod(Pack))
-            {
-                //there is a handler registered that handled this packet type 
-                return;
-            }
-            else
-            {
-                System.Text.Encoding _enc = System.Text.Encoding.ASCII;
-                switch (Pack.Type)
-                {
-                    case PacketType.ViewerEffect:
-                        ViewerEffectPacket viewer = (ViewerEffectPacket)Pack;
-                        foreach (ClientView client in m_clientThreads.Values)
-                        {
-                            if (client.AgentID != this.AgentID)
-                            {
-                                viewer.AgentData.AgentID = client.AgentID;
-                                viewer.AgentData.SessionID = client.SessionID;
-                                client.OutPacket(viewer);
-                            }
-                        }
-                        break;
-                    #region New Event System - World/Avatar
-                    case PacketType.ChatFromViewer:
-                        ChatFromViewerPacket inchatpack = (ChatFromViewerPacket)Pack;
-                        if (Util.FieldToString(inchatpack.ChatData.Message) == "")
-                        {
-                            //empty message so don't bother with it
-                            break;
-                        }
-                        string fromName = ClientAvatar.firstname + " " + ClientAvatar.lastname;
-                        byte[] message = inchatpack.ChatData.Message;
-                        byte type = inchatpack.ChatData.Type;
-                        LLVector3 fromPos = ClientAvatar.Pos;
-                        LLUUID fromAgentID = AgentID;
-                        this.OnChatFromViewer(message, type, fromPos, fromName, fromAgentID);
-                        break;
-                    case PacketType.RezObject:
-                        RezObjectPacket rezPacket = (RezObjectPacket)Pack;
-                        AgentInventory inven = this.m_inventoryCache.GetAgentsInventory(this.AgentID);
-                        if (inven != null)
-                        {
-                            if (inven.InventoryItems.ContainsKey(rezPacket.InventoryData.ItemID))
-                            {
-                                AssetBase asset = this.m_assetCache.GetAsset(inven.InventoryItems[rezPacket.InventoryData.ItemID].AssetID);
-                                if (asset != null)
-                                {
-                                    this.OnRezObject(asset, rezPacket.RezData.RayEnd);
-                                    this.m_inventoryCache.DeleteInventoryItem(this, rezPacket.InventoryData.ItemID);
-                                }
-                            }
-                        }
-                        break;
-                    case PacketType.DeRezObject:
-                        OnDeRezObject(Pack, this);
-                        break;
-                    case PacketType.ModifyLand:
-                        ModifyLandPacket modify = (ModifyLandPacket)Pack;
-                        if (modify.ParcelData.Length > 0)
-                        {
-                            OnModifyTerrain(modify.ModifyBlock.Action, modify.ParcelData[0].North, modify.ParcelData[0].West);
-                        }
-                        break;
-                    case PacketType.RegionHandshakeReply:
-                        OnRegionHandShakeReply(this);
-                        break;
-                    case PacketType.AgentWearablesRequest:
-                        OnRequestWearables(this);
-                        OnRequestAvatarsData(this);
-                        break;
-                    case PacketType.AgentSetAppearance:
-                        AgentSetAppearancePacket appear = (AgentSetAppearancePacket)Pack;
-                        OnSetAppearance(appear.ObjectData.TextureEntry, appear.VisualParam);
-                        break;
-                    case PacketType.CompleteAgentMovement:
-                        if (this.m_child) this.UpgradeClient();
-                        OnCompleteMovementToRegion();
-                        this.EnableNeighbours();
-                        break;
-                    case PacketType.AgentUpdate:
-                        OnAgentUpdate(Pack);
-                        break;
-                    case PacketType.AgentAnimation:
-                        if (!m_child)
-                        {
-                            AgentAnimationPacket AgentAni = (AgentAnimationPacket)Pack;
-                            for (int i = 0; i < AgentAni.AnimationList.Length; i++)
-                            {
-                                if (AgentAni.AnimationList[i].StartAnim)
-                                {
-                                    OnStartAnim(AgentAni.AnimationList[i].AnimID, 1);
-                                }
-                            }
-                        }
-                        break;
-                    #endregion
-                    #region New Event System - Objects/Prims
-                    case PacketType.ObjectLink:
-                        ObjectLinkPacket link = (ObjectLinkPacket)Pack;
-                        uint parentprimid = 0;
-                        List<uint> childrenprims = new List<uint>();
-                        if (link.ObjectData.Length > 1)
-                        {
-                            parentprimid = link.ObjectData[0].ObjectLocalID;
-                            for (int i = 1; i < link.ObjectData.Length; i++)
-                            {
-                                childrenprims.Add(link.ObjectData[i].ObjectLocalID);
-                            }
-                        }
-                        OnLinkObjects(parentprimid, childrenprims);
-                        break;
-                    case PacketType.ObjectAdd:
-                        m_world.AddNewPrim((ObjectAddPacket)Pack, this);
-                        OnAddPrim(Pack, this);
-                        break;
-                    case PacketType.ObjectShape:
-                        ObjectShapePacket shape = (ObjectShapePacket)Pack;
-                        for (int i = 0; i < shape.ObjectData.Length; i++)
-                        {
-                            OnUpdatePrimShape(shape.ObjectData[i].ObjectLocalID, shape.ObjectData[i]);
-                        }
-                        break;
-                    case PacketType.ObjectSelect:
-                        ObjectSelectPacket incomingselect = (ObjectSelectPacket)Pack;
-                        for (int i = 0; i < incomingselect.ObjectData.Length; i++)
-                        {
-                            OnObjectSelect(incomingselect.ObjectData[i].ObjectLocalID, this);
-                        }
-                        break;
-                    case PacketType.ObjectFlagUpdate:
-                        ObjectFlagUpdatePacket flags = (ObjectFlagUpdatePacket)Pack;
-                        OnUpdatePrimFlags(flags.AgentData.ObjectLocalID, Pack, this);
-                        break;
-                    case PacketType.ObjectImage:
-                        ObjectImagePacket imagePack = (ObjectImagePacket)Pack;
-                        for (int i = 0; i < imagePack.ObjectData.Length; i++)
-                        {
-                            OnUpdatePrimTexture(imagePack.ObjectData[i].ObjectLocalID, imagePack.ObjectData[i].TextureEntry, this);
-                        }
-                        break;
-                    #endregion      
-                   
-                    #region Inventory/Asset/Other related packets
-                    case PacketType.RequestImage:
-                        RequestImagePacket imageRequest = (RequestImagePacket)Pack;
-                        for (int i = 0; i < imageRequest.RequestImage.Length; i++)
-                        {
-                            m_assetCache.AddTextureRequest(this, imageRequest.RequestImage[i].Image);
-                        }
-                        break;
-                    case PacketType.TransferRequest:
-                        TransferRequestPacket transfer = (TransferRequestPacket)Pack;
-                        m_assetCache.AddAssetRequest(this, transfer);
-                        break;
-                    case PacketType.AssetUploadRequest:
-                        AssetUploadRequestPacket request = (AssetUploadRequestPacket)Pack;
-                        this.UploadAssets.HandleUploadPacket(request, request.AssetBlock.TransactionID.Combine(this.SecureSessionID));
-                        break;
-                    case PacketType.RequestXfer:
-                        break;
-                    case PacketType.SendXferPacket:
-                        this.UploadAssets.HandleXferPacket((SendXferPacketPacket)Pack);
-                        break;
-                    case PacketType.CreateInventoryFolder:
-                        CreateInventoryFolderPacket invFolder = (CreateInventoryFolderPacket)Pack;
-                        m_inventoryCache.CreateNewInventoryFolder(this, invFolder.FolderData.FolderID, (ushort)invFolder.FolderData.Type, Util.FieldToString(invFolder.FolderData.Name), invFolder.FolderData.ParentID);
-                        break;
-                    case PacketType.CreateInventoryItem:
-                        CreateInventoryItemPacket createItem = (CreateInventoryItemPacket)Pack;
-                        if (createItem.InventoryBlock.TransactionID != LLUUID.Zero)
-                        {
-                            this.UploadAssets.CreateInventoryItem(createItem);
-                        }
-                        else
-                        {
-                            this.CreateInventoryItem(createItem);
-                        }
-                        break;
-                    case PacketType.FetchInventory:
-                        FetchInventoryPacket FetchInventory = (FetchInventoryPacket)Pack;
-                        m_inventoryCache.FetchInventory(this, FetchInventory);
-                        break;
-                    case PacketType.FetchInventoryDescendents:
-                        FetchInventoryDescendentsPacket Fetch = (FetchInventoryDescendentsPacket)Pack;
-                        m_inventoryCache.FetchInventoryDescendents(this, Fetch);
-                        break;
-                    case PacketType.UpdateInventoryItem:
-                        UpdateInventoryItemPacket update = (UpdateInventoryItemPacket)Pack;
-                        for (int i = 0; i < update.InventoryData.Length; i++)
-                        {
-                            if (update.InventoryData[i].TransactionID != LLUUID.Zero)
-                            {
-                                AssetBase asset = m_assetCache.GetAsset(update.InventoryData[i].TransactionID.Combine(this.SecureSessionID));
-                                if (asset != null)
-                                {
-                                    m_inventoryCache.UpdateInventoryItemAsset(this, update.InventoryData[i].ItemID, asset);
-                                }
-                                else
-                                {
-                                    asset = this.UploadAssets.AddUploadToAssetCache(update.InventoryData[i].TransactionID);
-                                    if (asset != null)
-                                    {
-                                        m_inventoryCache.UpdateInventoryItemAsset(this, update.InventoryData[i].ItemID, asset);
-                                    }
-                                    else
-                                    {
-                                    }
-                                }
-                            }
-                            else
-                            {
-                                m_inventoryCache.UpdateInventoryItemDetails(this, update.InventoryData[i].ItemID, update.InventoryData[i]); ;
-                            }
-                        }
-                        break;
-                    case PacketType.RequestTaskInventory:
-                        RequestTaskInventoryPacket requesttask = (RequestTaskInventoryPacket)Pack;
-                        ReplyTaskInventoryPacket replytask = new ReplyTaskInventoryPacket();
-                        bool foundent = false;
-                        foreach (Entity ent in m_world.Entities.Values)
-                        {
-                            if (ent.localid == requesttask.InventoryData.LocalID)
-                            {
-                                replytask.InventoryData.TaskID = ent.uuid;
-                                replytask.InventoryData.Serial = 0;
-                                replytask.InventoryData.Filename = new byte[0];
-                                foundent = true;
-                            }
-                        }
-                        if (foundent)
-                        {
-                            this.OutPacket(replytask);
-                        }
-                        break;
-                    case PacketType.UpdateTaskInventory:
-                        UpdateTaskInventoryPacket updatetask = (UpdateTaskInventoryPacket)Pack;
-                        AgentInventory myinventory = this.m_inventoryCache.GetAgentsInventory(this.AgentID);
-                        if (myinventory != null)
-                        {
-                            if (updatetask.UpdateData.Key == 0)
-                            {
-                                if (myinventory.InventoryItems[updatetask.InventoryData.ItemID] != null)
-                                {
-                                    if (myinventory.InventoryItems[updatetask.InventoryData.ItemID].Type == 7)
-                                    {
-                                        LLUUID noteaid = myinventory.InventoryItems[updatetask.InventoryData.ItemID].AssetID;
-                                        AssetBase assBase = this.m_assetCache.GetAsset(noteaid);
-                                        if (assBase != null)
-                                        {
-                                            foreach (Entity ent in m_world.Entities.Values)
-                                            {
-                                                if (ent.localid == updatetask.UpdateData.LocalID)
-                                                {
-                                                    if (ent is OpenSim.RegionServer.Simulator.Primitive)
-                                                    {
-                                                        this.m_world.AddScript(ent, Util.FieldToString(assBase.Data));
-                                                    }
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                        break;
-                    case PacketType.MapLayerRequest:
-                        // This be busted.
-                        MapLayerRequestPacket MapRequest = (MapLayerRequestPacket)Pack;
-                        this.RequestMapLayer();
-                        this.RequestMapBlocks((int)this.m_regionData.RegionLocX - 5, (int)this.m_regionData.RegionLocY - 5, (int)this.m_regionData.RegionLocX + 5, (int)this.m_regionData.RegionLocY + 5);
-                        break;
-                    case PacketType.MapBlockRequest:
-                        MapBlockRequestPacket MapBRequest = (MapBlockRequestPacket)Pack;
-                        this.RequestMapBlocks(MapBRequest.PositionData.MinX, MapBRequest.PositionData.MinY, MapBRequest.PositionData.MaxX, MapBRequest.PositionData.MaxY);
-                        break;
-                    case PacketType.MapNameRequest:
-                        // TODO.
-                        break;
-                    case PacketType.TeleportLandmarkRequest:
-                        TeleportLandmarkRequestPacket tpReq = (TeleportLandmarkRequestPacket)Pack;
-                        TeleportStartPacket tpStart = new TeleportStartPacket();
-                        tpStart.Info.TeleportFlags = 8; // tp via lm
-                        this.OutPacket(tpStart);
-                        TeleportProgressPacket tpProgress = new TeleportProgressPacket();
-                        tpProgress.Info.Message = (new System.Text.ASCIIEncoding()).GetBytes("sending_landmark");
-                        tpProgress.Info.TeleportFlags = 8;
-                        tpProgress.AgentData.AgentID = tpReq.Info.AgentID;
-                        this.OutPacket(tpProgress);
-                        // Fetch landmark
-                        LLUUID lmid = tpReq.Info.LandmarkID;
-                        AssetBase lma = this.m_assetCache.GetAsset(lmid);
-                        if (lma != null)
-                        {
-                            AssetLandmark lm = new AssetLandmark(lma);
-                            if (lm.RegionID == m_regionData.SimUUID)
-                            {
-                                TeleportLocalPacket tpLocal = new TeleportLocalPacket();
-                                tpLocal.Info.AgentID = tpReq.Info.AgentID;
-                                tpLocal.Info.TeleportFlags = 8;  // Teleport via landmark
-                                tpLocal.Info.LocationID = 2;
-                                tpLocal.Info.Position = lm.Position;
-                                OutPacket(tpLocal);
-                            }
-                            else
-                            {
-                                TeleportCancelPacket tpCancel = new TeleportCancelPacket();
-                                tpCancel.Info.AgentID = tpReq.Info.AgentID;
-                                tpCancel.Info.SessionID = tpReq.Info.SessionID;
-                                OutPacket(tpCancel);
-                            }
-                        }
-                        else
-                        {
-                            Console.WriteLine("Cancelling Teleport - fetch asset not yet implemented");
-                            TeleportCancelPacket tpCancel = new TeleportCancelPacket();
-                            tpCancel.Info.AgentID = tpReq.Info.AgentID;
-                            tpCancel.Info.SessionID = tpReq.Info.SessionID;
-                            OutPacket(tpCancel);
-                        }
-                        break;
-                    case PacketType.TeleportLocationRequest:
-                        TeleportLocationRequestPacket tpLocReq = (TeleportLocationRequestPacket)Pack;
-                        Console.WriteLine(tpLocReq.ToString());
-                        tpStart = new TeleportStartPacket();
-                        tpStart.Info.TeleportFlags = 16; // Teleport via location
-                        Console.WriteLine(tpStart.ToString());
-                        OutPacket(tpStart);
-                        if (m_regionData.RegionHandle != tpLocReq.Info.RegionHandle)
-                        {
-                            /* m_gridServer.getRegion(tpLocReq.Info.RegionHandle); */
-                            Console.WriteLine("Inter-sim teleport not yet implemented");
-                            TeleportCancelPacket tpCancel = new TeleportCancelPacket();
-                            tpCancel.Info.SessionID = tpLocReq.AgentData.SessionID;
-                            tpCancel.Info.AgentID = tpLocReq.AgentData.AgentID;
-                            OutPacket(tpCancel);
-                        }
-                        else
-                        {
-                            Console.WriteLine("Local teleport");
-                            TeleportLocalPacket tpLocal = new TeleportLocalPacket();
-                            tpLocal.Info.AgentID = tpLocReq.AgentData.AgentID;
-                            tpLocal.Info.TeleportFlags = tpStart.Info.TeleportFlags;
-                            tpLocal.Info.LocationID = 2;
-                            tpLocal.Info.LookAt = tpLocReq.Info.LookAt;
-                            tpLocal.Info.Position = tpLocReq.Info.Position;
-                            OutPacket(tpLocal);
-                        }
-                        break;
-                    #endregion
-                    #region Parcel Packets
-                    case PacketType.ParcelPropertiesRequest:
-                        ParcelPropertiesRequestPacket propertiesRequest = (ParcelPropertiesRequestPacket)Pack;
-                        OnParcelPropertiesRequest((int)Math.Round(propertiesRequest.ParcelData.West), (int)Math.Round(propertiesRequest.ParcelData.South), (int)Math.Round(propertiesRequest.ParcelData.East), (int)Math.Round(propertiesRequest.ParcelData.North),propertiesRequest.ParcelData.SequenceID,propertiesRequest.ParcelData.SnapSelection, this);
-                        break;
-                    case PacketType.ParcelDivide:
-                        ParcelDividePacket parcelDivide = (ParcelDividePacket)Pack;
-                        OnParcelDivideRequest((int)Math.Round(parcelDivide.ParcelData.West), (int)Math.Round(parcelDivide.ParcelData.South), (int)Math.Round(parcelDivide.ParcelData.East), (int)Math.Round(parcelDivide.ParcelData.North), this);
-                        break;
-                    case PacketType.ParcelJoin:
-                        ParcelJoinPacket parcelJoin = (ParcelJoinPacket)Pack;
-                        OnParcelJoinRequest((int)Math.Round(parcelJoin.ParcelData.West), (int)Math.Round(parcelJoin.ParcelData.South), (int)Math.Round(parcelJoin.ParcelData.East), (int)Math.Round(parcelJoin.ParcelData.North), this);
-                        break;
-                    case PacketType.ParcelPropertiesUpdate:
-                        ParcelPropertiesUpdatePacket updatePacket = (ParcelPropertiesUpdatePacket)Pack;
-                        OnParcelPropertiesUpdateRequest(updatePacket, this);
-                        break;
-                    #endregion
-                    #region Estate Packets
-                    case PacketType.EstateOwnerMessage:
-                        this.m_world.estateManager.handleEstateOwnerMessage((EstateOwnerMessagePacket)Pack, this);
-                        break;
-                    #endregion
-                    #region unimplemented handlers
-                    case PacketType.AgentIsNowWearing:
-                        // AgentIsNowWearingPacket wear = (AgentIsNowWearingPacket)Pack;
-                        break;
-                    case PacketType.ObjectScale:
-                        break;
-                    case PacketType.MoneyBalanceRequest:
-                        //This need to be actually done and not thrown back with fake infos
-                        break;
-                    case PacketType.EstateCovenantRequest:
-                        //This should be actually done and not thrown back with fake info
-                        EstateCovenantRequestPacket estateCovenantRequest = (EstateCovenantRequestPacket)Pack;
-                        EstateCovenantReplyPacket estateCovenantReply = new EstateCovenantReplyPacket();
-                        estateCovenantReply.Data.EstateName = libsecondlife.Helpers.StringToField("Leet Estate");
-                        estateCovenantReply.Data.EstateOwnerID = LLUUID.Zero;
-                        estateCovenantReply.Data.CovenantID = LLUUID.Zero;
-                        estateCovenantReply.Data.CovenantTimestamp = (uint)0;
-                        this.OutPacket((Packet)estateCovenantReply);
-                        MainConsole.Instance.Notice("Sent Temporary Estate packet (they are in leet estate)");
-                        break;
-                    #endregion
-                }
-            }
-        }
-    }
-}
diff --git a/OpenSim/OpenSim.RegionServer/Client/ClientView.cs b/OpenSim/OpenSim.RegionServer/Client/ClientView.cs
deleted file mode 100644
index 29efcc9..0000000
--- a/OpenSim/OpenSim.RegionServer/Client/ClientView.cs
+++ /dev/null
@@ -1,461 +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 libsecondlife;
-using libsecondlife.Packets;
-using Nwc.XmlRpc;
-using System.Net;
-using System.Net.Sockets;
-using System.IO;
-using System.Threading;
-using System.Timers;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Inventory;
-using OpenSim.Framework.Utilities;
-using OpenSim.RegionServer.Simulator;
-using OpenSim.RegionServer.Assets;
-using OpenSim.Framework.Console;
-namespace OpenSim.RegionServer.Client
-{
-    public delegate bool PacketMethod(ClientView simClient, Packet packet);
-    /// <summary>
-    /// Handles new client connections
-    /// Constructor takes a single Packet and authenticates everything
-    /// </summary>
-    public partial class ClientView : ClientViewBase, IClientAPI
-    {
-        protected static Dictionary<PacketType, PacketMethod> PacketHandlers = new Dictionary<PacketType, PacketMethod>(); //Global/static handlers for all clients
-        protected Dictionary<PacketType, PacketMethod> m_packetHandlers = new Dictionary<PacketType, PacketMethod>(); //local handlers for this instance 
-        public LLUUID AgentID;
-        public LLUUID SessionID;
-        public LLUUID SecureSessionID = LLUUID.Zero;
-        public bool m_child;
-        public Simulator.Avatar ClientAvatar;
-        private UseCircuitCodePacket cirpack;
-        public Thread ClientThread;
-        public LLVector3 startpos;
-         
-        private AgentAssetUpload UploadAssets;
-        private LLUUID newAssetFolder = LLUUID.Zero;
-        private bool debug = false;
-        private World m_world;
-        private Dictionary<uint, ClientView> m_clientThreads;
-        private AssetCache m_assetCache;
-        private IGridServer m_gridServer;
-        private IUserServer m_userServer = null;
-        private InventoryCache m_inventoryCache;
-        public bool m_sandboxMode;
-        private int cachedtextureserial = 0;
-        private RegionInfo m_regionData;
-        protected AuthenticateSessionsBase m_authenticateSessionsHandler;
-        public IUserServer UserServer
-        {
-            set
-            {
-                this.m_userServer = value;
-            }
-        }
-        public LLVector3 StartPos
-        {
-            get
-            {
-                return startpos;
-            }
-            set
-            {
-                startpos = value;
-            }
-        }
-        public ClientView(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, World world, Dictionary<uint, ClientView> clientThreads, AssetCache assetCache, IGridServer gridServer, OpenSimNetworkHandler application, InventoryCache inventoryCache, bool sandboxMode, bool child, RegionInfo regionDat, AuthenticateSessionsBase authenSessions)
-        {
-            m_world = world;
-            m_clientThreads = clientThreads;
-            m_assetCache = assetCache;
-            m_gridServer = gridServer;
-            m_networkServer = application;
-            m_inventoryCache = inventoryCache;
-            m_sandboxMode = sandboxMode;
-            m_child = child;
-            m_regionData = regionDat;
-            m_authenticateSessionsHandler = authenSessions;
-            MainConsole.Instance.Notice("OpenSimClient.cs - Started up new client thread to handle incoming request");
-            cirpack = initialcirpack;
-            userEP = remoteEP;
-            if (m_gridServer.GetName() == "Remote")
-            {
-                this.m_child = m_authenticateSessionsHandler.GetAgentChildStatus(initialcirpack.CircuitCode.Code);
-                this.startpos = m_authenticateSessionsHandler.GetPosition(initialcirpack.CircuitCode.Code);
-                // Dont rez new users underground
-                float aboveGround = 3.0f; // rez at least 3 meters above ground
-                if (this.startpos.Z < (m_world.Terrain[(int)this.startpos.X, (int)this.startpos.Y] + aboveGround))
-                    this.startpos.Z = m_world.Terrain[(int)this.startpos.X, (int)this.startpos.Y] + aboveGround;
-            }
-            else
-            {
-                this.startpos = new LLVector3(128, 128, m_world.Terrain[(int)128, (int)128] + 15.0f); // new LLVector3(128.0f, 128.0f, 60f);
-            }
-            PacketQueue = new BlockingQueue<QueItem>();
-            this.UploadAssets = new AgentAssetUpload(this, m_assetCache, m_inventoryCache);
-            AckTimer = new System.Timers.Timer(500);
-            AckTimer.Elapsed += new ElapsedEventHandler(AckTimer_Elapsed);
-            AckTimer.Start();
-            this.RegisterLocalPacketHandlers();
-            ClientThread = new Thread(new ThreadStart(AuthUser));
-            ClientThread.IsBackground = true;
-            ClientThread.Start();
-        }
-        # region Client Methods
-        public void UpgradeClient()
-        {
-            MainConsole.Instance.Notice("SimClient.cs:UpgradeClient() - upgrading child to full agent");
-            this.m_child = false;
-            //this.m_world.RemoveViewerAgent(this);
-            if (!this.m_sandboxMode)
-            {
-                this.startpos = m_authenticateSessionsHandler.GetPosition(CircuitCode);
-                m_authenticateSessionsHandler.UpdateAgentChildStatus(CircuitCode, false);
-            }
-            OnChildAgentStatus(this.m_child);
-            //this.InitNewClient();
-        }
-        public void DowngradeClient()
-        {
-            MainConsole.Instance.Notice("SimClient.cs:UpgradeClient() - changing full agent to child");
-            this.m_child = true;
-            OnChildAgentStatus(this.m_child);
-            //this.m_world.RemoveViewerAgent(this);
-            //this.m_world.AddViewerAgent(this);
-        }
-        public void KillClient()
-        {
-            KillObjectPacket kill = new KillObjectPacket();
-            kill.ObjectData = new KillObjectPacket.ObjectDataBlock[1];
-            kill.ObjectData[0] = new KillObjectPacket.ObjectDataBlock();
-            kill.ObjectData[0].ID = this.ClientAvatar.localid;
-            foreach (ClientView client in m_clientThreads.Values)
-            {
-                client.OutPacket(kill);
-            }
-            if (this.m_userServer != null)
-            {
-                this.m_inventoryCache.ClientLeaving(this.AgentID, this.m_userServer);
-            }
-            else
-            {
-                this.m_inventoryCache.ClientLeaving(this.AgentID, null);
-            }
-            m_world.RemoveViewerAgent(this);
-            m_clientThreads.Remove(this.CircuitCode);
-            m_networkServer.RemoveClientCircuit(this.CircuitCode);
-            this.ClientThread.Abort();
-        }
-        #endregion
-        # region Packet Handling
-        public static bool AddPacketHandler(PacketType packetType, PacketMethod handler)
-        {
-            bool result = false;
-            lock (PacketHandlers)
-            {
-                if (!PacketHandlers.ContainsKey(packetType))
-                {
-                    PacketHandlers.Add(packetType, handler);
-                    result = true;
-                }
-            }
-            return result;
-        }
-        public bool AddLocalPacketHandler(PacketType packetType, PacketMethod handler)
-        {
-            bool result = false;
-            lock (m_packetHandlers)
-            {
-                if (!m_packetHandlers.ContainsKey(packetType))
-                {
-                    m_packetHandlers.Add(packetType, handler);
-                    result = true;
-                }
-            }
-            return result;
-        }
-        protected virtual bool ProcessPacketMethod(Packet packet)
-        {
-            bool result = false;
-            bool found = false;
-            PacketMethod method;
-            if (m_packetHandlers.TryGetValue(packet.Type, out method))
-            {
-                //there is a local handler for this packet type
-                result = method(this, packet);
-            }
-            else
-            {
-                //there is not a local handler so see if there is a Global handler
-                lock (PacketHandlers)
-                {
-                    found = PacketHandlers.TryGetValue(packet.Type, out method);
-                }
-                if (found)
-                {
-                    result = method(this, packet);
-                }
-            }
-            return result;
-        }
-        protected virtual void ClientLoop()
-        {
-            MainConsole.Instance.Notice("OpenSimClient.cs:ClientLoop() - Entered loop");
-            while (true)
-            {
-                QueItem nextPacket = PacketQueue.Dequeue();
-                if (nextPacket.Incoming)
-                {
-                    //is a incoming packet
-                    ProcessInPacket(nextPacket.Packet);
-                }
-                else
-                {
-                    //is a out going packet
-                    ProcessOutPacket(nextPacket.Packet);
-                }
-            }
-        }
-        # endregion
-        # region Setup
-        protected virtual void InitNewClient()
-        {
-            MainConsole.Instance.Notice("OpenSimClient.cs:InitNewClient() - Adding viewer agent to world");
-            this.ClientAvatar = m_world.AddViewerAgent(this);         
-        }
-        protected virtual void AuthUser()
-        {
-            // AuthenticateResponse sessionInfo = m_gridServer.AuthenticateSession(cirpack.CircuitCode.SessionID, cirpack.CircuitCode.ID, cirpack.CircuitCode.Code);
-            AuthenticateResponse sessionInfo = this.m_networkServer.AuthenticateSession(cirpack.CircuitCode.SessionID, cirpack.CircuitCode.ID, cirpack.CircuitCode.Code);
-            if (!sessionInfo.Authorised)
-            {
-                //session/circuit not authorised
-                OpenSim.Framework.Console.MainConsole.Instance.Notice("OpenSimClient.cs:AuthUser() - New user request denied to " + userEP.ToString());
-                ClientThread.Abort();
-            }
-            else
-            {
-                OpenSim.Framework.Console.MainConsole.Instance.Notice("OpenSimClient.cs:AuthUser() - Got authenticated connection from " + userEP.ToString());
-                //session is authorised
-                this.AgentID = cirpack.CircuitCode.ID;
-                this.SessionID = cirpack.CircuitCode.SessionID;
-                this.CircuitCode = cirpack.CircuitCode.Code;
-                InitNewClient(); 
-                this.ClientAvatar.firstname = sessionInfo.LoginInfo.First;
-                this.ClientAvatar.lastname = sessionInfo.LoginInfo.Last;
-                if (sessionInfo.LoginInfo.SecureSession != LLUUID.Zero)
-                {
-                    this.SecureSessionID = sessionInfo.LoginInfo.SecureSession;
-                }
-                // Create Inventory, currently only works for sandbox mode
-                if (m_sandboxMode)
-                {
-                    this.SetupInventory(sessionInfo);
-                }
-                //m_world.parcelManager.sendParcelOverlay(this);
-                m_world.estateManager.sendRegionInfoPacket(this);
-                ClientLoop();
-            }
-        }
-        # endregion
-        protected override void KillThread()
-        {
-            this.ClientThread.Abort();
-        }
-        #region World/Avatar To Viewer Methods
-        public void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID)
-        {
-            System.Text.Encoding enc = System.Text.Encoding.ASCII;
-            libsecondlife.Packets.ChatFromSimulatorPacket reply = new ChatFromSimulatorPacket();
-            reply.ChatData.Audible = 1;
-            reply.ChatData.Message = message;
-            reply.ChatData.ChatType = type;
-            reply.ChatData.SourceType = 1;
-            reply.ChatData.Position = fromPos;
-            reply.ChatData.FromName = enc.GetBytes(fromName + "\0");
-            reply.ChatData.OwnerID = fromAgentID;
-            reply.ChatData.SourceID = fromAgentID;
-            this.OutPacket(reply);
-        }
-        public void SendAppearance(AvatarWearable[] wearables)
-        {
-            AgentWearablesUpdatePacket aw = new AgentWearablesUpdatePacket();
-            aw.AgentData.AgentID = this.AgentID;
-            aw.AgentData.SerialNum = 0;
-            aw.AgentData.SessionID = this.SessionID;
-            aw.WearableData = new AgentWearablesUpdatePacket.WearableDataBlock[13];
-            AgentWearablesUpdatePacket.WearableDataBlock awb;
-            for (int i = 0; i < wearables.Length; i++)
-            {
-                awb = new AgentWearablesUpdatePacket.WearableDataBlock();
-                awb.WearableType = (byte)i;
-                awb.AssetID = wearables[i].AssetID;
-                awb.ItemID = wearables[i].ItemID;
-                aw.WearableData[i] = awb;
-            }
-            this.OutPacket(aw);
-        }
-        #endregion
-        #region Inventory Creation
-        private void SetupInventory(AuthenticateResponse sessionInfo)
-        {
-            AgentInventory inventory = null;
-            if (sessionInfo.LoginInfo.InventoryFolder != null)
-            {
-                inventory = this.CreateInventory(sessionInfo.LoginInfo.InventoryFolder);
-                if (sessionInfo.LoginInfo.BaseFolder != null)
-                {
-                    if (!inventory.HasFolder(sessionInfo.LoginInfo.BaseFolder))
-                    {
-                        m_inventoryCache.CreateNewInventoryFolder(this, sessionInfo.LoginInfo.BaseFolder);
-                    }
-                    this.newAssetFolder = sessionInfo.LoginInfo.BaseFolder;
-                    AssetBase[] inventorySet = m_assetCache.CreateNewInventorySet(this.AgentID);
-                    if (inventorySet != null)
-                    {
-                        for (int i = 0; i < inventorySet.Length; i++)
-                        {
-                            if (inventorySet[i] != null)
-                            {
-                                m_inventoryCache.AddNewInventoryItem(this, sessionInfo.LoginInfo.BaseFolder, inventorySet[i]);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        private AgentInventory CreateInventory(LLUUID baseFolder)
-        {
-            AgentInventory inventory = null;
-            if (this.m_userServer != null)
-            {
-                // a user server is set so request the inventory from it
-                MainConsole.Instance.Verbose("getting inventory from user server");
-                inventory = m_inventoryCache.FetchAgentsInventory(this.AgentID, m_userServer);
-            }
-            else
-            {
-                inventory = new AgentInventory();
-                inventory.AgentID = this.AgentID;
-                inventory.CreateRootFolder(this.AgentID, false);
-                m_inventoryCache.AddNewAgentsInventory(inventory);
-                m_inventoryCache.CreateNewInventoryFolder(this, baseFolder);
-            }
-            return inventory;
-        }
-        private void CreateInventoryItem(CreateInventoryItemPacket packet)
-        {
-            if (!(packet.InventoryBlock.Type == 3 || packet.InventoryBlock.Type == 7))
-            {
-                MainConsole.Instance.Warn("Attempted to create " + Util.FieldToString(packet.InventoryBlock.Name) + " in inventory.  Unsupported type");
-                return;
-            }
-            //lets try this out with creating a notecard
-            AssetBase asset = new AssetBase();
-            asset.Name = Util.FieldToString(packet.InventoryBlock.Name);
-            asset.Description = Util.FieldToString(packet.InventoryBlock.Description);
-            asset.InvType = packet.InventoryBlock.InvType;
-            asset.Type = packet.InventoryBlock.Type;
-            asset.FullID = LLUUID.Random();
-            switch (packet.InventoryBlock.Type)
-            {
-                case 7: // Notecard
-                    asset.Data = new byte[0];
-                    break;
-                case 3: // Landmark
-                    String content;
-                    content = "Landmark version 2\n";
-                    content += "region_id " + m_regionData.SimUUID + "\n";
-                    String strPos = String.Format("%.2f %.2f %.2f>",
-                                                    this.ClientAvatar.Pos.X,
-                                                    this.ClientAvatar.Pos.Y,
-                                                    this.ClientAvatar.Pos.Z);
-                    content += "local_pos " + strPos + "\n";
-                    asset.Data = (new System.Text.ASCIIEncoding()).GetBytes(content);
-                    break;
-                default:
-                    break;
-            }
-            m_assetCache.AddAsset(asset);
-            m_inventoryCache.AddNewInventoryItem(this, packet.InventoryBlock.FolderID, asset);
-        }
-        #endregion
-    }
-}
diff --git a/OpenSim/OpenSim.RegionServer/Client/ClientViewBase.cs b/OpenSim/OpenSim.RegionServer/Client/ClientViewBase.cs
deleted file mode 100644
index 2ff245f..0000000
--- a/OpenSim/OpenSim.RegionServer/Client/ClientViewBase.cs
+++ /dev/null
@@ -1,326 +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 libsecondlife;
-using libsecondlife.Packets;
-using System.Net;
-using System.Net.Sockets;
-using System.IO;
-using System.Threading;
-using System.Timers;
-using OpenSim.Framework.Utilities;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Console;
-namespace OpenSim.RegionServer.Client
-{
-    public class ClientViewBase 
-    {
-        protected BlockingQueue<QueItem> PacketQueue;
-        protected Dictionary<uint, uint> PendingAcks = new Dictionary<uint, uint>();
-        protected Dictionary<uint, Packet> NeedAck = new Dictionary<uint, Packet>();
-        protected System.Timers.Timer AckTimer;
-        protected uint Sequence = 0;
-        protected object SequenceLock = new object();
-        protected const int MAX_APPENDED_ACKS = 10;
-        protected const int RESEND_TIMEOUT = 4000;
-        protected const int MAX_SEQUENCE = 0xFFFFFF;
-        public uint CircuitCode;
-        public EndPoint userEP;
-        protected OpenSimNetworkHandler m_networkServer;
-        public ClientViewBase()
-        {
-        }
-        protected virtual void ProcessInPacket(Packet Pack)
-        {
-        }
-        protected virtual void ProcessOutPacket(Packet Pack)
-        {
-            // Keep track of when this packet was sent out
-            Pack.TickCount = Environment.TickCount;
-            if (!Pack.Header.Resent)
-            {
-                // Set the sequence number
-                lock (SequenceLock)
-                {
-                    if (Sequence >= MAX_SEQUENCE)
-                        Sequence = 1;
-                    else
-                        Sequence++;
-                    Pack.Header.Sequence = Sequence;
-                }
-                if (Pack.Header.Reliable)  //DIRTY HACK
-                {
-                    lock (NeedAck)
-                    {
-                        if (!NeedAck.ContainsKey(Pack.Header.Sequence))
-                        {
-                            try
-                            {
-                                NeedAck.Add(Pack.Header.Sequence, Pack);
-                            }
-                            catch (Exception e) // HACKY
-                            {
-                                e.ToString();
-                                // Ignore
-                                // Seems to throw a exception here occasionally
-                                // of 'duplicate key' despite being locked.
-                                // !?!?!?
-                            }
-                        }
-                        else
-                        {
-                            //  Client.Log("Attempted to add a duplicate sequence number (" +
-                            //     packet.Header.Sequence + ") to the NeedAck dictionary for packet type " +
-                            //      packet.Type.ToString(), Helpers.LogLevel.Warning);
-                        }
-                    }
-                    // Don't append ACKs to resent packets, in case that's what was causing the
-                    // delivery to fail
-                    if (!Pack.Header.Resent)
-                    {
-                        // Append any ACKs that need to be sent out to this packet
-                        lock (PendingAcks)
-                        {
-                            if (PendingAcks.Count > 0 && PendingAcks.Count < MAX_APPENDED_ACKS &&
-                                Pack.Type != PacketType.PacketAck &&
-                                Pack.Type != PacketType.LogoutRequest)
-                            {
-                                Pack.Header.AckList = new uint[PendingAcks.Count];
-                                int i = 0;
-                                foreach (uint ack in PendingAcks.Values)
-                                {
-                                    Pack.Header.AckList[i] = ack;
-                                    i++;
-                                }
-                                PendingAcks.Clear();
-                                Pack.Header.AppendedAcks = true;
-                            }
-                        }
-                    }
-                }
-            }
-            byte[] ZeroOutBuffer = new byte[4096];
-            byte[] sendbuffer;
-            sendbuffer = Pack.ToBytes();
-            try
-            {
-                if (Pack.Header.Zerocoded)
-                {
-                    int packetsize = Helpers.ZeroEncode(sendbuffer, sendbuffer.Length, ZeroOutBuffer);
-                    m_networkServer.SendPacketTo(ZeroOutBuffer, packetsize, SocketFlags.None, CircuitCode);//userEP);
-                }
-                else
-                {
-                    m_networkServer.SendPacketTo(sendbuffer, sendbuffer.Length, SocketFlags.None, CircuitCode); //userEP);
-                }
-            }
-            catch (Exception)
-            {
-                MainConsole.Instance.Warn("OpenSimClient.cs:ProcessOutPacket() - WARNING: Socket exception occurred on connection " + userEP.ToString() + " - killing thread");
-                this.KillThread();
-            }
-        }
-        public virtual void InPacket(Packet NewPack)
-        {
-            // Handle appended ACKs
-            if (NewPack.Header.AppendedAcks)
-            {
-                lock (NeedAck)
-                {
-                    foreach (uint ack in NewPack.Header.AckList)
-                    {
-                        NeedAck.Remove(ack);
-                    }
-                }
-            }
-            // Handle PacketAck packets
-            if (NewPack.Type == PacketType.PacketAck)
-            {
-                PacketAckPacket ackPacket = (PacketAckPacket)NewPack;
-                lock (NeedAck)
-                {
-                    foreach (PacketAckPacket.PacketsBlock block in ackPacket.Packets)
-                    {
-                        NeedAck.Remove(block.ID);
-                    }
-                }
-            }
-            else if ((NewPack.Type == PacketType.StartPingCheck))
-            {
-                //reply to pingcheck
-                libsecondlife.Packets.StartPingCheckPacket startPing = (libsecondlife.Packets.StartPingCheckPacket)NewPack;
-                libsecondlife.Packets.CompletePingCheckPacket endPing = new CompletePingCheckPacket();
-                endPing.PingID.PingID = startPing.PingID.PingID;
-                OutPacket(endPing);
-            }
-            else
-            {
-                QueItem item = new QueItem();
-                item.Packet = NewPack;
-                item.Incoming = true;
-                this.PacketQueue.Enqueue(item);
-            }
-        }
-        public virtual void OutPacket(Packet NewPack)
-        {
-            QueItem item = new QueItem();
-            item.Packet = NewPack;
-            item.Incoming = false;
-            this.PacketQueue.Enqueue(item);
-        }
-        # region Low Level Packet Methods
-        protected void ack_pack(Packet Pack)
-        {
-            if (Pack.Header.Reliable)
-            {
-                libsecondlife.Packets.PacketAckPacket ack_it = new PacketAckPacket();
-                ack_it.Packets = new PacketAckPacket.PacketsBlock[1];
-                ack_it.Packets[0] = new PacketAckPacket.PacketsBlock();
-                ack_it.Packets[0].ID = Pack.Header.Sequence;
-                ack_it.Header.Reliable = false;
-                OutPacket(ack_it);
-            }
-            /*
-            if (Pack.Header.Reliable)
-            {
-                lock (PendingAcks)
-                {
-                    uint sequence = (uint)Pack.Header.Sequence;
-                    if (!PendingAcks.ContainsKey(sequence)) { PendingAcks[sequence] = sequence; }
-                }
-            }*/
-        }
-        protected void ResendUnacked()
-        {
-            int now = Environment.TickCount;
-            lock (NeedAck)
-            {
-                foreach (Packet packet in NeedAck.Values)
-                {
-                    if ((now - packet.TickCount > RESEND_TIMEOUT) && (!packet.Header.Resent))
-                    {
-                        OpenSim.Framework.Console.MainConsole.Instance.Verbose("Resending " + packet.Type.ToString() + " packet, " +
-                         (now - packet.TickCount) + "ms have passed");
-                        packet.Header.Resent = true;
-                        OutPacket(packet);
-                    }
-                }
-            }
-        }
-        protected void SendAcks()
-        {
-            lock (PendingAcks)
-            {
-                if (PendingAcks.Count > 0)
-                {
-                    if (PendingAcks.Count > 250)
-                    {
-                        // FIXME: Handle the odd case where we have too many pending ACKs queued up
-                        OpenSim.Framework.Console.MainConsole.Instance.Verbose("Too many ACKs queued up!");
-                        return;
-                    }
-                    int i = 0;
-                    PacketAckPacket acks = new PacketAckPacket();
-                    acks.Packets = new PacketAckPacket.PacketsBlock[PendingAcks.Count];
-                    foreach (uint ack in PendingAcks.Values)
-                    {
-                        acks.Packets[i] = new PacketAckPacket.PacketsBlock();
-                        acks.Packets[i].ID = ack;
-                        i++;
-                    }
-                    acks.Header.Reliable = false;
-                    OutPacket(acks);
-                    PendingAcks.Clear();
-                }
-            }
-        }
-        protected void AckTimer_Elapsed(object sender, ElapsedEventArgs ea)
-        {
-            SendAcks();
-            ResendUnacked();
-        }
-        #endregion
-        protected virtual void KillThread()
-        {
-        }
-        #region Nested Classes
-        public class QueItem
-        {
-            public QueItem()
-            {
-            }
-            public Packet Packet;
-            public bool Incoming;
-        }
-        #endregion
-    }
-}
diff --git a/OpenSim/OpenSim.RegionServer/Estate/EstateManager.cs b/OpenSim/OpenSim.RegionServer/Estate/EstateManager.cs
deleted file mode 100644
index 0bf0615..0000000
--- a/OpenSim/OpenSim.RegionServer/Estate/EstateManager.cs
+++ /dev/null
@@ -1,293 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using OpenSim.Framework.Types;
-using OpenSim.RegionServer.Simulator;
-using OpenSim.RegionServer.Client;
-using libsecondlife;
-using libsecondlife.Packets;
-namespace OpenSim.RegionServer.Estate
-{
-    /// <summary>
-    /// Processes requests regarding estates. Refer to EstateSettings.cs in OpenSim.Framework. Types for all of the core settings
-    /// </summary>
-    public class EstateManager
-    {
-        private World m_world;
-        public EstateManager(World world)
-        {
-            m_world = world; //Estate settings found at world.m_regInfo.estateSettings            
-        }
-        private bool convertParamStringToBool(byte[] field)
-        {
-            string s = Helpers.FieldToUTF8String(field);
-            if (s == "1" || s.ToLower() == "y" || s.ToLower() == "yes" || s.ToLower() == "t" || s.ToLower() == "true")
-            {
-                return true;
-            }
-            return false;
-        }
-        public void handleEstateOwnerMessage(EstateOwnerMessagePacket packet, ClientView remote_client)
-        {
-            if (remote_client.AgentID == m_world.m_regInfo.MasterAvatarAssignedUUID)
-            {
-                switch (Helpers.FieldToUTF8String(packet.MethodData.Method))
-                {
-                    case "getinfo":
-                        Console.WriteLine("GETINFO Requested");
-                        this.sendRegionInfoPacketToAll();
-                        break;
-                    case "setregioninfo":
-                        if (packet.ParamList.Length != 9)
-                        {
-                            OpenSim.Framework.Console.MainConsole.Instance.Error("EstateOwnerMessage: SetRegionInfo method has a ParamList of invalid length");
-                        }
-                        else
-                        {
-                            m_world.m_regInfo.estateSettings.regionFlags = libsecondlife.Simulator.RegionFlags.None;
-                            if (convertParamStringToBool(packet.ParamList[0].Parameter))
-                            {
-                                m_world.m_regInfo.estateSettings.regionFlags = m_world.m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.BlockTerraform;
-                            }
-                            if (convertParamStringToBool(packet.ParamList[1].Parameter))
-                            {
-                                m_world.m_regInfo.estateSettings.regionFlags = m_world.m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.NoFly;
-                            }
-                            if (convertParamStringToBool(packet.ParamList[2].Parameter))
-                            {
-                                m_world.m_regInfo.estateSettings.regionFlags = m_world.m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.AllowDamage;
-                            }
-                            if (convertParamStringToBool(packet.ParamList[3].Parameter) == false)
-                            {
-                                m_world.m_regInfo.estateSettings.regionFlags = m_world.m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.BlockLandResell;
-                            }
-                            int tempMaxAgents = Convert.ToInt16(Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[4].Parameter)));
-                            m_world.m_regInfo.estateSettings.maxAgents = (byte)tempMaxAgents;
-                            float tempObjectBonusFactor = (float)Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[5].Parameter));
-                            m_world.m_regInfo.estateSettings.objectBonusFactor = tempObjectBonusFactor;
-                            int tempMatureLevel = Convert.ToInt16(Helpers.FieldToUTF8String(packet.ParamList[6].Parameter));
-                            m_world.m_regInfo.estateSettings.simAccess = (libsecondlife.Simulator.SimAccess)tempMatureLevel;
-                            
-                            if (convertParamStringToBool(packet.ParamList[7].Parameter))
-                            {
-                                m_world.m_regInfo.estateSettings.regionFlags = m_world.m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.RestrictPushObject;
-                            }
-                            if (convertParamStringToBool(packet.ParamList[8].Parameter))
-                            {
-                                m_world.m_regInfo.estateSettings.regionFlags = m_world.m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.AllowParcelChanges;
-                            }
-                            sendRegionInfoPacketToAll();
-                            
-                        }
-                        break;
-                    case "texturebase":
-                        foreach (EstateOwnerMessagePacket.ParamListBlock block in packet.ParamList)
-                        {
-                            string s = Helpers.FieldToUTF8String(block.Parameter);
-                            string[] splitField = s.Split(' ');
-                            if (splitField.Length == 2)
-                            {
-                                LLUUID tempUUID = new LLUUID(splitField[1]);
-                                switch (Convert.ToInt16(splitField[0]))
-                                {
-                                    case 0:
-                                        m_world.m_regInfo.estateSettings.terrainBase0 = tempUUID;
-                                        break;
-                                    case 1:
-                                        m_world.m_regInfo.estateSettings.terrainBase1 = tempUUID;
-                                        break;
-                                    case 2:
-                                        m_world.m_regInfo.estateSettings.terrainBase2 = tempUUID;
-                                        break;
-                                    case 3:
-                                        m_world.m_regInfo.estateSettings.terrainBase3 = tempUUID;
-                                        break;
-                                }
-                            }
-                        }
-                        break;
-                    case "texturedetail":
-                        foreach (EstateOwnerMessagePacket.ParamListBlock block in packet.ParamList)
-                        {
-                            string s = Helpers.FieldToUTF8String(block.Parameter);
-                            string[] splitField = s.Split(' ');
-                            if (splitField.Length == 2)
-                            {
-                                LLUUID tempUUID = new LLUUID(splitField[1]);
-                                switch (Convert.ToInt16(splitField[0]))
-                                {
-                                    case 0:
-                                        m_world.m_regInfo.estateSettings.terrainDetail0 = tempUUID;
-                                        break;
-                                    case 1:
-                                        m_world.m_regInfo.estateSettings.terrainDetail1 = tempUUID;
-                                        break;
-                                    case 2:
-                                        m_world.m_regInfo.estateSettings.terrainDetail2 = tempUUID;
-                                        break;
-                                    case 3:
-                                        m_world.m_regInfo.estateSettings.terrainDetail3 = tempUUID;
-                                        break;
-                                }
-                            }
-                        }
-                        break;
-                    case "textureheights":
-                        foreach (EstateOwnerMessagePacket.ParamListBlock block in packet.ParamList)
-                        {
-                            string s = Helpers.FieldToUTF8String(block.Parameter);
-                            string[] splitField = s.Split(' ');
-                            if (splitField.Length == 3)
-                            {
-                                float tempHeightLow = (float)Convert.ToDecimal(splitField[1]);
-                                float tempHeightHigh = (float)Convert.ToDecimal(splitField[2]);
-                                switch (Convert.ToInt16(splitField[0]))
-                                {
-                                    case 0:
-                                        m_world.m_regInfo.estateSettings.terrainStartHeight0 = tempHeightLow;
-                                        m_world.m_regInfo.estateSettings.terrainHeightRange0 = tempHeightHigh;
-                                        break;
-                                    case 1:
-                                        m_world.m_regInfo.estateSettings.terrainStartHeight1 = tempHeightLow;
-                                        m_world.m_regInfo.estateSettings.terrainHeightRange1 = tempHeightHigh;
-                                        break;
-                                    case 2:
-                                        m_world.m_regInfo.estateSettings.terrainStartHeight2 = tempHeightLow;
-                                        m_world.m_regInfo.estateSettings.terrainHeightRange2 = tempHeightHigh;
-                                        break;
-                                    case 3:
-                                        m_world.m_regInfo.estateSettings.terrainStartHeight3 = tempHeightLow;
-                                        m_world.m_regInfo.estateSettings.terrainHeightRange3 = tempHeightHigh;
-                                        break;
-                                }
-                            }
-                        }
-                        break;
-                    case "texturecommit":
-                        sendRegionHandshakeToAll();
-                        break;
-                    case "setregionterrain":
-                        if (packet.ParamList.Length != 9)
-                        {
-                            OpenSim.Framework.Console.MainConsole.Instance.Error("EstateOwnerMessage: SetRegionTerrain method has a ParamList of invalid length");
-                        }
-                        else
-                        {
-                            m_world.m_regInfo.estateSettings.waterHeight = (float)Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[0].Parameter));
-                            m_world.m_regInfo.estateSettings.terrainRaiseLimit = (float)Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[1].Parameter));
-                            m_world.m_regInfo.estateSettings.terrainLowerLimit = (float)Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[2].Parameter));
-                            m_world.m_regInfo.estateSettings.useFixedSun = this.convertParamStringToBool(packet.ParamList[4].Parameter);
-                            m_world.m_regInfo.estateSettings.sunHour = (float)Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[5].Parameter));
-                            sendRegionInfoPacketToAll();
-                        }
-                        break;
-                    default:
-                        OpenSim.Framework.Console.MainConsole.Instance.Error("EstateOwnerMessage: Unknown method requested\n" + packet.ToString());
-                        break;
-                }
-            }
-        }
-        public void sendRegionInfoPacketToAll()
-        {
-            foreach (OpenSim.RegionServer.Simulator.Avatar av in m_world.Avatars.Values)
-            {
-                this.sendRegionInfoPacket(av.ControllingClient);
-            }
-        }
-        public void sendRegionHandshakeToAll()
-        {
-            foreach (OpenSim.RegionServer.Simulator.Avatar av in m_world.Avatars.Values)
-            {
-                this.sendRegionHandshake(av.ControllingClient);
-            }
-        }
-        public void sendRegionInfoPacket(ClientView remote_client)
-        {
-            
-            RegionInfoPacket regionInfoPacket = new RegionInfoPacket();
-            regionInfoPacket.AgentData.AgentID = remote_client.AgentID;
-            regionInfoPacket.AgentData.SessionID = remote_client.SessionID;
-            regionInfoPacket.RegionInfo.BillableFactor = m_world.m_regInfo.estateSettings.billableFactor;
-            regionInfoPacket.RegionInfo.EstateID = m_world.m_regInfo.estateSettings.estateID;
-            regionInfoPacket.RegionInfo.MaxAgents = m_world.m_regInfo.estateSettings.maxAgents;
-            regionInfoPacket.RegionInfo.ObjectBonusFactor = m_world.m_regInfo.estateSettings.objectBonusFactor;
-            regionInfoPacket.RegionInfo.ParentEstateID = m_world.m_regInfo.estateSettings.parentEstateID;
-            regionInfoPacket.RegionInfo.PricePerMeter = m_world.m_regInfo.estateSettings.pricePerMeter;
-            regionInfoPacket.RegionInfo.RedirectGridX = m_world.m_regInfo.estateSettings.redirectGridX;
-            regionInfoPacket.RegionInfo.RedirectGridY = m_world.m_regInfo.estateSettings.redirectGridY;
-            regionInfoPacket.RegionInfo.RegionFlags = (uint)m_world.m_regInfo.estateSettings.regionFlags;
-            regionInfoPacket.RegionInfo.SimAccess = (byte)m_world.m_regInfo.estateSettings.simAccess;
-            regionInfoPacket.RegionInfo.SimName = Helpers.StringToField(m_world.m_regInfo.RegionName);
-            regionInfoPacket.RegionInfo.SunHour = m_world.m_regInfo.estateSettings.sunHour;
-            regionInfoPacket.RegionInfo.TerrainLowerLimit = m_world.m_regInfo.estateSettings.terrainLowerLimit;
-            regionInfoPacket.RegionInfo.TerrainRaiseLimit = m_world.m_regInfo.estateSettings.terrainRaiseLimit;
-            regionInfoPacket.RegionInfo.UseEstateSun = !m_world.m_regInfo.estateSettings.useFixedSun;
-            regionInfoPacket.RegionInfo.WaterHeight = m_world.m_regInfo.estateSettings.waterHeight;
-            remote_client.OutPacket(regionInfoPacket);
-        }
-        public void sendRegionHandshake(ClientView remote_client)
-        {
-            System.Text.Encoding _enc = System.Text.Encoding.ASCII;
-            RegionHandshakePacket handshake = new RegionHandshakePacket();
-            handshake.RegionInfo.BillableFactor = m_world.m_regInfo.estateSettings.billableFactor;
-            handshake.RegionInfo.IsEstateManager = false;
-            handshake.RegionInfo.TerrainHeightRange00 = m_world.m_regInfo.estateSettings.terrainHeightRange0;
-            handshake.RegionInfo.TerrainHeightRange01 = m_world.m_regInfo.estateSettings.terrainHeightRange1;
-            handshake.RegionInfo.TerrainHeightRange10 = m_world.m_regInfo.estateSettings.terrainHeightRange2;
-            handshake.RegionInfo.TerrainHeightRange11 = m_world.m_regInfo.estateSettings.terrainHeightRange3;
-            handshake.RegionInfo.TerrainStartHeight00 = m_world.m_regInfo.estateSettings.terrainStartHeight0;
-            handshake.RegionInfo.TerrainStartHeight01 = m_world.m_regInfo.estateSettings.terrainStartHeight1;
-            handshake.RegionInfo.TerrainStartHeight10 = m_world.m_regInfo.estateSettings.terrainStartHeight2;
-            handshake.RegionInfo.TerrainStartHeight11 = m_world.m_regInfo.estateSettings.terrainStartHeight3;
-            handshake.RegionInfo.SimAccess = (byte)m_world.m_regInfo.estateSettings.simAccess;
-            handshake.RegionInfo.WaterHeight = m_world.m_regInfo.estateSettings.waterHeight;
-            handshake.RegionInfo.RegionFlags = (uint)m_world.m_regInfo.estateSettings.regionFlags;
-            handshake.RegionInfo.SimName = _enc.GetBytes(m_world.m_regInfo.RegionName + "\0");
-            handshake.RegionInfo.SimOwner = m_world.m_regInfo.MasterAvatarAssignedUUID;
-            handshake.RegionInfo.TerrainBase0 = m_world.m_regInfo.estateSettings.terrainBase0;
-            handshake.RegionInfo.TerrainBase1 = m_world.m_regInfo.estateSettings.terrainBase1;
-            handshake.RegionInfo.TerrainBase2 = m_world.m_regInfo.estateSettings.terrainBase2;
-            handshake.RegionInfo.TerrainBase3 = m_world.m_regInfo.estateSettings.terrainBase3;
-            handshake.RegionInfo.TerrainDetail0 = m_world.m_regInfo.estateSettings.terrainDetail0;
-            handshake.RegionInfo.TerrainDetail1 = m_world.m_regInfo.estateSettings.terrainDetail1;
-            handshake.RegionInfo.TerrainDetail2 = m_world.m_regInfo.estateSettings.terrainDetail2;
-            handshake.RegionInfo.TerrainDetail3 = m_world.m_regInfo.estateSettings.terrainDetail3;
-            handshake.RegionInfo.CacheID = LLUUID.Random(); //I guess this is for the client to remember an old setting?
-            remote_client.OutPacket(handshake);
-        }
-    }
-}
diff --git a/OpenSim/OpenSim.RegionServer/Grid.cs b/OpenSim/OpenSim.RegionServer/Grid.cs
deleted file mode 100644
index 844bb71..0000000
--- a/OpenSim/OpenSim.RegionServer/Grid.cs
+++ /dev/null
@@ -1,117 +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.Reflection;
-using OpenSim.Framework.Interfaces;
-using OpenSim.UserServer;
-namespace OpenSim.RegionServer
-{
-    public class Grid
-    {
-        public IAssetServer AssetServer;
-        public IGridServer GridServer;
-        public IUserServer UserServer;
-        public string AssetDll = "";
-        public string GridDll = "";
-        public Grid()
-        {
-        }
-        public virtual void Initialise()
-        {
-            //load the dlls 
-            this.AssetServer = this.LoadAssetDll(this.AssetDll);
-            this.GridServer = this.LoadGridDll(this.GridDll);
-        }
-        public virtual void Close()
-        {
-            this.AssetServer.Close();
-            this.GridServer.Close();
-        }
-        private IAssetServer LoadAssetDll(string dllName)
-        {
-            Assembly pluginAssembly = Assembly.LoadFrom(dllName);
-            IAssetServer server = null;
-            foreach (Type pluginType in pluginAssembly.GetTypes())
-            {
-                if (pluginType.IsPublic)
-                {
-                    if (!pluginType.IsAbstract)
-                    {
-                        Type typeInterface = pluginType.GetInterface("IAssetPlugin", true);
-                        if (typeInterface != null)
-                        {
-                            IAssetPlugin plug = (IAssetPlugin)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
-                            server = plug.GetAssetServer();
-                            break;
-                        }
-                        typeInterface = null;
-                    }
-                }
-            }
-            pluginAssembly = null;
-            return server;
-        }
-        private IGridServer LoadGridDll(string dllName)
-        {
-            Assembly pluginAssembly = Assembly.LoadFrom(dllName);
-            IGridServer server = null;
-            foreach (Type pluginType in pluginAssembly.GetTypes())
-            {
-                if (pluginType.IsPublic)
-                {
-                    if (!pluginType.IsAbstract)
-                    {
-                        Type typeInterface = pluginType.GetInterface("IGridPlugin", true);
-                        if (typeInterface != null)
-                        {
-                            IGridPlugin plug = (IGridPlugin)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
-                            server = plug.GetGridServer();
-                            break;
-                        }
-                        typeInterface = null;
-                    }
-                }
-            }
-            pluginAssembly = null;
-            return server;
-        }
-    }
-}
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
deleted file mode 100644
index 889135b..0000000
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
+++ /dev/null
@@ -1,264 +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>{632E1BFD-0000-0000-0000-000000000000}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon></ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>OpenSim.RegionServer</AssemblyName>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenSim.RegionServer</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="Axiom.MathLib.dll" >
-      <HintPath>..\..\bin\Axiom.MathLib.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <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="..\..\Common\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="..\..\Common\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="..\..\Common\OpenSim.GenericConfig\Xml\OpenSim.GenericConfig.Xml.csproj">
-      <Name>OpenSim.GenericConfig.Xml</Name>
-      <Project>{E88EF749-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-                        <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj">
-      <Name>OpenSim.Physics.Manager</Name>
-      <Project>{8BE16150-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-                        <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Common\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="..\OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj">
-      <Name>OpenSim.Terrain.BasicTerrain</Name>
-      <Project>{2270B8FE-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-                        <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Common\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="AgentAssetUpload.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="AuthenticateSessionsBase.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="AuthenticateSessionsLocal.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="AuthenticateSessionsRemote.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Grid.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="OpenSimMain.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="OpenSimNetworkHandler.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="PacketServer.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="RegionInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="RegionInfoBase.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="RegionServerBase.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="UDPServer.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="VersionInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Assets\AssetCache.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Assets\InventoryCache.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="CAPS\AdminWebFront.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Client\ClientView.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Client\ClientView.Grid.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Client\ClientView.PacketHandlers.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Client\ClientView.ProcessPackets.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Client\ClientViewBase.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Estate\EstateManager.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Scripting\IScriptContext.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Scripting\IScriptEntity.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Scripting\IScriptHandler.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Scripting\Script.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Scripting\ScriptFactory.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Scripting\Scripts\FollowRandomAvatar.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Simulator\Avatar.Client.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Simulator\Avatar.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Simulator\Avatar.Update.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Simulator\AvatarAnimations.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Simulator\Entity.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Simulator\ParcelManager.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Simulator\Primitive.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Simulator\Primitive2.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Simulator\SceneObject.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Simulator\World.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Simulator\World.PacketHandlers.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Simulator\World.Scripting.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Simulator\WorldBase.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Types\Mesh.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Types\Triangle.cs">
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
deleted file mode 100644
index 13341b3..0000000
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" ?>
-<project name="OpenSim.RegionServer" 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.RegionServer" dynamicprefix="true" >
-            </resources>
-            <sources failonempty="true">
-                <include name="AgentAssetUpload.cs" />
-                <include name="AuthenticateSessionsBase.cs" />
-                <include name="AuthenticateSessionsLocal.cs" />
-                <include name="AuthenticateSessionsRemote.cs" />
-                <include name="Grid.cs" />
-                <include name="OpenSimMain.cs" />
-                <include name="OpenSimNetworkHandler.cs" />
-                <include name="PacketServer.cs" />
-                <include name="RegionInfo.cs" />
-                <include name="RegionInfoBase.cs" />
-                <include name="RegionServerBase.cs" />
-                <include name="UDPServer.cs" />
-                <include name="VersionInfo.cs" />
-                <include name="Assets/AssetCache.cs" />
-                <include name="Assets/InventoryCache.cs" />
-                <include name="CAPS/AdminWebFront.cs" />
-                <include name="Client/ClientView.cs" />
-                <include name="Client/ClientView.Grid.cs" />
-                <include name="Client/ClientView.PacketHandlers.cs" />
-                <include name="Client/ClientView.ProcessPackets.cs" />
-                <include name="Client/ClientViewBase.cs" />
-                <include name="Estate/EstateManager.cs" />
-                <include name="Scripting/IScriptContext.cs" />
-                <include name="Scripting/IScriptEntity.cs" />
-                <include name="Scripting/IScriptHandler.cs" />
-                <include name="Scripting/Script.cs" />
-                <include name="Scripting/ScriptFactory.cs" />
-                <include name="Scripting/Scripts/FollowRandomAvatar.cs" />
-                <include name="Simulator/Avatar.Client.cs" />
-                <include name="Simulator/Avatar.cs" />
-                <include name="Simulator/Avatar.Update.cs" />
-                <include name="Simulator/AvatarAnimations.cs" />
-                <include name="Simulator/Entity.cs" />
-                <include name="Simulator/ParcelManager.cs" />
-                <include name="Simulator/Primitive.cs" />
-                <include name="Simulator/Primitive2.cs" />
-                <include name="Simulator/SceneObject.cs" />
-                <include name="Simulator/World.cs" />
-                <include name="Simulator/World.PacketHandlers.cs" />
-                <include name="Simulator/World.Scripting.cs" />
-                <include name="Simulator/WorldBase.cs" />
-                <include name="Types/Mesh.cs" />
-                <include name="Types/Triangle.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/Axiom.MathLib.dll" />
-                <include name="../../bin/Db4objects.Db4o.dll" />
-                <include name="../../bin/libsecondlife.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.Physics.Manager.dll" />
-                <include name="../../bin/OpenSim.Servers.dll" />
-                <include name="../../bin/OpenSim.Terrain.BasicTerrain.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/OpenSim/OpenSim.RegionServer/OpenSimMain.cs b/OpenSim/OpenSim.RegionServer/OpenSimMain.cs
deleted file mode 100644
index 5aba625..0000000
--- a/OpenSim/OpenSim.RegionServer/OpenSimMain.cs
+++ /dev/null
@@ -1,531 +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.RegionServer.Simulator;
-using OpenSim.Terrain;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-using OpenSim.UserServer;
-using OpenSim.RegionServer.Assets;
-using OpenSim.RegionServer.CAPS;
-using OpenSim.Framework.Console;
-using OpenSim.Physics.Manager;
-using Nwc.XmlRpc;
-using OpenSim.Servers;
-using OpenSim.GenericConfig;
-namespace OpenSim
-{
-    //moved to the opensim main application project (do we want it there or here?)
-/*
-    public class OpenSimMain : OpenSimApplicationBase , conscmd_callback
-    {
-        public OpenSimMain(bool sandBoxMode, bool startLoginServer, string physicsEngine, bool useConfigFile, bool silent, string configFile)
-        {
-            this.configFileSetup = useConfigFile;
-            m_sandbox = sandBoxMode;
-            m_loginserver = startLoginServer;
-            m_physicsEngine = physicsEngine;
-            m_config = configFile;
-            m_console = new ConsoleBase("region-console-" + Guid.NewGuid().ToString() + ".log", "Region", this, silent);
-            OpenSim.Framework.Console.MainConsole.Instance = m_console;
-        }
-        /// <summary>
-        /// Performs initialisation of the world, such as loading configuration from disk.
-        /// </summary>
-        public override void StartUp()
-        {
-            this.regionData = new RegionInfo();
-            try
-            {
-                this.localConfig = new XmlConfig(m_config);
-                this.localConfig.LoadData();
-            }
-            catch (Exception e)
-            {
-                Console.WriteLine(e.Message);
-            }
-            if (this.configFileSetup)
-            {
-                this.SetupFromConfigFile(this.localConfig);
-            }
-            m_console.Notice("Main.cs:Startup() - Loading configuration");
-            this.regionData.InitConfig(this.m_sandbox, this.localConfig);
-            this.localConfig.Close();//for now we can close it as no other classes read from it , but this should change
-            GridServers = new Grid();
-            if (m_sandbox)
-            {
-                this.SetupLocalGridServers();
-                //Authenticate Session Handler
-                AuthenticateSessionsLocal authen = new AuthenticateSessionsLocal();
-                this.AuthenticateSessionsHandler = authen;
-            }
-            else
-            {
-                this.SetupRemoteGridServers();
-                //Authenticate Session Handler
-                AuthenticateSessionsRemote authen = new AuthenticateSessionsRemote();
-                this.AuthenticateSessionsHandler = authen;
-            }
-            startuptime = DateTime.Now;
-            try
-            {
-                AssetCache = new AssetCache(GridServers.AssetServer);
-                InventoryCache = new InventoryCache();
-            }
-            catch (Exception e)
-            {
-                m_console.Error(e.Message + "\nSorry, could not setup local cache");
-                Environment.Exit(1);
-            }
-            m_udpServer = new UDPServer(this.regionData.IPListenPort, this.GridServers, this.AssetCache, this.InventoryCache, this.regionData, this.m_sandbox, this.user_accounts, this.m_console, this.AuthenticateSessionsHandler);
-            
-            //should be passing a IGenericConfig object to these so they can read the config data they want from it
-            GridServers.AssetServer.SetServerInfo(regionData.AssetURL, regionData.AssetSendKey);
-            IGridServer gridServer = GridServers.GridServer;
-            gridServer.SetServerInfo(regionData.GridURL, regionData.GridSendKey, regionData.GridRecvKey);
-            if (!m_sandbox)
-            {
-                this.ConnectToRemoteGridServer();
-            }
-            this.SetupLocalWorld();
-            if (m_sandbox)
-            {
-                AssetCache.LoadDefaultTextureSet();
-            }
-            m_console.Notice("Main.cs:Startup() - Initialising HTTP server");
-            this.SetupHttpListener();
-            LoginServer loginServer = null;
-            LoginServer adminLoginServer = null;
-            bool sandBoxWithLoginServer = m_loginserver && m_sandbox;
-            if (sandBoxWithLoginServer)
-            {
-                loginServer = new LoginServer( regionData.IPListenAddr, regionData.IPListenPort, regionData.RegionLocX, regionData.RegionLocY, this.user_accounts);
-                loginServer.Startup();
-                loginServer.SetSessionHandler(((AuthenticateSessionsLocal) this.AuthenticateSessionsHandler).AddNewSession);
-                if (user_accounts)
-                {
-                    //sandbox mode with loginserver using accounts
-                    this.GridServers.UserServer = loginServer;
-                    adminLoginServer = loginServer;
-                    httpServer.AddXmlRPCHandler("login_to_simulator", loginServer.LocalUserManager.XmlRpcLoginMethod);
-                }
-                else
-                {
-                    //sandbox mode with loginserver not using accounts
-                    httpServer.AddXmlRPCHandler("login_to_simulator", loginServer.XmlRpcLoginMethod);
-                }
-            }
-            AdminWebFront adminWebFront = new AdminWebFront("Admin", LocalWorld, InventoryCache, adminLoginServer);
-            adminWebFront.LoadMethods(httpServer);
-            m_console.Notice("Main.cs:Startup() - Starting HTTP server");
-            httpServer.Start();
-            //MainServerListener();
-            this.m_udpServer.ServerListener();
-            m_heartbeatTimer.Enabled = true;
-            m_heartbeatTimer.Interval = 100;
-            m_heartbeatTimer.Elapsed += new ElapsedEventHandler(this.Heartbeat);
-        }
-        # region Setup methods
-        protected virtual void SetupLocalGridServers()
-        {
-            GridServers.AssetDll = "OpenSim.GridInterfaces.Local.dll";
-            GridServers.GridDll = "OpenSim.GridInterfaces.Local.dll";
-            m_console.Notice("Starting in Sandbox mode");
-            try
-            {
-                GridServers.Initialise();
-            }
-            catch (Exception e)
-            {
-                m_console.Error(e.Message + "\nSorry, could not setup the grid interface");
-                Environment.Exit(1);
-            }
-        }
-        protected virtual void SetupRemoteGridServers()
-        {
-            if (this.gridLocalAsset)
-            {
-                GridServers.AssetDll = "OpenSim.GridInterfaces.Local.dll";
-            }
-            else
-            {
-                GridServers.AssetDll = "OpenSim.GridInterfaces.Remote.dll";
-            }
-            GridServers.GridDll = "OpenSim.GridInterfaces.Remote.dll";
-            m_console.Notice("Starting in Grid mode");
-            try
-            {
-                GridServers.Initialise();
-            }
-            catch (Exception e)
-            {
-                m_console.Error(e.Message + "\nSorry, could not setup the grid interface");
-                Environment.Exit(1);
-            }
-        }
-        protected virtual void SetupLocalWorld()
-        {
-            m_console.Notice("Main.cs:Startup() - We are " + regionData.RegionName + " at " + regionData.RegionLocX.ToString() + "," + regionData.RegionLocY.ToString());
-            m_console.Notice("Initialising world");
-            m_console.componentname = "Region " + regionData.RegionName;
-            m_localWorld = new World(this.m_udpServer.PacketServer.ClientThreads, regionData, regionData.RegionHandle, regionData.RegionName);
-            LocalWorld.InventoryCache = InventoryCache;
-            LocalWorld.AssetCache = AssetCache;
-            this.m_udpServer.LocalWorld = LocalWorld;
-            this.m_udpServer.PacketServer.RegisterClientPacketHandlers();
-            this.physManager = new OpenSim.Physics.Manager.PhysicsManager();
-            this.physManager.LoadPlugins();
-            LocalWorld.m_datastore = this.regionData.DataStore;
-            LocalWorld.LoadStorageDLL("OpenSim.Storage.LocalStorageDb4o.dll"); //all these dll names shouldn't be hard coded.
-            LocalWorld.LoadWorldMap();
-            m_console.Notice("Main.cs:Startup() - Starting up messaging system");
-            LocalWorld.PhysScene = this.physManager.GetPhysicsScene(this.m_physicsEngine); 
-            LocalWorld.PhysScene.SetTerrain(LocalWorld.Terrain.getHeights1D());
-            LocalWorld.LoadPrimsFromStorage();
-        }
-        protected virtual void SetupHttpListener()
-        {
-            httpServer = new BaseHttpServer(regionData.IPListenPort);
-            if (this.GridServers.GridServer.GetName() == "Remote")
-            {
-                // we are in Grid mode so set a XmlRpc handler to handle "expect_user" calls from the user server
-                httpServer.AddXmlRPCHandler("expect_user", ((AuthenticateSessionsRemote)this.AuthenticateSessionsHandler).ExpectUser  );
-                httpServer.AddXmlRPCHandler("agent_crossing",
-                    delegate(XmlRpcRequest request)
-                    {
-                        Hashtable requestData = (Hashtable)request.Params[0];
-                        AgentCircuitData agent_data = new AgentCircuitData();
-                        agent_data.firstname = (string)requestData["firstname"];
-                        agent_data.lastname = (string)requestData["lastname"];
-                        agent_data.circuitcode = Convert.ToUInt32(requestData["circuit_code"]);
-                        agent_data.startpos = new LLVector3(Single.Parse((string)requestData["pos_x"]), Single.Parse((string)requestData["pos_y"]), Single.Parse((string)requestData["pos_z"]));
-                        if (((RemoteGridBase)this.GridServers.GridServer).agentcircuits.ContainsKey((uint)agent_data.circuitcode))
-                        {
-                            ((RemoteGridBase)this.GridServers.GridServer).agentcircuits[(uint)agent_data.circuitcode].firstname = agent_data.firstname;
-                            ((RemoteGridBase)this.GridServers.GridServer).agentcircuits[(uint)agent_data.circuitcode].lastname = agent_data.lastname;
-                            ((RemoteGridBase)this.GridServers.GridServer).agentcircuits[(uint)agent_data.circuitcode].startpos = agent_data.startpos;
-                        }
-                        return new XmlRpcResponse();
-                    });
-                httpServer.AddRestHandler("GET", "/simstatus/",
-                    delegate(string request, string path, string param)
-                    {
-                        return "OK";
-                    });
-            }
-        }
-        protected virtual void ConnectToRemoteGridServer()
-        {
-            if (GridServers.GridServer.RequestConnection(regionData.SimUUID, regionData.IPListenAddr, (uint)regionData.IPListenPort))
-            {
-                m_console.Notice("Main.cs:Startup() - Success: Got a grid connection OK!");
-            }
-            else
-            {
-                m_console.WriteLine(OpenSim.Framework.Console.LogPriority.CRITICAL, "Main.cs:Startup() - FAILED: Unable to get connection to grid. Shutting down.");
-                Shutdown();
-            }
-            GridServers.AssetServer.SetServerInfo((string)((RemoteGridBase)GridServers.GridServer).GridData["asset_url"], (string)((RemoteGridBase)GridServers.GridServer).GridData["asset_sendkey"]);
-            // If we are being told to load a file, load it.
-            string dataUri = (string)((RemoteGridBase)GridServers.GridServer).GridData["data_uri"];
-            if (!String.IsNullOrEmpty(dataUri))
-            {
-                this.LocalWorld.m_datastore = dataUri;
-            }
-            if (((RemoteGridBase)(GridServers.GridServer)).GridData["regionname"].ToString() != "")
-            {
-                // The grid server has told us who we are
-                // We must obey the grid server.
-                try
-                {
-                    regionData.RegionLocX = Convert.ToUInt32(((RemoteGridBase)(GridServers.GridServer)).GridData["region_locx"].ToString());
-                    regionData.RegionLocY = Convert.ToUInt32(((RemoteGridBase)(GridServers.GridServer)).GridData["region_locy"].ToString());
-                    regionData.RegionName = ((RemoteGridBase)(GridServers.GridServer)).GridData["regionname"].ToString();
-                }
-                catch (Exception e)
-                {
-                    m_console.WriteLine(OpenSim.Framework.Console.LogPriority.CRITICAL, e.Message + "\nBAD ERROR! THIS SHOULD NOT HAPPEN! Bad GridData from the grid interface!!!! ZOMG!!!");
-                    Environment.Exit(1);
-                }
-            }
-        }
-        #endregion
-        private void SetupFromConfigFile(IGenericConfig configData)
-        {
-            try
-            {
-                // SandBoxMode
-                string attri = "";
-                attri = configData.GetAttribute("SandBox");
-                if ((attri == "") || ((attri != "false") && (attri != "true")))
-                {
-                    this.m_sandbox = false;
-                    configData.SetAttribute("SandBox", "false");
-                }
-                else
-                {
-                    this.m_sandbox = Convert.ToBoolean(attri);
-                }
-                // LoginServer
-                attri = "";
-                attri = configData.GetAttribute("LoginServer");
-                if ((attri == "") || ((attri != "false") && (attri != "true")))
-                {
-                    this.m_loginserver = false;
-                    configData.SetAttribute("LoginServer", "false");
-                }
-                else
-                {
-                    this.m_loginserver = Convert.ToBoolean(attri);
-                }
-                // Sandbox User accounts
-                attri = "";
-                attri = configData.GetAttribute("UserAccount");
-                if ((attri == "") || ((attri != "false") && (attri != "true")))
-                {
-                    this.user_accounts = false;
-                    configData.SetAttribute("UserAccounts", "false");
-                }
-                else if (attri == "true")
-                {
-                    this.user_accounts = Convert.ToBoolean(attri);
-                }
-                // Grid mode hack to use local asset server
-                attri = "";
-                attri = configData.GetAttribute("LocalAssets");
-                if ((attri == "") || ((attri != "false") && (attri != "true")))
-                {
-                    this.gridLocalAsset = false;
-                    configData.SetAttribute("LocalAssets", "false");
-                }
-                else if (attri == "true")
-                {
-                    this.gridLocalAsset = Convert.ToBoolean(attri);
-                }
-                attri = "";
-                attri = configData.GetAttribute("PhysicsEngine");
-                switch (attri)
-                {
-                    default:
-                        m_console.Warn("Main.cs: SetupFromConfig() - Invalid value for PhysicsEngine attribute, terminating");
-                        Environment.Exit(1);
-                        break;
-                    case "":
-                        this.m_physicsEngine = "basicphysics";
-                        configData.SetAttribute("PhysicsEngine", "basicphysics");
-                        OpenSim.RegionServer.Simulator.Avatar.PhysicsEngineFlying = false;
-                        break;
-                    case "basicphysics":
-                        this.m_physicsEngine = "basicphysics";
-                        configData.SetAttribute("PhysicsEngine", "basicphysics");
-                        OpenSim.RegionServer.Simulator.Avatar.PhysicsEngineFlying = false;
-                        break;
-                    case "RealPhysX":
-                        this.m_physicsEngine = "RealPhysX";
-                        OpenSim.RegionServer.Simulator.Avatar.PhysicsEngineFlying = true;
-                        break;
-                    case "OpenDynamicsEngine":
-                        this.m_physicsEngine = "OpenDynamicsEngine";
-                        OpenSim.RegionServer.Simulator.Avatar.PhysicsEngineFlying = true;
-                        break;
-                }
-                configData.Commit();
-            }
-            catch (Exception e)
-            {
-                Console.WriteLine(e.Message);
-                Console.WriteLine("\nSorry, a fatal error occurred while trying to initialise the configuration data");
-                Console.WriteLine("Can not continue starting up");
-                Environment.Exit(1);
-            }
-        }
-        /// <summary>
-        /// Performs any last-minute sanity checking and shuts down the region server
-        /// </summary>
-        public virtual void Shutdown()
-        {
-            m_console.Notice("Main.cs:Shutdown() - Closing all threads");
-            m_console.Notice("Main.cs:Shutdown() - Killing listener thread");
-            m_console.Notice("Main.cs:Shutdown() - Killing clients");
-            // IMPLEMENT THIS
-            m_console.Notice("Main.cs:Shutdown() - Closing console and terminating");
-            LocalWorld.Close();
-            GridServers.Close();
-            m_console.Close();
-            Environment.Exit(0);
-        }
-        /// <summary>
-        /// Performs per-frame updates regularly
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        void Heartbeat(object sender, System.EventArgs e)
-        {
-            LocalWorld.Update();
-        }
-        #region Console Commands
-        /// <summary>
-        /// Runs commands issued by the server console from the operator
-        /// </summary>
-        /// <param name="command">The first argument of the parameter (the command)</param>
-        /// <param name="cmdparams">Additional arguments passed to the command</param>
-        public void RunCmd(string command, string[] cmdparams)
-        {
-            switch (command)
-            {
-                case "help":
-                    m_console.Error("show users - show info about connected users");
-                    m_console.Error("shutdown - disconnect all clients and shutdown");
-                    break;
-                case "show":
-                    Show(cmdparams[0]);
-                    break;
-                case "terrain":
-                    string result = "";
-                    if (!LocalWorld.Terrain.RunTerrainCmd(cmdparams, ref result))
-                    {
-                        m_console.Error(result);
-                    }
-                    break;
-                case "shutdown":
-                    Shutdown();
-                    break;
-                default:
-                    m_console.Error("Unknown command");
-                    break;
-            }
-        }
-        /// <summary>
-        /// Outputs to the console information about the region
-        /// </summary>
-        /// <param name="ShowWhat">What information to display (valid arguments are "uptime", "users")</param>
-        public void Show(string ShowWhat)
-        {
-            switch (ShowWhat)
-            {
-                case "uptime":
-                    m_console.Error("OpenSim has been running since " + startuptime.ToString());
-                    m_console.Error("That is " + (DateTime.Now - startuptime).ToString());
-                    break;
-                case "users":
-                    OpenSim.RegionServer.Simulator.Avatar TempAv;
-                    m_console.Error(String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16}{5,-16}", "Firstname", "Lastname", "Agent ID", "Session ID", "Circuit", "IP"));
-                    foreach (libsecondlife.LLUUID UUID in LocalWorld.Entities.Keys)
-                    {
-                        if (LocalWorld.Entities[UUID].ToString() == "OpenSim.RegionServer.Simulator.Avatar")
-                        {
-                            TempAv = (OpenSim.RegionServer.Simulator.Avatar)LocalWorld.Entities[UUID];
-                            m_console.Error(String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16},{5,-16}", TempAv.firstname, TempAv.lastname, UUID, TempAv.ControllingClient.SessionID, TempAv.ControllingClient.CircuitCode, TempAv.ControllingClient.userEP.ToString()));
-                        }
-                    }
-                    break;
-            }
-        }
-        #endregion
-    }
-    */
-}
diff --git a/OpenSim/OpenSim.RegionServer/OpenSimNetworkHandler.cs b/OpenSim/OpenSim.RegionServer/OpenSimNetworkHandler.cs
deleted file mode 100644
index bc85cdb..0000000
--- a/OpenSim/OpenSim.RegionServer/OpenSimNetworkHandler.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 System.Net;
-using System.Net.Sockets;
-using libsecondlife;
-using OpenSim.Framework.Interfaces;
-namespace OpenSim.RegionServer
-{
-    public interface OpenSimNetworkHandler
-    {
-        void SendPacketTo(byte[] buffer, int size, SocketFlags flags, uint circuitcode);// EndPoint packetSender);
-        void RemoveClientCircuit(uint circuitcode);
-        void RegisterPacketServer(PacketServer server);
-        AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);
-    }
-}
diff --git a/OpenSim/OpenSim.RegionServer/PacketServer.cs b/OpenSim/OpenSim.RegionServer/PacketServer.cs
deleted file mode 100644
index 7267ae8..0000000
--- a/OpenSim/OpenSim.RegionServer/PacketServer.cs
+++ /dev/null
@@ -1,116 +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.RegionServer.Simulator;
-using OpenSim.RegionServer.Client;
-using libsecondlife.Packets;
-namespace OpenSim.RegionServer
-{
-    public class PacketServer
-    {
-        private OpenSimNetworkHandler _networkHandler;
-        private World _localWorld;
-        public Dictionary<uint, ClientView> ClientThreads = new Dictionary<uint, ClientView>();
-        public PacketServer(OpenSimNetworkHandler networkHandler)
-        {
-            _networkHandler = networkHandler;
-            _networkHandler.RegisterPacketServer(this);
-        }
-        public World LocalWorld
-        {
-            set
-            {
-                this._localWorld = value;
-            }
-        }
-        public virtual void ClientInPacket(uint circuitCode, Packet packet)
-        {
-            if (this.ClientThreads.ContainsKey(circuitCode))
-            {
-                ClientThreads[circuitCode].InPacket(packet);
-            }
-        }
-        public virtual bool AddNewCircuitCodeClient(uint circuitCode)
-        {
-            return false;
-        }
-        public virtual void SendPacketToAllClients(Packet packet)
-        {
-        }
-        public virtual void SendPacketToAllExcept(Packet packet, ClientView simClient)
-        {
-        }
-        public virtual void AddClientPacketHandler(PacketType packetType, PacketMethod handler)
-        {
-        }
-        public virtual void RegisterClientPacketHandlers()
-        {
-            if (this._localWorld != null)
-            {
-                ClientView.AddPacketHandler(PacketType.UUIDNameRequest, this.RequestUUIDName);
-            }
-        }
-        #region Client Packet Handlers
-        public bool RequestUUIDName(ClientView simClient, Packet packet)
-        {
-            System.Text.Encoding enc = System.Text.Encoding.ASCII;
-            Console.WriteLine(packet.ToString());
-            UUIDNameRequestPacket nameRequest = (UUIDNameRequestPacket)packet;
-            UUIDNameReplyPacket nameReply = new UUIDNameReplyPacket();
-            nameReply.UUIDNameBlock = new UUIDNameReplyPacket.UUIDNameBlockBlock[nameRequest.UUIDNameBlock.Length];
-            for (int i = 0; i < nameRequest.UUIDNameBlock.Length; i++)
-            {
-                nameReply.UUIDNameBlock[i] = new UUIDNameReplyPacket.UUIDNameBlockBlock();
-                nameReply.UUIDNameBlock[i].ID = nameRequest.UUIDNameBlock[i].ID;
-                nameReply.UUIDNameBlock[i].FirstName = enc.GetBytes("Who\0");  //for now send any name
-                nameReply.UUIDNameBlock[i].LastName = enc.GetBytes("Knows\0");     //in future need to look it up               
-            }
-            simClient.OutPacket(nameReply);
-            return true;
-        }
-        #endregion
-    }
-}
diff --git a/OpenSim/OpenSim.RegionServer/RegionInfo.cs b/OpenSim/OpenSim.RegionServer/RegionInfo.cs
deleted file mode 100644
index de1750c..0000000
--- a/OpenSim/OpenSim.RegionServer/RegionInfo.cs
+++ /dev/null
@@ -1,380 +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 System.Net;
-using System.Web;
-using System.IO;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Utilities;
-using libsecondlife;
-namespace OpenSim.RegionServer
-{
-    public class RegionInfo : RegionInfoBase
-    {
-        //following should be removed and the GenericConfig object passed around,
-        //so each class (AssetServer, GridServer etc) can access what config data they want 
-        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 = "";
-        private bool isSandbox;
-        public string MasterAvatarFirstName = "";
-        public string MasterAvatarLastName = "";
-        public string MasterAvatarSandboxPassword = "";
-        public LLUUID MasterAvatarAssignedUUID = LLUUID.Zero;
-        public string DataStore;
-        public RegionInfo()
-        {
-        }
-        public void SaveToGrid()
-        {
-            //we really want to keep any server connection code out of here and out of the code code
-            // and put it in the server connection classes (those inheriting from IGridServer etc)
-            string reqtext;
-            reqtext = "<Root>";
-            reqtext += "<authkey>" + this.GridSendKey + "</authkey>";
-            reqtext += "<sim>";
-            reqtext += "<uuid>" + this.SimUUID.ToString() + "</uuid>";
-            reqtext += "<regionname>" + this.RegionName + "</regionname>";
-            reqtext += "<sim_ip>" + this.IPListenAddr + "</sim_ip>";
-            reqtext += "<sim_port>" + this.IPListenPort.ToString() + "</sim_port>";
-            reqtext += "<region_locx>" + this.RegionLocX.ToString() + "</region_locx>";
-            reqtext += "<region_locy>" + this.RegionLocY.ToString() + "</region_locy>";
-            reqtext += "<estate_id>1</estate_id>";
-            reqtext += "</sim>";
-            reqtext += "</Root>";
-            byte[] reqdata = (new System.Text.ASCIIEncoding()).GetBytes(reqtext);
-            string newpath = "";
-            if (this.GridURL.EndsWith("/"))
-            {
-                newpath = this.GridURL + "sims/";
-            }
-            else
-            {
-                newpath = this.GridURL + "/sims/";
-            }
-            WebRequest GridSaveReq = WebRequest.Create(newpath + this.SimUUID.ToString());
-            GridSaveReq.Method = "POST";
-            GridSaveReq.ContentType = "application/x-www-form-urlencoded";
-            GridSaveReq.ContentLength = reqdata.Length;
-            Stream stOut = GridSaveReq.GetRequestStream();
-            stOut.Write(reqdata, 0, reqdata.Length);
-            stOut.Close();
-            WebResponse gridresp = GridSaveReq.GetResponse();
-            StreamReader stIn = new StreamReader(gridresp.GetResponseStream(), Encoding.ASCII);
-            string GridResponse = stIn.ReadToEnd();
-            stIn.Close();
-            gridresp.Close();
-            OpenSim.Framework.Console.MainConsole.Instance.Verbose("RegionInfo.CS:SaveToGrid() - Grid said: " + GridResponse);
-        }
-        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.MainConsole.Instance.CmdPrompt("GENERAL SETTING: Simulator Name", "OpenSim Island");
-                    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.MainConsole.Instance.CmdPrompt("GENERAL SETTING: 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.MainConsole.Instance.CmdPrompt("GENERAL SETTING: 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.MainConsole.Instance.CmdPrompt("GENERAL SETTING: Filename for local world 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.MainConsole.Instance.CmdPrompt("GENERAL SETTING: UDP port for client connections", "9000");
-                    configData.SetAttribute("SimListenPort", port);
-                    this.IPListenPort = Convert.ToInt32(port);
-                }
-                else
-                {
-                    this.IPListenPort = Convert.ToInt32(attri);
-                }
-                //Sim Listen Address
-                attri = "";
-                attri = configData.GetAttribute("SimListenAddress");
-                if (attri == "")
-                {
-                    this.IPListenAddr = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("GENERAL SETTING: IP Address to listen on for client connections", "127.0.0.1");
-                    configData.SetAttribute("SimListenAddress", this.IPListenAddr);
-                }
-                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.IPListenAddr = ips[0].ToString();
-                        }
-                        catch (Exception e)
-                        {
-                            e.ToString();
-                            this.IPListenAddr = "127.0.0.1"; // Use the default if we fail
-                        }
-                    }
-                    else
-                    {
-                        this.IPListenAddr = attri;
-                    }
-                }
-                
-                // Terrain Default File
-                attri = "";
-                attri = configData.GetAttribute("TerrainFile");
-                if (attri == "")
-                {
-                    this.estateSettings.terrainFile = OpenSim.Framework.Console.MainConsole.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.MainConsole.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.MainConsole.Instance.CmdPrompt("GENERAL SETTING: First name of Master Avatar", "Test");
-                    configData.SetAttribute("MasterAvatarFirstName", this.MasterAvatarFirstName);
-                }
-                else
-                {
-                    this.MasterAvatarFirstName = attri;
-                }
-                attri = "";
-                attri = configData.GetAttribute("MasterAvatarLastName");
-                if (attri == "")
-                {
-                    this.MasterAvatarLastName = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("GENERAL SETTING: Last name of Master Avatar", "User");
-                    configData.SetAttribute("MasterAvatarLastName", this.MasterAvatarLastName);
-                }
-                else
-                {
-                    this.MasterAvatarLastName = attri;
-                }
-                if (isSandbox) //Sandbox Mode Settings
-                {
-                    attri = "";
-                    attri = configData.GetAttribute("MasterAvatarSandboxPassword");
-                    if (attri == "")
-                    {
-                        this.MasterAvatarSandboxPassword = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("SANDBOX MODE SETTING: Password of Master Avatar", "test");
-                        configData.SetAttribute("MasterAvatarSandboxPassword", this.MasterAvatarSandboxPassword);
-                    }
-                    else
-                    {
-                        this.MasterAvatarSandboxPassword = attri;
-                    }
-                }
-                else //Grid Mode Settings
-                {
-                    //shouldn't be reading this data in here, it should be up to the classes implementing the server interfaces to read what they need from the config object
-                    //Grid Server URL
-                    attri = "";
-                    attri = configData.GetAttribute("GridServerURL");
-                    if (attri == "")
-                    {
-                        this.GridURL = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("GRID MODE SETTING: 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.MainConsole.Instance.CmdPrompt("GRID MODE SETTING: 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.MainConsole.Instance.CmdPrompt("GRID MODE SETTING: 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.MainConsole.Instance.CmdPrompt("GRID MODE SETTING: Asset server URL", "http://127.0.0.1:8003/");
-                        configData.SetAttribute("AssetServerURL", this.AssetURL);
-                    }
-                    else
-                    {
-                        this.AssetURL = attri;
-                    }
-                }
-                 
-                this.RegionHandle = Util.UIntsToLong((RegionLocX * 256), (RegionLocY * 256));
-                if (!this.isSandbox)
-                {
-                    this.SaveToGrid();
-                }
-                configData.Commit();
-            }
-            catch (Exception e)
-            {
-                OpenSim.Framework.Console.MainConsole.Instance.Warn("Config.cs:InitConfig() - Exception occured");
-                OpenSim.Framework.Console.MainConsole.Instance.Warn(e.ToString());
-            }
-            OpenSim.Framework.Console.MainConsole.Instance.Verbose("Simulator Settings Loaded");
-            /* MainConsole.Instance.Notice("UUID: " + this.SimUUID.ToStringHyphenated());
-            MainConsole.Instance.Notice("Name: " + this.RegionName);
-            MainConsole.Instance.Notice("Region Location: [" + this.RegionLocX.ToString() + "," + this.RegionLocY + "]");
-            MainConsole.Instance.Notice("Region Handle: " + this.RegionHandle.ToString());
-            MainConsole.Instance.Notice("Listening on IP: " + this.IPListenAddr + ":" + this.IPListenPort);
-            MainConsole.Instance.Notice("Sandbox Mode? " + isSandbox.ToString());
-            MainConsole.Instance.Notice("Asset URL: " + this.AssetURL);
-            MainConsole.Instance.Notice("Asset key: " + this.AssetSendKey);
-            MainConsole.Instance.Notice("Grid URL: " + this.GridURL);
-            MainConsole.Instance.Notice("Grid key: " + this.GridSendKey); */
-        }
-    }
-}
diff --git a/OpenSim/OpenSim.RegionServer/RegionInfoBase.cs b/OpenSim/OpenSim.RegionServer/RegionInfoBase.cs
deleted file mode 100644
index 481b865..0000000
--- a/OpenSim/OpenSim.RegionServer/RegionInfoBase.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;
-using System.Collections.Generic;
-using System.Text;
-using System.Net;
-using System.Web;
-using System.IO;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Utilities;
-using OpenSim.Framework.Types;
-using libsecondlife;
-namespace OpenSim.RegionServer
-{
-    public class RegionInfoBase
-    {
-        public LLUUID SimUUID = new LLUUID();
-        public string RegionName = "";
-        public uint RegionLocX = 0;
-        public uint RegionLocY = 0;
-        public ulong RegionHandle = 0;
-        
-        public int IPListenPort = 0;
-        public string IPListenAddr = "";
-        public EstateSettings estateSettings;
-        public RegionInfoBase()
-        {
-            estateSettings = new EstateSettings();
-        }
-    }
-}
diff --git a/OpenSim/OpenSim.RegionServer/RegionServerBase.cs b/OpenSim/OpenSim.RegionServer/RegionServerBase.cs
deleted file mode 100644
index 2d99bb3..0000000
--- a/OpenSim/OpenSim.RegionServer/RegionServerBase.cs
+++ /dev/null
@@ -1,130 +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.RegionServer.Simulator;
-using OpenSim.Terrain;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-using OpenSim.UserServer;
-using OpenSim.RegionServer.Assets;
-using OpenSim.RegionServer.CAPS;
-using OpenSim.Framework.Console;
-using OpenSim.Physics.Manager;
-using Nwc.XmlRpc;
-using OpenSim.Servers;
-using OpenSim.GenericConfig;
-namespace OpenSim.RegionServer
-{
-    public class RegionServerBase
-    {
-        protected IGenericConfig localConfig;
-        protected PhysicsManager physManager;
-        protected Grid GridServers;
-        protected AssetCache AssetCache;
-        protected InventoryCache InventoryCache;
-        protected Dictionary<EndPoint, uint> clientCircuits = new Dictionary<EndPoint, uint>();
-        protected DateTime startuptime;
-        protected RegionInfo regionData;
-        protected System.Timers.Timer m_heartbeatTimer = new System.Timers.Timer();
-        public string m_physicsEngine;
-        public bool m_sandbox = false;
-        public bool m_loginserver;
-        public bool user_accounts = false;
-        public bool gridLocalAsset = false;
-        protected bool configFileSetup = false;
-        public string m_config;
-        protected UDPServer m_udpServer;
-        protected BaseHttpServer httpServer;
-        protected AuthenticateSessionsBase AuthenticateSessionsHandler;
-        protected ConsoleBase m_console;
-        public RegionServerBase()
-        {
-        }
-        public RegionServerBase(bool sandBoxMode, bool startLoginServer, string physicsEngine, bool useConfigFile, bool silent, string configFile)
-        {
-            this.configFileSetup = useConfigFile;
-            m_sandbox = sandBoxMode;
-            m_loginserver = startLoginServer;
-            m_physicsEngine = physicsEngine;
-            m_config = configFile;
-        }
-        protected World m_localWorld;
-        public World LocalWorld
-        {
-            get { return m_localWorld; }
-        }
-        /// <summary>
-        /// Performs initialisation of the world, such as loading configuration from disk.
-        /// </summary>
-        public virtual void StartUp()
-        {
-        }
-        protected virtual void SetupLocalGridServers()
-        {
-        }
-        protected virtual void SetupRemoteGridServers()
-        {
-        }
-        protected virtual void SetupLocalWorld()
-        {
-        }
-        protected virtual void SetupHttpListener()
-        {
-        }
-        protected virtual void ConnectToRemoteGridServer()
-        {
-        }
-    }
-}
diff --git a/OpenSim/OpenSim.RegionServer/Scripting/IScriptContext.cs b/OpenSim/OpenSim.RegionServer/Scripting/IScriptContext.cs
deleted file mode 100644
index 2ac0a2e..0000000
--- a/OpenSim/OpenSim.RegionServer/Scripting/IScriptContext.cs
+++ /dev/null
@@ -1,40 +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.RegionServer.Scripting
-{
-    public interface IScriptContext
-    {
-        IScriptEntity Entity { get; }
-        bool TryGetRandomAvatar(out IScriptReadonlyEntity avatar);
-    }
-}
diff --git a/OpenSim/OpenSim.RegionServer/Scripting/IScriptEntity.cs b/OpenSim/OpenSim.RegionServer/Scripting/IScriptEntity.cs
deleted file mode 100644
index 05a1237..0000000
--- a/OpenSim/OpenSim.RegionServer/Scripting/IScriptEntity.cs
+++ /dev/null
@@ -1,46 +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.RegionServer.Scripting
-{
-    public interface IScriptReadonlyEntity
-    {
-        LLVector3 Pos { get; }
-        string Name { get; }
-    }
-    
-    public interface IScriptEntity
-    {
-        LLVector3 Pos { get; set; }
-        string Name { get; }
-    }
-}
diff --git a/OpenSim/OpenSim.RegionServer/Scripting/IScriptHandler.cs b/OpenSim/OpenSim.RegionServer/Scripting/IScriptHandler.cs
deleted file mode 100644
index 7431799..0000000
--- a/OpenSim/OpenSim.RegionServer/Scripting/IScriptHandler.cs
+++ /dev/null
@@ -1,125 +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.Physics.Manager;
-using OpenSim.RegionServer.Simulator;
-using Avatar=OpenSim.RegionServer.Simulator.Avatar;
-using Primitive = OpenSim.RegionServer.Simulator.Primitive;
-namespace OpenSim.RegionServer.Scripting
-{
-    public delegate void ScriptEventHandler(IScriptContext context);
-    public class ScriptHandler : IScriptContext, IScriptEntity, IScriptReadonlyEntity
-    {
-        private World m_world;
-        private Script m_script;
-        private Entity m_entity;
-        public LLUUID ScriptId
-        {
-            get
-            {
-                return m_script.ScriptId;
-            }
-        }
-        public void OnFrame()
-        {
-            m_script.OnFrame(this);
-        }
-        public ScriptHandler(Script script, Entity entity, World world)
-        {
-            m_script = script;
-            m_entity = entity;
-            m_world = world;
-        }
-        #region IScriptContext Members
-        IScriptEntity IScriptContext.Entity
-        {
-            get
-            {
-                return this;
-            }
-        }
-        bool IScriptContext.TryGetRandomAvatar(out IScriptReadonlyEntity avatar)
-        {
-            foreach (Entity entity in m_world.Entities.Values )
-            {
-                if( entity is Avatar )
-                {
-                    avatar = entity;
-                    return true;
-                }
-            }
-            
-            avatar = null;
-            return false;
-        }
-        #endregion
-        #region IScriptEntity and IScriptReadonlyEntity Members
-        public string Name
-        {
-            get
-            {
-                return m_entity.Name;
-            }
-        }
-        public LLVector3 Pos
-        {
-            get
-            {
-                return m_entity.Pos;
-            }
-            set
-            {
-                if (m_entity is Primitive)
-                {
-                    Primitive prim = m_entity as Primitive;
-                    // Of course, we really should have asked the physEngine if this is possible, and if not, returned false.
-                    prim.UpdatePosition( value );
-                }
-            }
-        }
-        #endregion
-    }
-}
diff --git a/OpenSim/OpenSim.RegionServer/Scripting/Script.cs b/OpenSim/OpenSim.RegionServer/Scripting/Script.cs
deleted file mode 100644
index e6732a6..0000000
--- a/OpenSim/OpenSim.RegionServer/Scripting/Script.cs
+++ /dev/null
@@ -1,53 +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.RegionServer.Scripting
-{
-    public class Script
-    {
-        private LLUUID m_scriptId;        
-        public virtual LLUUID ScriptId
-        {
-            get
-            {
-                return m_scriptId;
-            }
-        }
-        public Script( LLUUID scriptId )
-        {
-            m_scriptId = scriptId;
-        }
-        
-        public ScriptEventHandler OnFrame;
-    }
-}
diff --git a/OpenSim/OpenSim.RegionServer/Scripting/ScriptFactory.cs b/OpenSim/OpenSim.RegionServer/Scripting/ScriptFactory.cs
deleted file mode 100644
index 525f63d..0000000
--- a/OpenSim/OpenSim.RegionServer/Scripting/ScriptFactory.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.RegionServer.Scripting
-{
-    public delegate Script ScriptFactory();
-}
diff --git a/OpenSim/OpenSim.RegionServer/Scripting/Scripts/FollowRandomAvatar.cs b/OpenSim/OpenSim.RegionServer/Scripting/Scripts/FollowRandomAvatar.cs
deleted file mode 100644
index 55ea795..0000000
--- a/OpenSim/OpenSim.RegionServer/Scripting/Scripts/FollowRandomAvatar.cs
+++ /dev/null
@@ -1,64 +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.RegionServer.Scripting
-{
-    public class FollowRandomAvatar : Script
-    {
-        public FollowRandomAvatar()
-            : base(LLUUID.Random())
-        {
-            OnFrame += MyOnFrame;
-        }
-        private void MyOnFrame(IScriptContext context)
-        {
-            LLVector3 pos = context.Entity.Pos;
-            IScriptReadonlyEntity avatar;
-            if (context.TryGetRandomAvatar(out avatar))
-            {
-                LLVector3 avatarPos = avatar.Pos;
-                float x = pos.X + ((float)avatarPos.X.CompareTo(pos.X)) / 2;
-                float y = pos.Y + ((float)avatarPos.Y.CompareTo(pos.Y)) / 2;
-                LLVector3 newPos = new LLVector3(x, y, pos.Z);
-                context.Entity.Pos = newPos;
-            }
-        }
-    }
-}
diff --git a/OpenSim/OpenSim.RegionServer/Simulator/Avatar.Client.cs b/OpenSim/OpenSim.RegionServer/Simulator/Avatar.Client.cs
deleted file mode 100644
index c6ce258..0000000
--- a/OpenSim/OpenSim.RegionServer/Simulator/Avatar.Client.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.Packets;
-namespace OpenSim.RegionServer.Simulator
-{
-    partial class Avatar
-    {
-        private List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock> updateList = new List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock>();
-        private List<Entity> interestList = new List<Entity>();
-        public void SendPacketToViewer(Packet packet)
-        {
-            this.ControllingClient.OutPacket(packet);
-        }
-        public void AddTerseUpdateToViewersList(ImprovedTerseObjectUpdatePacket.ObjectDataBlock terseBlock)
-        {
-        }
-        public void SendUpdateListToViewer()
-        {
-        }
-        private void UpdateInterestList()
-        {
-        }
-    }
-}
diff --git a/OpenSim/OpenSim.RegionServer/Simulator/Avatar.Update.cs b/OpenSim/OpenSim.RegionServer/Simulator/Avatar.Update.cs
deleted file mode 100644
index 03da861..0000000
--- a/OpenSim/OpenSim.RegionServer/Simulator/Avatar.Update.cs
+++ /dev/null
@@ -1,371 +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.RegionServer.Client;
-namespace OpenSim.RegionServer.Simulator
-{
-    partial class Avatar
-    {
-        public override void update()
-        {
-            if (!this.childAvatar)
-            {
-                if (this._physActor == null)
-                {
-                    //HACKHACK: Note to work out why this entity does not have a physics actor
-                    //          and prehaps create one.
-                    return;
-                }
-                libsecondlife.LLVector3 pos2 = new LLVector3(this._physActor.Position.X, this._physActor.Position.Y, this._physActor.Position.Z);
-                if (this.updateflag)
-                {
-                    //need to send movement info
-                    //so create the improvedterseobjectupdate packet
-                    //use CreateTerseBlock()
-                    ImprovedTerseObjectUpdatePacket.ObjectDataBlock terseBlock = CreateTerseBlock();
-                    ImprovedTerseObjectUpdatePacket terse = new ImprovedTerseObjectUpdatePacket();
-                    terse.RegionData.RegionHandle = m_world.m_regInfo.RegionHandle;
-                    terse.RegionData.TimeDilation = 64096;
-                    terse.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[1];
-                    terse.ObjectData[0] = terseBlock;
-                    List<Avatar> avList = this.m_world.RequestAvatarList();
-                    foreach (Avatar client in avList)
-                    {
-                        client.SendPacketToViewer(terse);
-                    }
-                    updateflag = false;
-                    //this._updateCount = 0;
-                }
-                else
-                {
-                    if ((pos2 != this.positionLastFrame) || (this.movementflag == 16))
-                    {
-                        _updateCount++;
-                        if (((!PhysicsEngineFlying) && (_updateCount > 3)) || (PhysicsEngineFlying) && (_updateCount > 0))
-                        {
-                            //It has been a while since last update was sent so lets send one.
-                            ImprovedTerseObjectUpdatePacket.ObjectDataBlock terseBlock = CreateTerseBlock();
-                            ImprovedTerseObjectUpdatePacket terse = new ImprovedTerseObjectUpdatePacket();
-                            terse.RegionData.RegionHandle = m_world.m_regInfo.RegionHandle;
-                            terse.RegionData.TimeDilation = 64096;
-                            terse.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[1];
-                            terse.ObjectData[0] = terseBlock;
-                            List<Avatar> avList = this.m_world.RequestAvatarList();
-                            foreach (Avatar client in avList)
-                            {
-                                client.SendPacketToViewer(terse);
-                            }
-                            _updateCount = 0;
-                        }
-                        if (this.movementflag == 16)
-                        {
-                            movementflag = 0;
-                        }
-                    }
-                }
-                if (positionFrameBeforeLast != pos2)
-                {
-                    this.positionFrameBeforeLast = this.positionLastFrame;
-                    this.positionLastFrame = pos2;
-                    int tempRoundedX = (int)Math.Round(positionLastFrame.X);
-                    int tempRoundedY = (int)Math.Round(positionLastFrame.Y);
-                    if (this.positionRoundedX != tempRoundedX || this.positionRoundedY != tempRoundedY)
-                    {
-                        this.positionRoundedX = tempRoundedX;
-                        this.positionRoundedY = tempRoundedY;
-                        int currentParcelLocalID = m_world.parcelManager.getParcel(tempRoundedX, tempRoundedY).parcelData.localID;
-                        if(currentParcelLocalID != this.positionParcelHoverLocalID)
-                        {
-                            Console.WriteLine("NEW PARCEL: " + m_world.parcelManager.getParcel(tempRoundedX, tempRoundedY).parcelData.parcelName);
-                            m_world.parcelManager.getParcel(tempRoundedX, tempRoundedY).sendParcelProperties(this.parcelUpdateSequenceIncrement, false, 0,this.ControllingClient);
-                            this.positionParcelHoverLocalID = currentParcelLocalID;
-                            this.parcelUpdateSequenceIncrement++;
-                        }
-                    }
-                }
-                if (!this.ControllingClient.m_sandboxMode)
-                {
-                    if (pos2.X < 0)
-                    {
-                        ControllingClient.CrossSimBorder(new LLVector3(this._physActor.Position.X, this._physActor.Position.Y, this._physActor.Position.Z));
-                    }
-                    if (pos2.Y < 0)
-                    {
-                        ControllingClient.CrossSimBorder(new LLVector3(this._physActor.Position.X, this._physActor.Position.Y, this._physActor.Position.Z));
-                    }
-                    if (pos2.X > 255)
-                    {
-                        ControllingClient.CrossSimBorder(new LLVector3(this._physActor.Position.X, this._physActor.Position.Y, this._physActor.Position.Z));
-                    }
-                    if (pos2.Y > 255)
-                    {
-                        ControllingClient.CrossSimBorder(new LLVector3(this._physActor.Position.X, this._physActor.Position.Y, this._physActor.Position.Z));
-                    }
-                }
-            }
-        }
-        public void SendUpdateToOtherClient(Avatar remoteAvatar)
-        {
-            ObjectUpdatePacket objupdate = CreateUpdatePacket();
-            remoteAvatar.SendPacketToViewer(objupdate);
-        }
-        public ObjectUpdatePacket CreateUpdatePacket()
-        {
-            System.Text.Encoding _enc = System.Text.Encoding.ASCII;
-            //send a objectupdate packet with information about the clients avatar
-            ObjectUpdatePacket objupdate = new ObjectUpdatePacket();
-            objupdate.RegionData.RegionHandle = m_world.m_regInfo.RegionHandle;
-            objupdate.RegionData.TimeDilation = 64096;
-            objupdate.ObjectData = new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock[1];
-            objupdate.ObjectData[0] = AvatarTemplate;
-            //give this avatar object a local id and assign the user a name
-            objupdate.ObjectData[0].ID = this.localid;
-            objupdate.ObjectData[0].FullID = ControllingClient.AgentID;
-            objupdate.ObjectData[0].NameValue = _enc.GetBytes("FirstName STRING RW SV " + firstname + "\nLastName STRING RW SV " + lastname + " \0");
-            libsecondlife.LLVector3 pos2 = new LLVector3((float)this._physActor.Position.X, (float)this._physActor.Position.Y, (float)this._physActor.Position.Z);
-            byte[] pb = pos2.GetBytes();
-            Array.Copy(pb, 0, objupdate.ObjectData[0].ObjectData, 16, pb.Length);
-            return objupdate;
-        }
-        public void SendInitialPosition()
-        {
-            System.Text.Encoding _enc = System.Text.Encoding.ASCII;
-            //send a objectupdate packet with information about the clients avatar
-            ObjectUpdatePacket objupdate = new ObjectUpdatePacket();
-            objupdate.RegionData.RegionHandle = m_world.m_regInfo.RegionHandle;
-            objupdate.RegionData.TimeDilation = 64096;
-            objupdate.ObjectData = new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock[1];
-            objupdate.ObjectData[0] = AvatarTemplate;
-            //give this avatar object a local id and assign the user a name
-            objupdate.ObjectData[0].ID = this.localid;
-            this.uuid = objupdate.ObjectData[0].FullID = ControllingClient.AgentID;
-            objupdate.ObjectData[0].NameValue = _enc.GetBytes("FirstName STRING RW SV " + firstname + "\nLastName STRING RW SV " + lastname + " \0");
-            libsecondlife.LLVector3 pos2 = new LLVector3((float)this.Pos.X, (float)this.Pos.Y, (float)this.Pos.Z);
-            byte[] pb = pos2.GetBytes();
-            Array.Copy(pb, 0, objupdate.ObjectData[0].ObjectData, 16, pb.Length);
-            m_world._localNumber++;
-            List<Avatar> avList = this.m_world.RequestAvatarList();
-            foreach (Avatar client in avList)
-            {
-                client.SendPacketToViewer(objupdate);
-                if (client.ControllingClient.AgentID != this.ControllingClient.AgentID)
-                {
-                    SendAppearanceToOtherAgent(client);
-                }
-            }
-        }
-        public void SendOurAppearance()
-        {
-            ControllingClient.SendAppearance(this.Wearables);
-        }
-        public void SendOurAppearance(ClientView OurClient)
-        {
-            //event handler for wearables request
-            this.SendOurAppearance();
-        }
-        public void SendAppearanceToOtherAgent(Avatar avatarInfo)
-        {
-            AvatarAppearancePacket avp = new AvatarAppearancePacket();
-            avp.VisualParam = new AvatarAppearancePacket.VisualParamBlock[218];
-            avp.ObjectData.TextureEntry = this.avatarAppearanceTexture.ToBytes();
-            AvatarAppearancePacket.VisualParamBlock avblock = null;
-            for (int i = 0; i < 218; i++)
-            {
-                avblock = new AvatarAppearancePacket.VisualParamBlock();
-                avblock.ParamValue = visualParams[i];
-                avp.VisualParam[i] = avblock;
-            }
-            avp.Sender.IsTrial = false;
-            avp.Sender.ID = ControllingClient.AgentID;
-            avatarInfo.SendPacketToViewer(avp);
-        }
-        public void SetAppearance(byte[] texture, AgentSetAppearancePacket.VisualParamBlock[] visualParam)
-        {
-            LLObject.TextureEntry tex = new LLObject.TextureEntry(texture, 0, texture.Length);
-            this.avatarAppearanceTexture = tex;
-            for (int i = 0; i < visualParam.Length; i++)
-            {
-                this.visualParams[i] = visualParam[i].ParamValue;
-            }
-            List<Avatar> avList = this.m_world.RequestAvatarList();
-            foreach (Avatar client in avList)
-            {
-                if (client.ControllingClient.AgentID != this.ControllingClient.AgentID)
-                {
-                    SendAppearanceToOtherAgent(client);
-                }
-            }
-        }
-        public ImprovedTerseObjectUpdatePacket.ObjectDataBlock CreateTerseBlock()
-        {
-            byte[] bytes = new byte[60];
-            int i = 0;
-            ImprovedTerseObjectUpdatePacket.ObjectDataBlock dat = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock();
-            dat.TextureEntry = new byte[0];// AvatarTemplate.TextureEntry;
-            libsecondlife.LLVector3 pos2 = new LLVector3(0, 0, 0);
-            lock (m_world.LockPhysicsEngine)
-            {
-                pos2 = new LLVector3(this._physActor.Position.X, this._physActor.Position.Y, this._physActor.Position.Z);
-            }
-            uint ID = this.localid;
-            bytes[i++] = (byte)(ID % 256);
-            bytes[i++] = (byte)((ID >> 8) % 256);
-            bytes[i++] = (byte)((ID >> 16) % 256);
-            bytes[i++] = (byte)((ID >> 24) % 256);
-            bytes[i++] = 0;
-            bytes[i++] = 1;
-            i += 14;
-            bytes[i++] = 128;
-            bytes[i++] = 63;
-            byte[] pb = pos2.GetBytes();
-            Array.Copy(pb, 0, bytes, i, pb.Length);
-            i += 12;
-            ushort InternVelocityX;
-            ushort InternVelocityY;
-            ushort InternVelocityZ;
-            Axiom.MathLib.Vector3 internDirec = new Axiom.MathLib.Vector3(0, 0, 0);
-            lock (m_world.LockPhysicsEngine)
-            {
-                internDirec = new Axiom.MathLib.Vector3(this._physActor.Velocity.X, this._physActor.Velocity.Y, this._physActor.Velocity.Z);
-            }
-            internDirec = internDirec / 128.0f;
-            internDirec.x += 1;
-            internDirec.y += 1;
-            internDirec.z += 1;
-            InternVelocityX = (ushort)(32768 * internDirec.x);
-            InternVelocityY = (ushort)(32768 * internDirec.y);
-            InternVelocityZ = (ushort)(32768 * internDirec.z);
-            ushort ac = 32767;
-            bytes[i++] = (byte)(InternVelocityX % 256);
-            bytes[i++] = (byte)((InternVelocityX >> 8) % 256);
-            bytes[i++] = (byte)(InternVelocityY % 256);
-            bytes[i++] = (byte)((InternVelocityY >> 8) % 256);
-            bytes[i++] = (byte)(InternVelocityZ % 256);
-            bytes[i++] = (byte)((InternVelocityZ >> 8) % 256);
-            //accel
-            bytes[i++] = (byte)(ac % 256);
-            bytes[i++] = (byte)((ac >> 8) % 256);
-            bytes[i++] = (byte)(ac % 256);
-            bytes[i++] = (byte)((ac >> 8) % 256);
-            bytes[i++] = (byte)(ac % 256);
-            bytes[i++] = (byte)((ac >> 8) % 256);
-            //rot
-            bytes[i++] = (byte)(ac % 256);
-            bytes[i++] = (byte)((ac >> 8) % 256);
-            bytes[i++] = (byte)(ac % 256);
-            bytes[i++] = (byte)((ac >> 8) % 256);
-            bytes[i++] = (byte)(ac % 256);
-            bytes[i++] = (byte)((ac >> 8) % 256);
-            bytes[i++] = (byte)(ac % 256);
-            bytes[i++] = (byte)((ac >> 8) % 256);
-            //rotation vel
-            bytes[i++] = (byte)(ac % 256);
-            bytes[i++] = (byte)((ac >> 8) % 256);
-            bytes[i++] = (byte)(ac % 256);
-            bytes[i++] = (byte)((ac >> 8) % 256);
-            bytes[i++] = (byte)(ac % 256);
-            bytes[i++] = (byte)((ac >> 8) % 256);
-            dat.Data = bytes;
-            return (dat);
-        }
-        // Sends animation update
-        public void SendAnimPack(LLUUID animID, int seq)
-        {
-            AvatarAnimationPacket ani = new AvatarAnimationPacket();
-            ani.AnimationSourceList = new AvatarAnimationPacket.AnimationSourceListBlock[1];
-            ani.AnimationSourceList[0] = new AvatarAnimationPacket.AnimationSourceListBlock();
-            ani.AnimationSourceList[0].ObjectID = ControllingClient.AgentID;
-            ani.Sender = new AvatarAnimationPacket.SenderBlock();
-            ani.Sender.ID = ControllingClient.AgentID;
-            ani.AnimationList = new AvatarAnimationPacket.AnimationListBlock[1];
-            ani.AnimationList[0] = new AvatarAnimationPacket.AnimationListBlock();
-            ani.AnimationList[0].AnimID = this.current_anim = animID;
-            ani.AnimationList[0].AnimSequenceID = this.anim_seq = seq;
-            List<Avatar> avList = this.m_world.RequestAvatarList();
-            foreach (Avatar client in avList)
-            {
-                client.SendPacketToViewer(ani);
-            }
-          
-        }
-        public void SendAnimPack()
-        {
-            this.SendAnimPack(this.current_anim, this.anim_seq);
-        }
-    }
-}
diff --git a/OpenSim/OpenSim.RegionServer/Simulator/Avatar.cs b/OpenSim/OpenSim.RegionServer/Simulator/Avatar.cs
deleted file mode 100644
index a64ee9e..0000000
--- a/OpenSim/OpenSim.RegionServer/Simulator/Avatar.cs
+++ /dev/null
@@ -1,435 +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 System.Text;
-using libsecondlife;
-using libsecondlife.Packets;
-using OpenSim.Physics.Manager;
-using OpenSim.Framework.Inventory;
-using OpenSim.Framework.Interfaces;
-using OpenSim.RegionServer.Client;
-using Axiom.MathLib;
-namespace OpenSim.RegionServer.Simulator
-{
-    public partial class Avatar : Entity
-    {
-        public static bool PhysicsEngineFlying = false;
-        public static AvatarAnimations Animations;
-        public string firstname;
-        public string lastname;
-        public ClientView ControllingClient;
-        public LLUUID current_anim;
-        public int anim_seq;
-        private static libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock AvatarTemplate;
-        private bool updateflag = false;
-        private byte movementflag = 0;
-        private List<NewForce> forcesList = new List<NewForce>();
-        private short _updateCount = 0;
-        private Axiom.MathLib.Quaternion bodyRot;
-        private LLObject.TextureEntry avatarAppearanceTexture = null;
-        private byte[] visualParams;
-        private AvatarWearable[] Wearables;
-        private LLVector3 positionLastFrame = new LLVector3(0, 0, 0);
-        private LLVector3 positionFrameBeforeLast = new LLVector3(0, 0, 0);
-        private int positionRoundedX = 0;
-        private int positionRoundedY = 0;
-        private int positionParcelHoverLocalID = -1; //Local ID of the last parcel they were over
-        private int parcelUpdateSequenceIncrement = 1;
-        private bool childAvatar = false;
-        public Avatar(ClientView TheClient, World world)
-        {
-            m_world = world;
-            ControllingClient = TheClient;
-            OpenSim.Framework.Console.MainConsole.Instance.Verbose("Avatar.cs - Loading details from grid (DUMMY)");
-            localid = 8880000 + (this.m_world._localNumber++);
-            Pos = ControllingClient.startpos;
-            visualParams = new byte[218];
-            for (int i = 0; i < 218; i++)
-            {
-                visualParams[i] = 100;
-            }
-            Wearables = new AvatarWearable[13]; //should be 13 of these
-            for (int i = 0; i < 13; i++)
-            {
-                Wearables[i] = new AvatarWearable();
-            }
-            this.Wearables[0].AssetID = new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73");
-            this.Wearables[0].ItemID = LLUUID.Random();
-            this.avatarAppearanceTexture = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005"));
-            //register for events
-            ControllingClient.OnRequestWearables += new ClientView.GenericCall(this.SendOurAppearance);
-            ControllingClient.OnSetAppearance += new SetAppearance(this.SetAppearance);
-            ControllingClient.OnCompleteMovementToRegion += new ClientView.GenericCall2(this.CompleteMovement);
-            ControllingClient.OnCompleteMovementToRegion += new ClientView.GenericCall2(this.SendInitialPosition);
-            ControllingClient.OnAgentUpdate += new ClientView.GenericCall3(this.HandleAgentUpdate);
-            ControllingClient.OnStartAnim += new StartAnim(this.SendAnimPack);
-            ControllingClient.OnChildAgentStatus += new ClientView.StatusChange(this.ChildStatusChange);
-        }
-        public PhysicsActor PhysActor
-        {
-            set
-            {
-                this._physActor = value;
-            }
-            get
-            {
-                return _physActor;
-            }
-        }
-        public void ChildStatusChange(bool status)
-        {
-            this.childAvatar = status;
-            if (this.childAvatar == true)
-            {
-                this._physActor.Velocity = new PhysicsVector(0, 0, 0);
-                ImprovedTerseObjectUpdatePacket.ObjectDataBlock terseBlock = CreateTerseBlock();
-                ImprovedTerseObjectUpdatePacket terse = new ImprovedTerseObjectUpdatePacket();
-                terse.RegionData.RegionHandle = m_world.m_regInfo.RegionHandle;
-                terse.RegionData.TimeDilation = 64096;
-                terse.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[1];
-                terse.ObjectData[0] = terseBlock;
-                List<Avatar> avList = this.m_world.RequestAvatarList();
-                foreach (Avatar client in avList)
-                {
-                    client.SendPacketToViewer(terse);
-                }
-            }
-            else
-            {
-                LLVector3 startp = ControllingClient.StartPos;
-                lock (m_world.LockPhysicsEngine)
-                {
-                    this._physActor.Position = new PhysicsVector(startp.X, startp.Y, startp.Z);
-                }
-            }
-        }
-        public override void addForces()
-        {
-            lock (this.forcesList)
-            {
-                if (this.forcesList.Count > 0)
-                {
-                    for (int i = 0; i < this.forcesList.Count; i++)
-                    {
-                        NewForce force = this.forcesList[i];
-                        PhysicsVector phyVector = new PhysicsVector(force.X, force.Y, force.Z);
-                        lock (m_world.LockPhysicsEngine)
-                        {
-                            this._physActor.Velocity = phyVector;
-                        }
-                        this.updateflag = true;
-                        this.velocity = new LLVector3(force.X, force.Y, force.Z); //shouldn't really be doing this
-                        // but as we are setting the velocity (rather than using real forces) at the moment it is okay.
-                    }
-                    for (int i = 0; i < this.forcesList.Count; i++)
-                    {
-                        this.forcesList.RemoveAt(0);
-                    }
-                }
-            }
-        }
-        public static void SetupTemplate(string name)
-        {
-            FileInfo fInfo = new FileInfo(name);
-            long numBytes = fInfo.Length;
-            FileStream fStream = new FileStream(name, FileMode.Open, FileAccess.Read);
-            BinaryReader br = new BinaryReader(fStream);
-            byte[] data1 = br.ReadBytes((int)numBytes);
-            br.Close();
-            fStream.Close();
-           
-            libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock objdata = new ObjectUpdatePacket.ObjectDataBlock(); //  new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock(data1, ref i);
-            SetDefaultPacketValues(objdata);
-            objdata.TextureEntry = data1;
-            objdata.UpdateFlags = 61 + (9 << 8) + (130 << 16) + (16 << 24);
-            objdata.PathCurve = 16;
-            objdata.ProfileCurve = 1;
-            objdata.PathScaleX = 100;
-            objdata.PathScaleY = 100;
-            objdata.ParentID = 0;
-            objdata.OwnerID = LLUUID.Zero;
-            objdata.Scale = new LLVector3(1, 1, 1);
-            objdata.PCode = 47;
-            System.Text.Encoding enc = System.Text.Encoding.ASCII;
-            libsecondlife.LLVector3 pos = new LLVector3(objdata.ObjectData, 16);
-            pos.X = 100f;
-            objdata.ID = 8880000;
-            objdata.NameValue = enc.GetBytes("FirstName STRING RW SV Test \nLastName STRING RW SV User \0");
-            libsecondlife.LLVector3 pos2 = new LLVector3(100f, 100f, 23f);
-            //objdata.FullID=user.AgentID;
-            byte[] pb = pos.GetBytes();
-            Array.Copy(pb, 0, objdata.ObjectData, 16, pb.Length);
-            Avatar.AvatarTemplate = objdata;
-        }
-        protected static void SetDefaultPacketValues(ObjectUpdatePacket.ObjectDataBlock objdata)
-        {
-            objdata.PSBlock = new byte[0];
-            objdata.ExtraParams = new byte[1];
-            objdata.MediaURL = new byte[0];
-            objdata.NameValue = new byte[0];
-            objdata.Text = new byte[0];
-            objdata.TextColor = new byte[4];
-            objdata.JointAxisOrAnchor = new LLVector3(0, 0, 0);
-            objdata.JointPivot = new LLVector3(0, 0, 0);
-            objdata.Material = 4;
-            objdata.TextureAnim = new byte[0];
-            objdata.Sound = LLUUID.Zero;
-            LLObject.TextureEntry ntex = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005"));
-            objdata.TextureEntry = ntex.ToBytes();
-            objdata.State = 0;
-            objdata.Data = new byte[0];
-            objdata.ObjectData = new byte[76];
-            objdata.ObjectData[15] = 128;
-            objdata.ObjectData[16] = 63;
-            objdata.ObjectData[56] = 128;
-            objdata.ObjectData[61] = 102;
-            objdata.ObjectData[62] = 40;
-            objdata.ObjectData[63] = 61;
-            objdata.ObjectData[64] = 189;
-        }
-        public void CompleteMovement()
-        {
-            OpenSim.Framework.Console.MainConsole.Instance.Verbose("Avatar.cs:CompleteMovement() - Constructing AgentMovementComplete packet");
-            AgentMovementCompletePacket mov = new AgentMovementCompletePacket();
-            mov.AgentData.SessionID = this.ControllingClient.SessionID;
-            mov.AgentData.AgentID = this.ControllingClient.AgentID;
-            mov.Data.RegionHandle = this.m_world.m_regInfo.RegionHandle;
-            // TODO - dynamicalise this stuff
-            mov.Data.Timestamp = 1172750370;
-            mov.Data.Position = this.ControllingClient.startpos;
-            mov.Data.LookAt = new LLVector3(0.99f, 0.042f, 0);
-            ControllingClient.OutPacket(mov);
-        }
-        public void HandleAgentUpdate(Packet pack)
-        {
-            this.HandleUpdate((AgentUpdatePacket)pack);
-        }
-        public void HandleUpdate(AgentUpdatePacket pack)
-        {
-            if (((uint)pack.AgentData.ControlFlags & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_FLY) != 0)
-            {
-                if (this._physActor.Flying == false)
-                {
-                    this.current_anim = Animations.AnimsLLUUID["FLY"];
-                    this.anim_seq = 1;
-                    this.SendAnimPack();
-                }
-                this._physActor.Flying = true;
-            }
-            else
-            {
-                if (this._physActor.Flying == true)
-                {
-                    this.current_anim = Animations.AnimsLLUUID["STAND"];
-                    this.anim_seq = 1;
-                    this.SendAnimPack();
-                }
-                this._physActor.Flying = false;
-            }
-            if (((uint)pack.AgentData.ControlFlags & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_AT_POS) != 0)
-            {
-                Axiom.MathLib.Quaternion q = new Axiom.MathLib.Quaternion(pack.AgentData.BodyRotation.W, pack.AgentData.BodyRotation.X, pack.AgentData.BodyRotation.Y, pack.AgentData.BodyRotation.Z);
-                if (((movementflag & 1) == 0) || (q != this.bodyRot))
-                {
-                    if (((movementflag & 1) == 0) && (!this._physActor.Flying))
-                    {
-                        this.current_anim = Animations.AnimsLLUUID["WALK"];
-                        this.anim_seq = 1;
-                        this.SendAnimPack();
-                    }
-                    //we should add a new force to the list
-                    // but for now we will deal with velocities
-                    NewForce newVelocity = new NewForce();
-                    Axiom.MathLib.Vector3 v3 = new Axiom.MathLib.Vector3(1, 0, 0);
-                    Axiom.MathLib.Vector3 direc = q * v3;
-                    direc.Normalize();
-                    //work out velocity for sim physics system
-                    direc = direc * ((0.03f) * 128f);
-                    if (this._physActor.Flying)
-                        direc *= 4;
-                    newVelocity.X = direc.x;
-                    newVelocity.Y = direc.y;
-                    newVelocity.Z = direc.z;
-                    this.forcesList.Add(newVelocity);
-                    movementflag = 1;
-                    this.bodyRot = q;
-                }
-            }
-            else if ((((uint)pack.AgentData.ControlFlags & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_UP_POS) != 0) && (PhysicsEngineFlying))
-            {
-                if (((movementflag & 2) == 0) && this._physActor.Flying)
-                {
-                    //we should add a new force to the list
-                    // but for now we will deal with velocities
-                    NewForce newVelocity = new NewForce();
-                    Axiom.MathLib.Vector3 v3 = new Axiom.MathLib.Vector3(0, 0, 1);
-                    Axiom.MathLib.Vector3 direc = v3;
-                    direc.Normalize();
-                    //work out velocity for sim physics system
-                    direc = direc * ((0.03f) * 128f * 2);
-                    newVelocity.X = direc.x;
-                    newVelocity.Y = direc.y;
-                    newVelocity.Z = direc.z;
-                    this.forcesList.Add(newVelocity);
-                    movementflag = 2;
-                }
-            }
-            else if ((((uint)pack.AgentData.ControlFlags & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_UP_NEG) != 0) && (PhysicsEngineFlying))
-            {
-                if (((movementflag & 4) == 0) && this._physActor.Flying)
-                {
-                    //we should add a new force to the list
-                    // but for now we will deal with velocities
-                    NewForce newVelocity = new NewForce();
-                    Axiom.MathLib.Vector3 v3 = new Axiom.MathLib.Vector3(0, 0, -1);
-                    //Axiom.MathLib.Quaternion q = new Axiom.MathLib.Quaternion(pack.AgentData.BodyRotation.W, pack.AgentData.BodyRotation.X, pack.AgentData.BodyRotation.Y, pack.AgentData.BodyRotation.Z);
-                    Axiom.MathLib.Vector3 direc = v3;
-                    direc.Normalize();
-                    //work out velocity for sim physics system
-                    direc = direc * ((0.03f) * 128f * 2);
-                    newVelocity.X = direc.x;
-                    newVelocity.Y = direc.y;
-                    newVelocity.Z = direc.z;
-                    this.forcesList.Add(newVelocity);
-                    movementflag = 4;
-                }
-            }
-            else if (((uint)pack.AgentData.ControlFlags & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_AT_NEG) != 0)
-            {
-                Axiom.MathLib.Quaternion q = new Axiom.MathLib.Quaternion(pack.AgentData.BodyRotation.W, pack.AgentData.BodyRotation.X, pack.AgentData.BodyRotation.Y, pack.AgentData.BodyRotation.Z);
-                if (((movementflag & 8) == 0) || (q != this.bodyRot))
-                {
-                    //we should add a new force to the list
-                    // but for now we will deal with velocities
-                    NewForce newVelocity = new NewForce();
-                    Axiom.MathLib.Vector3 v3 = new Axiom.MathLib.Vector3(-1, 0, 0);
-                    Axiom.MathLib.Vector3 direc = q * v3;
-                    direc.Normalize();
-                    //work out velocity for sim physics system
-                    direc = direc * ((0.03f) * 128f);
-                    if (this._physActor.Flying)
-                        direc *= 2;
-                    newVelocity.X = direc.x;
-                    newVelocity.Y = direc.y;
-                    newVelocity.Z = direc.z;
-                    this.forcesList.Add(newVelocity);
-                    movementflag = 8;
-                    this.bodyRot = q;
-                }
-            }
-            else
-            {
-                if (movementflag == 16)
-                {
-                    movementflag = 0;
-                }
-                if ((movementflag) != 0)
-                {
-                    NewForce newVelocity = new NewForce();
-                    newVelocity.X = 0;
-                    newVelocity.Y = 0;
-                    newVelocity.Z = 0;
-                    this.forcesList.Add(newVelocity);
-                    movementflag = 0;
-                    // We're standing still, so make it show!
-                    if (this._physActor.Flying == false)
-                    {
-                        this.current_anim = Animations.AnimsLLUUID["STAND"];
-                        this.anim_seq = 1;
-                        this.SendAnimPack();
-                    }
-                    this.movementflag = 16;
-                }
-            }
-        }
-        
-        public static void LoadAnims()
-        {
-            Avatar.Animations = new AvatarAnimations();
-            Avatar.Animations.LoadAnims();
-        }
-        public override void LandRenegerated()
-        {
-            Pos = new LLVector3(100.0f, 100.0f, m_world.Terrain[(int)Pos.X, (int)Pos.Y] + 50.0f);
-        }
-    }
-    public class NewForce
-    {
-        public float X;
-        public float Y;
-        public float Z;
-        public NewForce()
-        {
-        }
-    }
-}
diff --git a/OpenSim/OpenSim.RegionServer/Simulator/AvatarAnimations.cs b/OpenSim/OpenSim.RegionServer/Simulator/AvatarAnimations.cs
deleted file mode 100644
index c7557dc..0000000
--- a/OpenSim/OpenSim.RegionServer/Simulator/AvatarAnimations.cs
+++ /dev/null
@@ -1,73 +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 System.Xml;
-namespace OpenSim.RegionServer.Simulator
-{
-    public class AvatarAnimations
-    {
-        public Dictionary<string, LLUUID> AnimsLLUUID = new Dictionary<string, LLUUID>();
-        public Dictionary<LLUUID, string> AnimsNames = new Dictionary<LLUUID, string>();
-        
-        public AvatarAnimations()
-        {
-        }
-        public void LoadAnims()
-        {
-            OpenSim.Framework.Console.MainConsole.Instance.Verbose("Avatar.cs:LoadAnims() - Loading avatar animations");
-            XmlTextReader reader = new XmlTextReader("data/avataranimations.xml");
-           
-            XmlDocument doc = new XmlDocument();
-            doc.Load(reader);
-            foreach (XmlNode nod in doc.DocumentElement.ChildNodes)
-            {
-               
-                if ( nod.Attributes["name"] != null)
-                {
-                    AnimsLLUUID.Add(nod.Attributes["name"].Value, nod.InnerText);
-                }
-                
-            }
-            reader.Close();
-            OpenSim.Framework.Console.MainConsole.Instance.Verbose("Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)");
-            foreach (KeyValuePair<string, LLUUID> kp in OpenSim.RegionServer.Simulator.Avatar.Animations.AnimsLLUUID)
-            {
-                AnimsNames.Add(kp.Value, kp.Key);
-            }
-        }
-    }
-}
diff --git a/OpenSim/OpenSim.RegionServer/Simulator/Entity.cs b/OpenSim/OpenSim.RegionServer/Simulator/Entity.cs
deleted file mode 100644
index 6d25c81..0000000
--- a/OpenSim/OpenSim.RegionServer/Simulator/Entity.cs
+++ /dev/null
@@ -1,151 +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 Axiom.MathLib;
-using OpenSim.Physics.Manager;
-using OpenSim.RegionServer.Types;
-using libsecondlife;
-using OpenSim.RegionServer.Scripting;
-namespace OpenSim.RegionServer.Simulator
-{
-    public abstract class Entity : IScriptReadonlyEntity
-    {
-        public libsecondlife.LLUUID uuid;
-        public uint localid;
-        public LLVector3 velocity;
-        public Quaternion rotation;
-        protected List<Entity> children;
-        protected string m_name;
-        public virtual string Name
-        {
-            get { return m_name; }
-        }
-        protected LLVector3 m_pos;
-        protected PhysicsActor _physActor;
-        protected World m_world;
-        public virtual LLVector3 Pos
-        {
-            get
-            {
-                if (this._physActor != null)
-                {
-                    m_pos.X = _physActor.Position.X;
-                    m_pos.Y = _physActor.Position.Y;
-                    m_pos.Z = _physActor.Position.Z;
-                }
-                return m_pos;
-            }
-            set
-            {
-                if (this._physActor != null)
-                {
-                    try
-                    {
-                        lock (this.m_world.LockPhysicsEngine)
-                        {
-                            this._physActor.Position = new PhysicsVector(value.X, value.Y, value.Z);
-                        }
-                    }
-                    catch (Exception e)
-                    {
-                        Console.WriteLine(e.Message);
-                    }
-                }
-                m_pos = value;
-            }
-        }
-        /// <summary>
-        /// Creates a new Entity (should not occur on it's own)
-        /// </summary>
-        public Entity()
-        {
-            uuid = new libsecondlife.LLUUID();
-            localid = 0;
-            m_pos = new LLVector3();
-            velocity = new LLVector3();
-            rotation = new Quaternion();
-            m_name = "(basic entity)";
-            children = new List<Entity>();
-        }
-        public virtual void addForces()
-        {
-                foreach (Entity child in children)
-            {
-                child.addForces();
-            }
-        }
-        /// <summary>
-        /// Performs any updates that need to be done at each frame. This function is overridable from it's children.
-        /// </summary>
-        public virtual void update() {
-            // Do any per-frame updates needed that are applicable to every type of entity
-            foreach (Entity child in children)
-            {
-                child.update();
-            }
-        }
-        /// <summary>
-        /// Returns a mesh for this object and any dependents
-        /// </summary>
-        /// <returns>The mesh of this entity tree</returns>
-        public virtual Mesh getMesh()
-        {
-            Mesh mesh = new Mesh();
-            foreach (Entity child in children)
-            {
-                mesh += child.getMesh();
-            }
-            return mesh;
-        }
-        
-        public virtual void BackUp()
-        {
-                
-        }
-        public virtual void LandRenegerated()
-        {
-        }
-    }
-}
diff --git a/OpenSim/OpenSim.RegionServer/Simulator/ParcelManager.cs b/OpenSim/OpenSim.RegionServer/Simulator/ParcelManager.cs
deleted file mode 100644
index 21b783f..0000000
--- a/OpenSim/OpenSim.RegionServer/Simulator/ParcelManager.cs
+++ /dev/null
@@ -1,837 +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.RegionServer.Simulator;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-using OpenSim.RegionServer.Client;
-namespace OpenSim.RegionServer.Simulator
-{
-    public delegate void ParcelPropertiesRequest(int start_x, int start_y, int end_x, int end_y, int sequence_id, bool snap_selection, ClientView remote_client);
-    public delegate void ParcelDivideRequest(int west, int south, int east, int north, ClientView remote_client);
-    public delegate void ParcelJoinRequest(int west, int south, int east, int north, ClientView remote_client);
-    public delegate void ParcelPropertiesUpdateRequest(ParcelPropertiesUpdatePacket packet, ClientView remote_client);
-    #region ParcelManager Class
-    /// <summary>
-    /// Handles Parcel objects and operations requiring information from other Parcel objects (divide, join, etc)
-    /// </summary>
-    public class ParcelManager : OpenSim.Framework.Interfaces.ILocalStorageParcelReceiver
-    {
-        #region Constants
-        //Parcel types set with flags in ParcelOverlay.
-        //Only one of these can be used. 
-        public const byte PARCEL_TYPE_PUBLIC = (byte)0;      //Equals 00000000
-        public const byte PARCEL_TYPE_OWNED_BY_OTHER = (byte)1;      //Equals 00000001
-        public const byte PARCEL_TYPE_OWNED_BY_GROUP = (byte)2;      //Equals 00000010
-        public const byte PARCEL_TYPE_OWNED_BY_REQUESTER = (byte)3;      //Equals 00000011
-        public const byte PARCEL_TYPE_IS_FOR_SALE = (byte)4;      //Equals 00000100
-        public const byte PARCEL_TYPE_IS_BEING_AUCTIONED = (byte)5;      //Equals 00000101
-        //Flags that when set, a border on the given side will be placed
-        //NOTE: North and East is assumable by the west and south sides (if parcel to east has a west border, then I have an east border; etc)
-        //This took forever to figure out -- jeesh. /blame LL for even having to send these
-        public const byte PARCEL_FLAG_PROPERTY_BORDER_WEST = (byte)64;     //Equals 01000000
-        public const byte PARCEL_FLAG_PROPERTY_BORDER_SOUTH = (byte)128;    //Equals 10000000
-        //RequestResults (I think these are right, they seem to work):
-        public const int PARCEL_RESULT_ONE_PARCEL       = 0;    // The request they made contained only one parcel
-        public const int PARCEL_RESULT_MULTIPLE_PARCELS = 1;    // The request they made contained more than one parcel
-        //These are other constants. Yay!
-        public const int START_PARCEL_LOCAL_ID = 1;
-        #endregion
-        #region Member Variables
-        public Dictionary<int, Parcel> parcelList = new Dictionary<int, Parcel>();
-        private int lastParcelLocalID = START_PARCEL_LOCAL_ID - 1;
-        private int[,] parcelIDList = new int[64, 64];
-        private static World m_world;
-        #endregion
-        #region Constructors
-        public ParcelManager(World world)
-        {
-            m_world = world;
-            parcelIDList.Initialize();
-        }
-        #endregion
-        #region Member Functions
-        #region Parcel From Storage Functions
-        public void ParcelFromStorage(ParcelData data)
-        {
-            Parcel new_parcel = new Parcel(data.ownerID, data.isGroupOwned, m_world);
-            new_parcel.parcelData = data.Copy();
-            new_parcel.setParcelBitmapFromByteArray();
-            addParcel(new_parcel);
-        }
-        public void NoParcelDataFromStorage()
-        {
-            resetSimParcels();
-        }
-        #endregion
-        #region Parcel Add/Remove/Get/Create
-        /// <summary>
-        /// Creates a basic Parcel object without an owner (a zeroed key)
-        /// </summary>
-        /// <returns></returns>
-        public Parcel createBaseParcel()
-        {
-            return new Parcel(new LLUUID(), false, m_world);
-        }
-        /// <summary>
-        /// Adds a parcel to the stored list and adds them to the parcelIDList to what they own
-        /// </summary>
-        /// <param name="new_parcel">The parcel being added</param>
-        public void addParcel(Parcel new_parcel)
-        {
-            lastParcelLocalID++;
-            new_parcel.parcelData.localID = lastParcelLocalID;
-            parcelList.Add(lastParcelLocalID, new_parcel.Copy());
-            bool[,] parcelBitmap = new_parcel.getParcelBitmap();
-            int x, y;
-            for (x = 0; x < 64; x++)
-            {
-                for (y = 0; y < 64; y++)
-                {
-                    if (parcelBitmap[x, y])
-                    {
-                        parcelIDList[x, y] = lastParcelLocalID;
-                    }
-                }
-            }
-            parcelList[lastParcelLocalID].forceUpdateParcelInfo();
-            
-        }
-        /// <summary>
-        /// Removes a parcel from the list. Will not remove if local_id is still owning an area in parcelIDList
-        /// </summary>
-        /// <param name="local_id">Parcel.localID of the parcel to remove.</param>
-        public void removeParcel(int local_id)
-        {
-            int x, y;
-            for (x = 0; x < 64; x++)
-            {
-                for (y = 0; y < 64; y++)
-                {
-                    if (parcelIDList[x, y] == local_id)
-                    {
-                        throw new Exception("Could not remove parcel. Still being used at " + x + ", " + y);
-                    }
-                }
-            }
-            m_world.localStorage.RemoveParcel(parcelList[local_id].parcelData);
-            parcelList.Remove(local_id);
-        }
-        public void performFinalParcelJoin(Parcel master, Parcel slave)
-        {
-            int x, y;
-            bool[,] parcelBitmapSlave = slave.getParcelBitmap();
-            for (x = 0; x < 64; x++)
-            {
-                for (y = 0; y < 64; y++)
-                {
-                    if (parcelBitmapSlave[x, y])
-                    {
-                        parcelIDList[x, y] = master.parcelData.localID;
-                    }
-                }
-            }
-            removeParcel(slave.parcelData.localID);
-        }
-        /// <summary>
-        /// Get the parcel at the specified point
-        /// </summary>
-        /// <param name="x">Value between 0 - 256 on the x axis of the point</param>
-        /// <param name="y">Value between 0 - 256 on the y axis of the point</param>
-        /// <returns>Parcel at the point supplied</returns>
-        public Parcel getParcel(int x, int y)
-        {
-            if (x > 256 || y > 256 || x < 0 || y < 0)
-            {
-                throw new Exception("Error: Parcel not found at point " + x + ", " + y);
-            }
-            else
-            {
-                return parcelList[parcelIDList[x / 4, y / 4]];
-            }
-        }
-        #endregion
-        #region Parcel Modification
-        /// <summary>
-        /// Subdivides a parcel
-        /// </summary>
-        /// <param name="start_x">West Point</param>
-        /// <param name="start_y">South Point</param>
-        /// <param name="end_x">East Point</param>
-        /// <param name="end_y">North Point</param>
-        /// <param name="attempting_user_id">LLUUID of user who is trying to subdivide</param>
-        /// <returns>Returns true if successful</returns>
-        public bool subdivide(int start_x, int start_y, int end_x, int end_y, LLUUID attempting_user_id)
-        {
-            //First, lets loop through the points and make sure they are all in the same parcel
-            //Get the parcel at start
-            Parcel startParcel = getParcel(start_x, start_y);
-            if (startParcel == null) return false; //No such parcel at the beginning
-            //Loop through the points
-            try
-            {
-                int totalX = end_x - start_x;
-                int totalY = end_y - start_y;
-                int x, y;
-                for (y = 0; y < totalY; y++)
-                {
-                    for (x = 0; x < totalX; x++)
-                    {
-                        Parcel tempParcel = getParcel(start_x + x, start_y + y);
-                        if (tempParcel == null) return false; //No such parcel at that point
-                        if (tempParcel != startParcel) return false; //Subdividing over 2 parcels; no-no
-                    }
-                }
-            }
-            catch
-            {
-                return false; //Exception. For now, lets skip subdivision
-            }
-            //If we are still here, then they are subdividing within one parcel
-            //Check owner
-            if (startParcel.parcelData.ownerID != attempting_user_id)
-            {
-                return false; //They cant do this!
-            }
-            //Lets create a new parcel with bitmap activated at that point (keeping the old parcels info)
-            Parcel newParcel = startParcel.Copy();
-            newParcel.parcelData.parcelName = "Subdivision of " + newParcel.parcelData.parcelName;
-            newParcel.parcelData.globalID = LLUUID.Random();
-            newParcel.setParcelBitmap(Parcel.getSquareParcelBitmap(start_x, start_y, end_x, end_y));
-            //Now, lets set the subdivision area of the original to false
-            int startParcelIndex = startParcel.parcelData.localID;
-            parcelList[startParcelIndex].setParcelBitmap(Parcel.modifyParcelBitmapSquare(startParcel.getParcelBitmap(), start_x, start_y, end_x, end_y, false));
-            parcelList[startParcelIndex].forceUpdateParcelInfo();
-            
-            //Now add the new parcel
-            addParcel(newParcel);
-             
-            return true;
-        }
-        /// <summary>
-        /// Join 2 parcels together
-        /// </summary>
-        /// <param name="start_x">x value in first parcel</param>
-        /// <param name="start_y">y value in first parcel</param>
-        /// <param name="end_x">x value in second parcel</param>
-        /// <param name="end_y">y value in second parcel</param>
-        /// <param name="attempting_user_id">LLUUID of the avatar trying to join the parcels</param>
-        /// <returns>Returns true if successful</returns>
-        public bool join(int start_x, int start_y, int end_x, int end_y, LLUUID attempting_user_id)
-        {
-            end_x -= 4;
-            end_y -= 4;
-            
-            //NOTE: The following only connects the parcels in each corner and not all the parcels that are within the selection box!
-            //This should be fixed later -- somewhat "incomplete code" --Ming
-            Parcel startParcel, endParcel;
-            try
-            {
-                startParcel = getParcel(start_x, start_y);
-                endParcel = getParcel(end_x, end_y);
-            }
-            catch
-            {
-                return false; //Error occured when trying to get the start and end parcels
-            }
-            if (startParcel == endParcel)
-            {
-                return false; //Subdivision of the same parcel is not allowed
-            }
-            //Check the parcel owners:
-            if (startParcel.parcelData.ownerID != endParcel.parcelData.ownerID)
-            {
-                return false;
-            }
-            if (startParcel.parcelData.ownerID != attempting_user_id)
-            {
-                //TODO: Group editing stuff. Avatar owner support for now
-                return false;
-            }
-            //Same owners! Lets join them
-            //Merge them to startParcel
-            parcelList[startParcel.parcelData.localID].setParcelBitmap(Parcel.mergeParcelBitmaps(startParcel.getParcelBitmap(), endParcel.getParcelBitmap()));
-            performFinalParcelJoin(startParcel, endParcel);
-            return true;
-        }
-        #endregion
-        #region Parcel Updating
-        /// <summary>
-        /// Where we send the ParcelOverlay packet to the client
-        /// </summary>
-        /// <param name="remote_client">The object representing the client</param>
-        public void sendParcelOverlay(ClientView remote_client)
-        {
-            const int PARCEL_BLOCKS_PER_PACKET = 1024;
-            int x, y = 0;
-            byte[] byteArray = new byte[PARCEL_BLOCKS_PER_PACKET];
-            int byteArrayCount = 0;
-            int sequenceID = 0;
-            ParcelOverlayPacket packet;
-            for (y = 0; y < 64; y++)
-            {
-                for (x = 0; x < 64; x++)
-                {
-                    byte tempByte = (byte)0; //This represents the byte for the current 4x4
-                    Parcel currentParcelBlock = getParcel(x * 4, y * 4);
-                    if (currentParcelBlock.parcelData.ownerID == remote_client.AgentID)
-                    {
-                        //Owner Flag
-                        tempByte = Convert.ToByte(tempByte | PARCEL_TYPE_OWNED_BY_REQUESTER);
-                    }
-                    else if (currentParcelBlock.parcelData.salePrice > 0 && (currentParcelBlock.parcelData.authBuyerID == LLUUID.Zero || currentParcelBlock.parcelData.authBuyerID == remote_client.AgentID))
-                    {
-                        //Sale Flag
-                        tempByte = Convert.ToByte(tempByte | PARCEL_TYPE_IS_FOR_SALE);
-                    }
-                    else if (currentParcelBlock.parcelData.ownerID == LLUUID.Zero)
-                    {
-                        //Public Flag
-                        tempByte = Convert.ToByte(tempByte | PARCEL_TYPE_PUBLIC);
-                    }
-                    else
-                    {
-                        //Other Flag
-                        tempByte = Convert.ToByte(tempByte | PARCEL_TYPE_OWNED_BY_OTHER);
-                    }
-                    //Now for border control
-                    if (x == 0)
-                    {
-                        tempByte = Convert.ToByte(tempByte | PARCEL_FLAG_PROPERTY_BORDER_WEST);
-                    }
-                    else if (getParcel((x - 1) * 4, y * 4) != currentParcelBlock)
-                    {
-                        tempByte = Convert.ToByte(tempByte | PARCEL_FLAG_PROPERTY_BORDER_WEST);
-                    }
-                    if (y == 0)
-                    {
-                        tempByte = Convert.ToByte(tempByte | PARCEL_FLAG_PROPERTY_BORDER_SOUTH);
-                    }
-                    else if (getParcel(x * 4, (y - 1) * 4) != currentParcelBlock)
-                    {
-                        tempByte = Convert.ToByte(tempByte | PARCEL_FLAG_PROPERTY_BORDER_SOUTH);
-                    }
-                    byteArray[byteArrayCount] = tempByte;
-                    byteArrayCount++;
-                    if (byteArrayCount >= PARCEL_BLOCKS_PER_PACKET)
-                    {
-                        byteArrayCount = 0;
-                        packet = new ParcelOverlayPacket();
-                        packet.ParcelData.Data = byteArray;
-                        packet.ParcelData.SequenceID = sequenceID;
-                        //remote_client.OutPacket((Packet)packet);
-                        sequenceID++;
-                        byteArray = new byte[PARCEL_BLOCKS_PER_PACKET];
-                    }
-                }
-            }
-            packet = new ParcelOverlayPacket();
-            packet.ParcelData.Data = byteArray;
-            packet.ParcelData.SequenceID = sequenceID; //Eh?
-            //remote_client.OutPacket((Packet)packet);
-        }
-        #endregion
-        /// <summary>
-        /// Resets the sim to the default parcel (full sim parcel owned by the default user)
-        /// </summary>
-        public void resetSimParcels()
-        {
-            //Remove all the parcels in the sim and add a blank, full sim parcel set to public
-            parcelList.Clear();
-            lastParcelLocalID = START_PARCEL_LOCAL_ID - 1;
-            parcelIDList.Initialize();
-            Parcel fullSimParcel = new Parcel(LLUUID.Zero, false, m_world);
-            fullSimParcel.setParcelBitmap(Parcel.getSquareParcelBitmap(0, 0, 256, 256));
-            fullSimParcel.parcelData.parcelName = "Your Sim Parcel";
-            fullSimParcel.parcelData.parcelDesc = "";
-            fullSimParcel.parcelData.ownerID = m_world.m_regInfo.MasterAvatarAssignedUUID;
-            fullSimParcel.parcelData.salePrice = 1;
-            fullSimParcel.parcelData.parcelFlags = libsecondlife.Parcel.ParcelFlags.ForSale;
-            fullSimParcel.parcelData.parcelStatus = libsecondlife.Parcel.ParcelStatus.Leased;
-            addParcel(fullSimParcel);
-        }
-        #endregion
-    }
-    #endregion
-    #region Parcel Class
-    /// <summary>
-    /// Keeps track of a specific parcel's information
-    /// </summary>
-    public class Parcel
-    {
-        #region Member Variables
-        public ParcelData parcelData = new ParcelData();
-        public World m_world;
-        private bool[,] parcelBitmap = new bool[64, 64];
-        #endregion
-        #region Constructors
-        public Parcel(LLUUID owner_id, bool is_group_owned, World world)
-        {
-            m_world = world;
-            parcelData.ownerID = owner_id;
-            parcelData.isGroupOwned = is_group_owned;
-        }
-        #endregion
-        #region Member Functions
-        #region General Functions
-        /// <summary>
-        /// Checks to see if this parcel contains a point
-        /// </summary>
-        /// <param name="x"></param>
-        /// <param name="y"></param>
-        /// <returns>Returns true if the parcel contains the specified point</returns>
-        public bool containsPoint(int x, int y)
-        {
-            if (x >= 0 && y >= 0 && x <= 256 && x <= 256)
-            {
-                return (parcelBitmap[x / 4, y / 4] == true);
-            }
-            else
-            {
-                return false;
-            }
-        }
-        public Parcel Copy()
-        {
-            Parcel newParcel = new Parcel(this.parcelData.ownerID, this.parcelData.isGroupOwned, m_world);
-            //Place all new variables here!
-            newParcel.parcelBitmap = (bool[,])(this.parcelBitmap.Clone());
-            newParcel.parcelData = parcelData.Copy();
-           
-            return newParcel;
-        }
-        #endregion
-        #region Packet Request Handling
-        /// <summary>
-        /// Sends parcel properties as requested
-        /// </summary>
-        /// <param name="sequence_id">ID sent by client for them to keep track of</param>
-        /// <param name="snap_selection">Bool sent by client for them to use</param>
-        /// <param name="remote_client">Object representing the client</param>
-        public void sendParcelProperties(int sequence_id, bool snap_selection, int request_result, ClientView remote_client)
-        {
-            /*ParcelPropertiesPacket updatePacket = new ParcelPropertiesPacket();
-            updatePacket.ParcelData.AABBMax = parcelData.AABBMax;
-            updatePacket.ParcelData.AABBMin = parcelData.AABBMin;
-            updatePacket.ParcelData.Area = parcelData.area;
-            updatePacket.ParcelData.AuctionID = parcelData.auctionID;
-            updatePacket.ParcelData.AuthBuyerID =parcelData.authBuyerID; //unemplemented
-            updatePacket.ParcelData.Bitmap = parcelData.parcelBitmapByteArray;
-            updatePacket.ParcelData.Desc = libsecondlife.Helpers.StringToField(parcelData.parcelDesc);
-            updatePacket.ParcelData.Category = (byte)parcelData.category;
-            updatePacket.ParcelData.ClaimDate = parcelData.claimDate;
-            updatePacket.ParcelData.ClaimPrice = parcelData.claimPrice;
-            updatePacket.ParcelData.GroupID = parcelData.groupID;
-            updatePacket.ParcelData.GroupPrims = parcelData.groupPrims;
-            updatePacket.ParcelData.IsGroupOwned = parcelData.isGroupOwned;
-            updatePacket.ParcelData.LandingType = (byte)parcelData.landingType;
-            updatePacket.ParcelData.LocalID = parcelData.localID;
-            updatePacket.ParcelData.MaxPrims = 1000; //unemplemented
-            updatePacket.ParcelData.MediaAutoScale = parcelData.mediaAutoScale;
-            updatePacket.ParcelData.MediaID = parcelData.mediaID;
-            updatePacket.ParcelData.MediaURL = Helpers.StringToField(parcelData.mediaURL);
-            updatePacket.ParcelData.MusicURL = Helpers.StringToField(parcelData.musicURL);
-            updatePacket.ParcelData.Name = Helpers.StringToField(parcelData.parcelName);
-            updatePacket.ParcelData.OtherCleanTime = 0; //unemplemented
-            updatePacket.ParcelData.OtherCount = 0; //unemplemented
-            updatePacket.ParcelData.OtherPrims = 0; //unemplented
-            updatePacket.ParcelData.OwnerID = parcelData.ownerID;
-            updatePacket.ParcelData.OwnerPrims = 0; //unemplemented
-            updatePacket.ParcelData.ParcelFlags = (uint)parcelData.parcelFlags; //unemplemented
-            updatePacket.ParcelData.ParcelPrimBonus = (float)1.0; //unemplemented
-            updatePacket.ParcelData.PassHours = parcelData.passHours;
-            updatePacket.ParcelData.PassPrice = parcelData.passPrice;
-            updatePacket.ParcelData.PublicCount = 0; //unemplemented
-            updatePacket.ParcelData.RegionDenyAnonymous = false; //unemplemented
-            updatePacket.ParcelData.RegionDenyIdentified = false; //unemplemented
-            updatePacket.ParcelData.RegionDenyTransacted = false; //unemplemented
-            updatePacket.ParcelData.RegionPushOverride = true; //unemplemented
-            updatePacket.ParcelData.RentPrice = 0; //??
-            updatePacket.ParcelData.RequestResult = request_result;
-            updatePacket.ParcelData.SalePrice = parcelData.salePrice; //unemplemented
-            updatePacket.ParcelData.SelectedPrims = 0; //unemeplemented
-            updatePacket.ParcelData.SelfCount = 0;//unemplemented
-            updatePacket.ParcelData.SequenceID = sequence_id;
-            updatePacket.ParcelData.SimWideMaxPrims = 15000; //unemplemented
-            updatePacket.ParcelData.SimWideTotalPrims = 0; //unemplemented
-            updatePacket.ParcelData.SnapSelection = snap_selection; 
-            updatePacket.ParcelData.SnapshotID = parcelData.snapshotID;
-            updatePacket.ParcelData.Status = (byte)parcelData.parcelStatus;
-            updatePacket.ParcelData.TotalPrims = 0; //unemplemented
-            updatePacket.ParcelData.UserLocation = parcelData.userLocation;
-            updatePacket.ParcelData.UserLookAt = parcelData.userLookAt;
-            remote_client.OutPacket((Packet)updatePacket); */
-        }
-        public void updateParcelProperties(ParcelPropertiesUpdatePacket packet, ClientView remote_client)
-        {
-            if (remote_client.AgentID == parcelData.ownerID)
-            {
-                //Needs later group support
-                parcelData.authBuyerID = packet.ParcelData.AuthBuyerID;
-                parcelData.category = (libsecondlife.Parcel.ParcelCategory)packet.ParcelData.Category;
-                parcelData.parcelDesc = Helpers.FieldToUTF8String(packet.ParcelData.Desc);
-                parcelData.groupID = packet.ParcelData.GroupID;
-                parcelData.landingType = packet.ParcelData.LandingType;
-                parcelData.mediaAutoScale = packet.ParcelData.MediaAutoScale;
-                parcelData.mediaID = packet.ParcelData.MediaID;
-                parcelData.mediaURL = Helpers.FieldToUTF8String(packet.ParcelData.MediaURL);
-                parcelData.musicURL = Helpers.FieldToUTF8String(packet.ParcelData.MusicURL);
-                parcelData.parcelName = libsecondlife.Helpers.FieldToUTF8String(packet.ParcelData.Name);
-                parcelData.parcelFlags = (libsecondlife.Parcel.ParcelFlags)packet.ParcelData.ParcelFlags;
-                parcelData.passHours = packet.ParcelData.PassHours;
-                parcelData.passPrice = packet.ParcelData.PassPrice;
-                parcelData.salePrice = packet.ParcelData.SalePrice;
-                parcelData.snapshotID = packet.ParcelData.SnapshotID;
-                parcelData.userLocation = packet.ParcelData.UserLocation;
-                parcelData.userLookAt = packet.ParcelData.UserLookAt;
-                foreach (Avatar av in m_world.Avatars.Values)
-                {
-                    Parcel over = m_world.parcelManager.getParcel((int)Math.Round(av.Pos.X), (int)Math.Round(av.Pos.Y));
-                    if (over == this)
-                    {
-                        sendParcelProperties(0, false, 0, av.ControllingClient);
-                    }
-                }
-            }
-        }
-        #endregion
-        #region Update Functions
-        /// <summary>
-        /// Updates the AABBMin and AABBMax values after area/shape modification of parcel
-        /// </summary>
-        private void updateAABBAndAreaValues()
-        {
-            int min_x = 64;
-            int min_y = 64;
-            int max_x = 0;
-            int max_y = 0;
-            int tempArea = 0;
-            int x, y;
-            for (x = 0; x < 64; x++)
-            {
-                for (y = 0; y < 64; y++)
-                {
-                    if (parcelBitmap[x, y] == true)
-                    {
-                        if (min_x > x) min_x = x;
-                        if (min_y > y) min_y = y;
-                        if (max_x < x) max_x = x;
-                        if (max_y < y) max_y = y;
-                        tempArea += 16; //16sqm parcel
-                    }
-                }
-            }
-            parcelData.AABBMin = new LLVector3((float)(min_x * 4), (float)(min_y * 4), m_world.Terrain[(min_x * 4), (min_y * 4)]);
-            parcelData.AABBMax = new LLVector3((float)(max_x * 4), (float)(max_y * 4), m_world.Terrain[(max_x * 4), (max_y * 4)]);
-            parcelData.area = tempArea;
-        }
-        public void updateParcelBitmapByteArray()
-        {
-            parcelData.parcelBitmapByteArray = convertParcelBitmapToBytes();
-        }
-        /// <summary>
-        /// Update all settings in parcel such as area, bitmap byte array, etc
-        /// </summary>
-        public void forceUpdateParcelInfo()
-        {
-            this.updateAABBAndAreaValues();
-            this.updateParcelBitmapByteArray();
-        }
-        public void setParcelBitmapFromByteArray()
-        {
-            parcelBitmap = convertBytesToParcelBitmap();
-        }
-        #endregion
-        #region Parcel Bitmap Functions
-        /// <summary>
-        /// Sets the parcel's bitmap manually
-        /// </summary>
-        /// <param name="bitmap">64x64 block representing where this parcel is on a map</param>
-        public void setParcelBitmap(bool[,] bitmap)
-        {
-            if (bitmap.GetLength(0) != 64 || bitmap.GetLength(1) != 64 || bitmap.Rank != 2)
-            {
-                //Throw an exception - The bitmap is not 64x64
-                throw new Exception("Error: Invalid Parcel Bitmap");
-            }
-            else
-            {
-                //Valid: Lets set it
-                parcelBitmap = bitmap;
-                forceUpdateParcelInfo();
-               
-            }
-        }
-        /// <summary>
-        /// Gets the parcels bitmap manually
-        /// </summary>
-        /// <returns></returns>
-        public bool[,] getParcelBitmap()
-        {
-            return parcelBitmap;
-        }
-        /// <summary>
-        /// Converts the parcel bitmap to a packet friendly byte array
-        /// </summary>
-        /// <returns></returns>
-        private byte[] convertParcelBitmapToBytes()
-        {
-            byte[] tempConvertArr = new byte[512];
-            byte tempByte = 0;
-            int x, y, i, byteNum = 0;
-            i = 0;
-            for (y = 0; y < 64; y++)
-            {
-                for (x = 0; x < 64; x++)
-                {
-                    tempByte = Convert.ToByte(tempByte | Convert.ToByte(parcelBitmap[x, y]) << (i++ % 8));
-                    if (i % 8 == 0)
-                    {
-                        tempConvertArr[byteNum] = tempByte;
-                        tempByte = (byte)0;
-                        i = 0;
-                        byteNum++;
-                    }
-                }
-            }
-            return tempConvertArr;
-        }
-        private bool[,] convertBytesToParcelBitmap()
-        {
-            bool[,] tempConvertMap = new bool[64, 64];
-            tempConvertMap.Initialize(); 
-            byte tempByte = 0;
-            int x = 0, y = 0, i = 0, bitNum = 0;
-            for(i = 0; i < 512; i++)
-            {
-                tempByte = parcelData.parcelBitmapByteArray[i];
-                for(bitNum = 0; bitNum < 8; bitNum++)
-                {
-                    bool bit = Convert.ToBoolean(Convert.ToByte(tempByte >> bitNum) & (byte)1);
-                    tempConvertMap[x, y] = bit;
-                    x++;
-                    if(x > 63)
-                    {
-                        x = 0; 
-                        y++;
-                    }
-             
-                }
-            }
-            return tempConvertMap;
-        }
-        /// <summary>
-        /// Full sim parcel creation
-        /// </summary>
-        /// <returns></returns>
-        public static bool[,] basicFullRegionParcelBitmap()
-        {
-            return getSquareParcelBitmap(0, 0, 256, 256);
-        }
-        /// <summary>
-        /// Used to modify the bitmap between the x and y points. Points use 64 scale
-        /// </summary>
-        /// <param name="start_x"></param>
-        /// <param name="start_y"></param>
-        /// <param name="end_x"></param>
-        /// <param name="end_y"></param>
-        /// <returns></returns>
-        public static bool[,] getSquareParcelBitmap(int start_x, int start_y, int end_x, int end_y)
-        {
-            bool[,] tempBitmap = new bool[64, 64];
-            tempBitmap.Initialize();
-            tempBitmap = modifyParcelBitmapSquare(tempBitmap, start_x, start_y, end_x, end_y, true);
-            return tempBitmap;
-        }
-        /// <summary>
-        /// Change a parcel's bitmap at within a square and set those points to a specific value
-        /// </summary>
-        /// <param name="parcel_bitmap"></param>
-        /// <param name="start_x"></param>
-        /// <param name="start_y"></param>
-        /// <param name="end_x"></param>
-        /// <param name="end_y"></param>
-        /// <param name="set_value"></param>
-        /// <returns></returns>
-        public static bool[,] modifyParcelBitmapSquare(bool[,] parcel_bitmap, int start_x, int start_y, int end_x, int end_y, bool set_value)
-        {
-            if (parcel_bitmap.GetLength(0) != 64 || parcel_bitmap.GetLength(1) != 64 || parcel_bitmap.Rank != 2)
-            {
-                //Throw an exception - The bitmap is not 64x64
-                throw new Exception("Error: Invalid Parcel Bitmap in modifyParcelBitmapSquare()");
-            }
-            int x, y;
-            for (y = 0; y < 64; y++)
-            {
-                for (x = 0; x < 64; x++)
-                {
-                    if (x >= start_x / 4 && x < end_x / 4
-                        && y >= start_y / 4 && y < end_y / 4)
-                    {
-                        parcel_bitmap[x, y] = set_value;
-                    }
-                }
-            }
-            return parcel_bitmap;
-        }
-        /// <summary>
-        /// Join the true values of 2 bitmaps together
-        /// </summary>
-        /// <param name="bitmap_base"></param>
-        /// <param name="bitmap_add"></param>
-        /// <returns></returns>
-        public static bool[,] mergeParcelBitmaps(bool[,] bitmap_base, bool[,] bitmap_add)
-        {
-            if (bitmap_base.GetLength(0) != 64 || bitmap_base.GetLength(1) != 64 || bitmap_base.Rank != 2)
-            {
-                //Throw an exception - The bitmap is not 64x64
-                throw new Exception("Error: Invalid Parcel Bitmap - Bitmap_base in mergeParcelBitmaps");
-            }
-            if (bitmap_add.GetLength(0) != 64 || bitmap_add.GetLength(1) != 64 || bitmap_add.Rank != 2)
-            {
-                //Throw an exception - The bitmap is not 64x64
-                throw new Exception("Error: Invalid Parcel Bitmap - Bitmap_add in mergeParcelBitmaps");
-                
-            }
-            int x, y;
-            for (y = 0; y < 64; y++)
-            {
-                for (x = 0; x < 64; x++)
-                {
-                    if (bitmap_add[x, y])
-                    {
-                        bitmap_base[x, y] = true;
-                    }
-                }
-            }
-            return bitmap_base;
-        }
-        #endregion
-        #endregion
-       
-    }
-    #endregion
-    
-    
-}
diff --git a/OpenSim/OpenSim.RegionServer/Simulator/Primitive.cs b/OpenSim/OpenSim.RegionServer/Simulator/Primitive.cs
deleted file mode 100644
index f1417d0..0000000
--- a/OpenSim/OpenSim.RegionServer/Simulator/Primitive.cs
+++ /dev/null
@@ -1,598 +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.RegionServer.Types;
-using libsecondlife;
-using libsecondlife.Packets;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Physics.Manager;
-using OpenSim.Framework.Types;
-using OpenSim.RegionServer.Client;
-namespace OpenSim.RegionServer.Simulator
-{
-    public class Primitive : Entity
-    {
-        protected float mesh_cutbegin;
-        protected float mesh_cutend;
-        protected PrimData primData;
-        protected bool newPrimFlag = false;
-        protected bool updateFlag = false;
-        protected bool dirtyFlag = false;
-        private ObjectUpdatePacket OurPacket;
-        private bool physicsEnabled = false;
-        private bool physicstest = false;  
-        private LLVector3 positionLastFrame = new LLVector3(0, 0, 0);
-        private Dictionary<uint, ClientView> m_clientThreads;
-        private ulong m_regionHandle;
-        private const uint FULL_MASK_PERMISSIONS = 2147483647;
-        public bool PhysicsEnabled
-        {
-            get
-            {
-                return physicsEnabled;
-            }
-            set
-            {
-                physicsEnabled = value;
-            }
-        }
-        public bool UpdateFlag
-        {
-            get
-            {
-                return updateFlag;
-            }
-            set
-            {
-                updateFlag = value;
-            }
-        }
-        public LLVector3 Scale
-        {
-            set
-            {
-                LLVector3 offset = (value - primData.Scale);
-                offset.X /= 2;
-                offset.Y /= 2;
-                offset.Z /= 2;
-                this.primData.Position += offset;
-                this.primData.Scale = value;
-                
-                this.dirtyFlag = true;
-            }
-            get
-            {
-                return this.primData.Scale;
-            }
-        }
-        public PhysicsActor PhysActor
-        {
-            set
-            {
-                this._physActor = value;
-            }
-        }
-        public Primitive(Dictionary<uint, ClientView> clientThreads, ulong regionHandle, World world)
-        {
-            mesh_cutbegin = 0.0f;
-            mesh_cutend = 1.0f;
-            m_clientThreads = clientThreads;
-            m_regionHandle = regionHandle;
-            m_world = world;
-        }
-        public override Mesh getMesh()
-        {
-            Mesh mesh = new Mesh();
-            Triangle tri = new Triangle(
-                new Axiom.MathLib.Vector3(0.0f, 1.0f, 1.0f),
-                new Axiom.MathLib.Vector3(1.0f, 0.0f, 1.0f),
-                new Axiom.MathLib.Vector3(1.0f, 1.0f, 0.0f));
-            mesh.AddTri(tri);
-            mesh += base.getMesh();
-            return mesh;
-        }
-        public byte[] GetByteArray()
-        {
-            return this.primData.ToBytes();
-        }
-        public void GetProperites(ClientView client)
-        {
-            ObjectPropertiesPacket proper = new ObjectPropertiesPacket();
-            proper.ObjectData = new ObjectPropertiesPacket.ObjectDataBlock[1];
-            proper.ObjectData[0] = new ObjectPropertiesPacket.ObjectDataBlock();
-            proper.ObjectData[0].ItemID = LLUUID.Zero; // this.uuid;
-            proper.ObjectData[0].CreationDate = (ulong) this.primData.CreationDate;
-            proper.ObjectData[0].CreatorID = this.primData.OwnerID;
-            proper.ObjectData[0].FolderID = LLUUID.Zero;
-            proper.ObjectData[0].FromTaskID = LLUUID.Zero;
-            proper.ObjectData[0].GroupID = LLUUID.Zero;
-            proper.ObjectData[0].InventorySerial = 0;
-            proper.ObjectData[0].LastOwnerID = LLUUID.Zero;
-            proper.ObjectData[0].ObjectID = this.uuid;
-            proper.ObjectData[0].OwnerID = primData.OwnerID;
-            proper.ObjectData[0].TouchName = new byte[0];
-            proper.ObjectData[0].TextureID = new byte[0];
-            proper.ObjectData[0].SitName = new byte[0];
-            proper.ObjectData[0].Name = new byte[0];
-            proper.ObjectData[0].Description = new byte[0];
-            proper.ObjectData[0].OwnerMask = this.primData.OwnerMask;
-            proper.ObjectData[0].NextOwnerMask = this.primData.NextOwnerMask;
-            proper.ObjectData[0].GroupMask = this.primData.GroupMask;
-            proper.ObjectData[0].EveryoneMask = this.primData.EveryoneMask;
-            proper.ObjectData[0].BaseMask = this.primData.BaseMask;
-            
-            client.OutPacket(proper);
-        }
-        public void UpdatePosition(LLVector3 pos)
-        {
-            this.Pos = pos;
-            if (this._physActor != null) // && this.physicsEnabled)
-            {
-                try
-                {
-                    lock (m_world.LockPhysicsEngine)
-                    {
-                        this._physActor.Position = new PhysicsVector(pos.X, pos.Y, pos.Z);
-                    }
-                }
-                catch (Exception e)
-                {
-                    Console.WriteLine(e.Message);
-                }
-            }
-            this.updateFlag = true;
-        }
-        public override void update()
-        {
-            LLVector3 pos2 = new LLVector3(0, 0, 0);
-            if (this._physActor != null && this.physicsEnabled)
-            {
-                PhysicsVector pPos = this._physActor.Position;
-                pos2 = new LLVector3(pPos.X, pPos.Y, pPos.Z);
-            }
-            if (this.newPrimFlag)
-            {   
-                foreach (ClientView client in m_clientThreads.Values)
-                {
-                    client.OutPacket(OurPacket);
-                }
-                this.newPrimFlag = false;
-            }
-            else if (this.updateFlag)
-            {
-                ImprovedTerseObjectUpdatePacket terse = new ImprovedTerseObjectUpdatePacket();
-                terse.RegionData.RegionHandle = m_regionHandle; // FIXME
-                terse.RegionData.TimeDilation = 64096;
-                terse.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[1];
-                terse.ObjectData[0] = this.CreateImprovedBlock();
-                foreach (ClientView client in m_clientThreads.Values)
-                {
-                    client.OutPacket(terse);
-                }
-                this.updateFlag = false;
-            }
-            else if (this.dirtyFlag)
-            {
-                foreach (ClientView client in m_clientThreads.Values)
-                {
-                    UpdateClient(client);
-                }
-                this.dirtyFlag = false;
-            }
-            else
-            {
-                if (this._physActor != null && this.physicsEnabled)
-                {
-                    if (pos2 != this.positionLastFrame)
-                    {
-                        ImprovedTerseObjectUpdatePacket terse = new ImprovedTerseObjectUpdatePacket();
-                        terse.RegionData.RegionHandle = m_regionHandle; // FIXME
-                        terse.RegionData.TimeDilation = 64096;
-                        terse.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[1];
-                        terse.ObjectData[0] = this.CreateImprovedBlock();
-                        foreach (ClientView client in m_clientThreads.Values)
-                        {
-                            client.OutPacket(terse);
-                        }
-                    }
-                    this.positionLastFrame = pos2;
-                }
-            }
-            if (this.physicstest)
-            {
-                LLVector3 pos = this.Pos;
-                pos.Z += 0.0001f;
-                this.UpdatePosition(pos);
-                this.physicstest = false;
-            }
-        }
-        public void UpdateClient(ClientView RemoteClient)
-        {
-            LLVector3 lPos;
-            if (this._physActor != null && this.physicsEnabled)
-            {
-                PhysicsVector pPos = this._physActor.Position;
-                lPos = new LLVector3(pPos.X, pPos.Y, pPos.Z);
-            }
-            else
-            {
-                lPos = this.Pos;
-            }
-            byte[] pb = lPos.GetBytes();
-            Array.Copy(pb, 0, OurPacket.ObjectData[0].ObjectData, 0, pb.Length);
-            // OurPacket should be update with the follwing in updateShape() rather than having to do it here
-            OurPacket.ObjectData[0].OwnerID = this.primData.OwnerID;
-            OurPacket.ObjectData[0].PCode = this.primData.PCode;
-            OurPacket.ObjectData[0].PathBegin = this.primData.PathBegin;
-            OurPacket.ObjectData[0].PathEnd = this.primData.PathEnd;
-            OurPacket.ObjectData[0].PathScaleX = this.primData.PathScaleX;
-            OurPacket.ObjectData[0].PathScaleY = this.primData.PathScaleY;
-            OurPacket.ObjectData[0].PathShearX = this.primData.PathShearX;
-            OurPacket.ObjectData[0].PathShearY = this.primData.PathShearY;
-            OurPacket.ObjectData[0].PathSkew = this.primData.PathSkew;
-            OurPacket.ObjectData[0].ProfileBegin = this.primData.ProfileBegin;
-            OurPacket.ObjectData[0].ProfileEnd = this.primData.ProfileEnd;
-            OurPacket.ObjectData[0].Scale = this.primData.Scale;
-            OurPacket.ObjectData[0].PathCurve = this.primData.PathCurve;
-            OurPacket.ObjectData[0].ProfileCurve = this.primData.ProfileCurve;
-            OurPacket.ObjectData[0].ParentID = this.primData.ParentID ;
-            OurPacket.ObjectData[0].ProfileHollow = this.primData.ProfileHollow;
-            //finish off copying rest of shape data
-            OurPacket.ObjectData[0].PathRadiusOffset = this.primData.PathRadiusOffset;
-            OurPacket.ObjectData[0].PathRevolutions = this.primData.PathRevolutions;
-            OurPacket.ObjectData[0].PathTaperX = this.primData.PathTaperX;
-            OurPacket.ObjectData[0].PathTaperY = this.primData.PathTaperY;
-            OurPacket.ObjectData[0].PathTwist = this.primData.PathTwist;
-            OurPacket.ObjectData[0].PathTwistBegin = this.primData.PathTwistBegin;
-            RemoteClient.OutPacket(OurPacket);
-        }
-        public void UpdateShape(ObjectShapePacket.ObjectDataBlock addPacket)
-        {
-            this.primData.PathBegin = addPacket.PathBegin;
-            this.primData.PathEnd = addPacket.PathEnd;
-            this.primData.PathScaleX = addPacket.PathScaleX;
-            this.primData.PathScaleY = addPacket.PathScaleY;
-            this.primData.PathShearX = addPacket.PathShearX;
-            this.primData.PathShearY = addPacket.PathShearY;
-            this.primData.PathSkew = addPacket.PathSkew;
-            this.primData.ProfileBegin = addPacket.ProfileBegin;
-            this.primData.ProfileEnd = addPacket.ProfileEnd;
-            this.primData.PathCurve = addPacket.PathCurve;
-            this.primData.ProfileCurve = addPacket.ProfileCurve;
-            this.primData.ProfileHollow = addPacket.ProfileHollow;
-            this.primData.PathRadiusOffset = addPacket.PathRadiusOffset;
-            this.primData.PathRevolutions = addPacket.PathRevolutions;
-            this.primData.PathTaperX = addPacket.PathTaperX;
-            this.primData.PathTaperY = addPacket.PathTaperY;
-            this.primData.PathTwist = addPacket.PathTwist;
-            this.primData.PathTwistBegin = addPacket.PathTwistBegin;
-            this.dirtyFlag = true;
-        }
-        public void UpdateTexture(byte[] tex)
-        {
-            this.OurPacket.ObjectData[0].TextureEntry = tex;
-            this.primData.Texture = tex;
-            this.dirtyFlag = true;
-        }
-        public void UpdateObjectFlags(ObjectFlagUpdatePacket pack)
-        {
-            if (this._physActor != null)
-            {
-                if (this._physActor.Kinematic == pack.AgentData.UsePhysics)
-                {
-                    this._physActor.Kinematic = !pack.AgentData.UsePhysics; //if Usephysics = true, then Kinematic should = false
-                }
-                this.physicsEnabled = pack.AgentData.UsePhysics;
-                if (this._physActor.Kinematic == false)
-                {
-                    LLVector3 pos = this.Pos;
-                    this.UpdatePosition(pos);
-                    pos.Z += 0.000001f;
-                    this.UpdatePosition(pos);
-                    this.physicstest = true;
-                }
-                else
-                {
-                    PhysicsVector vec = this._physActor.Position;
-                    LLVector3 pos = new LLVector3(vec.X, vec.Y, vec.Z);
-                    this.Pos = pos;
-                    this.updateFlag = true;
-                }
-            }
-        }
-        public void MakeParent(Primitive prim)
-        {
-            this.primData.ParentID = prim.localid;
-            this.Pos -= prim.Pos;
-            this.dirtyFlag = true;
-        }
-        public void CreateFromPacket(ObjectAddPacket addPacket, LLUUID ownerID, uint localID)
-        {
-            ObjectUpdatePacket objupdate = new ObjectUpdatePacket();
-            objupdate.RegionData.RegionHandle = m_regionHandle;
-            objupdate.RegionData.TimeDilation = 64096; 
-            objupdate.ObjectData = new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock[1];
-            PrimData PData = new PrimData();
-            this.primData = PData;
-            this.primData.CreationDate = (Int32)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;
-           
-            objupdate.ObjectData[0] = new ObjectUpdatePacket.ObjectDataBlock();
-            objupdate.ObjectData[0].PSBlock = new byte[0];
-            objupdate.ObjectData[0].ExtraParams = new byte[1];
-            objupdate.ObjectData[0].MediaURL = new byte[0];
-            objupdate.ObjectData[0].NameValue = new byte[0];
-            objupdate.ObjectData[0].Text = new byte[0];
-            objupdate.ObjectData[0].TextColor = new byte[4];
-            objupdate.ObjectData[0].JointAxisOrAnchor = new LLVector3(0, 0, 0);
-            objupdate.ObjectData[0].JointPivot = new LLVector3(0, 0, 0);
-            objupdate.ObjectData[0].Material = 3;
-            objupdate.ObjectData[0].UpdateFlags =  32 + 65536 + 131072 + 256 + 4 + 8 + 2048 + 524288 + 268435456;
-            objupdate.ObjectData[0].TextureAnim = new byte[0];
-            objupdate.ObjectData[0].Sound = LLUUID.Zero;
-            LLObject.TextureEntry ntex = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005"));
-            this.primData.Texture = objupdate.ObjectData[0].TextureEntry = ntex.ToBytes();
-            objupdate.ObjectData[0].State = 0;
-            objupdate.ObjectData[0].Data = new byte[0];
-            PData.OwnerID = objupdate.ObjectData[0].OwnerID = ownerID;
-            PData.PCode = objupdate.ObjectData[0].PCode = addPacket.ObjectData.PCode;
-            PData.PathBegin = objupdate.ObjectData[0].PathBegin = addPacket.ObjectData.PathBegin;
-            PData.PathEnd = objupdate.ObjectData[0].PathEnd = addPacket.ObjectData.PathEnd;
-            PData.PathScaleX = objupdate.ObjectData[0].PathScaleX = addPacket.ObjectData.PathScaleX;
-            PData.PathScaleY = objupdate.ObjectData[0].PathScaleY = addPacket.ObjectData.PathScaleY;
-            PData.PathShearX = objupdate.ObjectData[0].PathShearX = addPacket.ObjectData.PathShearX;
-            PData.PathShearY = objupdate.ObjectData[0].PathShearY = addPacket.ObjectData.PathShearY;
-            PData.PathSkew = objupdate.ObjectData[0].PathSkew = addPacket.ObjectData.PathSkew;
-            PData.ProfileBegin = objupdate.ObjectData[0].ProfileBegin = addPacket.ObjectData.ProfileBegin;
-            PData.ProfileEnd = objupdate.ObjectData[0].ProfileEnd = addPacket.ObjectData.ProfileEnd;
-            PData.Scale = objupdate.ObjectData[0].Scale = addPacket.ObjectData.Scale;
-            PData.PathCurve = objupdate.ObjectData[0].PathCurve = addPacket.ObjectData.PathCurve;
-            PData.ProfileCurve = objupdate.ObjectData[0].ProfileCurve = addPacket.ObjectData.ProfileCurve;
-            PData.ParentID = objupdate.ObjectData[0].ParentID = 0;
-            PData.ProfileHollow = objupdate.ObjectData[0].ProfileHollow = addPacket.ObjectData.ProfileHollow;
-            PData.PathRadiusOffset = objupdate.ObjectData[0].PathRadiusOffset = addPacket.ObjectData.PathRadiusOffset;
-            PData.PathRevolutions = objupdate.ObjectData[0].PathRevolutions = addPacket.ObjectData.PathRevolutions;
-            PData.PathTaperX = objupdate.ObjectData[0].PathTaperX = addPacket.ObjectData.PathTaperX;
-            PData.PathTaperY = objupdate.ObjectData[0].PathTaperY = addPacket.ObjectData.PathTaperY;
-            PData.PathTwist = objupdate.ObjectData[0].PathTwist = addPacket.ObjectData.PathTwist;
-            PData.PathTwistBegin = objupdate.ObjectData[0].PathTwistBegin = addPacket.ObjectData.PathTwistBegin;
-            objupdate.ObjectData[0].ID = (uint)(localID);
-            objupdate.ObjectData[0].FullID = new LLUUID("edba7151-5857-acc5-b30b-f01efef" + (localID - 702000).ToString("00000"));
-            objupdate.ObjectData[0].ObjectData = new byte[60];
-            objupdate.ObjectData[0].ObjectData[46] = 128;
-            objupdate.ObjectData[0].ObjectData[47] = 63;
-            LLVector3 pos1 = addPacket.ObjectData.RayEnd;
-            //update position
-            byte[] pb = pos1.GetBytes();
-            Array.Copy(pb, 0, objupdate.ObjectData[0].ObjectData, 0, pb.Length);
-            this.newPrimFlag = true;
-            this.primData.FullID = this.uuid = objupdate.ObjectData[0].FullID;
-            this.localid = objupdate.ObjectData[0].ID;
-            this.primData.Position =  this.Pos = pos1;
-            this.OurPacket = objupdate;
-        }
-        public void CreateFromStorage(PrimData store)
-        {
-            this.CreateFromStorage(store, store.Position, store.LocalID, false);
-        }
-        public void CreateFromStorage(PrimData store, LLVector3 posi, uint localID, bool newprim)
-        {
-            //need to clean this up as it shares a lot of code with CreateFromPacket()
-            ObjectUpdatePacket objupdate = new ObjectUpdatePacket();
-            objupdate.RegionData.RegionHandle = m_regionHandle;
-            objupdate.RegionData.TimeDilation = 64096;
-            objupdate.ObjectData = new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock[1];
-            this.primData = store;
-            objupdate.ObjectData[0] = new ObjectUpdatePacket.ObjectDataBlock();
-            objupdate.ObjectData[0].PSBlock = new byte[0];
-            objupdate.ObjectData[0].ExtraParams = new byte[1];
-            objupdate.ObjectData[0].MediaURL = new byte[0];
-            objupdate.ObjectData[0].NameValue = new byte[0];
-            objupdate.ObjectData[0].Text = new byte[0];
-            objupdate.ObjectData[0].TextColor = new byte[4];
-            objupdate.ObjectData[0].JointAxisOrAnchor = new LLVector3(0, 0, 0);
-            objupdate.ObjectData[0].JointPivot = new LLVector3(0, 0, 0);
-            objupdate.ObjectData[0].Material = 3;
-            objupdate.ObjectData[0].UpdateFlags = 32 + 65536 + 131072 + 256 + 4 + 8 + 2048 + 524288 + 268435456;
-            objupdate.ObjectData[0].TextureAnim = new byte[0];
-            objupdate.ObjectData[0].Sound = LLUUID.Zero;
-            if (store.Texture == null)
-            {
-                LLObject.TextureEntry ntex = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005"));
-                objupdate.ObjectData[0].TextureEntry = ntex.ToBytes();
-            }
-            else
-            {
-                objupdate.ObjectData[0].TextureEntry = store.Texture;
-            }
-            objupdate.ObjectData[0].State = 0;
-            objupdate.ObjectData[0].Data = new byte[0];
-            objupdate.ObjectData[0].OwnerID = this.primData.OwnerID;
-            objupdate.ObjectData[0].PCode = this.primData.PCode;
-            objupdate.ObjectData[0].PathBegin = this.primData.PathBegin;
-            objupdate.ObjectData[0].PathEnd = this.primData.PathEnd;
-            objupdate.ObjectData[0].PathScaleX = this.primData.PathScaleX;
-            objupdate.ObjectData[0].PathScaleY = this.primData.PathScaleY;
-            objupdate.ObjectData[0].PathShearX = this.primData.PathShearX;
-            objupdate.ObjectData[0].PathShearY = this.primData.PathShearY;
-            objupdate.ObjectData[0].PathSkew = this.primData.PathSkew;
-            objupdate.ObjectData[0].ProfileBegin = this.primData.ProfileBegin;
-            objupdate.ObjectData[0].ProfileEnd = this.primData.ProfileEnd;
-            objupdate.ObjectData[0].Scale = this.primData.Scale;
-            objupdate.ObjectData[0].PathCurve = this.primData.PathCurve;
-            objupdate.ObjectData[0].ProfileCurve = this.primData.ProfileCurve;
-            objupdate.ObjectData[0].ParentID = 0;
-            objupdate.ObjectData[0].ProfileHollow = this.primData.ProfileHollow;
-            //finish off copying rest of shape data
-            objupdate.ObjectData[0].PathRadiusOffset = this.primData.PathRadiusOffset;
-            objupdate.ObjectData[0].PathRevolutions = this.primData.PathRevolutions;
-            objupdate.ObjectData[0].PathTaperX = this.primData.PathTaperX;
-            objupdate.ObjectData[0].PathTaperY = this.primData.PathTaperY;
-            objupdate.ObjectData[0].PathTwist = this.primData.PathTwist;
-            objupdate.ObjectData[0].PathTwistBegin = this.primData.PathTwistBegin;
-            objupdate.ObjectData[0].ID = localID; // (uint)store.LocalID;
-            objupdate.ObjectData[0].FullID = store.FullID;
-            objupdate.ObjectData[0].ObjectData = new byte[60];
-            objupdate.ObjectData[0].ObjectData[46] = 128;
-            objupdate.ObjectData[0].ObjectData[47] = 63;
-            LLVector3 pos1 = posi; // store.Position;
-            //update position
-            byte[] pb = pos1.GetBytes();
-            Array.Copy(pb, 0, objupdate.ObjectData[0].ObjectData, 0, pb.Length);
-            this.uuid = objupdate.ObjectData[0].FullID;
-            this.localid = objupdate.ObjectData[0].ID;
-            this.Pos = pos1;
-            this.OurPacket = objupdate;
-            if (newprim)
-            {
-                this.newPrimFlag = true;
-            }
-        }
-        public ImprovedTerseObjectUpdatePacket.ObjectDataBlock CreateImprovedBlock()
-        {
-            uint ID = this.localid;
-            byte[] bytes = new byte[60];
-            int i = 0;
-            ImprovedTerseObjectUpdatePacket.ObjectDataBlock dat = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock();
-            //dat.TextureEntry = this.OurPacket.ObjectData[0].TextureEntry;
-            dat.TextureEntry = new byte[0];
-            bytes[i++] = (byte)(ID % 256);
-            bytes[i++] = (byte)((ID >> 8) % 256);
-            bytes[i++] = (byte)((ID >> 16) % 256);
-            bytes[i++] = (byte)((ID >> 24) % 256);
-            bytes[i++] = 0;
-            bytes[i++] = 0;
-            LLVector3 lPos;
-            Axiom.MathLib.Quaternion lRot;
-            if (this._physActor != null && this.physicsEnabled)
-            {
-                PhysicsVector pPos = this._physActor.Position;
-                lPos = new LLVector3(pPos.X, pPos.Y, pPos.Z);
-                lRot = this._physActor.Orientation;
-            }
-            else
-            {
-                lPos = this.Pos;
-                lRot = this.rotation;
-            }
-            byte[] pb = lPos.GetBytes();
-            Array.Copy(pb, 0, bytes, i, pb.Length);
-            i += 12;
-            ushort ac = 32767;
-            //vel
-            bytes[i++] = (byte)(ac % 256);
-            bytes[i++] = (byte)((ac >> 8) % 256);
-            bytes[i++] = (byte)(ac % 256);
-            bytes[i++] = (byte)((ac >> 8) % 256);
-            bytes[i++] = (byte)(ac % 256);
-            bytes[i++] = (byte)((ac >> 8) % 256);
-            //accel
-            bytes[i++] = (byte)(ac % 256);
-            bytes[i++] = (byte)((ac >> 8) % 256);
-            bytes[i++] = (byte)(ac % 256);
-            bytes[i++] = (byte)((ac >> 8) % 256);
-            bytes[i++] = (byte)(ac % 256);
-            bytes[i++] = (byte)((ac >> 8) % 256);
-            ushort rw, rx, ry, rz;
-            rw = (ushort)(32768 * (lRot.w + 1));
-            rx = (ushort)(32768 * (lRot.x + 1));
-            ry = (ushort)(32768 * (lRot.y + 1));
-            rz = (ushort)(32768 * (lRot.z + 1));
-            //rot
-            bytes[i++] = (byte)(rx % 256);
-            bytes[i++] = (byte)((rx >> 8) % 256);
-            bytes[i++] = (byte)(ry % 256);
-            bytes[i++] = (byte)((ry >> 8) % 256);
-            bytes[i++] = (byte)(rz % 256);
-            bytes[i++] = (byte)((rz >> 8) % 256);
-            bytes[i++] = (byte)(rw % 256);
-            bytes[i++] = (byte)((rw >> 8) % 256);
-            //rotation vel
-            bytes[i++] = (byte)(ac % 256);
-            bytes[i++] = (byte)((ac >> 8) % 256);
-            bytes[i++] = (byte)(ac % 256);
-            bytes[i++] = (byte)((ac >> 8) % 256);
-            bytes[i++] = (byte)(ac % 256);
-            bytes[i++] = (byte)((ac >> 8) % 256);
-            dat.Data = bytes;
-            return dat;
-        }
-        public override void BackUp()
-        {
-            this.primData.FullID = this.uuid;
-            this.primData.LocalID = this.localid;
-            this.primData.Position = this.Pos;
-            this.primData.Rotation = new LLQuaternion(this.rotation.x, this.rotation.y, this.rotation.z, this.rotation.w);
-            this.m_world.localStorage.StorePrim(this.primData);
-        }
-    }
-}
diff --git a/OpenSim/OpenSim.RegionServer/Simulator/Primitive2.cs b/OpenSim/OpenSim.RegionServer/Simulator/Primitive2.cs
deleted file mode 100644
index 0286e54..0000000
--- a/OpenSim/OpenSim.RegionServer/Simulator/Primitive2.cs
+++ /dev/null
@@ -1,519 +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.RegionServer.Types;
-using libsecondlife;
-using libsecondlife.Packets;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Physics.Manager;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Inventory;
-using OpenSim.RegionServer.Client;
-namespace OpenSim.RegionServer.Simulator
-{
-    public class Primitive2 : Entity
-    {
-        protected PrimData primData;
-        //private ObjectUpdatePacket OurPacket;
-        private LLVector3 positionLastFrame = new LLVector3(0, 0, 0);
-        private Dictionary<uint, ClientView> m_clientThreads;
-        private ulong m_regionHandle;
-        private const uint FULL_MASK_PERMISSIONS = 2147483647;
-        private bool physicsEnabled = false;
-        private Dictionary<LLUUID, InventoryItem> inventoryItems;
-        #region Properties
-        public LLVector3 Scale
-        {
-            set
-            {
-                this.primData.Scale = value;
-                //this.dirtyFlag = true;
-            }
-            get
-            {
-                return this.primData.Scale;
-            }
-        }
-        public PhysicsActor PhysActor
-        {
-            set
-            {
-                this._physActor = value;
-            }
-        }
-        public override LLVector3 Pos
-        {
-            get
-            {
-                return base.Pos;
-            }
-            set
-            {
-                base.Pos = value;
-            }
-        }
-        #endregion
-        public Primitive2(Dictionary<uint, ClientView> clientThreads, ulong regionHandle, World world)
-        {
-            m_clientThreads = clientThreads;
-            m_regionHandle = regionHandle;
-            m_world = world;
-            inventoryItems = new Dictionary<LLUUID, InventoryItem>();
-        }
-        public Primitive2(Dictionary<uint, ClientView> clientThreads, ulong regionHandle, World world, LLUUID owner)
-        {
-            m_clientThreads = clientThreads;
-            m_regionHandle = regionHandle;
-            m_world = world;
-            inventoryItems = new Dictionary<LLUUID, InventoryItem>();
-            this.primData = new PrimData();
-            this.primData.CreationDate = (Int32)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;
-            this.primData.OwnerID = owner;
-        }
-        public byte[] GetByteArray()
-        {
-            byte[] result = null;
-            List<byte[]> dataArrays = new List<byte[]>();
-            dataArrays.Add(primData.ToBytes());
-            foreach (Entity child in children)
-            {
-                if (child is OpenSim.RegionServer.Simulator.Primitive2)
-                {
-                    dataArrays.Add(((OpenSim.RegionServer.Simulator.Primitive2)child).GetByteArray());
-                }
-            }
-            byte[] primstart = Helpers.StringToField("<Prim>");
-            byte[] primend = Helpers.StringToField("</Prim>");
-            int totalLength = primstart.Length + primend.Length;
-            for (int i = 0; i < dataArrays.Count; i++)
-            {
-                totalLength += dataArrays[i].Length;
-            }
-            result = new byte[totalLength];
-            int arraypos = 0;
-            Array.Copy(primstart, 0, result, 0, primstart.Length);
-            arraypos += primstart.Length;
-            for (int i = 0; i < dataArrays.Count; i++)
-            {
-                Array.Copy(dataArrays[i], 0, result, arraypos, dataArrays[i].Length);
-                arraypos += dataArrays[i].Length;
-            }
-            Array.Copy(primend, 0, result, arraypos, primend.Length);
-            return result;
-        }
-        #region Overridden Methods
-        public override void update()
-        {
-            LLVector3 pos2 = new LLVector3(0, 0, 0);
-        }
-        public override void BackUp()
-        {
-        }
-        #endregion
-        #region Packet handlers
-        public void UpdatePosition(LLVector3 pos)
-        {
-        }
-        public void UpdateShape(ObjectShapePacket.ObjectDataBlock addPacket)
-        {
-            this.primData.PathBegin = addPacket.PathBegin;
-            this.primData.PathEnd = addPacket.PathEnd;
-            this.primData.PathScaleX = addPacket.PathScaleX;
-            this.primData.PathScaleY = addPacket.PathScaleY;
-            this.primData.PathShearX = addPacket.PathShearX;
-            this.primData.PathShearY = addPacket.PathShearY;
-            this.primData.PathSkew = addPacket.PathSkew;
-            this.primData.ProfileBegin = addPacket.ProfileBegin;
-            this.primData.ProfileEnd = addPacket.ProfileEnd;
-            this.primData.PathCurve = addPacket.PathCurve;
-            this.primData.ProfileCurve = addPacket.ProfileCurve;
-            this.primData.ProfileHollow = addPacket.ProfileHollow;
-            this.primData.PathRadiusOffset = addPacket.PathRadiusOffset;
-            this.primData.PathRevolutions = addPacket.PathRevolutions;
-            this.primData.PathTaperX = addPacket.PathTaperX;
-            this.primData.PathTaperY = addPacket.PathTaperY;
-            this.primData.PathTwist = addPacket.PathTwist;
-            this.primData.PathTwistBegin = addPacket.PathTwistBegin;
-        }
-        public void UpdateTexture(byte[] tex)
-        {
-            this.primData.Texture = tex;
-            //this.dirtyFlag = true;
-        }
-        public void UpdateObjectFlags(ObjectFlagUpdatePacket pack)
-        {
-        }
-        public void AssignToParent(Primitive prim)
-        {
-        }
-        public void GetProperites(ClientView client)
-        {
-            ObjectPropertiesPacket proper = new ObjectPropertiesPacket();
-            proper.ObjectData = new ObjectPropertiesPacket.ObjectDataBlock[1];
-            proper.ObjectData[0] = new ObjectPropertiesPacket.ObjectDataBlock();
-            proper.ObjectData[0].ItemID = LLUUID.Zero;
-            proper.ObjectData[0].CreationDate = (ulong)this.primData.CreationDate;
-            proper.ObjectData[0].CreatorID = this.primData.OwnerID;
-            proper.ObjectData[0].FolderID = LLUUID.Zero;
-            proper.ObjectData[0].FromTaskID = LLUUID.Zero;
-            proper.ObjectData[0].GroupID = LLUUID.Zero;
-            proper.ObjectData[0].InventorySerial = 0;
-            proper.ObjectData[0].LastOwnerID = LLUUID.Zero;
-            proper.ObjectData[0].ObjectID = this.uuid;
-            proper.ObjectData[0].OwnerID = primData.OwnerID;
-            proper.ObjectData[0].TouchName = new byte[0];
-            proper.ObjectData[0].TextureID = new byte[0];
-            proper.ObjectData[0].SitName = new byte[0];
-            proper.ObjectData[0].Name = new byte[0];
-            proper.ObjectData[0].Description = new byte[0];
-            proper.ObjectData[0].OwnerMask = this.primData.OwnerMask;
-            proper.ObjectData[0].NextOwnerMask = this.primData.NextOwnerMask;
-            proper.ObjectData[0].GroupMask = this.primData.GroupMask;
-            proper.ObjectData[0].EveryoneMask = this.primData.EveryoneMask;
-            proper.ObjectData[0].BaseMask = this.primData.BaseMask;
-            client.OutPacket(proper);
-        }
-        #endregion
-        # region Inventory Methods
-        public bool AddToInventory(InventoryItem item)
-        {
-            return false;
-        }
-        public InventoryItem RemoveFromInventory(LLUUID itemID)
-        {
-            return null;
-        }
-        public void RequestInventoryInfo(ClientView simClient, RequestTaskInventoryPacket packet)
-        {
-        }
-        public void RequestXferInventory(ClientView simClient, ulong xferID)
-        {
-            //will only currently work if the total size of the inventory data array is under about 1000 bytes
-            SendXferPacketPacket send = new SendXferPacketPacket();
-            send.XferID.ID = xferID;
-            send.XferID.Packet = 1 + 2147483648;
-            send.DataPacket.Data = this.ConvertInventoryToBytes();
-            simClient.OutPacket(send);
-        }
-        public byte[] ConvertInventoryToBytes()
-        {
-            System.Text.Encoding enc = System.Text.Encoding.ASCII;
-            byte[] result = new byte[0];
-            List<byte[]> inventoryData = new List<byte[]>();
-            int totallength = 0;
-            foreach (InventoryItem invItem in inventoryItems.Values)
-            {
-                byte[] data = enc.GetBytes(invItem.ExportString());
-                inventoryData.Add(data);
-                totallength += data.Length;
-            }
-            //TODO: copy arrays into the single result array
-            return result;
-        }
-        public void CreateInventoryFromBytes(byte[] data)
-        {
-        }
-        #endregion
-        #region Update viewers Methods
-        //should change these mehtods, so that outgoing packets are sent through the avatar class
-        public void SendFullUpdateToClient(ClientView remoteClient)
-        {
-            LLVector3 lPos;
-            if (this._physActor != null && this.physicsEnabled)
-            {
-                PhysicsVector pPos = this._physActor.Position;
-                lPos = new LLVector3(pPos.X, pPos.Y, pPos.Z);
-            }
-            else
-            {
-                lPos = this.Pos;
-            }
-            ObjectUpdatePacket outPacket = new ObjectUpdatePacket();
-            outPacket.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[1];
-            outPacket.ObjectData[0] = this.CreateUpdateBlock();
-            byte[] pb = lPos.GetBytes();
-            Array.Copy(pb, 0, outPacket.ObjectData[0].ObjectData, 0, pb.Length);
-            remoteClient.OutPacket(outPacket);
-        }
-        public void SendFullUpdateToAllClients()
-        {
-        }
-        public void SendTerseUpdateToClient(ClientView RemoteClient)
-        {
-        }
-        public void SendTerseUpdateToALLClients()
-        {
-        }
-        #endregion
-        #region Create Methods
-        public void CreateFromPacket(ObjectAddPacket addPacket, LLUUID ownerID, uint localID)
-        {
-            PrimData PData = new PrimData();
-            this.primData = PData;
-            this.primData.CreationDate = (Int32)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;
-            PData.OwnerID = ownerID;
-            PData.PCode = addPacket.ObjectData.PCode;
-            PData.PathBegin = addPacket.ObjectData.PathBegin;
-            PData.PathEnd = addPacket.ObjectData.PathEnd;
-            PData.PathScaleX = addPacket.ObjectData.PathScaleX;
-            PData.PathScaleY = addPacket.ObjectData.PathScaleY;
-            PData.PathShearX = addPacket.ObjectData.PathShearX;
-            PData.PathShearY = addPacket.ObjectData.PathShearY;
-            PData.PathSkew = addPacket.ObjectData.PathSkew;
-            PData.ProfileBegin = addPacket.ObjectData.ProfileBegin;
-            PData.ProfileEnd = addPacket.ObjectData.ProfileEnd;
-            PData.Scale = addPacket.ObjectData.Scale;
-            PData.PathCurve = addPacket.ObjectData.PathCurve;
-            PData.ProfileCurve = addPacket.ObjectData.ProfileCurve;
-            PData.ParentID = 0;
-            PData.ProfileHollow = addPacket.ObjectData.ProfileHollow;
-            PData.PathRadiusOffset = addPacket.ObjectData.PathRadiusOffset;
-            PData.PathRevolutions = addPacket.ObjectData.PathRevolutions;
-            PData.PathTaperX = addPacket.ObjectData.PathTaperX;
-            PData.PathTaperY = addPacket.ObjectData.PathTaperY;
-            PData.PathTwist = addPacket.ObjectData.PathTwist;
-            PData.PathTwistBegin = addPacket.ObjectData.PathTwistBegin;
-            LLVector3 pos1 = addPacket.ObjectData.RayEnd;
-            this.primData.FullID = this.uuid = LLUUID.Random();
-            this.localid = (uint)(localID);
-            this.primData.Position = this.Pos = pos1;
-        }
-        public void CreateFromBytes(byte[] data)
-        {
-        }
-        public void CreateFromPrimData(PrimData primData)
-        {
-            this.CreateFromPrimData(primData, primData.Position, primData.LocalID, false);
-        }
-        public void CreateFromPrimData(PrimData primData, LLVector3 posi, uint localID, bool newprim)
-        {
-        }
-        #endregion
-        #region Packet Update Methods
-        protected void SetDefaultPacketValues(ObjectUpdatePacket.ObjectDataBlock objdata)
-        {
-            objdata.PSBlock = new byte[0];
-            objdata.ExtraParams = new byte[1];
-            objdata.MediaURL = new byte[0];
-            objdata.NameValue = new byte[0];
-            objdata.Text = new byte[0];
-            objdata.TextColor = new byte[4];
-            objdata.JointAxisOrAnchor = new LLVector3(0, 0, 0);
-            objdata.JointPivot = new LLVector3(0, 0, 0);
-            objdata.Material = 3;
-            objdata.TextureAnim = new byte[0];
-            objdata.Sound = LLUUID.Zero;
-            LLObject.TextureEntry ntex = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005"));
-            this.primData.Texture = objdata.TextureEntry = ntex.ToBytes();
-            objdata.State = 0;
-            objdata.Data = new byte[0];
-            objdata.ObjectData = new byte[60];
-            objdata.ObjectData[46] = 128;
-            objdata.ObjectData[47] = 63;
-        }
-        protected void SetPacketShapeData(ObjectUpdatePacket.ObjectDataBlock objectData)
-        {
-            objectData.OwnerID = this.primData.OwnerID;
-            objectData.PCode = this.primData.PCode;
-            objectData.PathBegin = this.primData.PathBegin;
-            objectData.PathEnd = this.primData.PathEnd;
-            objectData.PathScaleX = this.primData.PathScaleX;
-            objectData.PathScaleY = this.primData.PathScaleY;
-            objectData.PathShearX = this.primData.PathShearX;
-            objectData.PathShearY = this.primData.PathShearY;
-            objectData.PathSkew = this.primData.PathSkew;
-            objectData.ProfileBegin = this.primData.ProfileBegin;
-            objectData.ProfileEnd = this.primData.ProfileEnd;
-            objectData.Scale = this.primData.Scale;
-            objectData.PathCurve = this.primData.PathCurve;
-            objectData.ProfileCurve = this.primData.ProfileCurve;
-            objectData.ParentID = this.primData.ParentID;
-            objectData.ProfileHollow = this.primData.ProfileHollow;
-            objectData.PathRadiusOffset = this.primData.PathRadiusOffset;
-            objectData.PathRevolutions = this.primData.PathRevolutions;
-            objectData.PathTaperX = this.primData.PathTaperX;
-            objectData.PathTaperY = this.primData.PathTaperY;
-            objectData.PathTwist = this.primData.PathTwist;
-            objectData.PathTwistBegin = this.primData.PathTwistBegin;
-        }
-        #endregion
-        protected ObjectUpdatePacket.ObjectDataBlock CreateUpdateBlock()
-        {
-            ObjectUpdatePacket.ObjectDataBlock objupdate = new ObjectUpdatePacket.ObjectDataBlock();
-            this.SetDefaultPacketValues(objupdate);
-            objupdate.UpdateFlags = 32 + 65536 + 131072 + 256 + 4 + 8 + 2048 + 524288 + 268435456;
-            this.SetPacketShapeData(objupdate);
-            byte[] pb = this.Pos.GetBytes();
-            Array.Copy(pb, 0, objupdate.ObjectData, 0, pb.Length);
-            return objupdate;
-        }
-        protected ImprovedTerseObjectUpdatePacket.ObjectDataBlock CreateImprovedBlock()
-        {
-            uint ID = this.localid;
-            byte[] bytes = new byte[60];
-            int i = 0;
-            ImprovedTerseObjectUpdatePacket.ObjectDataBlock dat = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock();
-            dat.TextureEntry = new byte[0];
-            bytes[i++] = (byte)(ID % 256);
-            bytes[i++] = (byte)((ID >> 8) % 256);
-            bytes[i++] = (byte)((ID >> 16) % 256);
-            bytes[i++] = (byte)((ID >> 24) % 256);
-            bytes[i++] = 0;
-            bytes[i++] = 0;
-            LLVector3 lPos;
-            Axiom.MathLib.Quaternion lRot;
-            if (this._physActor != null && this.physicsEnabled)
-            {
-                PhysicsVector pPos = this._physActor.Position;
-                lPos = new LLVector3(pPos.X, pPos.Y, pPos.Z);
-                lRot = this._physActor.Orientation;
-            }
-            else
-            {
-                lPos = this.Pos;
-                lRot = this.rotation;
-            }
-            byte[] pb = lPos.GetBytes();
-            Array.Copy(pb, 0, bytes, i, pb.Length);
-            i += 12;
-            ushort ac = 32767;
-            //vel
-            bytes[i++] = (byte)(ac % 256);
-            bytes[i++] = (byte)((ac >> 8) % 256);
-            bytes[i++] = (byte)(ac % 256);
-            bytes[i++] = (byte)((ac >> 8) % 256);
-            bytes[i++] = (byte)(ac % 256);
-            bytes[i++] = (byte)((ac >> 8) % 256);
-            //accel
-            bytes[i++] = (byte)(ac % 256);
-            bytes[i++] = (byte)((ac >> 8) % 256);
-            bytes[i++] = (byte)(ac % 256);
-            bytes[i++] = (byte)((ac >> 8) % 256);
-            bytes[i++] = (byte)(ac % 256);
-            bytes[i++] = (byte)((ac >> 8) % 256);
-            ushort rw, rx, ry, rz;
-            rw = (ushort)(32768 * (lRot.w + 1));
-            rx = (ushort)(32768 * (lRot.x + 1));
-            ry = (ushort)(32768 * (lRot.y + 1));
-            rz = (ushort)(32768 * (lRot.z + 1));
-            //rot
-            bytes[i++] = (byte)(rx % 256);
-            bytes[i++] = (byte)((rx >> 8) % 256);
-            bytes[i++] = (byte)(ry % 256);
-            bytes[i++] = (byte)((ry >> 8) % 256);
-            bytes[i++] = (byte)(rz % 256);
-            bytes[i++] = (byte)((rz >> 8) % 256);
-            bytes[i++] = (byte)(rw % 256);
-            bytes[i++] = (byte)((rw >> 8) % 256);
-            //rotation vel
-            bytes[i++] = (byte)(ac % 256);
-            bytes[i++] = (byte)((ac >> 8) % 256);
-            bytes[i++] = (byte)(ac % 256);
-            bytes[i++] = (byte)((ac >> 8) % 256);
-            bytes[i++] = (byte)(ac % 256);
-            bytes[i++] = (byte)((ac >> 8) % 256);
-            dat.Data = bytes;
-            return dat;
-        }
-    }
-}
diff --git a/OpenSim/OpenSim.RegionServer/Simulator/SceneObject.cs b/OpenSim/OpenSim.RegionServer/Simulator/SceneObject.cs
deleted file mode 100644
index ce2b50d..0000000
--- a/OpenSim/OpenSim.RegionServer/Simulator/SceneObject.cs
+++ /dev/null
@@ -1,102 +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.RegionServer.Types;
-using libsecondlife;
-using libsecondlife.Packets;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Physics.Manager;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Inventory;
-using OpenSim.RegionServer.Client;
-namespace OpenSim.RegionServer.Simulator
-{
-    public class SceneObject : Entity
-    {
-        private Dictionary<LLUUID, Primitive2> ChildPrimitives = new Dictionary<LLUUID, Primitive2>();
-        
-        public SceneObject()
-        {
-        }
-        public void CreateFromPacket(ObjectAddPacket addPacket, LLUUID agentID, uint localID)
-        {
-        }
-        public void CreateFromBytes(byte[] data)
-        {
-        }
-        public override void update()
-        {
-        }
-        public override void BackUp()
-        {
-        }
-        public void GetProperites(ClientView client)
-        {
-            /*
-            ObjectPropertiesPacket proper = new ObjectPropertiesPacket();
-            proper.ObjectData = new ObjectPropertiesPacket.ObjectDataBlock[1];
-            proper.ObjectData[0] = new ObjectPropertiesPacket.ObjectDataBlock();
-            proper.ObjectData[0].ItemID = LLUUID.Zero;
-            proper.ObjectData[0].CreationDate = (ulong)this.primData.CreationDate;
-            proper.ObjectData[0].CreatorID = this.primData.OwnerID;
-            proper.ObjectData[0].FolderID = LLUUID.Zero;
-            proper.ObjectData[0].FromTaskID = LLUUID.Zero;
-            proper.ObjectData[0].GroupID = LLUUID.Zero;
-            proper.ObjectData[0].InventorySerial = 0;
-            proper.ObjectData[0].LastOwnerID = LLUUID.Zero;
-            proper.ObjectData[0].ObjectID = this.uuid;
-            proper.ObjectData[0].OwnerID = primData.OwnerID;
-            proper.ObjectData[0].TouchName = new byte[0];
-            proper.ObjectData[0].TextureID = new byte[0];
-            proper.ObjectData[0].SitName = new byte[0];
-            proper.ObjectData[0].Name = new byte[0];
-            proper.ObjectData[0].Description = new byte[0];
-            proper.ObjectData[0].OwnerMask = this.primData.OwnerMask;
-            proper.ObjectData[0].NextOwnerMask = this.primData.NextOwnerMask;
-            proper.ObjectData[0].GroupMask = this.primData.GroupMask;
-            proper.ObjectData[0].EveryoneMask = this.primData.EveryoneMask;
-            proper.ObjectData[0].BaseMask = this.primData.BaseMask;
-            client.OutPacket(proper);
-             * */
-        }
-    }
-}
diff --git a/OpenSim/OpenSim.RegionServer/Simulator/World.PacketHandlers.cs b/OpenSim/OpenSim.RegionServer/Simulator/World.PacketHandlers.cs
deleted file mode 100644
index 2c5a05f..0000000
--- a/OpenSim/OpenSim.RegionServer/Simulator/World.PacketHandlers.cs
+++ /dev/null
@@ -1,449 +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.Physics.Manager;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Terrain;
-using OpenSim.Framework.Inventory;
-using OpenSim.Framework.Utilities;
-using OpenSim.RegionServer.Assets;
-using OpenSim.RegionServer.Client;
-namespace OpenSim.RegionServer.Simulator
-{
-    public partial class World
-    {
-        public void ModifyTerrain(byte action, float north, float west)
-        {
-            switch (action)
-            {
-                case 1:
-                    // raise terrain
-                    Terrain.raise(north, west, 10.0, 0.001);
-                    RegenerateTerrain(true, (int)north, (int)west);
-                    break;
-                case 2:
-                    //lower terrain
-                    Terrain.lower(north, west, 10.0, 0.001);
-                    RegenerateTerrain(true, (int)north, (int)west);
-                    break;
-            }
-            return;
-        }
-        public void SimChat(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID)
-        {
-            foreach (ClientView client in m_clientThreads.Values)
-            {
-                // int dis = Util.fast_distance2d((int)(client.ClientAvatar.Pos.X - simClient.ClientAvatar.Pos.X), (int)(client.ClientAvatar.Pos.Y - simClient.ClientAvatar.Pos.Y));
-                int dis = (int)client.ClientAvatar.Pos.GetDistanceTo(fromPos);
-                switch (type)
-                {
-                    case 0: // Whisper
-                        if ((dis < 10) && (dis > -10))
-                        {
-                            //should change so the message is sent through the avatar rather than direct to the ClientView
-                            client.SendChatMessage(message, type, fromPos, fromName, fromAgentID);
-                        }
-                        break;
-                    case 1: // Say
-                        if ((dis < 30) && (dis > -30))
-                        {
-                            client.SendChatMessage(message, type, fromPos, fromName, fromAgentID);
-                        }
-                        break;
-                    case 2: // Shout
-                        if ((dis < 100) && (dis > -100))
-                        {
-                            client.SendChatMessage(message, type, fromPos, fromName, fromAgentID);
-                        }
-                        break;
-                    case 0xff: // Broadcast
-                        client.SendChatMessage(message, type, fromPos, fromName, fromAgentID);
-                        break;
-                }
-            }
-        }
-        public void RezObject(AssetBase primAsset, LLVector3 pos)
-        {
-            PrimData primd = new PrimData(primAsset.Data);
-            Primitive nPrim = new Primitive(m_clientThreads, m_regionHandle, this);
-            nPrim.CreateFromStorage(primd, pos, this._primCount, true);
-            this.Entities.Add(nPrim.uuid, nPrim);
-            this._primCount++;
-        }
-        public void DeRezObject(Packet packet, ClientView simClient)
-        {
-            DeRezObjectPacket DeRezPacket = (DeRezObjectPacket)packet;
-            //Needs to delete object from physics at a later date
-            if (DeRezPacket.AgentBlock.DestinationID == LLUUID.Zero)
-            {
-                //currently following code not used (or don't know of any case of destination being zero
-                libsecondlife.LLUUID[] DeRezEnts;
-                DeRezEnts = new libsecondlife.LLUUID[DeRezPacket.ObjectData.Length];
-                int i = 0;
-                foreach (DeRezObjectPacket.ObjectDataBlock Data in DeRezPacket.ObjectData)
-                {
-                    //OpenSim.Framework.Console.MainConsole.Instance.WriteLine("LocalID:" + Data.ObjectLocalID.ToString());
-                    foreach (Entity ent in this.Entities.Values)
-                    {
-                        if (ent.localid == Data.ObjectLocalID)
-                        {
-                            DeRezEnts[i++] = ent.uuid;
-                            this.localStorage.RemovePrim(ent.uuid);
-                            KillObjectPacket kill = new KillObjectPacket();
-                            kill.ObjectData = new KillObjectPacket.ObjectDataBlock[1];
-                            kill.ObjectData[0] = new KillObjectPacket.ObjectDataBlock();
-                            kill.ObjectData[0].ID = ent.localid;
-                            foreach (ClientView client in m_clientThreads.Values)
-                            {
-                                client.OutPacket(kill);
-                            }
-                            //Uncommenting this means an old UUID will be re-used, thus crashing the asset server
-                            //Uncomment when prim/object UUIDs are random or such
-                            //2007-03-22 - Randomskk
-                            //this._primCount--;
-                            OpenSim.Framework.Console.MainConsole.Instance.Verbose("Deleted UUID " + ent.uuid);
-                        }
-                    }
-                }
-                foreach (libsecondlife.LLUUID uuid in DeRezEnts)
-                {
-                    lock (Entities)
-                    {
-                        Entities.Remove(uuid);
-                    }
-                }
-            }
-            else
-            {
-                foreach (DeRezObjectPacket.ObjectDataBlock Data in DeRezPacket.ObjectData)
-                {
-                    Entity selectedEnt = null;
-                    //OpenSim.Framework.Console.MainConsole.Instance.WriteLine("LocalID:" + Data.ObjectLocalID.ToString());
-                    foreach (Entity ent in this.Entities.Values)
-                    {
-                        if (ent.localid == Data.ObjectLocalID)
-                        {
-                            AssetBase primAsset = new AssetBase();
-                            primAsset.FullID = LLUUID.Random();//DeRezPacket.AgentBlock.TransactionID.Combine(LLUUID.Zero); //should be combining with securesessionid
-                            primAsset.InvType = 6;
-                            primAsset.Type = 6;
-                            primAsset.Name = "Prim";
-                            primAsset.Description = "";
-                            primAsset.Data = ((Primitive)ent).GetByteArray();
-                            this._assetCache.AddAsset(primAsset);
-                            this._inventoryCache.AddNewInventoryItem(simClient, DeRezPacket.AgentBlock.DestinationID, primAsset);
-                            selectedEnt = ent;
-                            break;
-                        }
-                    }
-                    if (selectedEnt != null)
-                    {
-                        this.localStorage.RemovePrim(selectedEnt.uuid);
-                        KillObjectPacket kill = new KillObjectPacket();
-                        kill.ObjectData = new KillObjectPacket.ObjectDataBlock[1];
-                        kill.ObjectData[0] = new KillObjectPacket.ObjectDataBlock();
-                        kill.ObjectData[0].ID = selectedEnt.localid;
-                        foreach (ClientView client in m_clientThreads.Values)
-                        {
-                            client.OutPacket(kill);
-                        }
-                        lock (Entities)
-                        {
-                            Entities.Remove(selectedEnt.uuid);
-                        }
-                    }
-                }
-            }
-            
-        }
-        public void SendAvatarsToClient(ClientView remoteClient)
-        {
-            foreach (ClientView client in m_clientThreads.Values)
-            {
-                if (client.AgentID != remoteClient.AgentID)
-                {
-                    // ObjectUpdatePacket objupdate = client.ClientAvatar.CreateUpdatePacket();
-                    // RemoteClient.OutPacket(objupdate);
-                    client.ClientAvatar.SendUpdateToOtherClient(remoteClient.ClientAvatar);
-                    client.ClientAvatar.SendAppearanceToOtherAgent(remoteClient.ClientAvatar);
-                }
-            }
-        }
-        public void LinkObjects(uint parentPrim, List<uint> childPrims)
-        {
-            Primitive parentprim = null;
-            foreach (Entity ent in Entities.Values)
-            {
-                if (ent.localid == parentPrim)
-                {
-                    parentprim = (OpenSim.RegionServer.Simulator.Primitive)ent;
-                }
-            }
-            for (int i = 0; i < childPrims.Count; i++)
-            {
-                uint childId = childPrims[i];
-                foreach (Entity ent in Entities.Values)
-                {
-                    if (ent.localid == childId)
-                    {
-                        ((OpenSim.RegionServer.Simulator.Primitive)ent).MakeParent(parentprim);
-                    }
-                }
-            }
-        }
-        public void UpdatePrimShape(uint primLocalID, ObjectShapePacket.ObjectDataBlock shapeBlock)
-        {
-            foreach (Entity ent in Entities.Values)
-            {
-                if (ent.localid == primLocalID)
-                {
-                    ((OpenSim.RegionServer.Simulator.Primitive)ent).UpdateShape(shapeBlock);
-                    break;
-                }
-            }
-        }
-        public void SelectPrim(uint primLocalID, ClientView remoteClient)
-        {
-            foreach (Entity ent in Entities.Values)
-            {
-                if (ent.localid == primLocalID)
-                {
-                    ((OpenSim.RegionServer.Simulator.Primitive)ent).GetProperites(remoteClient);
-                    break;
-                }
-            }
-        }
-        public void UpdatePrimFlags(uint localID, Packet packet, ClientView remoteClient)
-        {
-            foreach (Entity ent in Entities.Values)
-            {
-                if (ent.localid == localID)
-                {
-                    ((OpenSim.RegionServer.Simulator.Primitive)ent).UpdateObjectFlags((ObjectFlagUpdatePacket) packet);
-                    break;
-                }
-            }
-        }
-        public void UpdatePrimTexture(uint localID, byte[] texture, ClientView remoteClient)
-        {
-            foreach (Entity ent in Entities.Values)
-            {
-                if (ent.localid == localID)
-                {
-                    ((OpenSim.RegionServer.Simulator.Primitive)ent).UpdateTexture(texture);
-                    break;
-                }
-            }
-        }
-        public void UpdatePrimPosition(uint localID, LLVector3 pos, ClientView remoteClient)
-        {
-            foreach (Entity ent in Entities.Values)
-            {
-                if (ent.localid == localID)
-                {
-                    ((OpenSim.RegionServer.Simulator.Primitive)ent).UpdatePosition(pos);
-                    break;
-                }
-            }
-        }
-        public void UpdatePrimRotation(uint localID, LLQuaternion rot, ClientView remoteClient)
-        {
-            foreach (Entity ent in Entities.Values)
-            {
-                if (ent.localid == localID)
-                {
-                    ent.rotation = new Axiom.MathLib.Quaternion(rot.W, rot.X, rot.Y, rot.Z);
-                    ((OpenSim.RegionServer.Simulator.Primitive)ent).UpdateFlag = true;
-                    break;
-                }
-            }
-        }
-        public void UpdatePrimScale(uint localID, LLVector3 scale, ClientView remoteClient)
-        {
-            foreach (Entity ent in Entities.Values)
-            {
-                if (ent.localid == localID)
-                {
-                    ((OpenSim.RegionServer.Simulator.Primitive)ent).Scale = scale;
-                    break;
-                }
-            }
-        }
-        #region Parcel Packet Handlers
-        void ParcelPropertiesRequest(int start_x, int start_y, int end_x, int end_y, int sequence_id, bool snap_selection, ClientView remote_client)
-        {
-            //Get the parcels within the bounds
-            List<OpenSim.RegionServer.Simulator.Parcel> temp = new List<OpenSim.RegionServer.Simulator.Parcel>();
-            int x, y, i;
-            int inc_x = end_x - start_x;
-            int inc_y = end_y - start_y;
-            for(x = 0; x < inc_x; x++)
-            {
-                for(y = 0; y < inc_y; y++)
-                {
-                    OpenSim.RegionServer.Simulator.Parcel currentParcel = parcelManager.getParcel(start_x + x, start_y + y);
-                    if(!temp.Contains(currentParcel))
-                    {
-                        currentParcel.
-                            forceUpdateParcelInfo();
-                        temp.Add(currentParcel);
-                    }
-                }
-            }
-            int requestResult = OpenSim.RegionServer.Simulator.ParcelManager.PARCEL_RESULT_ONE_PARCEL;
-            if (temp.Count > 1)
-            {
-                requestResult = OpenSim.RegionServer.Simulator.ParcelManager.PARCEL_RESULT_MULTIPLE_PARCELS;
-            }
-            for (i = 0; i < temp.Count; i++)
-            {
-                temp[i].sendParcelProperties(sequence_id, snap_selection, requestResult, remote_client);
-            }
-            parcelManager.sendParcelOverlay(remote_client);
-        }
-        void ParcelDivideRequest(int west, int south, int east, int north, ClientView remote_client)
-        {
-            parcelManager.subdivide(west, south, east, north, remote_client.AgentID);
-        }
-        void ParcelJoinRequest(int west, int south, int east, int north, ClientView remote_client)
-        {
-            parcelManager.join(west, south, east, north, remote_client.AgentID);
-        }
-        void ParcelPropertiesUpdateRequest(ParcelPropertiesUpdatePacket packet, ClientView remote_client)
-        {
-            if (parcelManager.parcelList.ContainsKey(packet.ParcelData.LocalID))
-            {
-                parcelManager.parcelList[packet.ParcelData.LocalID].updateParcelProperties(packet, remote_client);
-            }
-        }
-        #endregion
-        /*
-        public void RequestMapBlock(ClientView simClient, int minX, int minY, int maxX, int maxY)
-        {
-            System.Text.Encoding _enc = System.Text.Encoding.ASCII;
-            if (((m_regInfo.RegionLocX > minX) && (m_regInfo.RegionLocX < maxX)) && ((m_regInfo.RegionLocY > minY) && (m_regInfo.RegionLocY < maxY)))
-            {
-                MapBlockReplyPacket mapReply = new MapBlockReplyPacket();
-                mapReply.AgentData.AgentID = simClient.AgentID;
-                mapReply.AgentData.Flags = 0;
-                mapReply.Data = new MapBlockReplyPacket.DataBlock[1];
-                mapReply.Data[0] = new MapBlockReplyPacket.DataBlock();
-                mapReply.Data[0].MapImageID = new LLUUID("00000000-0000-0000-9999-000000000007");
-                mapReply.Data[0].X = (ushort)m_regInfo.RegionLocX;
-                mapReply.Data[0].Y = (ushort)m_regInfo.RegionLocY;
-                mapReply.Data[0].WaterHeight = (byte)m_regInfo.RegionWaterHeight;
-                mapReply.Data[0].Name = _enc.GetBytes(this.m_regionName);
-                mapReply.Data[0].RegionFlags = 72458694;
-                mapReply.Data[0].Access = 13;
-                mapReply.Data[0].Agents = 1; //should send number of clients connected
-                simClient.OutPacket(mapReply);
-            }
-        }
-         public bool RezObjectHandler(ClientView simClient, Packet packet)
-        {
-            RezObjectPacket rezPacket = (RezObjectPacket)packet;
-            AgentInventory inven = this._inventoryCache.GetAgentsInventory(simClient.AgentID);
-            if (inven != null)
-            {
-                if (inven.InventoryItems.ContainsKey(rezPacket.InventoryData.ItemID))
-                {
-                    AssetBase asset = this._assetCache.GetAsset(inven.InventoryItems[rezPacket.InventoryData.ItemID].AssetID);
-                    if (asset != null)
-                    {
-                        PrimData primd = new PrimData(asset.Data);
-                        Primitive nPrim = new Primitive(m_clientThreads, m_regionHandle, this);
-                        nPrim.CreateFromStorage(primd, rezPacket.RezData.RayEnd, this._primCount, true);
-                        this.Entities.Add(nPrim.uuid, nPrim);
-                        this._primCount++;
-                        this._inventoryCache.DeleteInventoryItem(simClient, rezPacket.InventoryData.ItemID);
-                    }
-                }
-            }
-            return true;
-        }
-         public bool ModifyTerrain(ClientView simClient, Packet packet)
-        {
-            ModifyLandPacket modify = (ModifyLandPacket)packet;
-            switch (modify.ModifyBlock.Action)
-            {
-                case 1:
-                    // raise terrain
-                    if (modify.ParcelData.Length > 0)
-                    {
-                        Terrain.raise(modify.ParcelData[0].North, modify.ParcelData[0].West, 10.0, 0.1);
-                        RegenerateTerrain(true, (int)modify.ParcelData[0].North, (int)modify.ParcelData[0].West);
-                    }
-                    break;
-                case 2:
-                    //lower terrain
-                    if (modify.ParcelData.Length > 0)
-                    {
-                        Terrain.lower(modify.ParcelData[0].North, modify.ParcelData[0].West, 10.0, 0.1);
-                        RegenerateTerrain(true, (int)modify.ParcelData[0].North, (int)modify.ParcelData[0].West);
-                    }
-                    break;
-            }
-            return true;
-        }
-         */
-    }
-}
diff --git a/OpenSim/OpenSim.RegionServer/Simulator/World.Scripting.cs b/OpenSim/OpenSim.RegionServer/Simulator/World.Scripting.cs
deleted file mode 100644
index 747730c..0000000
--- a/OpenSim/OpenSim.RegionServer/Simulator/World.Scripting.cs
+++ /dev/null
@@ -1,151 +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.Reflection;
-using OpenSim.Framework;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-using libsecondlife;
-namespace OpenSim.RegionServer.Simulator
-{
-    public partial class World
-    {
-        private Dictionary<string, IScriptEngine> scriptEngines = new Dictionary<string, IScriptEngine>();
-        private void LoadScriptEngines()
-        {
-            this.LoadScriptPlugins();
-        }
-        public void LoadScriptPlugins()
-        {
-            string path = Path.Combine(System.AppDomain.CurrentDomain.BaseDirectory, "ScriptEngines");
-            string[] pluginFiles = Directory.GetFiles(path, "*.dll");
-            for (int i = 0; i < pluginFiles.Length; i++)
-            {
-                this.AddPlugin(pluginFiles[i]);
-            }
-        }
-        private void AddPlugin(string FileName)
-        {
-            Assembly pluginAssembly = Assembly.LoadFrom(FileName);
-            foreach (Type pluginType in pluginAssembly.GetTypes())
-            {
-                if (pluginType.IsPublic)
-                {
-                    if (!pluginType.IsAbstract)
-                    {
-                        Type typeInterface = pluginType.GetInterface("IScriptEngine", true);
-                        if (typeInterface != null)
-                        {
-                            IScriptEngine plug = (IScriptEngine)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
-                            plug.Init(this);
-                            this.scriptEngines.Add(plug.GetName(), plug);
-                        }
-                        typeInterface = null;
-                    }
-                }
-            }
-            pluginAssembly = null;
-        }
-        public void LoadScript(string scriptType, string scriptName, string script, Entity ent)
-        {
-            if(this.scriptEngines.ContainsKey(scriptType))
-            {
-                this.scriptEngines[scriptType].LoadScript(script, scriptName, ent.localid);
-            }
-        }
-        #region IScriptAPI Methods
-        public OSVector3 GetEntityPosition(uint localID)
-        {
-            OSVector3 res = new OSVector3();
-           // Console.WriteLine("script-  getting entity " + localID + " position");
-            foreach (Entity entity in this.Entities.Values)
-            {
-                if (entity.localid == localID)
-                {
-                    res.X = entity.Pos.X;
-                    res.Y = entity.Pos.Y;
-                    res.Z = entity.Pos.Z;
-                }
-            }
-            return res;
-        }
-        public void SetEntityPosition(uint localID, float x , float y, float z)
-        {
-            foreach (Entity entity in this.Entities.Values)
-            {
-                if (entity.localid == localID && entity is Primitive)
-                {
-                    LLVector3 pos = entity.Pos;
-                    pos.X = x;
-                    pos.Y = y;
-                   Primitive prim = entity as Primitive;
-                    // Of course, we really should have asked the physEngine if this is possible, and if not, returned false.
-                   prim.UpdatePosition(pos);
-                   // Console.WriteLine("script- setting entity " + localID + " positon");
-                }
-            }
-           
-        }
-        public uint GetRandomAvatarID()
-        {
-            //Console.WriteLine("script- getting random avatar id");
-            uint res = 0;
-            foreach (Entity entity in this.Entities.Values)
-            {
-                if (entity is Avatar)
-                {
-                    res = entity.localid;
-                }
-            }
-            return res;
-        }
-        #endregion
-    }
-}
diff --git a/OpenSim/OpenSim.RegionServer/Simulator/World.cs b/OpenSim/OpenSim.RegionServer/Simulator/World.cs
deleted file mode 100644
index ac64c79..0000000
--- a/OpenSim/OpenSim.RegionServer/Simulator/World.cs
+++ /dev/null
@@ -1,737 +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 libsecondlife.Packets;
-using System.Collections.Generic;
-using System.Text;
-using System.Reflection;
-using System.IO;
-using System.Threading;
-using OpenSim.Physics.Manager;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Terrain;
-using OpenSim.Framework.Inventory;
-using OpenSim.RegionServer.Assets;
-using OpenSim.RegionServer.Scripting;
-using OpenSim.Terrain;
-using OpenSim.Framework.Console;
-using OpenSim.RegionServer.Client;
-namespace OpenSim.RegionServer.Simulator
-{
-    public partial class World : WorldBase, ILocalStorageReceiver, IScriptAPI
-    {
-        public object LockPhysicsEngine = new object();
-        public Dictionary<libsecondlife.LLUUID, Avatar> Avatars;
-        public Dictionary<libsecondlife.LLUUID, Primitive> Prims;
-        //public ScriptEngine Scripts;
-        public uint _localNumber = 0;
-        private PhysicsScene phyScene;
-        private float timeStep = 0.1f;
-        public ILocalStorage localStorage;
-        private Random Rand = new Random();
-        private uint _primCount = 702000;
-        private int storageCount;
-        private Dictionary<LLUUID, ScriptHandler> m_scriptHandlers;
-        private Dictionary<string, ScriptFactory> m_scripts;
-        private Mutex updateLock;
-        public string m_datastore;
-        public OpenSim.RegionServer.Simulator.ParcelManager parcelManager;
-        public OpenSim.RegionServer.Estate.EstateManager estateManager;
-        #region Properties
-        public PhysicsScene PhysScene
-        {
-            set
-            {
-                this.phyScene = value;
-            }
-            get
-            {
-                return (this.phyScene);
-            }
-        }
-        #endregion
-        #region Constructors
-        /// <summary>
-        /// Creates a new World class, and a region to go with it.
-        /// </summary>
-        /// <param name="clientThreads">Dictionary to contain client threads</param>
-        /// <param name="regionHandle">Region Handle for this region</param>
-        /// <param name="regionName">Region Name for this region</param>
-        public World(Dictionary<uint, ClientView> clientThreads, RegionInfo regInfo, ulong regionHandle, string regionName)
-        {
-            try
-            {
-                updateLock = new Mutex(false);
-                m_clientThreads = clientThreads;
-                m_regionHandle = regionHandle;
-                m_regionName = regionName;
-                m_regInfo = regInfo;
-                m_scriptHandlers = new Dictionary<LLUUID, ScriptHandler>();
-                m_scripts = new Dictionary<string, ScriptFactory>();
-                MainConsole.Instance.Notice("World.cs - creating new entitities instance");
-                Entities = new Dictionary<libsecondlife.LLUUID, Entity>();
-                Avatars = new Dictionary<LLUUID, Avatar>();
-                Prims = new Dictionary<LLUUID, Primitive>();
-                MainConsole.Instance.Notice("World.cs - creating LandMap");
-                TerrainManager = new TerrainManager(new SecondLife());
-                Terrain = new TerrainEngine();
-                Avatar.SetupTemplate("avatar-texture.dat");
-                //      MainConsole.Instance.WriteLine("World.cs - Creating script engine instance");
-                // Initialise this only after the world has loaded
-                //      Scripts = new ScriptEngine(this);
-                Avatar.LoadAnims();
-                this.SetDefaultScripts();
-                this.LoadScriptEngines();
-                
-            }
-            catch (Exception e)
-            {
-                OpenSim.Framework.Console.MainConsole.Instance.Error("World.cs: Constructor failed with exception " + e.ToString());
-            }
-        }
-        #endregion
-        #region Script Methods
-        /// <summary>
-        /// Loads a new script into the specified entity
-        /// </summary>
-        /// <param name="entity">Entity to be scripted</param>
-        /// <param name="script">The script to load</param>
-        public void AddScript(Entity entity, Script script)
-        {
-            try
-            {
-                ScriptHandler scriptHandler = new ScriptHandler(script, entity, this);
-                m_scriptHandlers.Add(scriptHandler.ScriptId, scriptHandler);
-            }
-            catch (Exception e)
-            {
-                MainConsole.Instance.Warn("World.cs: AddScript() - Failed with exception " + e.ToString());
-            }
-        }
-        /// <summary>
-        /// Loads a new script into the specified entity, using a script loaded from a string.
-        /// </summary>
-        /// <param name="entity">The entity to be scripted</param>
-        /// <param name="scriptData">The string containing the script</param>
-        public void AddScript(Entity entity, string scriptData)
-        {
-            try
-            {
-                int scriptstart = 0;
-                int scriptend = 0;
-                string substring;
-                scriptstart = scriptData.LastIndexOf("<Script>");
-                scriptend = scriptData.LastIndexOf("</Script>");
-                substring = scriptData.Substring(scriptstart + 8, scriptend - scriptstart - 8);
-                substring = substring.Trim();
-                //Console.WriteLine("searching for script to add: " + substring);
-                ScriptFactory scriptFactory;
-                //Console.WriteLine("script string is " + substring);
-                if (substring.StartsWith("<ScriptEngine:"))
-                {
-                    string substring1 = "";
-                    string script = "";
-                    // Console.WriteLine("searching for script engine");
-                    substring1 = substring.Remove(0, 14);
-                    int dev = substring1.IndexOf(',');
-                    string sEngine = substring1.Substring(0, dev);
-                    substring1 = substring1.Remove(0, dev + 1);
-                    int end = substring1.IndexOf('>');
-                    string sName = substring1.Substring(0, end);
-                    //Console.WriteLine(" script info : " + sEngine + " , " + sName);
-                    int startscript = substring.IndexOf('>');
-                    script = substring.Remove(0, startscript + 1);
-                    // Console.WriteLine("script data is " + script);
-                    if (this.scriptEngines.ContainsKey(sEngine))
-                    {
-                        this.scriptEngines[sEngine].LoadScript(script, sName, entity.localid);
-                    }
-                }
-                else if (this.m_scripts.TryGetValue(substring, out scriptFactory))
-                {
-                    //Console.WriteLine("added script");
-                    this.AddScript(entity, scriptFactory());
-                }
-            }
-            catch (Exception e)
-            {
-                MainConsole.Instance.Warn("World.cs: AddScript() - Failed with exception " + e.ToString());
-            }
-        }
-        #endregion
-        #region Update Methods
-        /// <summary>
-        /// Performs per-frame updates on the world, this should be the central world loop
-        /// </summary>
-        public override void Update()
-        {
-            updateLock.WaitOne();
-            try
-            {
-                if (this.phyScene.IsThreaded)
-                {
-                    this.phyScene.GetResults();
-                }
-                foreach (libsecondlife.LLUUID UUID in Entities.Keys)
-                {
-                    Entities[UUID].addForces();
-                }
-                lock (this.LockPhysicsEngine)
-                {
-                    this.phyScene.Simulate(timeStep);
-                }
-                foreach (libsecondlife.LLUUID UUID in Entities.Keys)
-                {
-                    Entities[UUID].update();
-                }
-                foreach (ScriptHandler scriptHandler in m_scriptHandlers.Values)
-                {
-                    scriptHandler.OnFrame();
-                }
-                foreach (IScriptEngine scripteng in this.scriptEngines.Values)
-                {
-                    scripteng.OnFrame();
-                }
-                //backup world data
-                this.storageCount++;
-                if (storageCount > 1200) //set to how often you want to backup 
-                {
-                    this.Backup();
-                    storageCount = 0;
-                }
-            }
-            catch (Exception e)
-            {
-                MainConsole.Instance.Warn("World.cs: Update() - Failed with exception " + e.ToString());
-            }
-            updateLock.ReleaseMutex();
-        }
-        public bool Backup()
-        {
-            try
-            {
-                // Terrain backup routines
-                if (Terrain.tainted > 0)
-                {
-                    Terrain.tainted = 0;
-                    MainConsole.Instance.Notice("World.cs: Backup() - Terrain tainted, saving.");
-                    localStorage.SaveMap(Terrain.getHeights1D());
-                    MainConsole.Instance.Notice("World.cs: Backup() - Rebuilding world map image.");
-                    Terrain.exportImage("map_" + m_regInfo.RegionName.ToLower() + ".png", "defaultstripe.png");
-                    MainConsole.Instance.Notice("World.cs: Backup() - Terrain saved, informing Physics.");
-                    phyScene.SetTerrain(Terrain.getHeights1D());
-                    // Needs optimising to just send patches which have changed.
-                    MainConsole.Instance.Notice("World.cs: Backup() - Terrain changed, informing Clients.");
-                    foreach (ClientView client in m_clientThreads.Values)
-                    {
-                        this.SendLayerData(client);
-                    }
-                }
-                // Primitive backup routines -- should only do if there's been a change.
-                MainConsole.Instance.Notice("World.cs: Backup() - Backing up Primitives");
-                foreach (libsecondlife.LLUUID UUID in Entities.Keys)
-                {
-                    Entities[UUID].BackUp();
-                }
-                
-                //Parcel backup routines. Yay!
-                ParcelData[] parcels = new ParcelData[parcelManager.parcelList.Count];
-                int i = 0;
-                foreach(OpenSim.RegionServer.Simulator.Parcel parcel in parcelManager.parcelList.Values)
-                {
-                    parcels[i] = parcel.parcelData;
-                    i++;
-                }
-                localStorage.SaveParcels(parcels);
-                // Backup successful
-                return true;
-            }
-            catch (Exception e)
-            {
-                // Backup failed
-                OpenSim.Framework.Console.MainConsole.Instance.Error("World.cs: Backup() - Backup Failed with exception " + e.ToString());
-                return false;
-            }
-        }
-        #endregion
-        #region Setup Methods
-        /// <summary>
-        /// Loads a new storage subsystem from a named library
-        /// </summary>
-        /// <param name="dllName">Storage Library</param>
-        /// <returns>Successful or not</returns>
-        public bool LoadStorageDLL(string dllName)
-        {
-            try
-            {
-                Assembly pluginAssembly = Assembly.LoadFrom(dllName);
-                ILocalStorage store = null;
-                foreach (Type pluginType in pluginAssembly.GetTypes())
-                {
-                    if (pluginType.IsPublic)
-                    {
-                        if (!pluginType.IsAbstract)
-                        {
-                            Type typeInterface = pluginType.GetInterface("ILocalStorage", true);
-                            if (typeInterface != null)
-                            {
-                                ILocalStorage plug = (ILocalStorage)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
-                                store = plug;
-                                store.Initialise(this.m_datastore);
-                                break;
-                            }
-                            typeInterface = null;
-                        }
-                    }
-                }
-                pluginAssembly = null;
-                this.localStorage = store;
-                return (store == null);
-            }
-            catch (Exception e)
-            {
-                MainConsole.Instance.Warn("World.cs: LoadStorageDLL() - Failed with exception " + e.ToString());
-                return false;
-            }
-        }
-        public void SetDefaultScripts()
-        {
-            this.m_scripts.Add("FollowRandomAvatar", delegate()
-                                                             {
-                                                                 return new OpenSim.RegionServer.Scripting.FollowRandomAvatar();
-                                                             });
-        }
-        #endregion
-        #region Regenerate Terrain
-        /// <summary>
-        /// Rebuilds the terrain using a procedural algorithm
-        /// </summary>
-        public void RegenerateTerrain()
-        {
-            try
-            {
-                Terrain.hills();
-                lock (this.LockPhysicsEngine)
-                {
-                    this.phyScene.SetTerrain(Terrain.getHeights1D());
-                }
-                this.localStorage.SaveMap(this.Terrain.getHeights1D());
-                foreach (ClientView client in m_clientThreads.Values)
-                {
-                    this.SendLayerData(client);
-                }
-                foreach (libsecondlife.LLUUID UUID in Entities.Keys)
-                {
-                    Entities[UUID].LandRenegerated();
-                }
-            }
-            catch (Exception e)
-            {
-                MainConsole.Instance.Warn("World.cs: RegenerateTerrain() - Failed with exception " + e.ToString());
-            }
-        }
-        /// <summary>
-        /// Rebuilds the terrain using a 2D float array
-        /// </summary>
-        /// <param name="newMap">256,256 float array containing heights</param>
-        public void RegenerateTerrain(float[,] newMap)
-        {
-            try
-            {
-                this.Terrain.setHeights2D(newMap);
-                lock (this.LockPhysicsEngine)
-                {
-                    this.phyScene.SetTerrain(this.Terrain.getHeights1D());
-                }
-                this.localStorage.SaveMap(this.Terrain.getHeights1D());
-                foreach (ClientView client in m_clientThreads.Values)
-                {
-                    this.SendLayerData(client);
-                }
-                foreach (libsecondlife.LLUUID UUID in Entities.Keys)
-                {
-                    Entities[UUID].LandRenegerated();
-                }
-            }
-            catch (Exception e)
-            {
-                MainConsole.Instance.Warn("World.cs: RegenerateTerrain() - Failed with exception " + e.ToString());
-            }
-        }
-        /// <summary>
-        /// Rebuilds the terrain assuming changes occured at a specified point[?]
-        /// </summary>
-        /// <param name="changes">???</param>
-        /// <param name="pointx">???</param>
-        /// <param name="pointy">???</param>
-        public void RegenerateTerrain(bool changes, int pointx, int pointy)
-        {
-            try
-            {
-                if (changes)
-                {
-                    /* Dont save here, rely on tainting system instead */
-                    foreach (ClientView client in m_clientThreads.Values)
-                    {
-                        this.SendLayerData(pointx, pointy, client);
-                    }
-                }
-            }
-            catch (Exception e)
-            {
-                MainConsole.Instance.Warn("World.cs: RegenerateTerrain() - Failed with exception " + e.ToString());
-            }
-        }
-        #endregion
-        #region Load Terrain
-        /// <summary>
-        /// Loads the World heightmap
-        /// </summary>
-        public override void LoadWorldMap()
-        {
-            try
-            {
-                float[] map = this.localStorage.LoadWorld();
-                if (map == null)
-                {
-                    if (string.IsNullOrEmpty(this.m_regInfo.estateSettings.terrainFile))
-                    {
-                        Console.WriteLine("No default terrain, procedurally generating...");
-                        this.Terrain.hills();
-                        this.localStorage.SaveMap(this.Terrain.getHeights1D());
-                    }
-                    else
-                    {
-                        try
-                        {
-                            this.Terrain.loadFromFileF32(this.m_regInfo.estateSettings.terrainFile);
-                            this.Terrain *= this.m_regInfo.estateSettings.terrainMultiplier;
-                        }
-                        catch
-                        {
-                            Console.WriteLine("Unable to load default terrain, procedurally generating instead...");
-                            Terrain.hills();
-                        }
-                        this.localStorage.SaveMap(this.Terrain.getHeights1D());
-                    }
-                }
-                else
-                {
-                    this.Terrain.setHeights1D(map);
-                }
-            }
-            catch (Exception e)
-            {
-                MainConsole.Instance.Warn("World.cs: LoadWorldMap() - Failed with exception " + e.ToString());
-            }
-        }
-        #endregion
-        #region Primitives Methods
-        /// <summary>
-        /// Sends prims to a client
-        /// </summary>
-        /// <param name="RemoteClient">Client to send to</param>
-        public void GetInitialPrims(ClientView RemoteClient)
-        {
-            try
-            {
-                foreach (libsecondlife.LLUUID UUID in Entities.Keys)
-                {
-                    if (Entities[UUID] is Primitive)
-                    {
-                        Primitive primitive = Entities[UUID] as Primitive;
-                        primitive.UpdateClient(RemoteClient);
-                    }
-                }
-            }
-            catch (Exception e)
-            {
-                MainConsole.Instance.Warn("World.cs: GetInitialPrims() - Failed with exception " + e.ToString());
-            }
-        }
-        /// <summary>
-        /// Loads the World's objects
-        /// </summary>
-        public void LoadPrimsFromStorage()
-        {
-            try
-            {
-                MainConsole.Instance.Notice("World.cs: LoadPrimsFromStorage() - Loading primitives");
-                this.localStorage.LoadPrimitives(this);
-            }
-            catch (Exception e)
-            {
-                MainConsole.Instance.Warn("World.cs: LoadPrimsFromStorage() - Failed with exception " + e.ToString());
-            }
-        }
-        /// <summary>
-        /// Loads a specific object from storage
-        /// </summary>
-        /// <param name="prim">The object to load</param>
-        public void PrimFromStorage(PrimData prim)
-        {
-            try
-            {
-                if (prim.LocalID >= this._primCount)
-                {
-                    _primCount = prim.LocalID + 1;
-                }
-                MainConsole.Instance.Notice("World.cs: PrimFromStorage() - Reloading prim (localId " + prim.LocalID + " ) from storage");
-                Primitive nPrim = new Primitive(m_clientThreads, m_regionHandle, this);
-                nPrim.CreateFromStorage(prim);
-                this.Entities.Add(nPrim.uuid, nPrim);
-            }
-            catch (Exception e)
-            {
-                MainConsole.Instance.Warn("World.cs: PrimFromStorage() - Failed with exception " + e.ToString());
-            }
-        }
-        public void AddNewPrim(Packet addPacket, ClientView agentClient)
-        {
-            AddNewPrim((ObjectAddPacket)addPacket, agentClient.AgentID);
-        }
-        public void AddNewPrim(ObjectAddPacket addPacket, LLUUID ownerID)
-        {
-            try
-            {
-                MainConsole.Instance.Notice("World.cs: AddNewPrim() - Creating new prim");
-                Primitive prim = new Primitive(m_clientThreads, m_regionHandle, this);
-                prim.CreateFromPacket(addPacket, ownerID, this._primCount);
-                PhysicsVector pVec = new PhysicsVector(prim.Pos.X, prim.Pos.Y, prim.Pos.Z);
-                PhysicsVector pSize = new PhysicsVector(0.255f, 0.255f, 0.255f);
-                if (OpenSim.RegionServer.Simulator.Avatar.PhysicsEngineFlying)
-                {
-                    lock (this.LockPhysicsEngine)
-                    {
-                        prim.PhysActor = this.phyScene.AddPrim(pVec, pSize);
-                    }
-                }
-                this.Entities.Add(prim.uuid, prim);
-                this._primCount++;
-            }
-            catch (Exception e)
-            {
-                MainConsole.Instance.Warn("World.cs: AddNewPrim() - Failed with exception " + e.ToString());
-            }
-        }
-        #endregion
-        #region Add/Remove Avatar Methods
-        public override Avatar AddViewerAgent(ClientView agentClient)
-        {
-            //register for events
-            agentClient.OnChatFromViewer += new ChatFromViewer(this.SimChat);
-            agentClient.OnRezObject += new RezObject(this.RezObject);
-            agentClient.OnModifyTerrain += new ModifyTerrain(this.ModifyTerrain);
-            agentClient.OnRegionHandShakeReply += new ClientView.GenericCall(this.SendLayerData);
-            agentClient.OnRequestWearables += new ClientView.GenericCall(this.GetInitialPrims);
-            agentClient.OnRequestAvatarsData += new ClientView.GenericCall(this.SendAvatarsToClient);
-            agentClient.OnLinkObjects += new LinkObjects(this.LinkObjects);
-            agentClient.OnAddPrim += new ClientView.GenericCall4(this.AddNewPrim);
-            agentClient.OnUpdatePrimShape += new ClientView.UpdateShape(this.UpdatePrimShape);
-            
-            agentClient.OnObjectSelect += new ClientView.ObjectSelect(this.SelectPrim);
-            agentClient.OnUpdatePrimFlags += new ClientView.UpdatePrimFlags(this.UpdatePrimFlags);
-            agentClient.OnUpdatePrimTexture += new ClientView.UpdatePrimTexture(this.UpdatePrimTexture);
-            agentClient.OnUpdatePrimPosition += new ClientView.UpdatePrimVector(this.UpdatePrimPosition);
-            agentClient.OnUpdatePrimRotation += new ClientView.UpdatePrimRotation(this.UpdatePrimRotation);
-            agentClient.OnUpdatePrimScale += new ClientView.UpdatePrimVector(this.UpdatePrimScale);
-            agentClient.OnDeRezObject += new ClientView.GenericCall4(this.DeRezObject);
-            agentClient.OnParcelPropertiesRequest += new OpenSim.RegionServer.Simulator.ParcelPropertiesRequest(ParcelPropertiesRequest);
-            agentClient.OnParcelDivideRequest += new OpenSim.RegionServer.Simulator.ParcelDivideRequest(ParcelDivideRequest);
-            agentClient.OnParcelJoinRequest+=new OpenSim.RegionServer.Simulator.ParcelJoinRequest(ParcelJoinRequest);
-            agentClient.OnParcelPropertiesUpdateRequest += new OpenSim.RegionServer.Simulator.ParcelPropertiesUpdateRequest(ParcelPropertiesUpdateRequest);
-            
-            Avatar newAvatar = null;
-            try
-            {
-                MainConsole.Instance.Notice("World.cs:AddViewerAgent() - Creating new avatar for remote viewer agent");
-                newAvatar = new Avatar(agentClient, this);
-                MainConsole.Instance.Notice("World.cs:AddViewerAgent() - Adding new avatar to world");
-                MainConsole.Instance.Notice("World.cs:AddViewerAgent() - Starting RegionHandshake ");
-                estateManager.sendRegionHandshake(newAvatar.ControllingClient);                
-                    
-                PhysicsVector pVec = new PhysicsVector(newAvatar.Pos.X, newAvatar.Pos.Y, newAvatar.Pos.Z);
-                lock (this.LockPhysicsEngine)
-                {
-                    newAvatar.PhysActor = this.phyScene.AddAvatar(pVec);
-                }
-                lock (Entities)
-                {
-                    if (!Entities.ContainsKey(agentClient.AgentID))
-                    {
-                        this.Entities.Add(agentClient.AgentID, newAvatar);
-                    }
-                    else
-                    {
-                        Entities[agentClient.AgentID] = newAvatar;
-                    }
-                }
-                lock (Avatars)
-                {
-                    if (Avatars.ContainsKey(agentClient.AgentID))
-                    {
-                        Avatars[agentClient.AgentID] = newAvatar;
-                    }
-                    else
-                    {
-                        this.Avatars.Add(agentClient.AgentID, newAvatar);
-                    }
-                }
-            }
-            catch (Exception e)
-            {
-                MainConsole.Instance.Warn("World.cs: AddViewerAgent() - Failed with exception " + e.ToString());
-            }
-            return newAvatar;
-        }
-        
-        
-       
-        public override void RemoveViewerAgent(ClientView agentClient)
-        {
-            try
-            {
-                lock (Entities)
-                {
-                    Entities.Remove(agentClient.AgentID);
-                }
-                lock (Avatars)
-                {
-                    Avatars.Remove(agentClient.AgentID);
-                }
-                if (agentClient.ClientAvatar.PhysActor != null)
-                {
-                    this.phyScene.RemoveAvatar(agentClient.ClientAvatar.PhysActor);
-                }
-            }
-            catch (Exception e)
-            {
-                MainConsole.Instance.Warn("World.cs: RemoveViewerAgent() - Failed with exception " + e.ToString());
-            }
-        }
-        #endregion
-        #region Request Avatars List Methods
-        //The idea is to have a group of method that return a list of avatars meeting some requirement
-        // ie it could be all Avatars within a certain range of the calling prim/avatar. 
-        public List<Avatar> RequestAvatarList()
-        {
-            List<Avatar> result = new List<Avatar>();
-            foreach (Avatar avatar in Avatars.Values)
-            {
-                result.Add(avatar);
-            }
-            return result;
-        }
-        #endregion
-        #region ShutDown
-        /// <summary>
-        /// Tidy before shutdown
-        /// </summary>
-        public override void Close()
-        {
-            try
-            {
-                this.localStorage.ShutDown();
-            }
-            catch (Exception e)
-            {
-                OpenSim.Framework.Console.MainConsole.Instance.Error("World.cs: Close() - Failed with exception " + e.ToString());
-            }
-        }
-        #endregion
-    }
-}
diff --git a/OpenSim/OpenSim.RegionServer/Simulator/WorldBase.cs b/OpenSim/OpenSim.RegionServer/Simulator/WorldBase.cs
deleted file mode 100644
index c09ddd0..0000000
--- a/OpenSim/OpenSim.RegionServer/Simulator/WorldBase.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 libsecondlife;
-using libsecondlife.Packets;
-using System.Collections.Generic;
-using System.Text;
-using System.Reflection;
-using System.IO;
-using System.Threading;
-using OpenSim.Physics.Manager;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Terrain;
-using OpenSim.Framework.Inventory;
-using OpenSim.RegionServer.Assets;
-using OpenSim.RegionServer.Scripting;
-using OpenSim.RegionServer.Client;
-using OpenSim.Terrain;
-using OpenSim.Framework.Console;
-namespace OpenSim.RegionServer.Simulator
-{
-    public class WorldBase
-    {
-        public Dictionary<libsecondlife.LLUUID, Entity> Entities;
-        protected Dictionary<uint, ClientView> m_clientThreads;
-        protected ulong m_regionHandle;
-        protected string m_regionName;
-        protected InventoryCache _inventoryCache;
-        protected AssetCache _assetCache;
-        public RegionInfo m_regInfo;
-        public TerrainEngine Terrain; //TODO: Replace TerrainManager with this.
-        protected libsecondlife.TerrainManager TerrainManager; // To be referenced via TerrainEngine
-        #region Properties
-        public InventoryCache InventoryCache
-        {
-            set
-            {
-                this._inventoryCache = value;
-            }
-        }
-        public AssetCache AssetCache
-        {
-            set
-            {
-                this._assetCache = value;
-            }
-        }
-        #endregion
-        #region Constructors
-        public WorldBase()
-        {
-        }
-        #endregion
-        #region Setup Methods
-        /// <summary>
-        /// Register Packet handler Methods with the packet server (which will register them with the SimClient)
-        /// </summary>
-        /// <param name="packetServer"></param>
-        public virtual void RegisterPacketHandlers(PacketServer packetServer)
-        {
-        }
-        #endregion
-        #region Update Methods
-        /// <summary>
-        /// Normally called once every frame/tick to let the world preform anything required (like running the physics simulation)
-        /// </summary>
-        public virtual void Update()
-        {
-        }
-        #endregion
-        #region Terrain Methods
-        /// <summary>
-        /// Loads the World heightmap
-        /// </summary>
-        public virtual void LoadWorldMap()
-        {
-        }
-        /// <summary>
-        /// Send the region heightmap to the client
-        /// </summary>
-        /// <param name="RemoteClient">Client to send to</param>
-        public virtual void SendLayerData(ClientView RemoteClient)
-        {
-            try
-            {
-                int[] patches = new int[4];
-                for (int y = 0; y < 16; y++)
-                {
-                    for (int x = 0; x < 16; x = x + 4)
-                    {
-                        patches[0] = x + 0 + y * 16;
-                        patches[1] = x + 1 + y * 16;
-                        patches[2] = x + 2 + y * 16;
-                        patches[3] = x + 3 + y * 16;
-                        Packet layerpack = TerrainManager.CreateLandPacket(Terrain.getHeights1D(), patches);
-                        RemoteClient.OutPacket(layerpack);
-                    }
-                }
-            }
-            catch (Exception e)
-            {
-                MainConsole.Instance.Warn("World.cs: SendLayerData() - Failed with exception " + e.ToString());
-            }
-        }
-        /// <summary>
-        /// Sends a specified patch to a client
-        /// </summary>
-        /// <param name="px">Patch coordinate (x) 0..16</param>
-        /// <param name="py">Patch coordinate (y) 0..16</param>
-        /// <param name="RemoteClient">The client to send to</param>
-        public void SendLayerData(int px, int py, ClientView RemoteClient)
-        {
-            try
-            {
-                int[] patches = new int[1];
-                int patchx, patchy;
-                patchx = px / 16;
-                patchy = py / 16;
-                patches[0] = patchx + 0 + patchy * 16;
-                Packet layerpack = TerrainManager.CreateLandPacket(Terrain.getHeights1D(), patches);
-                RemoteClient.OutPacket(layerpack);
-            }
-            catch (Exception e)
-            {
-                MainConsole.Instance.Warn("World.cs: SendLayerData() - Failed with exception " + e.ToString());
-            }
-        }
-        #endregion
-        #region Add/Remove Agent/Avatar
-        /// <summary>
-        /// Add a new Agent's avatar
-        /// </summary>
-        /// <param name="agentClient"></param>
-        public virtual Avatar AddViewerAgent(ClientView agentClient)
-        {
-            return null;
-        }
-        /// <summary>
-        /// Remove a Agent's avatar
-        /// </summary>
-        /// <param name="agentClient"></param>
-        public virtual void RemoveViewerAgent(ClientView agentClient)
-        {
-        }
-        #endregion
-        #region Shutdown
-        /// <summary>
-        /// Tidy before shutdown
-        /// </summary>
-        public virtual void Close()
-        {
-        }
-        #endregion
-    }
-}
diff --git a/OpenSim/OpenSim.RegionServer/Types/Mesh.cs b/OpenSim/OpenSim.RegionServer/Types/Mesh.cs
deleted file mode 100644
index 4c8acab..0000000
--- a/OpenSim/OpenSim.RegionServer/Types/Mesh.cs
+++ /dev/null
@@ -1,55 +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.RegionServer.Types
-{
-    // TODO: This will need some performance tuning no doubt.
-    public class Mesh
-    {
-        public List<Triangle> mesh;
-        public Mesh()
-        {
-            mesh = new List<Triangle>();
-        }
-        public void AddTri(Triangle tri)
-        {
-            mesh.Add(tri);
-        }
-        public static Mesh operator +(Mesh a, Mesh b)
-        {
-            a.mesh.AddRange(b.mesh);
-            return a;
-        }
-    }
-}
diff --git a/OpenSim/OpenSim.RegionServer/Types/Triangle.cs b/OpenSim/OpenSim.RegionServer/Types/Triangle.cs
deleted file mode 100644
index ffb62e5..0000000
--- a/OpenSim/OpenSim.RegionServer/Types/Triangle.cs
+++ /dev/null
@@ -1,55 +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 Axiom.MathLib;
-namespace OpenSim.RegionServer.Types
-{
-    public class Triangle
-    {
-        Vector3 a;
-        Vector3 b;
-        Vector3 c;
-        public Triangle()
-        {
-            a = new Vector3();
-            b = new Vector3();
-            c = new Vector3();
-        }
-        public Triangle(Vector3 A, Vector3 B, Vector3 C)
-        {
-            a = A;
-            b = B;
-            c = C;
-        }
-    }
-}
diff --git a/OpenSim/OpenSim.RegionServer/UDPServer.cs b/OpenSim/OpenSim.RegionServer/UDPServer.cs
deleted file mode 100644
index ae62607..0000000
--- a/OpenSim/OpenSim.RegionServer/UDPServer.cs
+++ /dev/null
@@ -1,265 +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.Terrain;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Console;
-using OpenSim.UserServer;
-using OpenSim.RegionServer.Simulator;
-using OpenSim.RegionServer.Assets;
-using OpenSim.RegionServer.CAPS;
-using OpenSim.RegionServer.Client;
-using Nwc.XmlRpc;
-using OpenSim.Servers;
-using OpenSim.GenericConfig;
-namespace OpenSim.RegionServer
-{
-    public delegate AuthenticateResponse AuthenticateSessionHandler(LLUUID sessionID, LLUUID agentID, uint circuitCode);
-    public class UDPServer : OpenSimNetworkHandler
-    {
-        protected Dictionary<EndPoint, uint> clientCircuits = new Dictionary<EndPoint, uint>();
-        private 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 PacketServer _packetServer;
-        protected int listenPort;
-        protected Grid m_gridServers;
-        protected World m_localWorld;
-        protected AssetCache m_assetCache;
-        protected InventoryCache m_inventoryCache;
-        protected RegionInfo m_regionData;
-        protected bool m_sandbox = false;
-        protected bool user_accounts = false;
-        protected ConsoleBase m_console;
-        protected AuthenticateSessionsBase m_authenticateSessionsClass;
-        public AuthenticateSessionHandler AuthenticateHandler;
-        public PacketServer PacketServer
-        {
-            get
-            {
-                return _packetServer;
-            }
-            set
-            {
-                _packetServer = value;
-            }
-        }
-        public World LocalWorld
-        {
-            set
-            {
-                this.m_localWorld = value;
-                this._packetServer.LocalWorld = this.m_localWorld;
-            }
-        }
-        public UDPServer()
-        {
-        }
-        public UDPServer(int port, Grid gridServers, AssetCache assetCache, InventoryCache inventoryCache, RegionInfo _regionData, bool sandbox, bool accounts, ConsoleBase console, AuthenticateSessionsBase authenticateClass)
-        {
-            listenPort = port;
-            this.m_gridServers = gridServers;
-            this.m_assetCache = assetCache;
-            this.m_inventoryCache = inventoryCache;
-            this.m_regionData = _regionData;
-            this.m_sandbox = sandbox;
-            this.user_accounts = accounts;
-            this.m_console = console;
-            this.m_authenticateSessionsClass = authenticateClass;
-            this.CreatePacketServer();
-            //set up delegate for authenticate sessions
-            this.AuthenticateHandler = new AuthenticateSessionHandler(this.m_authenticateSessionsClass.AuthenticateSession);
-        }
-        protected virtual void CreatePacketServer()
-        {
-            PacketServer packetServer = new PacketServer(this);
-        }
-        protected virtual void OnReceivedData(IAsyncResult result)
-        {
-            ipeSender = new IPEndPoint(IPAddress.Any, 0);
-            epSender = (EndPoint)ipeSender;
-            Packet packet = null;
-            int numBytes;
-            try
-            {
-                numBytes = Server.EndReceiveFrom(result, ref epSender);
-            }
-            catch (SocketException e)
-            {
-                switch( e.SocketErrorCode )
-                {
-                    case SocketError.NotConnected:
-                    case SocketError.ConnectionReset:
-                        // At this point, we should clear the client connection altogether.
-                        // The app should hook a disconnect event into the UDPServer.
-                        // But for now, just ignore it.
-                        return;
-                       default:
-                        throw;
-                }
-            }
-            int packetEnd = numBytes - 1;
-            packet = Packet.BuildPacket(RecvBuffer, ref packetEnd, ZeroBuffer);
-            // do we already have a circuit for this endpoint
-            if (this.clientCircuits.ContainsKey(epSender))
-            {
-                //if so then send packet to the packetserver
-                this._packetServer.ClientInPacket(this.clientCircuits[epSender], packet);
-            }
-            else if (packet.Type == PacketType.UseCircuitCode)
-            {
-                // new client
-                this.AddNewClient(packet);
-            }
-            else
-            { // invalid client
-                Console.Error.WriteLine("UDPServer.cs:OnReceivedData() - WARNING: Got a packet from an invalid client - " + epSender.ToString());
-            }
-            Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null);
-        }
-        protected virtual void AddNewClient(Packet packet)
-        {
-            UseCircuitCodePacket useCircuit = (UseCircuitCodePacket)packet;
-            this.clientCircuits.Add(epSender, useCircuit.CircuitCode.Code);
-            bool isChildAgent = false;
-            ClientView newuser = new ClientView(epSender, useCircuit, m_localWorld, _packetServer.ClientThreads, m_assetCache, m_gridServers.GridServer, this, m_inventoryCache, m_sandbox, isChildAgent, this.m_regionData, m_authenticateSessionsClass);
-            if ((this.m_gridServers.UserServer != null) && (user_accounts))
-            {
-                newuser.UserServer = this.m_gridServers.UserServer;
-            }
-            //OpenSimRoot.Instance.ClientThreads.Add(epSender, newuser);
-            this._packetServer.ClientThreads.Add(useCircuit.CircuitCode.Code, newuser);
-        }
-        public void ServerListener()
-        {
-            m_console.Notice("UDPServer.cs:ServerListener() - Opening UDP socket on " + listenPort);
-            ServerIncoming = new IPEndPoint(IPAddress.Any, listenPort);
-            Server = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
-            /// Add this new socket to the list of sockets that was opened by the application.  When the application
-            /// closes, either gracefully or not, all sockets can be cleaned up.  Right now I am not aware of any method
-            /// to get all of the sockets for a process within .NET, but if so, this process can be refactored, as
-            /// socket registration would not be neccessary.
-            SocketRegistry.Register(Server);
-            Server.Bind(ServerIncoming);
-            m_console.Notice("UDPServer.cs:ServerListener() - UDP socket bound, getting ready to listen");
-            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);
-            m_console.Notice("UDPServer.cs:ServerListener() - Listening...");
-        }
-        public virtual void RegisterPacketServer(PacketServer server)
-        {
-            this._packetServer = server;
-        }
-        public virtual void SendPacketTo(byte[] buffer, int size, SocketFlags flags, uint circuitcode)//EndPoint packetSender)
-        {
-            // find the endpoint for this circuit
-            EndPoint sendto = null;
-            foreach (KeyValuePair<EndPoint, uint> p in this.clientCircuits)
-            {
-                if (p.Value == circuitcode)
-                {
-                    sendto = p.Key;
-                    break;
-                }
-            }
-            if (sendto != null)
-            {
-                //we found the endpoint so send the packet to it
-                this.Server.SendTo(buffer, size, flags, sendto);
-            }
-        }
-        public virtual void RemoveClientCircuit(uint circuitcode)
-        {
-            foreach (KeyValuePair<EndPoint, uint> p in this.clientCircuits)
-            {
-                if (p.Value == circuitcode)
-                {
-                    this.clientCircuits.Remove(p.Key);
-                    break;
-                }
-            }
-        }
-        public virtual AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode)
-        {
-            return this.AuthenticateHandler(sessionID, agentID, circuitCode);
-        }
-    }
-}
diff --git a/OpenSim/OpenSim.RegionServer/VersionInfo.cs b/OpenSim/OpenSim.RegionServer/VersionInfo.cs
deleted file mode 100644
index 5e0eed6..0000000
--- a/OpenSim/OpenSim.RegionServer/VersionInfo.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;
-namespace OpenSim.RegionServer
-{
-    /// <summary>
-    /// </summary>
-    public class VersionInfo
-    {
-        public static string Version = "0.2, SVN build - please use releng if you desire any form of support";
-    }
-}
diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/ClassInstance.cs b/OpenSim/OpenSim.Scripting/EmbeddedJVM/ClassInstance.cs
deleted file mode 100644
index 1d93197..0000000
--- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/ClassInstance.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 OpenSim.Scripting.EmbeddedJVM.Types;
-namespace OpenSim.Scripting.EmbeddedJVM
-{
-    public class ClassInstance : Object
-    {
-        public int size;
-        public Dictionary<string, BaseType> Fields = new Dictionary<string, BaseType>();
-        public ClassInstance()
-        {
-        }
-    }
-}
diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/ClassRecord.cs b/OpenSim/OpenSim.Scripting/EmbeddedJVM/ClassRecord.cs
deleted file mode 100644
index f4ab1a2..0000000
--- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/ClassRecord.cs
+++ /dev/null
@@ -1,503 +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;
-using System.Collections.Generic;
-using System.Text;
-using OpenSim.Scripting.EmbeddedJVM.Types;
-namespace OpenSim.Scripting.EmbeddedJVM
-{
-    public class ClassRecord
-    {
-        private ushort _majorVersion;
-        private ushort _minorVersion;
-        private ushort _constantPoolCount;
-        private ushort _accessFlags;
-        private ushort _thisClass;
-        private ushort _supperClass;
-        private ushort _interfaceCount;
-        private ushort _fieldCount;
-        private ushort _methodCount;
-        //private ushort _attributeCount;
-        //private string _name;
-        public Dictionary<string, BaseType> StaticFields = new Dictionary<string, BaseType>();
-        public PoolClass mClass;
-        public List<PoolItem> _constantsPool = new List<PoolItem>();
-        private List<MethodInfo> _methodsList = new List<MethodInfo>();
-        private List<FieldInfo> _fieldList = new List<FieldInfo>();
-        public ClassRecord()
-        {
-        }
-        public ClassInstance CreateNewInstance()
-        {
-            return new ClassInstance();
-        }
-        public void LoadClassFromFile(string fileName)
-        {
-            Console.WriteLine("loading script " + fileName);
-            FileStream fs = File.OpenRead(fileName);
-            this.LoadClassFromBytes(ReadFully(fs));
-            fs.Close();
-        }
-        public void LoadClassFromBytes(byte[] data)
-        {
-            int i = 0;
-            i += 4;
-            _minorVersion = (ushort)((data[i++] << 8) + data[i++]  );
-            _majorVersion = (ushort)((data[i++] << 8) + data[i++]  );
-            _constantPoolCount = (ushort)((data[i++] << 8) + data[i++]  );
-           // Console.WriteLine("there should be " + _constantPoolCount + " items in the pool");
-            for (int count = 0; count < _constantPoolCount -1 ; count++)
-            {
-                //read in the constant pool
-                byte pooltype = data[i++];
-                //Console.WriteLine("#" +count +": new constant type = " +pooltype);
-                //Console.WriteLine("start position is: " + i);
-                switch (pooltype)
-                {
-                    case 1:  //Utf8
-                        ushort uLength = (ushort)((data[i++] << 8) + data[i++]  );
-                       // Console.WriteLine("new utf8 type, length is " + uLength);
-                        PoolUtf8 utf8 = new PoolUtf8();
-                        utf8.readValue(data, ref i, uLength);
-                        this._constantsPool.Add(utf8);
-                        break;
-                    case 3: //Int
-                        break;
-                    case 7: //Class
-                        PoolClass pClass = new PoolClass(this);
-                        pClass.readValue(data, ref i);
-                        this._constantsPool.Add(pClass);
-                        break;
-                    case 10: //Method
-                        PoolMethodRef pMeth = new PoolMethodRef(this);
-                        pMeth.readValue(data, ref i);
-                        this._constantsPool.Add(pMeth);
-                        break;
-                    case 12:  //NamedType
-                        PoolNamedType pNamed = new PoolNamedType(this);
-                        pNamed.readValue(data, ref i);
-                        this._constantsPool.Add(pNamed);
-                        break;
-                }
-            }
-            _accessFlags = (ushort)((data[i++] << 8) + data[i++]  );
-            _thisClass = (ushort)((data[i++] << 8) + data[i++]  );
-            _supperClass = (ushort)((data[i++] << 8) + data[i++]  );
-            if (this._constantsPool[this._thisClass - 1] is PoolClass)
-            {
-                this.mClass = ((PoolClass)this._constantsPool[this._thisClass - 1]);
-            }
-            _interfaceCount = (ushort)((data[i++] << 8) + data[i++]);
-            //should now read in the info for each interface
-            _fieldCount = (ushort)((data[i++] << 8) + data[i++]);
-            //should now read in the info for each field
-            _methodCount = (ushort)((data[i++] << 8) + data[i++]);
-            for (int count = 0; count < _methodCount; count++)
-            {
-                MethodInfo methInf = new MethodInfo(this);
-                methInf.ReadData(data, ref i);
-                this._methodsList.Add(methInf);
-            }
-        }
-        public void AddMethodsToMemory(MethodMemory memory)
-        {
-            for (int count = 0; count < _methodCount; count++)
-            {
-                this._methodsList[count].AddMethodCode(memory);
-            }
-        }
-        public bool StartMethod(Thread thread, string methodName)
-        {
-            for (int count = 0; count < _methodCount; count++)
-            {
-                if (this._constantsPool[this._methodsList[count].NameIndex-1] is PoolUtf8)
-                {
-                    if (((PoolUtf8)this._constantsPool[this._methodsList[count].NameIndex-1]).Value == methodName)
-                    {
-                        //Console.WriteLine("found method: " + ((PoolUtf8)this._constantsPool[this._methodsList[count].NameIndex - 1]).Value);
-                        thread.SetPC(this._methodsList[count].CodePointer);
-                        return true;
-                    }
-                }
-            }
-            return false;
-        }
-        public void PrintToConsole()
-        {
-            Console.WriteLine("Class File:");
-           Console.WriteLine("Major version: " + _majorVersion);
-           Console.WriteLine("Minor version: " + _minorVersion);
-            Console.WriteLine("Pool size: " + _constantPoolCount);
-            for (int i = 0; i < _constantsPool.Count; i++)
-            {
-                this._constantsPool[i].Print();
-            }
-           Console.WriteLine("Access flags: " + _accessFlags);
-           Console.WriteLine("This class: " + _thisClass );
-           Console.WriteLine("Super class: " + _supperClass);
-            for (int count = 0; count < _methodCount; count++)
-            {
-                Console.WriteLine();
-                this._methodsList[count].Print();
-            }
-           Console.WriteLine("class name is " + this.mClass.Name.Value);
-        }
-        public static byte[] ReadFully(Stream stream)
-        {
-            byte[] buffer = new byte[1024];
-            using (MemoryStream ms = new MemoryStream())
-            {
-                while (true)
-                {
-                    int read = stream.Read(buffer, 0, buffer.Length);
-                    if (read <= 0)
-                        return ms.ToArray();
-                    ms.Write(buffer, 0, read);
-                }
-            }
-        }
-        #region nested classes
-        public class PoolItem
-        {
-            public virtual void Print()
-            {
-            }
-        }
-        public class PoolUtf8 : PoolItem
-        {
-            public string Value = "";
-            public void readValue(byte[] data,ref int pointer , int length)
-            {
-                for (int i = 0; i < length; i++)
-                {
-                    int a =(int) data[pointer++];
-                    if ((a & 0x80) == 0)
-                    {
-                        Value = Value + (char)a;
-                    }
-                    else if ((a & 0x20) == 0)
-                    {
-                        int b = (int) data[pointer++];
-                        Value = Value + (char)(((a & 0x1f) << 6) + (b & 0x3f));      
-                    }
-                    else
-                    {
-                        int b = (int)data[pointer++];
-                        int c = (int)data[pointer++];
-                        Value = Value + (char)(((a & 0xf) << 12) + ((b & 0x3f) << 6) + (c & 0x3f));            
-                    }
-                }
-            }
-            public override void Print()
-            {
-               Console.WriteLine("Utf8 type: " + Value);
-            }
-        }
-        private class PoolInt : PoolItem
-        {
-        }
-        public class PoolClass : PoolItem
-        {
-            //public string name = "";
-            public ushort namePointer = 0;
-            private ClassRecord parent;
-            public PoolUtf8 Name;
-            public PoolClass(ClassRecord paren)
-            {
-                parent = paren;
-            }
-            public void readValue(byte[] data, ref int pointer)
-            {
-                namePointer = (ushort)((data[pointer++] << 8) + data[pointer++] );
-            }
-            public override void Print()
-            {
-                this.Name = ((PoolUtf8)this.parent._constantsPool[namePointer - 1]);
-                Console.Write("Class type: " + namePointer);
-                Console.WriteLine(" // " + ((PoolUtf8)this.parent._constantsPool[namePointer - 1]).Value);
-                
-            }
-        }
-        public class PoolMethodRef : PoolItem
-        {
-            public ushort classPointer = 0;
-            public ushort nameTypePointer = 0;
-            public PoolNamedType mNameType;
-            public PoolClass mClass;
-            private ClassRecord parent;
-            public PoolMethodRef(ClassRecord paren)
-            {
-                parent = paren;
-            }
-            public void readValue(byte[] data, ref int pointer)
-            {
-                classPointer = (ushort)((data[pointer++] << 8) + data[pointer++]);
-                nameTypePointer = (ushort)((data[pointer++] << 8) + data[pointer++]);
-            }
-            public override void Print()
-            {
-                this.mNameType = ((PoolNamedType)this.parent._constantsPool[nameTypePointer - 1]);
-                this.mClass = ((PoolClass)this.parent._constantsPool[classPointer - 1]);
-               Console.WriteLine("MethodRef type: " + classPointer + " , " + nameTypePointer); 
-            }
-        }
-        public class PoolNamedType : PoolItem
-        {
-            public ushort namePointer = 0;
-            public ushort typePointer = 0;
-            private ClassRecord parent;
-            public PoolUtf8 Name;
-            public PoolUtf8 Type;
-            public PoolNamedType(ClassRecord paren)
-            {
-                parent = paren;
-            }
-            public void readValue(byte[] data, ref int pointer)
-            {
-                namePointer = (ushort)((data[pointer++] << 8) + data[pointer++] );
-                typePointer = (ushort)((data[pointer++] << 8) + data[pointer++] );
-            }
-            public override void Print()
-            {
-                Name = ((PoolUtf8)this.parent._constantsPool[namePointer-1]);
-                Type = ((PoolUtf8)this.parent._constantsPool[typePointer-1]);
-                Console.Write("Named type: " + namePointer + " , " + typePointer );
-                Console.WriteLine(" // "+ ((PoolUtf8)this.parent._constantsPool[namePointer-1]).Value);
-            }
-        }
-        //***********************
-        public class MethodInfo
-        {
-            public ushort AccessFlags = 0;
-            public ushort NameIndex = 0;
-            public string Name = "";
-            public ushort DescriptorIndex = 0;
-            public ushort AttributeCount = 0;
-            public List<MethodAttribute> Attributes = new List<MethodAttribute>();
-            private ClassRecord parent;
-            public int CodePointer = 0;
- 
-            public MethodInfo(ClassRecord paren)
-            {
-                parent = paren;
-            }
-            public void AddMethodCode(MethodMemory memory)
-            {
-                Array.Copy(this.Attributes[0].Code, 0, memory.MethodBuffer, memory.NextMethodPC, this.Attributes[0].Code.Length);
-                memory.Methodcount++;
-                this.CodePointer = memory.NextMethodPC;
-                memory.NextMethodPC += this.Attributes[0].Code.Length;
-            }
-            public void ReadData(byte[] data, ref int pointer)
-            {
-                AccessFlags = (ushort)((data[pointer++] << 8) + data[pointer++]);
-                NameIndex = (ushort)((data[pointer++] << 8) + data[pointer++]);
-                DescriptorIndex = (ushort)((data[pointer++] << 8) + data[pointer++]);
-                AttributeCount = (ushort)((data[pointer++] << 8) + data[pointer++]);
-                for(int i =0; i< AttributeCount; i++)
-                {
-                    MethodAttribute attri = new MethodAttribute(this.parent);
-                    attri.ReadData(data, ref pointer);
-                    this.Attributes.Add(attri);
-                }
-            }
-            public void Print()
-            {
-               Console.WriteLine("Method Info Struct: ");
-              Console.WriteLine("AccessFlags: " + AccessFlags);
-              Console.WriteLine("NameIndex: " + NameIndex +" // "+ ((PoolUtf8)this.parent._constantsPool[NameIndex-1]).Value);
-              Console.WriteLine("DescriptorIndex: " + DescriptorIndex + " // "+ ((PoolUtf8)this.parent._constantsPool[DescriptorIndex-1]).Value);
-              Console.WriteLine("Attribute Count:" + AttributeCount);
-                for (int i = 0; i < AttributeCount; i++)
-                {
-                    this.Attributes[i].Print();
-                }
-            }
-            public class MethodAttribute
-            {
-                public ushort NameIndex = 0;
-                public string Name = "";
-                public Int32 Length = 0;
-                //for now only support code attribute
-                public ushort MaxStack = 0;
-                public ushort MaxLocals = 0;
-                public Int32 CodeLength = 0;
-                public byte[] Code;
-                public ushort ExceptionTableLength = 0;
-                public ushort SubAttributeCount = 0;
-                public List<SubAttribute> SubAttributes = new List<SubAttribute>();
-                private ClassRecord parent;
-                public MethodAttribute(ClassRecord paren)
-                {
-                    parent = paren;
-                }
-                public void ReadData(byte[] data, ref int pointer)
-                {
-                    NameIndex = (ushort)((data[pointer++] << 8) + data[pointer++]);
-                    Length = (Int32)((data[pointer++] << 24) + (data[pointer++] << 16) + (data[pointer++] << 8) + data[pointer++]);
-                    MaxStack = (ushort)((data[pointer++] << 8) + data[pointer++]);
-                    MaxLocals = (ushort)((data[pointer++] << 8) + data[pointer++]);
-                    CodeLength = (Int32)((data[pointer++] << 24) + (data[pointer++] << 16) + (data[pointer++] << 8) + data[pointer++]);
-                    Code = new byte[CodeLength];
-                    for (int i = 0; i < CodeLength; i++)
-                    {
-                        Code[i] = data[pointer++];
-                    }
-                    ExceptionTableLength = (ushort)((data[pointer++] << 8) + data[pointer++]);
-                    SubAttributeCount = (ushort)((data[pointer++] << 8) + data[pointer++]);
-                    for (int i = 0; i < SubAttributeCount; i++)
-                    {
-                        SubAttribute subAttri = new SubAttribute(this.parent);
-                        subAttri.ReadData(data, ref pointer);
-                        this.SubAttributes.Add(subAttri);
-                    }
-                }
-                public void Print()
-                {
-                   Console.WriteLine("Method Attribute: ");
-                 Console.WriteLine("Name Index: " + NameIndex + " // "+ ((PoolUtf8)this.parent._constantsPool[NameIndex-1]).Value);
-                  Console.WriteLine("Length: " + Length);
-                  Console.WriteLine("MaxStack: " + MaxStack);
-                  Console.WriteLine("MaxLocals: " + MaxLocals);
-                 Console.WriteLine("CodeLength: " + CodeLength);
-                    for (int i = 0; i < Code.Length; i++)
-                    {
-                        Console.WriteLine("OpCode #" + i + " is: " + Code[i]);
-                    }
-                    Console.WriteLine("SubAttributes: " + SubAttributeCount);
-                    for (int i = 0; i < SubAttributeCount; i++)
-                    {
-                        this.SubAttributes[i].Print();
-                    }
-                }
-                public class SubAttribute
-                {
-                    public ushort NameIndex = 0;
-                    public string Name = "";
-                    public Int32 Length = 0;
-                    public byte[] Data;
-                    private ClassRecord parent;
-                    public SubAttribute(ClassRecord paren)
-                    {
-                        parent = paren;
-                    }
-                    public void ReadData(byte[] data, ref int pointer)
-                    {
-                        NameIndex = (ushort)((data[pointer++] << 8) + data[pointer++]);
-                        Length = (Int32)((data[pointer++] << 24) + (data[pointer++] << 16) + (data[pointer++] << 8) + data[pointer++]);
-                        Data = new byte[Length];
-                        for (int i = 0; i < Length; i++)
-                        {
-                            Data[i] = data[pointer++];
-                        }
-                    }
-                    public void Print()
-                    {
-                        Console.WriteLine("SubAttribute: NameIndex: " + NameIndex + " // " + ((PoolUtf8)this.parent._constantsPool[NameIndex - 1]).Value);
-                    }
-                }
-            }
-        }
-        private class InterfaceInfo
-        {
-            public void ReadData(byte[] data, ref int i)
-            {
-            }
-        }
-        private class FieldInfo
-        {
-            public void ReadData(byte[] data, ref int i)
-            {
-            }
-        }
-        private class AttributeInfo
-        {
-            public void ReadData(byte[] data, ref int i)
-            {
-            }
-        }
-        #endregion
-    }
-}
diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/Heap.cs b/OpenSim/OpenSim.Scripting/EmbeddedJVM/Heap.cs
deleted file mode 100644
index f213c36..0000000
--- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/Heap.cs
+++ /dev/null
@@ -1,43 +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.Scripting.EmbeddedJVM
-{
-    public class Heap
-    {
-        public List<ClassInstance> ClassObjects = new List<ClassInstance>();
-        public Heap()
-        {
-        }
-    }
-}
diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/Interpreter.cs b/OpenSim/OpenSim.Scripting/EmbeddedJVM/Interpreter.cs
deleted file mode 100644
index c5995b2..0000000
--- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/Interpreter.cs
+++ /dev/null
@@ -1,135 +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.Scripting.EmbeddedJVM.Types;
-using OpenSim.Scripting.EmbeddedJVM.Types.PrimitiveTypes;
-namespace OpenSim.Scripting.EmbeddedJVM
-{
-    partial class Thread
-    {
-        private partial class Interpreter
-        {
-            private Thread _mThread;
-            public Interpreter(Thread parentThread)
-            {
-                _mThread = parentThread;
-            }
-            public bool Excute()
-            {
-                bool run = true;
-                byte currentOpCode = GlobalMemory.MethodArea.MethodBuffer[this._mThread.PC++];
-               // Console.WriteLine("opCode is: " + currentOpCode);
-                bool handled = false;
-                handled = this.IsLogicOpCode(currentOpCode);
-                if (!handled)
-                {
-                    handled = this.IsMethodOpCode(currentOpCode);
-                }
-                if (!handled)
-                {
-                    if (currentOpCode == 172)
-                    {
-                        if (this._mThread.stack.StackFrames.Count > 1)
-                        {
-                            Console.WriteLine("returning int from function");
-                            int retPC1 = this._mThread.currentFrame.ReturnPC;
-                            BaseType bas1 = this._mThread.currentFrame.OpStack.Pop();
-                            this._mThread.stack.StackFrames.Pop();
-                            this._mThread.currentFrame = this._mThread.stack.StackFrames.Peek();
-                            this._mThread.PC = retPC1;
-                            if (bas1 is Int)
-                            {
-                                this._mThread.currentFrame.OpStack.Push((Int)bas1);
-                            }
-                        }
-                        else
-                        {
-                          //  Console.WriteLine("No parent function so ending program");
-                            this._mThread.stack.StackFrames.Pop();
-                            run = false;
-                        }
-                        handled = true;
-                    }
-                    if (currentOpCode == 174)
-                    {
-                        if (this._mThread.stack.StackFrames.Count > 1)
-                        {
-                            Console.WriteLine("returning float from function");
-                            int retPC1 = this._mThread.currentFrame.ReturnPC;
-                            BaseType bas1 = this._mThread.currentFrame.OpStack.Pop();
-                            this._mThread.stack.StackFrames.Pop();
-                            this._mThread.currentFrame = this._mThread.stack.StackFrames.Peek();
-                            this._mThread.PC = retPC1;
-                            if (bas1 is Float)
-                            {
-                                this._mThread.currentFrame.OpStack.Push((Float)bas1);
-                            }
-                        }
-                        else
-                        {
-                           // Console.WriteLine("No parent function so ending program");
-                            this._mThread.stack.StackFrames.Pop();
-                            run = false;
-                        }
-                        handled = true;
-                    }
-                    if (currentOpCode == 177)
-                    {
-                        if (this._mThread.stack.StackFrames.Count > 1)
-                        {
-                            Console.WriteLine("returning from function");
-                            int retPC = this._mThread.currentFrame.ReturnPC;
-                            this._mThread.stack.StackFrames.Pop();
-                            this._mThread.currentFrame = this._mThread.stack.StackFrames.Peek();
-                            this._mThread.PC = retPC;
-                        }
-                        else
-                        {
-                           // Console.WriteLine("No parent function so ending program");
-                            this._mThread.stack.StackFrames.Pop();
-                            run = false;
-                        }
-                        handled = true;
-                    }
-                }
-                if (!handled)
-                {
-                    Console.WriteLine("opcode " + currentOpCode + " not been handled ");
-                }
-                return run;
-            }
-        }
-    }
-}
diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/InterpreterLogic.cs b/OpenSim/OpenSim.Scripting/EmbeddedJVM/InterpreterLogic.cs
deleted file mode 100644
index 2a11afd..0000000
--- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/InterpreterLogic.cs
+++ /dev/null
@@ -1,427 +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.Scripting.EmbeddedJVM.Types;
-using OpenSim.Scripting.EmbeddedJVM.Types.PrimitiveTypes;
-namespace OpenSim.Scripting.EmbeddedJVM
-{
-    partial class Thread
-    {
-        private partial class Interpreter
-        {
-            private bool IsLogicOpCode(byte opcode)
-            {
-                bool result = false;
-                switch (opcode)
-                {
-                    case 2:
-                        Int m_int= new Int();
-                        m_int.mValue = -1;
-                        this._mThread.currentFrame.OpStack.Push(m_int);
-                        result = true;
-                        break;
-                    case 3:
-                        m_int= new Int();
-                        m_int.mValue = 0;
-                        this._mThread.currentFrame.OpStack.Push(m_int);
-                        result = true;
-                        break;
-                    case 4:
-                        m_int = new Int();
-                        m_int.mValue = 1;
-                        this._mThread.currentFrame.OpStack.Push(m_int);
-                        result = true;
-                        break;
-                    case 5:
-                        m_int = new Int();
-                        m_int.mValue = 2;
-                        this._mThread.currentFrame.OpStack.Push(m_int);
-                        result = true;
-                        break;
-                    case 6:
-                        m_int = new Int();
-                        m_int.mValue = 3;
-                        this._mThread.currentFrame.OpStack.Push(m_int);
-                        break;
-                    case 7:
-                        m_int = new Int();
-                        m_int.mValue = 4;
-                        this._mThread.currentFrame.OpStack.Push(m_int);
-                        result = true;
-                        break;
-                    case 8:
-                        m_int = new Int();
-                        m_int.mValue = 5;
-                        this._mThread.currentFrame.OpStack.Push(m_int);
-                        result = true;
-                        break;
-                    case 11:
-                        Float m_float = new Float();
-                        m_float.mValue = 0.0f;
-                        this._mThread.currentFrame.OpStack.Push(m_float);
-                        result = true;
-                        break;
-                    case 12:
-                        m_float = new Float();
-                        m_float.mValue = 1.0f;
-                        this._mThread.currentFrame.OpStack.Push(m_float);
-                        result = true;
-                        break;
-                    case 13:
-                        m_float = new Float();
-                        m_float.mValue = 2.0f;
-                        this._mThread.currentFrame.OpStack.Push(m_float);
-                        result = true;
-                        break;
-                    case 16:
-                        int pushvalue = (int)GlobalMemory.MethodArea.MethodBuffer[this._mThread.PC];
-                        Int pushInt = new Int();
-                        pushInt.mValue = pushvalue;
-                        this._mThread.currentFrame.OpStack.Push(pushInt);
-                        this._mThread.PC++;
-                        result = true;
-                        break;
-                    case 17:
-                        short pushvalue2 = (short)((GlobalMemory.MethodArea.MethodBuffer[this._mThread.PC] << 8) + GlobalMemory.MethodArea.MethodBuffer[this._mThread.PC + 1]);
-                        Int pushInt2 = new Int();
-                        pushInt2.mValue = pushvalue2;
-                        this._mThread.currentFrame.OpStack.Push(pushInt2);
-                        this._mThread.PC += 2;
-                        result = true;
-                        break;
-                    case 23:
-                        short findex1 = (short)((GlobalMemory.MethodArea.MethodBuffer[this._mThread.PC]));
-                        Float fload = new Float();
-                        if (this._mThread.currentFrame.LocalVariables[findex1] != null)
-                        {
-                            if (this._mThread.currentFrame.LocalVariables[findex1] is Float)
-                            {
-                                fload.mValue = ((Float)this._mThread.currentFrame.LocalVariables[findex1]).mValue;
-                                this._mThread.currentFrame.OpStack.Push(fload);
-                            }
-                        }
-                        this._mThread.PC++;
-                        result = true;
-                        break;
-                    case 26:
-                        if (this._mThread.currentFrame.LocalVariables[0] != null)
-                        {
-                            if (this._mThread.currentFrame.LocalVariables[0] is Int)
-                            {
-                                Int newInt = new Int();
-                                newInt.mValue = ((Int)this._mThread.currentFrame.LocalVariables[0]).mValue;
-                                this._mThread.currentFrame.OpStack.Push(newInt);
-                            }
-                        }
-                        result = true;
-                        break;
-                    case 27:
-                        if (this._mThread.currentFrame.LocalVariables[1] != null)
-                        {
-                            if (this._mThread.currentFrame.LocalVariables[1] is Int)
-                            {
-                                Int newInt = new Int();
-                                newInt.mValue = ((Int)this._mThread.currentFrame.LocalVariables[1]).mValue;
-                                this._mThread.currentFrame.OpStack.Push(newInt);
-                            }
-                        }
-                        result = true;
-                        break;
-                    case 34:
-                        if (this._mThread.currentFrame.LocalVariables[0] != null)
-                        {
-                            if (this._mThread.currentFrame.LocalVariables[0] is Float)
-                            {
-                                Float newfloat = new Float();
-                                newfloat.mValue = ((Float)this._mThread.currentFrame.LocalVariables[0]).mValue;
-                                this._mThread.currentFrame.OpStack.Push(newfloat);
-                            }
-                        }
-                        result = true;
-                        break;
-                    case 35:
-                        if (this._mThread.currentFrame.LocalVariables[1] != null)
-                        {
-                            if (this._mThread.currentFrame.LocalVariables[1] is Float)
-                            {
-                                Float newfloat = new Float();
-                                newfloat.mValue = ((Float)this._mThread.currentFrame.LocalVariables[1]).mValue;
-                                this._mThread.currentFrame.OpStack.Push(newfloat);
-                            }
-                        }
-                        result = true;
-                        break;
-                    case 36:
-                        if (this._mThread.currentFrame.LocalVariables[2] != null)
-                        {
-                            if (this._mThread.currentFrame.LocalVariables[2] is Float)
-                            {
-                                Float newfloat = new Float();
-                                newfloat.mValue = ((Float)this._mThread.currentFrame.LocalVariables[2]).mValue;
-                                this._mThread.currentFrame.OpStack.Push(newfloat);
-                            }
-                        }
-                        result = true;
-                        break;
-                    case 37:
-                        if (this._mThread.currentFrame.LocalVariables[3] != null)
-                        {
-                            if (this._mThread.currentFrame.LocalVariables[3] is Float)
-                            {
-                                Float newfloat = new Float();
-                                newfloat.mValue = ((Float)this._mThread.currentFrame.LocalVariables[3]).mValue;
-                                this._mThread.currentFrame.OpStack.Push(newfloat);
-                            }
-                        }
-                        result = true;
-                        break;
-                    case 56:
-                        short findex = (short)((GlobalMemory.MethodArea.MethodBuffer[this._mThread.PC] ));
-                        BaseType fstor = this._mThread.currentFrame.OpStack.Pop();
-                        if (fstor is Float)
-                        {
-                            this._mThread.currentFrame.LocalVariables[findex] = (Float)fstor;
-                        }
-                        this._mThread.PC++;
-                        result = true;
-                        break;
-                    case 59:
-                        BaseType baset = this._mThread.currentFrame.OpStack.Pop();
-                        if (baset is Int)
-                        {
-                            this._mThread.currentFrame.LocalVariables[0] = (Int)baset;
-                        }
-                        result = true;
-                        break;
-                    case 60:
-                        baset = this._mThread.currentFrame.OpStack.Pop();
-                        if (baset is Int)
-                        {
-                            this._mThread.currentFrame.LocalVariables[1] = (Int)baset;
-                        }
-                        result = true;
-                        break;
-                    case 67:
-                        baset = this._mThread.currentFrame.OpStack.Pop();
-                        if (baset is Float)
-                        {
-                            this._mThread.currentFrame.LocalVariables[0] = (Float)baset;
-                        }
-                        result = true;
-                        break;
-                    case 68:
-                        baset = this._mThread.currentFrame.OpStack.Pop();
-                        if (baset is Float)
-                        {
-                            this._mThread.currentFrame.LocalVariables[1] = (Float)baset;
-                        }
-                        result = true;
-                        break;
-                    case 69:
-                        baset = this._mThread.currentFrame.OpStack.Pop();
-                        if (baset is Float)
-                        {
-                            this._mThread.currentFrame.LocalVariables[2] = (Float)baset;
-                        }
-                        result = true;
-                        break;
-                    case 70:
-                        baset = this._mThread.currentFrame.OpStack.Pop();
-                        if (baset is Float)
-                        {
-                            this._mThread.currentFrame.LocalVariables[3] = (Float)baset;
-                        }
-                        result = true;
-                        break;
-                    case 87:
-                        this._mThread.currentFrame.OpStack.Pop();
-                        result = true;
-                        break;
-                    case 98:
-                        BaseType bf2 = this._mThread.currentFrame.OpStack.Pop();
-                        BaseType bf1 = this._mThread.currentFrame.OpStack.Pop();
-                        if (bf1 is Float && bf2 is Float)
-                        {
-                            Float nflt = new Float();
-                            nflt.mValue = ((Float)bf1).mValue + ((Float)bf2).mValue;
-                            this._mThread.currentFrame.OpStack.Push(nflt);
-                        }
-                        result = true;
-                        break;
-                    case 102:
-                        BaseType bsf2 = this._mThread.currentFrame.OpStack.Pop();
-                        BaseType bsf1 = this._mThread.currentFrame.OpStack.Pop();
-                        if (bsf1 is Float && bsf2 is Float)
-                        {
-                            Float resf = new Float();
-                            resf.mValue = ((Float)bsf1).mValue - ((Float)bsf2).mValue;
-                            this._mThread.currentFrame.OpStack.Push(resf);
-                        }
-                        result = true;
-                        break;
-                    case 104: //check the order of the two values off the stack is correct
-                        BaseType bs2 = this._mThread.currentFrame.OpStack.Pop();
-                        BaseType bs1 = this._mThread.currentFrame.OpStack.Pop();
-                        if (bs1 is Int && bs2 is Int)
-                        {
-                            Int nInt = new Int();
-                            nInt.mValue = ((Int)bs1).mValue * ((Int)bs2).mValue;
-                            this._mThread.currentFrame.OpStack.Push(nInt);
-                        }
-                        result = true;
-                        break;
-                    case 132:
-                        if (this._mThread.currentFrame.LocalVariables[GlobalMemory.MethodArea.MethodBuffer[this._mThread.PC]] != null)
-                        {
-                            if (this._mThread.currentFrame.LocalVariables[GlobalMemory.MethodArea.MethodBuffer[this._mThread.PC]] is Int)
-                            {
-                                ((Int)this._mThread.currentFrame.LocalVariables[GlobalMemory.MethodArea.MethodBuffer[this._mThread.PC]]).mValue += (sbyte) GlobalMemory.MethodArea.MethodBuffer[this._mThread.PC + 1];
-                            }
-                        }
-                        this._mThread.PC += 2;
-                        result = true;
-                        break;
-                    case 139:
-                        BaseType conv1 = this._mThread.currentFrame.OpStack.Pop();
-                        if (conv1 is Float)
-                        {
-                            Int newconv = new Int();
-                            newconv.mValue = (int)((Float)conv1).mValue;
-                            this._mThread.currentFrame.OpStack.Push(newconv);
-                        }
-                        result = true;
-                        break;
-                    case 149:
-                        BaseType flcom2 = this._mThread.currentFrame.OpStack.Pop();
-                        BaseType flcom1 = this._mThread.currentFrame.OpStack.Pop();
-                        if (flcom1 is Float && flcom2 is Float)
-                        {
-                            Int compres = new Int();
-                            if (((Float)flcom1).mValue < ((Float)flcom2).mValue)
-                            {
-                                compres.mValue = -1;
-                            }
-                            else if (((Float)flcom1).mValue > ((Float)flcom2).mValue)
-                            {
-                                compres.mValue = 1;
-                            }
-                            else
-                            {
-                                compres.mValue = 0;
-                            }
-                            this._mThread.currentFrame.OpStack.Push(compres);
-                        }
-                        result = true;
-                        break;
-                    case 158:
-                        short compareoffset1 = (short)((GlobalMemory.MethodArea.MethodBuffer[this._mThread.PC] << 8) + GlobalMemory.MethodArea.MethodBuffer[this._mThread.PC + 1]);
-                        BaseType comp1 = this._mThread.currentFrame.OpStack.Pop();
-                        if (comp1 is Int)
-                        {
-                            if (((Int)comp1).mValue <= 0)
-                            {
-                                this._mThread.PC += -1 + compareoffset1;
-                            }
-                            else
-                            {
-                                this._mThread.PC += 2;
-                            }
-                        }
-                        else
-                        {
-                            this._mThread.PC += 2;
-                        }
-                        result = true;
-                        break;
-                    case 162:
-                        short compareoffset = (short)((GlobalMemory.MethodArea.MethodBuffer[this._mThread.PC] << 8) + GlobalMemory.MethodArea.MethodBuffer[this._mThread.PC + 1]);
-                        BaseType bc2 = this._mThread.currentFrame.OpStack.Pop();
-                        BaseType bc1 = this._mThread.currentFrame.OpStack.Pop();
-                        if (bc1 is Int && bc2 is Int)
-                        {
-                            //Console.WriteLine("comparing " + ((Int)bc1).mValue + " and " + ((Int)bc2).mValue);
-                            if (((Int)bc1).mValue >= ((Int)bc2).mValue)
-                            {
-                               // Console.WriteLine("branch compare true , offset is " +compareoffset);
-                               // Console.WriteLine("current PC is " + this._mThread.PC);
-                                this._mThread.PC += -1 + compareoffset;
-                                //Console.WriteLine("new PC is " + this._mThread.PC);
-                            }
-                            else
-                            {
-                                //Console.WriteLine("branch compare false");
-                                this._mThread.PC += 2;
-                            }
-                        }
-                        else
-                        {
-                            this._mThread.PC += 2;
-                        }
-                        result = true;
-                        break;
-                    case 164:
-                        short compareloffset = (short)((GlobalMemory.MethodArea.MethodBuffer[this._mThread.PC] << 8) + GlobalMemory.MethodArea.MethodBuffer[this._mThread.PC + 1]);
-                        BaseType bcl2 = this._mThread.currentFrame.OpStack.Pop();
-                        BaseType bcl1 = this._mThread.currentFrame.OpStack.Pop();
-                        if (bcl1 is Int && bcl2 is Int)
-                        {
-                            //Console.WriteLine("comparing " + ((Int)bcl1).mValue + " and " + ((Int)bcl2).mValue);
-                            if (((Int)bcl1).mValue <= ((Int)bcl2).mValue)
-                            {
-                              // Console.WriteLine("branch compare true , offset is " + compareloffset);
-                              // Console.WriteLine("current PC is " + this._mThread.PC);
-                               this._mThread.PC += -1 + compareloffset;
-                              // Console.WriteLine("new PC is " + this._mThread.PC);
-                            }
-                            else
-                            {
-                                //Console.WriteLine("branch compare false");
-                                this._mThread.PC += 2;
-                            }
-                        }
-                        else
-                        {
-                            this._mThread.PC += 2;
-                        }
-                        result = true;
-                        break;
-                    case 167:
-                        short offset = (short)((GlobalMemory.MethodArea.MethodBuffer[this._mThread.PC] << 8) + GlobalMemory.MethodArea.MethodBuffer[this._mThread.PC+1]);
-                        this._mThread.PC += -1 + offset;
-                        result = true;
-                        break;
-                }
-                return result;
-            }
-        }
-    }
-}
diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/InterpreterMethods.cs b/OpenSim/OpenSim.Scripting/EmbeddedJVM/InterpreterMethods.cs
deleted file mode 100644
index 8e34de7..0000000
--- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/InterpreterMethods.cs
+++ /dev/null
@@ -1,161 +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.Scripting.EmbeddedJVM.Types;
-using OpenSim.Scripting.EmbeddedJVM.Types.PrimitiveTypes;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework;
-using OpenSim.Framework.Types;
-namespace OpenSim.Scripting.EmbeddedJVM
-{
-    partial class Thread
-    {
-        private partial class Interpreter
-        {
-            private bool IsMethodOpCode(byte opcode)
-            {
-                bool result = false;
-                switch (opcode)
-                {
-                    case 184:
-                        short refIndex = (short) ((GlobalMemory.MethodArea.MethodBuffer[this._mThread.PC] << 8) + GlobalMemory.MethodArea.MethodBuffer[this._mThread.PC+1]);
-                        if (this._mThread.currentClass._constantsPool[refIndex - 1] is ClassRecord.PoolMethodRef)
-                        {
-                            string typ = ((ClassRecord.PoolMethodRef)this._mThread.currentClass._constantsPool[refIndex - 1]).mNameType.Type.Value;
-                            string typeparam = "";
-                            string typereturn = "";
-                            int firstbrak = 0;
-                            int secondbrak = 0;
-                            firstbrak = typ.LastIndexOf('(');
-                            secondbrak = typ.LastIndexOf(')');
-                            typeparam = typ.Substring(firstbrak + 1, secondbrak - firstbrak - 1);
-                            typereturn = typ.Substring(secondbrak + 1, typ.Length - secondbrak - 1);
-                            if (((ClassRecord.PoolMethodRef)this._mThread.currentClass._constantsPool[refIndex - 1]).mClass.Name.Value == this._mThread.currentClass.mClass.Name.Value)
-                            {
-                                //calling a method in this class
-                                if (typeparam.Length == 0)
-                                {
-                                    this._mThread.JumpToStaticVoidMethod(((ClassRecord.PoolMethodRef)this._mThread.currentClass._constantsPool[refIndex - 1]).mNameType.Name.Value, (this._mThread.PC + 2));
-                                }
-                                else
-                                {
-                                    this._mThread.JumpToStaticParamMethod(((ClassRecord.PoolMethodRef)this._mThread.currentClass._constantsPool[refIndex - 1]).mNameType.Name.Value, typeparam, (this._mThread.PC + 2));
-                                }
-                            }
-                            else
-                            {
-                                //calling a method of a different class
-                                //for now we will have a built in OpenSimAPI class, but this should be a java class that then calls native methods
-                                if (((ClassRecord.PoolMethodRef)this._mThread.currentClass._constantsPool[refIndex - 1]).mClass.Name.Value == "OpenSimAPI")
-                                {
-                                    switch (((ClassRecord.PoolMethodRef)this._mThread.currentClass._constantsPool[refIndex - 1]).mNameType.Name.Value)
-                                    {
-                                        case "GetEntityID":
-                                            Int entityID = new Int();
-                                            entityID.mValue =(int) this._mThread.EntityId;
-                                            this._mThread.currentFrame.OpStack.Push(entityID);
-                                            this._mThread.PC += 2;
-                                            break;
-                                        case "GetRandomAvatarID":
-                                            entityID = new Int();
-                                            entityID.mValue = (int)Thread.OpenSimScriptAPI.GetRandomAvatarID();
-                                            this._mThread.currentFrame.OpStack.Push(entityID);
-                                            this._mThread.PC += 2;
-                                            break;
-                                        case "GetEntityPositionX":
-                                            BaseType bs1 = this._mThread.currentFrame.OpStack.Pop();
-                                            if (bs1 is Int)
-                                            {
-                                                //should get the position of the entity from the IScriptAPI
-                                                OSVector3 vec3 = Thread.OpenSimScriptAPI.GetEntityPosition((uint)((Int)bs1).mValue);
-                                                Float pos = new Float();
-                                                pos.mValue = vec3.X;
-                                                this._mThread.currentFrame.OpStack.Push(pos);
-                                            }
-                                            this._mThread.PC += 2;
-                                            break;
-                                        case "GetEntityPositionY":
-                                            bs1 = this._mThread.currentFrame.OpStack.Pop();
-                                            if (bs1 is Int)
-                                            {
-                                                //should get the position of the entity from the IScriptAPI
-                                                OSVector3 vec3 = Thread.OpenSimScriptAPI.GetEntityPosition((uint)((Int)bs1).mValue);
-                                                Float pos = new Float();
-                                                pos.mValue = vec3.Y;
-                                                this._mThread.currentFrame.OpStack.Push(pos);
-                                            }
-                                            this._mThread.PC += 2;
-                                            break;
-                                        case "GetEntityPositionZ":
-                                            bs1 = this._mThread.currentFrame.OpStack.Pop();
-                                            if (bs1 is Int)
-                                            {
-                                                //should get the position of the entity from the IScriptAPI
-                                                OSVector3 vec3 = Thread.OpenSimScriptAPI.GetEntityPosition((uint)((Int)bs1).mValue);
-                                                Float pos = new Float();
-                                                pos.mValue = vec3.Z;
-                                                this._mThread.currentFrame.OpStack.Push(pos);
-                                            }
-                                            this._mThread.PC += 2;
-                                            break;
-                                        case "SetEntityPosition":
-                                            //pop the three float values and the entity id
-                                            BaseType ft3 = this._mThread.currentFrame.OpStack.Pop();
-                                            BaseType ft2 = this._mThread.currentFrame.OpStack.Pop();
-                                            BaseType ft1 = this._mThread.currentFrame.OpStack.Pop();
-                                            BaseType in1 = this._mThread.currentFrame.OpStack.Pop();
-                                            if (ft1 is Float && ft2 is Float && ft3 is Float)
-                                            {
-                                                if(in1 is Int)
-                                                {
-                                                    Thread.OpenSimScriptAPI.SetEntityPosition((uint)((Int) in1).mValue, ((Float)ft1).mValue, ((Float)ft2).mValue, ((Float)ft3).mValue);
-                                                }
-                                            }
-                                            this._mThread.PC += 2;
-                                            break;
-                                    }
-                                }
-                            }
-                        }
-                        else
-                        {
-                            this._mThread.PC += 2;
-                        }
-                        result = true;
-                        break;
-                }
-                return result;
-            }
-        }
-    }
-}
diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/InterpreterReturn.cs b/OpenSim/OpenSim.Scripting/EmbeddedJVM/InterpreterReturn.cs
deleted file mode 100644
index cbedb71..0000000
--- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/InterpreterReturn.cs
+++ /dev/null
@@ -1,40 +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.Scripting.EmbeddedJVM
-{
-    partial class Thread
-    {
-        private partial class Interpreter
-        {
-        }
-    }
-}
diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/MainMemory.cs b/OpenSim/OpenSim.Scripting/EmbeddedJVM/MainMemory.cs
deleted file mode 100644
index 97d9fb6..0000000
--- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/MainMemory.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;
-namespace OpenSim.Scripting.EmbeddedJVM
-{
-    public class MainMemory
-    {
-        public Heap HeapArea;
-        public MethodMemory MethodArea;
- 
-        public MainMemory()
-        {
-            MethodArea = new MethodMemory();
-            HeapArea = new Heap();
-        }
-    }
-}
diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/MethodMemory.cs b/OpenSim/OpenSim.Scripting/EmbeddedJVM/MethodMemory.cs
deleted file mode 100644
index 7e938b4..0000000
--- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/MethodMemory.cs
+++ /dev/null
@@ -1,46 +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.Scripting.EmbeddedJVM
-{
-    public class MethodMemory
-    {
-        public byte[] MethodBuffer;
-        public List<ClassRecord> Classes = new List<ClassRecord>();
-        public int NextMethodPC = 0;
-        public int Methodcount = 0;
-        public MethodMemory()
-        {
-            MethodBuffer = new byte[20000];
-        }
-    }
-}
diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/Object.cs b/OpenSim/OpenSim.Scripting/EmbeddedJVM/Object.cs
deleted file mode 100644
index 2c3bedd..0000000
--- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/Object.cs
+++ /dev/null
@@ -1,37 +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.Scripting.EmbeddedJVM
-{
-    public class Object
-    {
-    }
-}
diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj
deleted file mode 100644
index bd1a332..0000000
--- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj
+++ /dev/null
@@ -1,153 +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>{97A82740-0000-0000-0000-000000000000}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon></ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>OpenSim.Scripting.EmbeddedJVM</AssemblyName>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenSim.Scripting.EmbeddedJVM</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\ScriptEngines\</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\ScriptEngines\</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="..\..\..\Common\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="ClassInstance.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ClassRecord.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Heap.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Interpreter.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="InterpreterLogic.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="InterpreterMethods.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="InterpreterReturn.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="MainMemory.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="MethodMemory.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Object.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="OpenSimJVM.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Stack.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="StackFrame.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Thread.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Types\ArrayReference.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Types\BaseType.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Types\ObjectReference.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Types\PrimitiveTypes\Byte.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Types\PrimitiveTypes\Char.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Types\PrimitiveTypes\Float.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Types\PrimitiveTypes\Int.cs">
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build
deleted file mode 100644
index cce2fef..0000000
--- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" ?>
-<project name="OpenSim.Scripting.EmbeddedJVM" 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.Scripting.EmbeddedJVM" dynamicprefix="true" >
-            </resources>
-            <sources failonempty="true">
-                <include name="ClassInstance.cs" />
-                <include name="ClassRecord.cs" />
-                <include name="Heap.cs" />
-                <include name="Interpreter.cs" />
-                <include name="InterpreterLogic.cs" />
-                <include name="InterpreterMethods.cs" />
-                <include name="InterpreterReturn.cs" />
-                <include name="MainMemory.cs" />
-                <include name="MethodMemory.cs" />
-                <include name="Object.cs" />
-                <include name="OpenSimJVM.cs" />
-                <include name="Stack.cs" />
-                <include name="StackFrame.cs" />
-                <include name="Thread.cs" />
-                <include name="Properties/AssemblyInfo.cs" />
-                <include name="Types/ArrayReference.cs" />
-                <include name="Types/BaseType.cs" />
-                <include name="Types/ObjectReference.cs" />
-                <include name="Types/PrimitiveTypes/Byte.cs" />
-                <include name="Types/PrimitiveTypes/Char.cs" />
-                <include name="Types/PrimitiveTypes/Float.cs" />
-                <include name="Types/PrimitiveTypes/Int.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/ScriptEngines/" />
-        <mkdir dir="${project::get-base-directory()}/../../../bin/ScriptEngines/"/>
-        <copy todir="${project::get-base-directory()}/../../../bin/ScriptEngines/">
-            <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/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSimJVM.cs b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSimJVM.cs
deleted file mode 100644
index 2de8152..0000000
--- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSimJVM.cs
+++ /dev/null
@@ -1,161 +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.Threading;
-using OpenSim.Framework;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Utilities;
-namespace OpenSim.Scripting.EmbeddedJVM
-{
-    public class OpenSimJVM : IScriptEngine
-    {
-        private List<Thread> _threads = new List<Thread>();
-        private BlockingQueue<CompileInfo> CompileScripts = new BlockingQueue<CompileInfo>();
-        private MainMemory _mainMemory;
-        private System.Threading.Thread compileThread;
-        public OpenSimJVM()
-        {
-        }
-        public bool Init(IScriptAPI api)
-        {
-            Console.WriteLine("Creating OpenSim JVM scripting engine");
-            _mainMemory = new MainMemory();
-            Thread.GlobalMemory = this._mainMemory;
-            Thread.OpenSimScriptAPI = api;
-            compileThread = new System.Threading.Thread(new ThreadStart(CompileScript));
-            compileThread.IsBackground = true;
-            compileThread.Start();
-            return true;
-        }
-        public string GetName()
-        {
-            return "OpenSimJVM";
-        }
-        public void LoadScript(string script, string scriptName, uint entityID)
-        {
-            Console.WriteLine("OpenSimJVM - loading new script: " + scriptName);
-            CompileInfo comp = new CompileInfo();
-            comp.entityId = entityID;
-            comp.script = script;
-            comp.scriptName = scriptName;
-            this.CompileScripts.Enqueue(comp);
-        }
-        public void CompileScript()
-        {
-            while (true)
-            {
-                CompileInfo comp = this.CompileScripts.Dequeue();
-                string script = comp.script;
-                string scriptName = comp.scriptName;
-                uint entityID = comp.entityId;
-                try
-                {
-                    //need to compile the script into a java class file
-                    //first save it to a java source file
-                    TextWriter tw = new StreamWriter(scriptName + ".java");
-                    tw.WriteLine(script);
-                    tw.Close();
-                    //now compile
-                    System.Diagnostics.ProcessStartInfo psi = new System.Diagnostics.ProcessStartInfo("javac.exe", "*.java");
-                   // psi.RedirectStandardOutput = true;
-                    psi.WindowStyle = System.Diagnostics.ProcessWindowStyle.Hidden;
-                    psi.UseShellExecute = false;
-                    System.Diagnostics.Process javacomp;
-                    javacomp = System.Diagnostics.Process.Start(psi);
-                    javacomp.WaitForExit();
-                    
-                    //now load in class file
-                    ClassRecord class1 = new ClassRecord();
-                    class1.LoadClassFromFile(scriptName + ".class");
-                    class1.PrintToConsole();
-                    //Console.WriteLine();
-                    this._mainMemory.MethodArea.Classes.Add(class1);
-                    class1.AddMethodsToMemory(this._mainMemory.MethodArea);
-                    Thread newThread = new Thread();
-                    this._threads.Add(newThread);
-                    newThread.EntityId = entityID;
-                    newThread.currentClass = class1;
-                    //now delete the created files
-                    System.IO.File.Delete(scriptName + ".java");
-                    System.IO.File.Delete(scriptName + ".class");
-                    //this.OnFrame();
-                }
-                catch (Exception e)
-                {
-                    Console.WriteLine("exception");
-                    Console.WriteLine(e.StackTrace);
-                    Console.WriteLine(e.Message);
-                }
-            }
-        }
-        public void OnFrame()
-        {
-            for (int i = 0; i < this._threads.Count; i++)
-            {
-                if (!this._threads[i].running)
-                {
-                    this._threads[i].StartMethod("OnFrame");
-                    bool run = true;
-                    while (run)
-                    {
-                        run = this._threads[i].Excute();
-                    }
-                }
-            }
-        }
-        private class CompileInfo
-        {
-            public string script;
-            public string scriptName;
-            public uint entityId;
-            public CompileInfo()
-            {
-            }
-        }
-    }
-}
diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/Properties/AssemblyInfo.cs b/OpenSim/OpenSim.Scripting/EmbeddedJVM/Properties/AssemblyInfo.cs
deleted file mode 100644
index 53a0f08..0000000
--- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/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.Scripting.EmbeddedJVM")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("OpenSim.Scripting.EmbeddedJVM")]
-[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("087c0917-5a6a-4b47-a4dd-0928dd85bd4b")]
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/Stack.cs b/OpenSim/OpenSim.Scripting/EmbeddedJVM/Stack.cs
deleted file mode 100644
index 69a274c..0000000
--- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/Stack.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.Scripting.EmbeddedJVM
-{
-    public class Stack
-    {
-        public Stack<StackFrame> StackFrames = new Stack<StackFrame>();
-        public Stack()
-        {
-        }
-    }
-}
diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/StackFrame.cs b/OpenSim/OpenSim.Scripting/EmbeddedJVM/StackFrame.cs
deleted file mode 100644
index 3a2b58a..0000000
--- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/StackFrame.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 OpenSim.Scripting.EmbeddedJVM.Types;
-namespace OpenSim.Scripting.EmbeddedJVM
-{
-    public class StackFrame
-    {
-        public BaseType[] LocalVariables;
-        public Stack<BaseType> OpStack = new Stack<BaseType>();
-        public int ReturnPC = 0;
-        public ClassRecord CallingClass = null;
-        public StackFrame()
-        {
-            LocalVariables = new BaseType[20];
-        }
-    }
-}
diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/Thread.cs b/OpenSim/OpenSim.Scripting/EmbeddedJVM/Thread.cs
deleted file mode 100644
index 6813a20..0000000
--- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/Thread.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 OpenSim.Scripting.EmbeddedJVM.Types;
-using OpenSim.Scripting.EmbeddedJVM.Types.PrimitiveTypes;
-using OpenSim.Framework;
-using OpenSim.Framework.Interfaces;
-namespace OpenSim.Scripting.EmbeddedJVM
-{
-    public partial class Thread
-    {
-        public static MainMemory GlobalMemory;
-        public static IScriptAPI OpenSimScriptAPI;
-        private int PC = 0;
-        private Stack stack;
-        private Interpreter mInterpreter;
-        public ClassRecord currentClass;
-        public ClassInstance currentInstance;
-        private StackFrame currentFrame;
-        public int excutionCounter = 0;
-        public bool running = false;
-        public uint EntityId = 0;
-        public Thread()
-        {
-            this.mInterpreter = new Interpreter(this);
-            this.stack = new Stack();
-        }
-        public void SetPC(int methodpointer)
-        {
-            //Console.WriteLine("Thread PC has been set to " + methodpointer);
-            PC = methodpointer;
-        }
-        public void StartMethod(ClassRecord rec, string methName)
-        {
-            currentFrame = new StackFrame();
-            this.stack.StackFrames.Push(currentFrame);
-            this.currentClass = rec;
-            currentClass.StartMethod(this, methName);
-        }
-        public void StartMethod( string methName)
-        {
-            currentFrame = new StackFrame();
-            this.stack.StackFrames.Push(currentFrame);
-            currentClass.StartMethod(this, methName);
-        }
-        public void JumpToStaticVoidMethod(string methName, int returnPC)
-        {
-            currentFrame = new StackFrame();
-            currentFrame.ReturnPC = returnPC;
-            this.stack.StackFrames.Push(currentFrame);
-            currentClass.StartMethod(this, methName);
-        }
-        public void JumpToStaticParamMethod(string methName, string param, int returnPC)
-        {
-            if (param == "I")
-            {
-                BaseType bs1 = currentFrame.OpStack.Pop();
-                currentFrame = new StackFrame();
-                currentFrame.ReturnPC = returnPC;
-                this.stack.StackFrames.Push(currentFrame);
-                currentFrame.LocalVariables[0] = ((Int)bs1);
-                currentClass.StartMethod(this, methName);
-            }
-            if (param == "F")
-            {
-            }
-        }
-        public void JumpToClassStaticVoidMethod(string className, string methName, int returnPC)
-        {
-        }
-        public bool Excute()
-        {
-            excutionCounter++;
-            return this.mInterpreter.Excute();
-        }
-    }
-}
diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/Types/ArrayReference.cs b/OpenSim/OpenSim.Scripting/EmbeddedJVM/Types/ArrayReference.cs
deleted file mode 100644
index 2854eab..0000000
--- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/Types/ArrayReference.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-namespace OpenSim.Scripting.EmbeddedJVM.Types
-{
-    public class ArrayReference :BaseType
-    {
-    }
-}
diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/Types/BaseType.cs b/OpenSim/OpenSim.Scripting/EmbeddedJVM/Types/BaseType.cs
deleted file mode 100644
index 270aa7b..0000000
--- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/Types/BaseType.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-namespace OpenSim.Scripting.EmbeddedJVM.Types
-{
-    public class BaseType : Object
-    {
-    }
-}
diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/Types/ObjectReference.cs b/OpenSim/OpenSim.Scripting/EmbeddedJVM/Types/ObjectReference.cs
deleted file mode 100644
index da28eaa..0000000
--- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/Types/ObjectReference.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-namespace OpenSim.Scripting.EmbeddedJVM.Types
-{
-    public class ObjectReference : BaseType
-    {
-        public ushort Reference;
-        public ObjectReference()
-        {
-        }
-    }
-}
diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Byte.cs b/OpenSim/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Byte.cs
deleted file mode 100644
index 1a3ecff..0000000
--- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Byte.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-namespace OpenSim.Scripting.EmbeddedJVM.Types.PrimitiveTypes
-{
-    public class Byte : BaseType
-    {
-    }
-}
diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Char.cs b/OpenSim/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Char.cs
deleted file mode 100644
index 19002d4..0000000
--- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Char.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-namespace OpenSim.Scripting.EmbeddedJVM.Types.PrimitiveTypes
-{
-    public class Char : BaseType
-    {
-    }
-}
diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Float.cs b/OpenSim/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Float.cs
deleted file mode 100644
index 91f1679..0000000
--- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Float.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-namespace OpenSim.Scripting.EmbeddedJVM.Types.PrimitiveTypes
-{
-    public class Float : BaseType
-    {
-        public float mValue = 0;
-        public Float()
-        {
-        }
-    }
-}
diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Int.cs b/OpenSim/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Int.cs
deleted file mode 100644
index 4ecd325..0000000
--- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Int.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-namespace OpenSim.Scripting.EmbeddedJVM.Types.PrimitiveTypes
-{
-    public class Int : BaseType
-    {
-        public int mValue = 0;
-        public Int()
-        {
-        }
-    }
-}
diff --git a/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs b/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs
deleted file mode 100644
index 1818e3a..0000000
--- a/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs
+++ /dev/null
@@ -1,118 +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.
-* 
-*/
-// BDB Support
-// Apparently broken on Mono
-using System;
-using System.Collections.Generic;
-using System.Data;
-using libsecondlife;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Terrain;
-using BerkeleyDb;
-using Kds.Serialization;
-using Kds.Serialization.Buffer;
-namespace OpenSim.Storage.LocalStorageBDB
-{
-    public class BDBLocalStorage : ILocalStorage
-    {
-        const string simDbName = "localsim.db";
-        DbHash sim;
-        Db DB;
-        //BEFormatter formatter;
-        public BDBLocalStorage()
-        {
-            DB = new Db(DbCreateFlags.None);
-            sim = (DbHash)DB.Open(null, simDbName, null, BerkeleyDb.DbType.Hash, Db.OpenFlags.Create, 0);
-            //vendorDb = (DbBTree)db.Open(null, VendorDbName, null, DbType.BTree, Db.OpenFlags.Create, 0);
-        }
-        public void Initialise(string file)
-        {
-            // Blank
-        }
-        public void StorePrim(PrimData prim)
-        {
-            DbEntry key = new DbEntry();
-            DbEntry data = new DbEntry();
-            lock (sim)
-            {
-                sim.PutUnique(null, ref key, ref data, DbFile.WriteFlags.AutoCommit);
-            }
-        }
-        public void RemovePrim(LLUUID primID)
-        {
-        }
-        public void LoadPrimitives(ILocalStorageReceiver receiver)
-        {
-        }
-        public float[] LoadWorld()
-        {
-            return new float[65536];
-        }
-        public void SaveMap(float[] heightmap)
-        {
-        }
-        public void SaveParcels(ParcelData[] parcel_data)
-        {
-        }
-        public void SaveParcel(ParcelData parcel)
-        {
-        }
-        public void RemoveParcel(ParcelData parcel)
-        {
-        }
-        public void RemoveAllParcels()
-        {
-        }
-        public void LoadParcels(ILocalStorageParcelReceiver recv)
-        {
-            recv.NoParcelDataFromStorage();
-        }
-        public void ShutDown()
-        {
-            sim.GetDb().Close();
-            DB.Close();
-        }
-    }
-}
-\ No newline at end of file
diff --git a/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj b/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj
deleted file mode 100644
index 417643f..0000000
--- a/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.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>{EE9E5D96-0000-0000-0000-000000000000}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon></ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>OpenSim.Storage.LocalStorageBerkeleyDB</AssemblyName>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenSim.Storage.LocalStorageBerkeleyDB</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="Kds.Serialization.dll" >
-      <HintPath>..\..\..\bin\Kds.Serialization.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="libdb_dotNET43.dll" >
-      <HintPath>..\..\..\bin\libdb_dotNET43.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="..\..\..\Common\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="..\..\..\Common\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>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="BDBLocalStorage.cs">
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
diff --git a/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build b/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build
deleted file mode 100644
index bc2d8ec..0000000
--- a/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" ?>
-<project name="OpenSim.Storage.LocalStorageBerkeleyDB" 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.Storage.LocalStorageBerkeleyDB" dynamicprefix="true" >
-            </resources>
-            <sources failonempty="true">
-                <include name="BDBLocalStorage.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/Kds.Serialization.dll" />
-                <include name="../../../bin/libdb_dotNET43.dll" />
-                <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.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/OpenSim/OpenSim.Storage/LocalStorageDb4o/AssemblyInfo.cs b/OpenSim/OpenSim.Storage/LocalStorageDb4o/AssemblyInfo.cs
deleted file mode 100644
index ea2b62e..0000000
--- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/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("Db4LocalStorage")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Db4LocalStorage")]
-[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/OpenSim/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs b/OpenSim/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs
deleted file mode 100644
index 46fecd0..0000000
--- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs
+++ /dev/null
@@ -1,271 +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 Db4objects.Db4o;
-using Db4objects.Db4o.Query;
-using libsecondlife;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Terrain;
-using OpenSim.Framework.Console;
-namespace OpenSim.Storage.LocalStorageDb4o
-{
-        /// <summary>
-        /// 
-        /// </summary>
-        public class Db4LocalStorage : ILocalStorage
-        {
-                private IObjectContainer db;
-        private string datastore;
-                
-                public Db4LocalStorage()
-                {
-                        
-                }
-        public void Initialise(string dfile)
-        {
-            OpenSim.Framework.Console.MainConsole.Instance.Warn("Db4LocalStorage Opening " + dfile);
-            datastore = dfile;
-            try
-            {
-                db = Db4oFactory.OpenFile(datastore);
-                OpenSim.Framework.Console.MainConsole.Instance.Verbose("Db4LocalStorage creation");
-            }
-            catch (Exception e)
-            {
-                db.Close();
-                OpenSim.Framework.Console.MainConsole.Instance.Warn("Db4LocalStorage :Constructor - Exception occured");
-                OpenSim.Framework.Console.MainConsole.Instance.Warn(e.ToString());
-            }
-        }
-                
-                public void StorePrim(PrimData prim)
-                {
-                        IObjectSet result = db.Query(new UUIDPrimQuery(prim.FullID));
-                        if(result.Count>0)
-                        {
-                                //prim already in storage
-                                //so update it
-                                PrimData found = (PrimData) result.Next();
-                                found.PathBegin = prim.PathBegin;
-                                found.PathCurve= prim.PathCurve;
-                                found.PathEnd = prim.PathEnd;
-                                found.PathRadiusOffset = prim.PathRadiusOffset;
-                                found.PathRevolutions = prim.PathRevolutions;
-                                found.PathScaleX= prim.PathScaleX;
-                                found.PathScaleY = prim.PathScaleY;
-                                found.PathShearX = prim.PathShearX;
-                                found.PathShearY = prim.PathShearY;
-                                found.PathSkew = prim.PathSkew;
-                                found.PathTaperX = prim.PathTaperX;
-                                found.PathTaperY = prim.PathTaperY;
-                                found.PathTwist = prim.PathTwist;
-                                found.PathTwistBegin = prim.PathTwistBegin;
-                                found.PCode = prim.PCode;
-                                found.ProfileBegin = prim.ProfileBegin;
-                                found.ProfileCurve = prim.ProfileCurve;
-                                found.ProfileEnd = prim.ProfileEnd;
-                                found.ProfileHollow = prim.ProfileHollow;
-                                found.Position = prim.Position;
-                                found.Rotation = prim.Rotation;
-                found.Texture = prim.Texture;
-                                db.Set(found);
-                                db.Commit();
-                        }
-                        else
-                        {
-                                //not in storage
-                                db.Set(prim);
-                                db.Commit();
-                        }
-                }
-                
-                public void RemovePrim(LLUUID primID)
-                {
-                        IObjectSet result = db.Query(new UUIDPrimQuery(primID));
-                        if(result.Count>0)
-                        {
-                                PrimData found = (PrimData) result.Next();
-                                db.Delete(found);
-                        }
-                }
-                
-                
-                public void LoadPrimitives(ILocalStorageReceiver receiver)
-                {
-                        IObjectSet result = db.Get(typeof(PrimData));
-                        OpenSim.Framework.Console.MainConsole.Instance.Verbose("Db4LocalStorage.cs: LoadPrimitives() - number of prims in storages is "+result.Count);
-                        foreach (PrimData prim in result) {
-                                receiver.PrimFromStorage(prim);
-                        }
-                }
-        public float[] LoadWorld()
-        {
-            OpenSim.Framework.Console.MainConsole.Instance.Verbose("LoadWorld() - Loading world....");
-            float[] heightmap = null;
-            OpenSim.Framework.Console.MainConsole.Instance.Verbose("LoadWorld() - Looking for a heightmap in local DB");
-            IObjectSet world_result = db.Get(typeof(MapStorage));
-            if (world_result.Count > 0)
-            {
-                OpenSim.Framework.Console.MainConsole.Instance.Verbose("LoadWorld() - Found a heightmap in local database, loading");
-                MapStorage map = (MapStorage)world_result.Next();
-                //blank.LandMap = map.Map;
-                heightmap = map.Map;
-            }
-            return heightmap;
-        }
-        public void SaveMap(float[] heightmap)
-        {
-            IObjectSet world_result = db.Get(typeof(MapStorage));
-            if (world_result.Count > 0)
-            {
-                OpenSim.Framework.Console.MainConsole.Instance.Verbose("SaveWorld() - updating saved copy of heightmap in local database");
-                MapStorage map = (MapStorage)world_result.Next();
-                db.Delete(map);
-            }
-            MapStorage map1 = new MapStorage();
-            map1.Map = heightmap; //OpenSim_Main.local_world.LandMap;
-            db.Set(map1);
-            db.Commit();
-        }
-        public void SaveParcel(ParcelData parcel)
-        {
-            IObjectSet result = db.Query(new UUIDParcelQuery(parcel.globalID));
-            if (result.Count > 0)
-            {
-                //Old Parcel
-                ParcelData updateParcel = (ParcelData)result.Next();
-                updateParcel.AABBMax = parcel.AABBMax;
-                updateParcel.AABBMin = parcel.AABBMin;
-                updateParcel.area = parcel.area;
-                updateParcel.auctionID = parcel.auctionID;
-                updateParcel.authBuyerID = parcel.authBuyerID;
-                updateParcel.category = parcel.category;
-                updateParcel.claimDate = parcel.claimDate;
-                updateParcel.claimPrice = parcel.claimPrice;
-                updateParcel.groupID = parcel.groupID;
-                updateParcel.groupPrims = parcel.groupPrims;
-                updateParcel.isGroupOwned = parcel.isGroupOwned;
-                updateParcel.landingType = parcel.landingType;
-                updateParcel.mediaAutoScale = parcel.mediaAutoScale;
-                updateParcel.mediaID = parcel.mediaID;
-                updateParcel.mediaURL = parcel.mediaURL;
-                updateParcel.musicURL = parcel.musicURL;
-                updateParcel.localID = parcel.localID;
-                updateParcel.ownerID = parcel.ownerID;
-                updateParcel.passHours = parcel.passHours;
-                updateParcel.passPrice = parcel.passPrice;
-                updateParcel.parcelBitmapByteArray = (byte[])parcel.parcelBitmapByteArray.Clone();
-                updateParcel.parcelDesc = parcel.parcelDesc;
-                updateParcel.parcelFlags = parcel.parcelFlags;
-                updateParcel.parcelName = parcel.parcelName;
-                updateParcel.parcelStatus = parcel.parcelStatus;
-                updateParcel.salePrice = parcel.salePrice;
-                updateParcel.snapshotID = parcel.snapshotID;
-                updateParcel.userLocation = parcel.userLocation;
-                updateParcel.userLookAt = parcel.userLookAt;
-                db.Set(updateParcel);
-            }
-            else
-            {
-                db.Set(parcel);
-            }
-            db.Commit();                
-        }
-        public void SaveParcels(ParcelData[] parcel_data)
-        {
-            MainConsole.Instance.Notice("Parcel Backup: Saving Parcels...");
-            int i;
-            for (i = 0; i < parcel_data.GetLength(0); i++)
-            {
-                SaveParcel(parcel_data[i]);
-            }
-            MainConsole.Instance.Notice("Parcel Backup: Parcel Save Complete");
-        }
-        public void RemoveParcel(ParcelData parcel)
-        {
-            IObjectSet result = db.Query(new UUIDParcelQuery(parcel.globalID));
-            if (result.Count > 0)
-            {
-                db.Delete(result[0]);
-            }
-            db.Commit();
-        }
-        public void RemoveAllParcels()
-        {
-            MainConsole.Instance.Notice("Parcel Backup: Removing all parcels...");
-            IObjectSet result = db.Get(typeof(ParcelData));
-            if (result.Count > 0)
-            {
-                foreach (ParcelData parcelData in result)
-                {
-                    RemoveParcel(parcelData);
-                }
-            }
-        }
-        public void LoadParcels(ILocalStorageParcelReceiver recv)
-        {
-            MainConsole.Instance.Notice("Parcel Backup: Loading Parcels...");
-            IObjectSet result = db.Get(typeof(ParcelData));
-            if (result.Count > 0)
-            {
-                MainConsole.Instance.Notice("Parcel Backup: Parcels exist in database.");
-                foreach (ParcelData parcelData in result)
-                {
-                    recv.ParcelFromStorage(parcelData);
-                }
-            }
-            else
-            {
-                MainConsole.Instance.Notice("Parcel Backup: No parcels exist. Creating basic parcel.");
-                recv.NoParcelDataFromStorage();
-            }
-            MainConsole.Instance.Notice("Parcel Backup: Parcels Restored");
-        }
-                public void ShutDown()
-                {
-                        db.Commit();
-                        db.Close();
-                }
-        }
-}
-\ No newline at end of file
diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/MapStorage.cs b/OpenSim/OpenSim.Storage/LocalStorageDb4o/MapStorage.cs
deleted file mode 100644
index 56387ac..0000000
--- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/MapStorage.cs
+++ /dev/null
@@ -1,43 +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.Storage.LocalStorageDb4o
-{
-    public class MapStorage
-    {
-        public float[] Map;
-        public MapStorage()
-        {
-        }
-    }
-}
-\ No newline at end of file
diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
deleted file mode 100644
index 5b8f1c1..0000000
--- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.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>{E1B79ECF-0000-0000-0000-000000000000}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon></ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>OpenSim.Storage.LocalStorageDb4o</AssemblyName>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenSim.Storage.LocalStorageDb4o</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="..\..\..\Common\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="..\..\..\Common\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>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Db4LocalStorage.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="MapStorage.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="UUIDParcelQuery.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="UUIDPrimQuery.cs">
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
deleted file mode 100644
index 739b98c..0000000
--- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" ?>
-<project name="OpenSim.Storage.LocalStorageDb4o" 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.Storage.LocalStorageDb4o" dynamicprefix="true" >
-            </resources>
-            <sources failonempty="true">
-                <include name="AssemblyInfo.cs" />
-                <include name="Db4LocalStorage.cs" />
-                <include name="MapStorage.cs" />
-                <include name="UUIDParcelQuery.cs" />
-                <include name="UUIDPrimQuery.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.dll" />
-                <include name="../../../bin/OpenSim.Framework.Console.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/OpenSim/OpenSim.Storage/LocalStorageDb4o/UUIDParcelQuery.cs b/OpenSim/OpenSim.Storage/LocalStorageDb4o/UUIDParcelQuery.cs
deleted file mode 100644
index d24fb5f..0000000
--- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/UUIDParcelQuery.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 Db4objects.Db4o;
-using Db4objects.Db4o.Query;
-using libsecondlife;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-namespace OpenSim.Storage.LocalStorageDb4o
-{
-    public class UUIDParcelQuery : Predicate
-    {
-        private LLUUID globalIDSearch;
-        public UUIDParcelQuery(LLUUID find)
-        {
-            globalIDSearch = find;
-        }
-        public bool Match(ParcelData parcel)
-        {
-            return (parcel.globalID == globalIDSearch);
-        }
-    }
-}
diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/UUIDPrimQuery.cs b/OpenSim/OpenSim.Storage/LocalStorageDb4o/UUIDPrimQuery.cs
deleted file mode 100644
index b2e8a91..0000000
--- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/UUIDPrimQuery.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 Db4objects.Db4o;
-using Db4objects.Db4o.Query;
-using libsecondlife;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-namespace OpenSim.Storage.LocalStorageDb4o
-{
-    public class UUIDPrimQuery : Predicate
-    {
-        private LLUUID _findID;
-        public UUIDPrimQuery(LLUUID find)
-        {
-            _findID = find;
-        }
-        public bool Match(PrimData prim)
-        {
-            return (prim.FullID == _findID);
-        }
-    }
-}
diff --git a/OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj b/OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj
deleted file mode 100644
index ff93a8f..0000000
--- a/OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.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>{6B20B603-0000-0000-0000-000000000000}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon></ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>OpenSim.Storage.LocalStorageSQLite</AssemblyName>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenSim.Storage.LocalStorageSQLite</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.Data.SQLite.dll" >
-      <HintPath>..\..\..\bin\System.Data.SQLite.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Xml" >
-      <HintPath>System.Xml.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\Common\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="..\..\..\Common\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>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="SQLiteLocalStorage.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/OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build b/OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build
deleted file mode 100644
index bd4c731..0000000
--- a/OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" ?>
-<project name="OpenSim.Storage.LocalStorageSQLite" 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.Storage.LocalStorageSQLite" dynamicprefix="true" >
-            </resources>
-            <sources failonempty="true">
-                <include name="SQLiteLocalStorage.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/OpenSim.Framework.dll" />
-                <include name="../../../bin/OpenSim.Framework.Console.dll" />
-                <include name="System.dll" />
-                <include name="System.Data.dll" />
-                <include name="../../../bin/System.Data.SQLite.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/OpenSim/OpenSim.Storage/LocalStorageSQLite/Properties/AssemblyInfo.cs b/OpenSim/OpenSim.Storage/LocalStorageSQLite/Properties/AssemblyInfo.cs
deleted file mode 100644
index fe81f8a..0000000
--- a/OpenSim/OpenSim.Storage/LocalStorageSQLite/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.Storage.LocalStorageSQLite")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("OpenSim.Storage.LocalStorageSQLite")]
-[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("ecd6e0c1-7909-413e-9e3f-659678ac3bc3")]
-// 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.*")]
-[assembly: AssemblyFileVersion("1.0.0.*")]
diff --git a/OpenSim/OpenSim.Storage/LocalStorageSQLite/SQLiteLocalStorage.cs b/OpenSim/OpenSim.Storage/LocalStorageSQLite/SQLiteLocalStorage.cs
deleted file mode 100644
index 8106727..0000000
--- a/OpenSim/OpenSim.Storage/LocalStorageSQLite/SQLiteLocalStorage.cs
+++ /dev/null
@@ -1,199 +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.
-* 
-*/
-// SQLite Support
-// A bad idea, but the IRC people told me to!
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Data.SQLite;
-using libsecondlife;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Terrain;
-namespace OpenSim.Storage.LocalStorageSQLite
-{
-    public class SQLiteLocalStorage : ILocalStorage
-    {
-        IDbConnection db;
-        public SQLiteLocalStorage()
-        {
-            try
-            {
-                string connectionstring = "URI=file:localsim.sdb";
-                db = (IDbConnection)new SQLiteConnection(connectionstring);
-                db.Open();
-            }
-            catch (Exception e)
-            {
-                db.Close();
-                OpenSim.Framework.Console.MainConsole.Instance.Warn("SQLiteLocalStorage :Constructor - Exception occured");
-                OpenSim.Framework.Console.MainConsole.Instance.Warn(e.ToString());
-            }
-        }
-        public void Initialise(string file)
-        {
-            // Blank
-        }
-        public void StorePrim(PrimData prim)
-        {
-            IDbCommand cmd = db.CreateCommand();
-            //SECURITY WARNING:
-            // These parameters wont produce SQL injections since they are all integer based, however.
-            // if inserting strings such as name or description, you will need to use appropriate
-            // measures to prevent SQL injection (although the value of SQL injection in this is limited).
-            string sql = "REPLACE INTO prim (OwnerID,PCode,PathBegin,PathEnd,PathScaleX,PathScaleY,PathShearX,PathShearY,PathSkew,ProfileBegin,ProfileEnd,Scale,PathCurve,ProfileCurve,ParentID,ProfileHollow,PathRadiusOffset,PathRevolutions,PathTaperX,PathTaperY,PathTwist,PathTwistBegin,Texture,CreationDate,OwnerMask,NextOwnerMask,GroupMask,EveryoneMask,BaseMask,Position,Rotation,LocalID,FullID) ";
-            sql += "VALUES (";
-            sql += "\"" + prim.OwnerID.ToStringHyphenated() + "\","; // KILL ME NOW!
-            sql += "\"" + prim.PCode.ToString() + "\",";
-            sql += "\"" + prim.PathBegin.ToString() + "\",";
-            sql += "\"" + prim.PathEnd.ToString() + "\",";
-            sql += "\"" + prim.PathScaleX.ToString() + "\",";
-            sql += "\"" + prim.PathScaleY.ToString() + "\",";
-            sql += "\"" + prim.PathShearX.ToString() + "\",";
-            sql += "\"" + prim.PathShearY.ToString() + "\",";
-            sql += "\"" + prim.PathSkew.ToString() + "\",";
-            sql += "\"" + prim.ProfileBegin.ToString() + "\",";
-            sql += "\"" + prim.ProfileEnd.ToString() + "\",";
-            sql += "\"" + prim.Scale.ToString() + "\",";
-            sql += "\"" + prim.PathCurve.ToString() + "\",";
-            sql += "\"" + prim.ProfileCurve.ToString() + "\",";
-            sql += "\"" + prim.ParentID.ToString() + "\",";
-            sql += "\"" + prim.ProfileHollow.ToString() + "\",";
-            sql += "\"" + prim.PathRadiusOffset.ToString() + "\",";
-            sql += "\"" + prim.PathRevolutions.ToString() + "\",";
-            sql += "\"" + prim.PathTaperX.ToString() + "\",";
-            sql += "\"" + prim.PathTaperY.ToString() + "\",";
-            sql += "\"" + prim.PathTwist.ToString() + "\",";
-            sql += "\"" + prim.PathTwistBegin.ToString() + "\",";
-            sql += "\"" + prim.Texture.ToString() + "\",";
-            sql += "\"" + prim.CreationDate.ToString() + "\",";
-            sql += "\"" + prim.OwnerMask.ToString() + "\",";
-            sql += "\"" + prim.NextOwnerMask.ToString() + "\",";
-            sql += "\"" + prim.GroupMask.ToString() + "\",";
-            sql += "\"" + prim.EveryoneMask.ToString() + "\",";
-            sql += "\"" + prim.BaseMask.ToString() + "\",";
-            sql += "\"" + prim.Position.ToString() + "\",";
-            sql += "\"" + prim.Rotation.ToString() + "\",";
-            sql += "\"" + prim.LocalID.ToString() + "\",";
-            sql += "\"" + prim.FullID.ToString() + "\")";
-            cmd.CommandText = sql;
-            try
-            {
-                cmd.ExecuteNonQuery();
-            }
-            catch (Exception e)
-            {
-                OpenSim.Framework.Console.MainConsole.Instance.Warn("SQLiteLocalStorage :StorePrim - Exception occured");
-                OpenSim.Framework.Console.MainConsole.Instance.Warn(e.ToString());
-            }
-            cmd.Dispose();
-            cmd = null;
-        }
-        public void RemovePrim(LLUUID primID)
-        {
-            IDbCommand cmd = db.CreateCommand();
-            //SECURITY WARNING:
-            // These parameters wont produce SQL injections since they are all integer based, however.
-            // if inserting strings such as name or description, you will need to use appropriate
-            // measures to prevent SQL injection (although the value of SQL injection in this is limited).
-            string sql = "DELETE FROM prim WHERE FullID = \"" + primID.ToStringHyphenated() + "\"";
-            cmd.CommandText = sql;
-            try
-            {
-                cmd.ExecuteNonQuery();
-            }
-            catch (Exception e)
-            {
-                OpenSim.Framework.Console.MainConsole.Instance.Warn("SQLiteLocalStorage :RemovePrim - Exception occured");
-                OpenSim.Framework.Console.MainConsole.Instance.Warn(e.ToString());
-            }
-            cmd.Dispose();
-            cmd = null;
-        }
-        public void LoadPrimitives(ILocalStorageReceiver receiver)
-        {
-        }
-        public float[] LoadWorld()
-        {
-            return new float[65536];
-        }
-        public void SaveMap(float[] heightmap)
-        {
-        }
-        public void SaveParcels(ParcelData[] parcel_manager)
-        {
-        }
-        public void SaveParcel(ParcelData parcel)
-        {
-        }
-        public void RemoveParcel(ParcelData parcel)
-        {
-        }
-        public void RemoveAllParcels()
-        {
-        }
-        public void LoadParcels(ILocalStorageParcelReceiver recv)
-        {
-            recv.NoParcelDataFromStorage();
-        }
-        public void ShutDown()
-        {
-            db.Close();
-            db = null;
-        }
-    }
-}
-\ No newline at end of file
diff --git a/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj b/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj
deleted file mode 100644
index aae0ab8..0000000
--- a/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj
+++ /dev/null
@@ -1,99 +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>{2270B8FE-0000-0000-0000-000000000000}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon></ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>OpenSim.Terrain.BasicTerrain</AssemblyName>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenSim.Terrain.BasicTerrain</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="libTerrain-BSD.dll" >
-      <HintPath>..\..\bin\libTerrain-BSD.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.Drawing" >
-      <HintPath>System.Drawing.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="TerrainEngine.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/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build b/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build
deleted file mode 100644
index 6526648..0000000
--- a/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" ?>
-<project name="OpenSim.Terrain.BasicTerrain" 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.Terrain.BasicTerrain" dynamicprefix="true" >
-            </resources>
-            <sources failonempty="true">
-                <include name="TerrainEngine.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/libTerrain-BSD.dll" />
-                <include name="System.dll" />
-                <include name="System.Data.dll" />
-                <include name="System.Drawing.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/OpenSim/OpenSim.Terrain.BasicTerrain/Properties/AssemblyInfo.cs b/OpenSim/OpenSim.Terrain.BasicTerrain/Properties/AssemblyInfo.cs
deleted file mode 100644
index bd74993..0000000
--- a/OpenSim/OpenSim.Terrain.BasicTerrain/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.Terrain.BasicTerrain")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("OpenSim.Terrain.BasicTerrain")]
-[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("3263f5b5-0a41-4ed5-91a2-9baaaeecc849")]
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Revision and Build Numbers 
-// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/OpenSim/OpenSim.Terrain.BasicTerrain/TerrainEngine.cs b/OpenSim/OpenSim.Terrain.BasicTerrain/TerrainEngine.cs
deleted file mode 100644
index 373d6ad..0000000
--- a/OpenSim/OpenSim.Terrain.BasicTerrain/TerrainEngine.cs
+++ /dev/null
@@ -1,533 +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.Drawing;
-using libTerrain;
-namespace OpenSim.Terrain
-{
-    public class TerrainEngine
-    {
-        /// <summary>
-        /// A [normally] 256x256 heightmap
-        /// </summary>
-        public Channel heightmap;
-        /// <summary>
-        /// Whether or not the terrain has been modified since it was last saved and sent to the Physics engine.
-        /// Counts the number of modifications since the last save. (0 = Untainted)
-        /// </summary>
-        public int tainted;
-        int w, h;
-        /// <summary>
-        /// Generate a new TerrainEngine instance and creates a new heightmap
-        /// </summary>
-        public TerrainEngine()
-        {
-            w = 256;
-            h = 256;
-            heightmap = new Channel(w, h);
-            tainted++;
-        }
-        /// <summary>
-        /// Converts the heightmap to a 65536 value 1D floating point array
-        /// </summary>
-        /// <returns>A float[65536] array containing the heightmap</returns>
-        public float[] getHeights1D()
-        {
-            float[] heights = new float[w * h];
-            int i;
-            for (i = 0; i < w * h; i++)
-            {
-                heights[i] = (float)heightmap.map[i / w, i % w];
-            }
-            return heights;
-        }
-        /// <summary>
-        /// Converts the heightmap to a 256x256 value 2D floating point array.
-        /// </summary>
-        /// <returns>An array of 256,256 values containing the heightmap</returns>
-        public float[,] getHeights2D()
-        {
-            float[,] heights = new float[w, h];
-            int x, y;
-            for (x = 0; x < w; x++)
-            {
-                for (y = 0; y < h; y++)
-                {
-                    heights[x, y] = (float)heightmap.map[x, y];
-                }
-            }
-            return heights;
-        }
-        /// <summary>
-        /// Imports a 1D floating point array into the 2D heightmap array
-        /// </summary>
-        /// <param name="heights">The array to import (must have 65536 members)</param>
-        public void setHeights1D(float[] heights)
-        {
-            int i;
-            for (i = 0; i < w * h; i++)
-            {
-                heightmap.map[i / w, i % w] = heights[i];
-            }
-            tainted++;
-        }
-        /// <summary>
-        /// Loads a 2D array of values into the heightmap
-        /// </summary>
-        /// <param name="heights">An array of 256,256 float values</param>
-        public void setHeights2D(float[,] heights)
-        {
-            int x, y;
-            for (x = 0; x < w; x++)
-            {
-                for (y = 0; y < h; y++)
-                {
-                    heightmap.set(x, y, (double)heights[x, y]);
-                }
-            }
-            tainted++;
-        }
-        /// <summary>
-        /// Processes a terrain-specific command
-        /// </summary>
-        /// <param name="args">Commandline arguments (space seperated)</param>
-        /// <param name="resultText">Reference that returns error or help text if returning false</param>
-        /// <returns>If the operation was successful (if not, the error is placed into resultText)</returns>
-        public bool RunTerrainCmd(string[] args, ref string resultText)
-        {
-            string command = args[0];
-            try
-            {
-                switch (command)
-                {
-                    case "help":
-                        resultText += "terrain regenerate - rebuilds the sims terrain using a default algorithm\n";
-                        resultText += "terrain seed <seed> - sets the random seed value to <seed>\n";
-                        resultText += "terrain load <type> <filename> - loads a terrain from disk, type can be 'F32', 'F64', 'RAW' or 'IMG'\n";
-                        resultText += "terrain save <type> <filename> - saves a terrain to disk, type can be 'F32' or 'F64'\n";
-                        resultText += "terrain save grdmap <filename> <gradient map> - creates a PNG snapshot of the region using a named gradient map\n";
-                        resultText += "terrain rescale <min> <max> - rescales a terrain to be between <min> and <max> meters high\n";
-                        resultText += "terrain erode aerobic <windspeed> <pickupmin> <dropmin> <carry> <rounds> <lowest>\n";
-                        resultText += "terrain erode thermal <talus> <rounds> <carry>\n";
-                        resultText += "terrain multiply <val> - multiplies a terrain by <val>\n";
-                        return false;
-                    case "seed":
-                        setSeed(Convert.ToInt32(args[1]));
-                        break;
-                    case "erode":
-                        switch (args[1].ToLower())
-                        {
-                            case "aerobic":
-                                // WindSpeed, PickupMinimum,DropMinimum,Carry,Rounds,Lowest
-                                heightmap.AerobicErosion(Convert.ToDouble(args[2]), Convert.ToDouble(args[3]), Convert.ToDouble(args[4]), Convert.ToDouble(args[5]), Convert.ToInt32(args[6]), Convert.ToBoolean(args[7]));
-                                break;
-                            case "thermal":
-                                heightmap.thermalWeathering(Convert.ToDouble(args[2]), Convert.ToInt32(args[3]), Convert.ToDouble(args[4]));
-                                break;
-                            default:
-                                resultText = "Unknown erosion type";
-                                return false;
-                        }
-                        break;
-                    case "regenerate":
-                        hills();
-                        break;
-                    case "rescale":
-                        setRange(Convert.ToSingle(args[1]), Convert.ToSingle(args[2]));
-                        break;
-                    case "multiply":
-                        heightmap *= Convert.ToDouble(args[1]);
-                        break;
-                    case "load":
-                        switch (args[1].ToLower())
-                        {
-                            case "f32":
-                                loadFromFileF32(args[2]);
-                                break;
-                            case "f64":
-                                loadFromFileF64(args[2]);
-                                break;
-                            case "raw":
-                                loadFromFileSLRAW(args[2]);
-                                break;
-                            case "img":
-                                loadFromFileIMG(args[2]);
-                                return false;
-                            default:
-                                resultText = "Unknown image or data format";
-                                return false;
-                        }
-                        break;
-                    case "save":
-                        switch (args[1].ToLower())
-                        {
-                            case "f32":
-                                writeToFileF32(args[2]);
-                                break;
-                            case "f64":
-                                writeToFileF64(args[2]);
-                                break;
-                            case "grdmap":
-                                exportImage(args[2], args[3]);
-                                break;
-                            default:
-                                resultText = "Unknown image or data format";
-                                return false;
-                        }
-                        break;
-                    default:
-                        resultText = "Unknown terrain command";
-                        return false;
-                }
-                return true;
-            }
-            catch (Exception e)
-            {
-                resultText = "Error running terrain command: " + e.ToString();
-                return false;
-            }
-        }
-        /// <summary>
-        /// Renormalises the array between min and max
-        /// </summary>
-        /// <param name="min">Minimum value of the new array</param>
-        /// <param name="max">Maximum value of the new array</param>
-        public void setRange(float min, float max)
-        {
-            heightmap.normalise((double)min, (double)max);
-            tainted++;
-        }
-        /// <summary>
-        /// Loads a file from an image compatible with System.Drawing
-        /// </summary>
-        /// <param name="filename">File to load</param>
-        public void loadFromFileIMG(string filename)
-        {
-            System.Drawing.Bitmap bmp = new Bitmap(filename);
-            if (bmp.Width != heightmap.w && bmp.Height != heightmap.h)
-                throw new Exception("Wrong image size! Images for this region must be " + heightmap.w.ToString() + " by " + heightmap.h.ToString() + " pixels in dimension");
-            int x, y;
-            for (x = 0; x < w; x++)
-            {
-                for (y = 0; y < h; y++)
-                {
-                    Color c = bmp.GetPixel(x, y);
-                }
-            }
-        }
-        /// <summary>
-        /// Loads a file consisting of 256x256 doubles and imports it as an array into the map.
-        /// </summary>
-        /// <remarks>TODO: Move this to libTerrain itself</remarks>
-        /// <param name="filename">The filename of the double array to import</param>
-        public void loadFromFileF64(string filename)
-        {
-            System.IO.FileInfo file = new System.IO.FileInfo(filename);
-            System.IO.FileStream s = file.Open(System.IO.FileMode.Open, System.IO.FileAccess.Read);
-            System.IO.BinaryReader bs = new System.IO.BinaryReader(s);
-            int x, y;
-            for (x = 0; x < w; x++)
-            {
-                for (y = 0; y < h; y++)
-                {
-                    heightmap.map[x, y] = bs.ReadDouble();
-                }
-            }
-            bs.Close();
-            s.Close();
-            tainted++;
-        }
-        /// <summary>
-        /// Loads a file consisting of 256x256 floats and imports it as an array into the map.
-        /// </summary>
-        /// <remarks>TODO: Move this to libTerrain itself</remarks>
-        /// <param name="filename">The filename of the float array to import</param>
-        public void loadFromFileF32(string filename)
-        {
-            System.IO.FileInfo file = new System.IO.FileInfo(filename);
-            System.IO.FileStream s = file.Open(System.IO.FileMode.Open, System.IO.FileAccess.Read);
-            System.IO.BinaryReader bs = new System.IO.BinaryReader(s);
-            int x, y;
-            for (x = 0; x < w; x++)
-            {
-                for (y = 0; y < h; y++)
-                {
-                    heightmap.map[x, y] = (double)bs.ReadSingle();
-                }
-            }
-            bs.Close();
-            s.Close();
-            tainted++;
-        }
-        /// <summary>
-        /// Loads a file formatted in the SL .RAW Format used on the main grid
-        /// </summary>
-        /// <remarks>This file format stinks and is best avoided.</remarks>
-        /// <param name="filename">A path to the .RAW format</param>
-        public void loadFromFileSLRAW(string filename)
-        {
-            System.IO.FileInfo file = new System.IO.FileInfo(filename);
-            System.IO.FileStream s = file.Open(System.IO.FileMode.Open, System.IO.FileAccess.Read);
-            System.IO.BinaryReader bs = new System.IO.BinaryReader(s);
-            int x, y;
-            for (x = 0; x < w; x++)
-            {
-                for (y = 0; y < h; y++)
-                {
-                    heightmap.map[x, y] = (double)bs.ReadByte() * ((double)bs.ReadByte() / 127.0);
-                    bs.ReadBytes(11); // Advance the stream to next bytes.
-                }
-            }
-            bs.Close();
-            s.Close();
-            tainted++;
-        }
-        /// <summary>
-        /// Writes the current terrain heightmap to disk, in the format of a 65536 entry double[] array.
-        /// </summary>
-        /// <param name="filename">The desired output filename</param>
-        public void writeToFileF64(string filename)
-        {
-            System.IO.FileInfo file = new System.IO.FileInfo(filename);
-            System.IO.FileStream s = file.Open(System.IO.FileMode.CreateNew, System.IO.FileAccess.Write);
-            System.IO.BinaryWriter bs = new System.IO.BinaryWriter(s);
-            int x, y;
-            for (x = 0; x < w; x++)
-            {
-                for (y = 0; y < h; y++)
-                {
-                    bs.Write(heightmap.get(x, y));
-                }
-            }
-            bs.Close();
-            s.Close();
-        }
-        /// <summary>
-        /// Writes the current terrain heightmap to disk, in the format of a 65536 entry float[] array
-        /// </summary>
-        /// <param name="filename">The desired output filename</param>
-        public void writeToFileF32(string filename)
-        {
-            System.IO.FileInfo file = new System.IO.FileInfo(filename);
-            System.IO.FileStream s = file.Open(System.IO.FileMode.CreateNew, System.IO.FileAccess.Write);
-            System.IO.BinaryWriter bs = new System.IO.BinaryWriter(s);
-            int x, y;
-            for (x = 0; x < w; x++)
-            {
-                for (y = 0; y < h; y++)
-                {
-                    bs.Write((float)heightmap.get(x, y));
-                }
-            }
-            bs.Close();
-            s.Close();
-        }
-        /// <summary>
-        /// Sets the random seed to be used by procedural functions which involve random numbers.
-        /// </summary>
-        /// <param name="val">The desired seed</param>
-        public void setSeed(int val)
-        {
-            heightmap.seed = val;
-        }
-        /// <summary>
-        /// Raises land in a sphere around the specified coordinates
-        /// </summary>
-        /// <param name="rx">Center of the sphere on the X axis</param>
-        /// <param name="ry">Center of the sphere on the Y axis</param>
-        /// <param name="size">The radius of the sphere</param>
-        /// <param name="amount">Scale the height of the sphere by this amount (recommended 0..2)</param>
-        public void raise(double rx, double ry, double size, double amount)
-        {
-            lock (heightmap)
-            {
-                heightmap.raise(rx, ry, size, amount);
-            }
-            tainted++;
-        }
-        /// <summary>
-        /// Lowers the land in a sphere around the specified coordinates
-        /// </summary>
-        /// <param name="rx">The center of the sphere at the X axis</param>
-        /// <param name="ry">The center of the sphere at the Y axis</param>
-        /// <param name="size">The radius of the sphere in meters</param>
-        /// <param name="amount">Scale the height of the sphere by this amount (recommended 0..2)</param>
-        public void lower(double rx, double ry, double size, double amount)
-        {
-            lock (heightmap)
-            {
-                heightmap.lower(rx, ry, size, amount);
-            }
-            tainted++;
-        }
-        /// <summary>
-        /// Generates a simple set of hills in the shape of an island
-        /// </summary>
-        public void hills()
-        {
-            lock (heightmap)
-            {
-                heightmap.hillsSpheres(200, 20, 40, true, true, false);
-                heightmap.normalise();
-                heightmap *= 60.0; // Raise to 60m
-            }
-            tainted++;
-        }
-        /// <summary>
-        /// Multiplies the heightfield by val
-        /// </summary>
-        /// <param name="meep">The heightfield</param>
-        /// <param name="val">The multiplier</param>
-        /// <returns></returns>
-        public static TerrainEngine operator *(TerrainEngine meep, Double val)
-        {
-            meep.heightmap *= val;
-            meep.tainted++;
-            return meep;
-        }
-        /// <summary>
-        /// Returns the height at the coordinates x,y
-        /// </summary>
-        /// <param name="x">X Coordinate</param>
-        /// <param name="y">Y Coordinate</param>
-        /// <returns></returns>
-        public float this[int x, int y]
-        {
-            get
-            {
-                return (float)heightmap.get(x, y);
-            }
-            set
-            {
-                tainted++;
-                heightmap.set(x, y, (double)value);
-            }
-        }
-        /// <summary>
-        /// Exports the current heightmap to a PNG file
-        /// </summary>
-        /// <param name="filename">The destination filename for the image</param>
-        /// <param name="gradientmap">A 1x*height* image which contains the colour gradient to export with. Must be at least 1x2 pixels, 1x256 or more is ideal.</param>
-        public void exportImage(string filename, string gradientmap)
-        {
-            try
-            {
-                Bitmap gradientmapLd = new Bitmap(gradientmap);
-                int pallete = gradientmapLd.Height;
-                Bitmap bmp = new Bitmap(heightmap.w, heightmap.h);
-                Color[] colours = new Color[pallete];
-                for (int i = 0; i < pallete; i++)
-                {
-                    colours[i] = gradientmapLd.GetPixel(0, i);
-                }
-                Channel copy = heightmap.copy();
-                for (int x = 0; x < copy.w; x++)
-                {
-                    for (int y = 0; y < copy.h; y++)
-                    {
-                        // 512 is the largest possible height before colours clamp
-                        int colorindex = (int)(Math.Max(Math.Min(1.0, copy.get(x, y) / 512.0), 0.0) * pallete);
-                        bmp.SetPixel(y, 255 - x, colours[colorindex]);
-                    }
-                }
-                bmp.Save(filename, System.Drawing.Imaging.ImageFormat.Png);
-            }
-            catch (Exception e)
-            {
-                Console.WriteLine("Failed generating terrain map: " + e.ToString());
-            }
-        }
-    }
-}
-\ No newline at end of file
diff --git a/OpenSim/OpenSim/Application.cs b/OpenSim/OpenSim/Application.cs
deleted file mode 100644
index dec0029..0000000
--- a/OpenSim/OpenSim/Application.cs
+++ /dev/null
@@ -1,137 +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.UserServer;
-using OpenSim.Framework.Console;
-using OpenSim.RegionServer;
-namespace OpenSim
-{
-    public class Application
-    {   
-        //could move our main function into OpenSimMain and kill this class
-        [STAThread]
-        public static void Main(string[] args)
-        {
-            try
-            {
-                Console.WriteLine("OpenSim " + VersionInfo.Version + "\n");
-                Console.WriteLine("Starting...\n");
-                bool sandBoxMode = false;
-                bool startLoginServer = false;
-                string physicsEngine = "basicphysics";
-                bool allowFlying = false;
-                bool userAccounts = false;
-                bool gridLocalAsset = false;
-                bool useConfigFile = false;
-                bool silent = false;
-                string configFile = "simconfig.xml";
-                for (int i = 0; i < args.Length; i++)
-                {
-                    if (args[i] == "-sandbox")
-                    {
-                        sandBoxMode = true;
-                        userAccounts = true;
-                        startLoginServer = true;
-                    }
-                    /*
-                    if (args[i] == "-loginserver")
-                    {
-                        startLoginServer = true;
-                    }*/
-                    if (args[i] == "-accounts")
-                    {
-                        userAccounts = true;
-                    }
-                    if (args[i] == "-realphysx")
-                    {
-                        physicsEngine = "RealPhysX";
-                        allowFlying = true;
-                    }
-                    if (args[i] == "-ode")
-                    {
-                        physicsEngine = "OpenDynamicsEngine";
-                        allowFlying = true;
-                    }
-                    if (args[i] == "-localasset")
-                    {
-                        gridLocalAsset = true;
-                    }
-                    if (args[i] == "-configfile")
-                    {
-                        useConfigFile = true;
-                    }
-                    if (args[i] == "-noverbose")
-                    {
-                        silent = true;
-                    }
-                    if (args[i] == "-config")
-                    {
-                        try
-                        {
-                            i++;
-                            configFile = args[i];
-                        }
-                        catch (Exception e)
-                        {
-                            Console.WriteLine("-config: Please specify a config file. (" + e.ToString() + ")");
-                        }
-                    }
-                }
-                OpenSimMain sim = new OpenSimMain(sandBoxMode, startLoginServer, physicsEngine, useConfigFile, silent, configFile);
-                // OpenSimRoot.Instance.Application = sim;
-                sim.m_sandbox = sandBoxMode;
-                sim.user_accounts = userAccounts;
-                sim.gridLocalAsset = gridLocalAsset;
-                OpenSim.RegionServer.Simulator.Avatar.PhysicsEngineFlying = allowFlying;
-                sim.StartUp();
-                while (true)
-                {
-                    OpenSim.Framework.Console.MainConsole.Instance.MainConsolePrompt();
-                }
-            }
-            finally
-            {
-                /// Ensure that all sockets have been closed before the process closes.  This helps ensure that no
-                /// open ports are left open on process that '<do not exist>'.  This is in the finally block, as it
-                /// should be done regardless of whether a exception closes the application, or if the application
-                /// is closed normally.
-                OpenSim.Servers.SocketRegistry.UnregisterAllAndClose();
-            }
-        }
-    }
-}
diff --git a/OpenSim/OpenSim/OpenSim.csproj b/OpenSim/OpenSim/OpenSim.csproj
deleted file mode 100644
index f55735f..0000000
--- a/OpenSim/OpenSim/OpenSim.csproj
+++ /dev/null
@@ -1,147 +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>{438A9556-0000-0000-0000-000000000000}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon></ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>OpenSim</AssemblyName>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenSim</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="Axiom.MathLib.dll" >
-      <HintPath>..\..\bin\Axiom.MathLib.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <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="..\..\Common\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="..\..\Common\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="..\..\Common\OpenSim.GenericConfig\Xml\OpenSim.GenericConfig.Xml.csproj">
-      <Name>OpenSim.GenericConfig.Xml</Name>
-      <Project>{E88EF749-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-                        <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj">
-      <Name>OpenSim.Physics.Manager</Name>
-      <Project>{8BE16150-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-                        <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\OpenSim.RegionServer\OpenSim.RegionServer.csproj">
-      <Name>OpenSim.RegionServer</Name>
-      <Project>{632E1BFD-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-                        <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Common\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="..\OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj">
-      <Name>OpenSim.Terrain.BasicTerrain</Name>
-      <Project>{2270B8FE-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-                        <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Common\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="Application.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="OpenSimMain.cs">
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
diff --git a/OpenSim/OpenSim/OpenSim.exe.build b/OpenSim/OpenSim/OpenSim.exe.build
deleted file mode 100644
index 784c9ca..0000000
--- a/OpenSim/OpenSim/OpenSim.exe.build
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" ?>
-<project name="OpenSim" 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="exe" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe">
-            <resources prefix="OpenSim" dynamicprefix="true" >
-            </resources>
-            <sources failonempty="true">
-                <include name="Application.cs" />
-                <include name="OpenSimMain.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/Axiom.MathLib.dll" />
-                <include name="../../bin/Db4objects.Db4o.dll" />
-                <include name="../../bin/libsecondlife.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.Physics.Manager.dll" />
-                <include name="../../bin/OpenSim.RegionServer.dll" />
-                <include name="../../bin/OpenSim.Servers.dll" />
-                <include name="../../bin/OpenSim.Terrain.BasicTerrain.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/OpenSim/OpenSim/OpenSimMain.cs b/OpenSim/OpenSim/OpenSimMain.cs
deleted file mode 100644
index 0a316bd..0000000
--- a/OpenSim/OpenSim/OpenSimMain.cs
+++ /dev/null
@@ -1,552 +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.RegionServer;
-using OpenSim.RegionServer.Simulator;
-using OpenSim.Terrain;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-using OpenSim.UserServer;
-using OpenSim.RegionServer.Assets;
-using OpenSim.RegionServer.CAPS;
-using OpenSim.Framework.Console;
-using OpenSim.Physics.Manager;
-using Nwc.XmlRpc;
-using OpenSim.Servers;
-using OpenSim.GenericConfig;
-namespace OpenSim
-{
-    public class OpenSimMain : OpenSim.RegionServer.RegionServerBase, conscmd_callback
-    {
-        private CheckSumServer checkServer;
-        public OpenSimMain(bool sandBoxMode, bool startLoginServer, string physicsEngine, bool useConfigFile, bool silent, string configFile)
-        {
-            this.configFileSetup = useConfigFile;
-            m_sandbox = sandBoxMode;
-            m_loginserver = startLoginServer;
-            m_physicsEngine = physicsEngine;
-            m_config = configFile;
-            m_console = new ConsoleBase("region-console-" + Guid.NewGuid().ToString() + ".log", "Region", this, silent);
-            OpenSim.Framework.Console.MainConsole.Instance = m_console;
-        }
-        /// <summary>
-        /// Performs initialisation of the world, such as loading configuration from disk.
-        /// </summary>
-        public override void StartUp()
-        {
-            this.regionData = new RegionInfo();
-            this.localConfig = new XmlConfig(m_config);
-            this.localConfig.LoadData();
-            if (this.configFileSetup)
-            {
-                this.SetupFromConfigFile(this.localConfig);
-            }
-            m_console.Notice("Main.cs:Startup() - Loading configuration");
-            this.regionData.InitConfig(this.m_sandbox, this.localConfig);
-            this.localConfig.Close();//for now we can close it as no other classes read from it , but this should change
-            GridServers = new Grid();
-            if (m_sandbox)
-            {
-                this.SetupLocalGridServers();
-                //Authenticate Session Handler
-                AuthenticateSessionsLocal authen = new AuthenticateSessionsLocal();
-                this.AuthenticateSessionsHandler = authen;
-                this.checkServer = new CheckSumServer(12036);
-                this.checkServer.ServerListener();
-            }
-            else
-            {
-                this.SetupRemoteGridServers();
-                //Authenticate Session Handler
-                AuthenticateSessionsRemote authen = new AuthenticateSessionsRemote();
-                this.AuthenticateSessionsHandler = authen;
-            }
-            startuptime = DateTime.Now;
-            AssetCache = new AssetCache(GridServers.AssetServer);
-            InventoryCache = new InventoryCache();
-            m_udpServer = new UDPServer(this.regionData.IPListenPort, this.GridServers, this.AssetCache, this.InventoryCache, this.regionData, this.m_sandbox, this.user_accounts, this.m_console, this.AuthenticateSessionsHandler);
-            //should be passing a IGenericConfig object to these so they can read the config data they want from it
-            GridServers.AssetServer.SetServerInfo(regionData.AssetURL, regionData.AssetSendKey);
-            IGridServer gridServer = GridServers.GridServer;
-            gridServer.SetServerInfo(regionData.GridURL, regionData.GridSendKey, regionData.GridRecvKey);
-            if (!m_sandbox)
-            {
-                this.ConnectToRemoteGridServer();
-            }
-            this.SetupLocalWorld();
-            if (m_sandbox)
-            {
-                AssetCache.LoadDefaultTextureSet();
-            }
-            m_console.Notice("Main.cs:Startup() - Initialising HTTP server");
-            this.SetupHttpListener();
-            //Login server setup
-            LoginServer loginServer = null;
-            LoginServer adminLoginServer = null;
-            bool sandBoxWithLoginServer = m_loginserver && m_sandbox;
-            if (sandBoxWithLoginServer)
-            {
-                loginServer = new LoginServer(regionData.IPListenAddr, regionData.IPListenPort, regionData.RegionLocX, regionData.RegionLocY, this.user_accounts);
-                loginServer.Startup();
-                loginServer.SetSessionHandler(((AuthenticateSessionsLocal)this.AuthenticateSessionsHandler).AddNewSession);
-                if (user_accounts)
-                {
-                    //sandbox mode with loginserver using accounts
-                    this.GridServers.UserServer = loginServer;
-                    adminLoginServer = loginServer;
-                    httpServer.AddXmlRPCHandler("login_to_simulator", loginServer.LocalUserManager.XmlRpcLoginMethod);
-                }
-                else
-                {
-                    //sandbox mode with loginserver not using accounts
-                    httpServer.AddXmlRPCHandler("login_to_simulator", loginServer.XmlRpcLoginMethod);
-                }
-            }
-            //Web front end setup
-            AdminWebFront adminWebFront = new AdminWebFront("Admin", LocalWorld, InventoryCache, adminLoginServer);
-            adminWebFront.LoadMethods(httpServer);
-            //Start http server
-            m_console.Notice("Main.cs:Startup() - Starting HTTP server");
-            httpServer.Start();
-            // Start UDP server
-            this.m_udpServer.ServerListener();
-            //Setup Master Avatar
-            m_console.Notice("Main.cs:Startup() - Setting up Master Avatar");
-            if (this.m_sandbox)
-            {
-                OpenSim.Framework.User.UserProfile masterUser = adminLoginServer.LocalUserManager.GetProfileByName(this.regionData.MasterAvatarFirstName, this.regionData.MasterAvatarLastName);
-                if (masterUser == null)
-                {
-                    m_console.Notice("Main.cs:Startup() - Sandbox Mode; Master Avatar is a new user; creating account.");
-                    adminLoginServer.CreateUserAccount(this.regionData.MasterAvatarFirstName, this.regionData.MasterAvatarLastName, this.regionData.MasterAvatarSandboxPassword);
-                    masterUser = adminLoginServer.LocalUserManager.GetProfileByName(this.regionData.MasterAvatarFirstName, this.regionData.MasterAvatarLastName);
-                    if (masterUser == null) //Still NULL?!!?! OMG FAIL!
-                    {
-                        throw new Exception("Failure to create master user account");
-                    }
-                }
-                m_console.Notice("Main.cs:Startup() - Master User UUID: " + masterUser.UUID.ToStringHyphenated());
-                regionData.MasterAvatarAssignedUUID = masterUser.UUID;
-            }
-            else
-            {
-                m_console.Warn("Main.cs:Startup() - Grid Mode; Do not know how to get the user's master key yet!");
-            }
-            m_console.Notice("Creating Estate Manager");
-            LocalWorld.estateManager = new OpenSim.RegionServer.Estate.EstateManager(this.LocalWorld);
-            m_console.Notice("Creating Parcel Manager");
-            LocalWorld.parcelManager = new OpenSim.RegionServer.Simulator.ParcelManager(this.LocalWorld);
-            m_console.Notice("Loading Parcels from DB...");
-            LocalWorld.localStorage.LoadParcels((ILocalStorageParcelReceiver)LocalWorld.parcelManager);
-            m_heartbeatTimer.Enabled = true;
-            m_heartbeatTimer.Interval = 100;
-            m_heartbeatTimer.Elapsed += new ElapsedEventHandler(this.Heartbeat);
-        }
-        # region Setup methods
-        protected override void SetupLocalGridServers()
-        {
-            GridServers.AssetDll = "OpenSim.GridInterfaces.Local.dll";
-            GridServers.GridDll = "OpenSim.GridInterfaces.Local.dll";
-            m_console.Notice("Starting in Sandbox mode");
-            GridServers.Initialise();
-        }
-        protected override void SetupRemoteGridServers()
-        {
-            if (this.gridLocalAsset)
-            {
-                GridServers.AssetDll = "OpenSim.GridInterfaces.Local.dll";
-            }
-            else
-            {
-                GridServers.AssetDll = "OpenSim.GridInterfaces.Remote.dll";
-            }
-            GridServers.GridDll = "OpenSim.GridInterfaces.Remote.dll";
-            m_console.Notice("Starting in Grid mode");
-            GridServers.Initialise();
-        }
-        protected override void SetupLocalWorld()
-        {
-            m_console.Status("Main.cs:Startup() - We are " + regionData.RegionName + " at " + regionData.RegionLocX.ToString() + "," + regionData.RegionLocY.ToString());
-            m_console.Notice("Initialising world");
-            m_console.componentname = "Region " + regionData.RegionName;
-            m_localWorld = new World(this.m_udpServer.PacketServer.ClientThreads, regionData, regionData.RegionHandle, regionData.RegionName);
-            LocalWorld.InventoryCache = InventoryCache;
-            LocalWorld.AssetCache = AssetCache;
-            this.m_udpServer.LocalWorld = LocalWorld;
-            this.m_udpServer.PacketServer.RegisterClientPacketHandlers();
-            this.physManager = new OpenSim.Physics.Manager.PhysicsManager();
-            this.physManager.LoadPlugins();
-            LocalWorld.m_datastore = this.regionData.DataStore;
-            LocalWorld.LoadStorageDLL("OpenSim.Storage.LocalStorageDb4o.dll"); //all these dll names shouldn't be hard coded.
-            LocalWorld.LoadWorldMap();
-            m_console.Notice("Main.cs:Startup() - Starting up messaging system");
-            LocalWorld.PhysScene = this.physManager.GetPhysicsScene(this.m_physicsEngine);
-            LocalWorld.PhysScene.SetTerrain(LocalWorld.Terrain.getHeights1D());
-            LocalWorld.LoadPrimsFromStorage();
-        }
-        protected override void SetupHttpListener()
-        {
-            httpServer = new BaseHttpServer(regionData.IPListenPort);
-            if (this.GridServers.GridServer.GetName() == "Remote")
-            {
-                // we are in Grid mode so set a XmlRpc handler to handle "expect_user" calls from the user server
-                httpServer.AddXmlRPCHandler("expect_user", ((AuthenticateSessionsRemote)this.AuthenticateSessionsHandler).ExpectUser);
-                httpServer.AddXmlRPCHandler("agent_crossing",
-                    delegate(XmlRpcRequest request)
-                    {
-                        Hashtable requestData = (Hashtable)request.Params[0];
-                        uint circuitcode = Convert.ToUInt32(requestData["circuit_code"]);
-                        AgentCircuitData agent_data = new AgentCircuitData();
-                        agent_data.firstname = (string)requestData["firstname"];
-                        agent_data.lastname = (string)requestData["lastname"];
-                        agent_data.circuitcode = circuitcode;
-                        agent_data.startpos = new LLVector3(Single.Parse((string)requestData["pos_x"]), Single.Parse((string)requestData["pos_y"]), Single.Parse((string)requestData["pos_z"]));
-                        AuthenticateSessionsHandler.UpdateAgentData(agent_data);
-                        return new XmlRpcResponse();
-                    });
-                httpServer.AddRestHandler("GET", "/simstatus/",
-                    delegate(string request, string path, string param)
-                    {
-                        return "OK";
-                    });
-            }
-        }
-        protected override void ConnectToRemoteGridServer()
-        {
-            if (GridServers.GridServer.RequestConnection(regionData.SimUUID, regionData.IPListenAddr, (uint)regionData.IPListenPort))
-            {
-                m_console.Notice("Main.cs:Startup() - Success: Got a grid connection OK!");
-            }
-            else
-            {
-                m_console.Error("Main.cs:Startup() - FAILED: Unable to get connection to grid. Shutting down.");
-                Shutdown();
-            }
-            GridServers.AssetServer.SetServerInfo((string)((RemoteGridBase)GridServers.GridServer).GridData["asset_url"], (string)((RemoteGridBase)GridServers.GridServer).GridData["asset_sendkey"]);
-            // If we are being told to load a file, load it.
-            string dataUri = (string)((RemoteGridBase)GridServers.GridServer).GridData["data_uri"];
-            if (!String.IsNullOrEmpty(dataUri))
-            {
-                this.LocalWorld.m_datastore = dataUri;
-            }
-            if (((RemoteGridBase)(GridServers.GridServer)).GridData["regionname"].ToString() != "")
-            {
-                // The grid server has told us who we are
-                // We must obey the grid server.
-                regionData.RegionLocX = Convert.ToUInt32(((RemoteGridBase)(GridServers.GridServer)).GridData["region_locx"].ToString());
-                regionData.RegionLocY = Convert.ToUInt32(((RemoteGridBase)(GridServers.GridServer)).GridData["region_locy"].ToString());
-                regionData.RegionName = ((RemoteGridBase)(GridServers.GridServer)).GridData["regionname"].ToString();
-            }
-        }
-        #endregion
-        private void SetupFromConfigFile(IGenericConfig configData)
-        {
-            // SandBoxMode
-            string attri = "";
-            attri = configData.GetAttribute("SandBox");
-            if ((attri == "") || ((attri != "false") && (attri != "true")))
-            {
-                this.m_sandbox = false;
-                configData.SetAttribute("SandBox", "false");
-            }
-            else
-            {
-                this.m_sandbox = Convert.ToBoolean(attri);
-            }
-            // LoginServer
-            attri = "";
-            attri = configData.GetAttribute("LoginServer");
-            if ((attri == "") || ((attri != "false") && (attri != "true")))
-            {
-                this.m_loginserver = false;
-                configData.SetAttribute("LoginServer", "false");
-            }
-            else
-            {
-                this.m_loginserver = Convert.ToBoolean(attri);
-            }
-            // Sandbox User accounts
-            attri = "";
-            attri = configData.GetAttribute("UserAccount");
-            if ((attri == "") || ((attri != "false") && (attri != "true")))
-            {
-                this.user_accounts = false;
-                configData.SetAttribute("UserAccounts", "false");
-            }
-            else if (attri == "true")
-            {
-                this.user_accounts = Convert.ToBoolean(attri);
-            }
-            // Grid mode hack to use local asset server
-            attri = "";
-            attri = configData.GetAttribute("LocalAssets");
-            if ((attri == "") || ((attri != "false") && (attri != "true")))
-            {
-                this.gridLocalAsset = false;
-                configData.SetAttribute("LocalAssets", "false");
-            }
-            else if (attri == "true")
-            {
-                this.gridLocalAsset = Convert.ToBoolean(attri);
-            }
-            attri = "";
-            attri = configData.GetAttribute("PhysicsEngine");
-            switch (attri)
-            {
-                default:
-                    m_console.Warn("Main.cs: SetupFromConfig() - Invalid value for PhysicsEngine attribute, terminating");
-                    Environment.Exit(1);
-                    break;
-                case "":
-                    this.m_physicsEngine = "basicphysics";
-                    configData.SetAttribute("PhysicsEngine", "basicphysics");
-                    OpenSim.RegionServer.Simulator.Avatar.PhysicsEngineFlying = false;
-                    break;
-                case "basicphysics":
-                    this.m_physicsEngine = "basicphysics";
-                    configData.SetAttribute("PhysicsEngine", "basicphysics");
-                    OpenSim.RegionServer.Simulator.Avatar.PhysicsEngineFlying = false;
-                    break;
-                case "RealPhysX":
-                    this.m_physicsEngine = "RealPhysX";
-                    OpenSim.RegionServer.Simulator.Avatar.PhysicsEngineFlying = true;
-                    break;
-                case "OpenDynamicsEngine":
-                    this.m_physicsEngine = "OpenDynamicsEngine";
-                    OpenSim.RegionServer.Simulator.Avatar.PhysicsEngineFlying = true;
-                    break;
-            }
-            configData.Commit();
-        }
-        /// <summary>
-        /// Performs any last-minute sanity checking and shuts down the region server
-        /// </summary>
-        public virtual void Shutdown()
-        {
-            m_console.Notice("Main.cs:Shutdown() - Closing all threads");
-            m_console.Notice("Main.cs:Shutdown() - Killing listener thread");
-            m_console.Notice("Main.cs:Shutdown() - Killing clients");
-            // IMPLEMENT THIS
-            m_console.Notice("Main.cs:Shutdown() - Closing console and terminating");
-            LocalWorld.Close();
-            GridServers.Close();
-            m_console.Close();
-            Environment.Exit(0);
-        }
-        /// <summary>
-        /// Performs per-frame updates regularly
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        void Heartbeat(object sender, System.EventArgs e)
-        {
-            LocalWorld.Update();
-        }
-        #region Console Commands
-        /// <summary>
-        /// Runs commands issued by the server console from the operator
-        /// </summary>
-        /// <param name="command">The first argument of the parameter (the command)</param>
-        /// <param name="cmdparams">Additional arguments passed to the command</param>
-        public void RunCmd(string command, string[] cmdparams)
-        {
-            switch (command)
-            {
-                case "help":
-                    m_console.Error("show users - show info about connected users");
-                    m_console.Error("shutdown - disconnect all clients and shutdown");
-                    m_console.Error("backup - start a backup manually");
-                    break;
-                case "show":
-                    Show(cmdparams[0]);
-                    break;
-                case "terrain":
-                    string result = "";
-                    if (!LocalWorld.Terrain.RunTerrainCmd(cmdparams, ref result))
-                    {
-                        m_console.Error(result);
-                    }
-                    break;
-                case "shutdown":
-                    Shutdown();
-                    break;
-                case "backup":
-                    LocalWorld.Backup();
-                    break;
-                case "reset":
-                    if (cmdparams[0] == "parcels")
-                    {
-                        LocalWorld.localStorage.RemoveAllParcels();
-                        LocalWorld.localStorage.LoadParcels((ILocalStorageParcelReceiver)LocalWorld.parcelManager);
-                    }
-                    break;
-                default:
-                    m_console.Error("Unknown command");
-                    break;
-            }
-        }
-        /// <summary>
-        /// Outputs to the console information about the region
-        /// </summary>
-        /// <param name="ShowWhat">What information to display (valid arguments are "uptime", "users")</param>
-        public void Show(string ShowWhat)
-        {
-            switch (ShowWhat)
-            {
-                case "uptime":
-                    m_console.Error("OpenSim has been running since " + startuptime.ToString());
-                    m_console.Error("That is " + (DateTime.Now - startuptime).ToString());
-                    break;
-                case "users":
-                    OpenSim.RegionServer.Simulator.Avatar TempAv;
-                    m_console.Error(String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16}{5,-16}", "Firstname", "Lastname", "Agent ID", "Session ID", "Circuit", "IP"));
-                    foreach (libsecondlife.LLUUID UUID in LocalWorld.Entities.Keys)
-                    {
-                        if (LocalWorld.Entities[UUID].ToString() == "OpenSim.RegionServer.Simulator.Avatar")
-                        {
-                            TempAv = (OpenSim.RegionServer.Simulator.Avatar)LocalWorld.Entities[UUID];
-                            m_console.Error(String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16},{5,-16}", TempAv.firstname, TempAv.lastname, UUID, TempAv.ControllingClient.SessionID, TempAv.ControllingClient.CircuitCode, TempAv.ControllingClient.userEP.ToString()));
-                        }
-                    }
-                    break;
-                case "parcels":
-                    foreach (OpenSim.RegionServer.Simulator.Parcel parcel in LocalWorld.parcelManager.parcelList.Values)
-                    {
-                        m_console.Error("Parcel ID#" + parcel.parcelData.localID + "(Global UUID: " + parcel.parcelData.globalID + "):");
-                        m_console.Error("\tParcel Name: " + parcel.parcelData.parcelName);
-                        m_console.Error("\tParcel Owner UUID: " + parcel.parcelData.ownerID);
-                        m_console.Error("\tParcel Area: " + parcel.parcelData.area + "sqm");
-                        m_console.Error(" ");
-                    }
-                    break;
-            }
-        }
-        #endregion
-    }
-}
-\ No newline at end of file
diff --git a/Prebuild/Prebuild.build b/Prebuild/Prebuild.build
deleted file mode 100644
index 395fb31..0000000
--- a/Prebuild/Prebuild.build
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" ?>
-<project name="Prebuild" default="build">
-    <echo message="Using '${nant.settings.currentframework}' Framework"/>
-    <property name="bin.dir" value="bin" />
-    <property name="obj.dir" value="obj" />
-    <property name="doc.dir" value="doc" />
-    <property name="project.main.dir" value="${project::get-base-directory()}" />
-    <target name="Debug" description="">
-        <property name="project.config" value="Debug" />
-        <property name="build.debug" value="true" />
-    </target>
-    <property name="project.config" value="Release" />
-    <target name="Release" description="">
-        <property name="project.config" value="Release" />
-        <property name="build.debug" value="false" />
-    </target>
-    <target name="net-1.1" description="Sets framework to .NET 1.1">
-        <property name="nant.settings.currentframework" value="net-1.1" />
-    </target>
-    <target name="net-2.0" description="Sets framework to .NET 2.0">
-        <property name="nant.settings.currentframework" value="net-2.0" />
-    </target>
-    <target name="mono-2.0" description="Sets framework to mono 2.0">
-        <property name="nant.settings.currentframework" value="mono-2.0" />
-    </target>
-    <target name="mono-1.0" description="Sets framework to mono 1.0">
-        <property name="nant.settings.currentframework" value="mono-1.0" />
-    </target>
-    <target name="init" description="">
-        <call target="${project.config}" />
-        <sysinfo />
-        <echo message="Platform ${sys.os.platform}" />
-        <property name="build.dir" value="${bin.dir}/${project.config}" />
-    </target>
-    <target name="clean" description="">
-        <echo message="Deleting all builds from all configurations" />
-        <delete dir="${bin.dir}" failonerror="false" />
-        <delete dir="${obj.dir}" failonerror="false" />
-        <nant buildfile="src/Prebuild.exe.build" target="clean" />
-    </target>
-    <target name="build" depends="init" description="">
-        <nant buildfile="src/Prebuild.exe.build" target="build" />
-    </target>
-    <target name="build-release" depends="Release, init, build" description="Builds in Release mode" />
-    <target name="build-debug" depends="Debug, init, build" description="Builds in Debug mode" />
-    <target name="package" depends="clean, doc" description="Builds all" />
-    <target name="doc" depends="build-release">
-        <echo message="Generating all documentation from all builds" />
-        <nant buildfile="src/Prebuild.exe.build" target="doc" />
-    </target>
-</project>
diff --git a/Prebuild/Prebuild.sln b/Prebuild/Prebuild.sln
deleted file mode 100644
index 449896b..0000000
--- a/Prebuild/Prebuild.sln
+++ /dev/null
@@ -1,19 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prebuild", "src\Prebuild.csproj", "{92E80C1C-0000-0000-0000-000000000000}"
-EndProject
-Global
-  GlobalSection(SolutionConfigurationPlatforms) = preSolution
-    Debug|Any CPU = Debug|Any CPU
-    Release|Any CPU = Release|Any CPU
-  EndGlobalSection
-  GlobalSection(ProjectConfigurationPlatforms) = postSolution
-    {92E80C1C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {92E80C1C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {92E80C1C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {92E80C1C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-  EndGlobalSection
-  GlobalSection(SolutionProperties) = preSolution
-    HideSolutionNode = FALSE
-  EndGlobalSection
-EndGlobal
diff --git a/Prebuild/README b/Prebuild/README
deleted file mode 100644
index eca6be1..0000000
--- a/Prebuild/README
+++ /dev/null
@@ -1,230 +0,0 @@
-Prebuild Instructions
-Prebuild is an XML-driven pre-build tool allowing developers to easily generate project or make files for major IDE's and .NET development tools including: Visual Studio 2005, Visual Studio 2003, Visual Studio 2002, SharpDevelop, SharpDevelop2, MonoDevelop, and NAnt.
-_________________________________________________________________________________
-Overview
-Prebuild can be either be run from the command line to generate the project and make files or you can execute the included batch (*.bat) and Unix Shell script (*.sh) files.
-The Prebuild file
-_________________________________________________________________________________
-The currently supported developement tools and their associated batch and shell script files.
-Visual Studio .NET 2005 (VS2005.bat)
-Visual Studio .NET 2003 (VS2003.bat)
-Visual Studio .NET 2002 (VS2002.bat)
-SharpDevelop (SharpDevelop.bat) - http://www.icsharpcode.net/OpenSource/SD/
-SharpDevelop2 (SharpDevelop.bat) - http://www.icsharpcode.net/OpenSource/SD/
-MonoDevelop (MonoDevelop.sh) - http://www.monodevelop.com/
-NAnt (nant.sh and nant.bat) - http://nant.sourceforge.net/
-Autotools (autotools.bat and autotools.sh) http://www.gnu.org. Only partial support
-Notes:
-A Unix Shell script is provided for MonoDevelop, as this is more appropriate than a windows batch file.
-Visual Studio .NET 2005 and the Visual Express IDE's can import solutions from older versions of Visual Studio .NET.
-Makefiles are not currently supported.
-_________________________________________________________________________________
-Command Line Syntax:
- 
-Example:
->Prebuild /target vs2003
-This will generate the project files for Visual Studio.NET 2003 and place the redirect the log to a file named PrebuildLog.txt in the parent directory
-The syntax structure is as below, where commandParameter is optional depending on the command and you can provide several option-value pairs.
-Note: The '>' signified the command line, do not actually enter this manually
->Prebuild /<option> <commandParameter>
->Prebuild /target vs2003 /pause
->Prebuild /target vs2003 /log ../Log.txt /pause /ppo /file ProjectConfig.xml
->Prebuild /target sharpdev /log
->Prebuild /removedir obj|bin
->Prebuild /target vs2003 /allowedgroups Group1|Group2
->Prebuild /clean
->Prebuild /clean /yes
->Prebuild /clean vs2003
-_________________________________________________________________________________
-Command Line Options:
-/usage  - Shows the help information on how to use Prebuild and what the different options are and what they do
-/clean - The project files generated for the target type specified as a parameter for this option will be deleted.  If no value is specified or if 'all' is specified, then project files for all the target types will be deleted.
-/target - Specified the name of the development tool for which project or make files will be generated.  Possible parameter values include:  vs2003, vs2002, sharpdev
-/file - Specifies the name of the XML which defines what files are to be referenced by the generated project files as well as configures the options for them.  If not specified, prebuild.xml will be used as the default.
-/log - Specified the log file that should be written to for build errors.  If this option is not specified, no log file is generated, but if just no value is specified, then the defaul filename will be used for the log (Prebuild.log).
-/ppo - Preprocesses the xml file to test for syntax errors or problems but doesn't generate the files
-/pause - Shows the console until you press a key so that you can view the messages written while performing the specified actions.
-This allows you to check if an errors occurred and - if so - what it was.
-/showtargets - Shows a list of all the targets that can be specified as values for the /clean and /target commands.
-/allowedgroups - This is followed by a pipe-delimited list of project group filter flags (eg. Group1|Group2) allow optional filtering of all projects that dont have at least one of these flags
-/removedir - This is followed by a pipe-delimited list of directory names that will be deleted while recursivly searching the directory of the prebuild application and its child directories (eg. use obj|bin to delete all output and temporary directories before file releases)
-/yes - Answer yes to any warnings (e.g. when cleaning all projects).
-_________________________________________________________________________________
-Example Batch Files and Shell Scripts
-NOTE: Common batch and shell script files are included with Prebuild source and file releases.
-______________________________
-MonoDevelop
-#!/bin/sh
-# Generates a combine (.cmbx) and a set of project files (.prjx) 
-# for MonoDevelop, a Mono port of SharpDevelop (http://icsharpcode.net/OpenSource/SD/Default.aspx)
-./Prebuild /target sharpdev /pause
-______________________________
-Visual Studio .NET 2003
-@rem Generates a solution (.sln) and a set of project files (.csproj) 
-@rem for Microsoft Visual Studio .NET 2002
-Prebuild /target vs2003 /pause
-Notes:
-Text after lines that start with @rem are comments and are not evaluated
-You can also place pause on the last line instead of specifing the /pause command.
-________________________________________________________________________________
-Example XML Configuration File
-Note:
-XML Comments (<!-- Comment -->) are used to markup the prebuild.xml file with notes
-The below file may be out-of-date, however the RealmForge Prebuild file serves as an up-to-date and extensive example.
-It can be viewed using Tigris.org's WebSVN (http://realmforge.tigris.org/source/browse/realmforge/trunk/src/prebuild.xml) by just clicking on the "view file" link for the latest revision.
-_________________________________
-<?xml version="1.0" encoding="utf-8"?>
-    <!--The version of the XML schema specified in the version and xmlns attributes should match the one for which the version of Prebuild.exe used was compiled for.  In this example it is the version 1.3 schema, you can find the XSD schema file at the url specified in the xmlns attribute. -->
-<Prebuild version="1.6" xmlns="http://dnpb.sourceforge.net/schemas/prebuild-1.6.xsd">
-        <Solution name="RealmForge"> <!--The title and file name for the solution, combine, workspace, or project group (depending on what development tool you are using)-->
-                       <!--Configurations found as children of Solution are used as templates for the configurations found in the project, this allows you to avoid writing the same options in each project (and maintaining each of these).  You can provide defaults and then override them in the configurations defined for each project. All options are optional.-->
-                <Configuration name="Debug">
-                        <Options>
-                                <!-- simple logically expressions can be evaluated, if, else, elseif, and endif are valid statements.  Note that it is not neccisary to define POSIX or WIN32 -->
-                                <?if OS = "Win32" ?>
-                                        <CompilerDefines>DEBUG;TRACE;WIN32</CompilerDefines>
-                                <?else ?>
-                                        <CompilerDefines>DEBUG;TRACE;POSIX</CompilerDefines>
-                                <?endif ?>
-                                <OptimizeCode>false</OptimizeCode>
-                                <CheckUnderflowOverflow>false</CheckUnderflowOverflow>
-                                <AllowUnsafe>false</AllowUnsafe>
-                                <WarningLevel>4</WarningLevel>   
-                                <!-The filter for the number of warnings or errors shown and the tolerance level as to what is an error. This is value from 0 to 4 where 4 is the most strict (least tolerent).-->
-                                <WarningsAsErrors>false</WarningsAsErrors>
-                                <SuppressWarnings>1591;219;1573;1572;168</SuppressWarnings> 
-                                <!-- A semicolon ';'  delimited list of the warnings that are filtered and not shown in the output window during compiling a project.  Only include the number portion of the warning codes that are shown in output during compilation (eg CS1591, should be entered as 1591)-->
-                                <OutputPath>..\bin</OutputPath>
-                                <DebugInformation>true</DebugInformation>
-                                <RegisterComInterop>false</RegisterComInterop>
-                                <IncrementalBuild>true</IncrementalBuild>
-                                <BaseAddress>285212672</BaseAddress>
-                                <FileAlignment>4096</FileAlignment>
-                                <NoStdLib>false</NoStdLib>
-                                <XmlDocFile>Docs.xml</XmlDocFile>
-                        </Options>
-                </Configuration>
-                <Configuration name="Release"> <!-- You can define multple configurations that projects can have, but there is no way to define which one is selected by default as this is a part of the user preferences for a project, not the solution or project files -->
-                        <Options>
-                                <CompilerDefines>TRACE</CompilerDefines>
-                                <OptimizeCode>true</OptimizeCode>
-                                <CheckUnderflowOverflow>false</CheckUnderflowOverflow>
-                                <AllowUnsafe>false</AllowUnsafe>
-                                <WarningLevel>4</WarningLevel>
-                                <WarningsAsErrors>false</WarningsAsErrors>
-                                <SuppressWarnings>1591;219;1573;1572;168</SuppressWarnings>
-                                <OutputPath>..\bin</OutputPath>
-                                <DebugInformation>false</DebugInformation>
-                                <RegisterComInterop>false</RegisterComInterop>
-                                <IncrementalBuild>true</IncrementalBuild>
-                                <BaseAddress>285212672</BaseAddress>
-                                <FileAlignment>4096</FileAlignment>
-                                <NoStdLib>false</NoStdLib>
-                                <GenerateXmlDocFile>true</GenerateXmlDocFile>
-                                <XmlDocFile>Docs.xml</XmlDocFile>                               
-                        </Options>
-                </Configuration>
-                <!-- One of the projects that is included in the Solution -->
-                <Project name="RealmForge.Utility" Language="VisualBasic" path="Utility" type="Library" assemblyName="RealmForge.Utility" rootNamespace="RealmForge">
-                        <Configuration name="Debug">
-                                <Options>
-                                        <OutputPath>..\bin\lib\Utility</OutputPath>
-                                        <XmlDocFile>RealmForge.Utility.xml</XmlDocFile>
-                                </Options>
-                        </Configuration>
-                        <Configuration name="Release">
-                                <Options>
-                                        <OutputPath>..\bin\lib\Utility</OutputPath>
-                                        <XmlDocFile>RealmForge.Utility.xml</XmlDocFile>
-                                </Options>
-                        </Configuration>
-                        <ReferencePath>../bin</ReferencePath>
-                        <Reference name="System"/>
-                        <Reference name="System.Data"/> 
-                        <Reference name="System.Drawing"/>
-                        <Reference name="System.Xml"/>
-                        <Reference name="System.Runtime.Serialization.Formatters.Soap"/>
-                        <Reference name="ICSharpCode.SharpZipLib"/>
-                        <Files>
-                                <Match path="." pattern="*.vb" recurse="true"/>
-                        </Files>
-                </Project>
-                <!-- Another projects that is included in the Solution -->
-                <Project name="DemoGame" Language="C#" path="DemoGame" type="WinExe" icon="..\bin\RealmForge.ico" assemblyName="DemoGame" rootNamespace="RealmForge">
-                                <!-- icon is used to define the location of the .ico file that is embeeded in the assembly when the project is compiled.  This is relative to the project path -->
-                                <!--type defines the type of project, valid types are Library (.dll), WinExe (.exe), and Exe (.exe).  WinExe is not windows specific, it just defines that it is a GUI application and that no Console or Command window will show when it is started-->
-                        <Configuration name="Debug">
-                                <Options>
-                                        <OutputPath>..\bin</OutputPath>
-                                        <XmlDocFile>DemoGame.xml</XmlDocFile>
-                                </Options>
-                        </Configuration>
-                        <Configuration name="Release">
-                                <Options>
-                                        <OutputPath>..\bin</OutputPath>
-                                        <XmlDocFile>DemoGame.xml</XmlDocFile>           
-                                </Options>
-                        </Configuration>
-                        <ReferencePath>../bin</ReferencePath>
-                        <Reference name="System"/> <!-- Assemblies that are located in the GAC (installed, global) can be referenced-->
-                        <Reference name="ode"/>  <!-- Assemblies that are located in the output directory to which the file is built can be referenced -->
-                        <Reference name="RealmForge.Utility"/> <!-- When you reference the name of another project, then that project (and it's output) will be referenced instead of looking for a pre-built assembly-->
-                        <Files>
-                                <Match path="." pattern="*.cs" recurse="true"/>
-                                <Match path="." pattern="*.bmp" recurse="true" buildAction="EmbeddedResource"/>
-                                <Match path="." pattern="[^a]*\.(png|jpg)" useRegex="true" buildAction="EmbeddedResource"/>
-                                
-                                <!-- Uses a regex or regular expression to find all files that end with .png or .jpg but dont have the letter 'a' in their name and add them to the project as EmbeddedResource's.  Because recurse enabled (default is false), only the values in the files in that are directly in the project directory (not child directories) are checked.-->
-                                <!--EmbeddedResource, Content, and Compile are valid buildAction's-->
-                        </Files>
-                </Project>
-                
-        </Solution>
-</Prebuild>
diff --git a/Prebuild/TODO b/Prebuild/TODO
deleted file mode 100644
index d01780a..0000000
--- a/Prebuild/TODO
+++ /dev/null
@@ -1,21 +0,0 @@
-* monodev target should be able to detect whether the project is 1.x
-  or 2.x runtime
-* make an autotools install target for .exe files
-* Fix the autotools target so that
-if(numProjects == 1){
-  for($projectDir){
-    generate_a_project_configure_dot_ac()
-  }
-}else{
-  generate_a_solution_configure_dot_ac()
-  foreach($project in $projectsList){
-    mkdir $project/
-    cd $project/
-    generate_a_project_configure_dot_ac
-  }
-}
diff --git a/Prebuild/doc/prebuild-example1.xml b/Prebuild/doc/prebuild-example1.xml
deleted file mode 100644
index ea6f455..0000000
--- a/Prebuild/doc/prebuild-example1.xml
+++ /dev/null
@@ -1,300 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Prebuild version="1.6" xmlns="http://dnpb.sourceforge.net/schemas/prebuild-1.6.xsd">
-        <Solution name="RealmForge">
-                <Configuration name="Debug">
-                        <Options>
-                                <CompilerDefines>TRACE;DEBUG</CompilerDefines>
-                                <OptimizeCode>false</OptimizeCode>
-                                <CheckUnderflowOverflow>false</CheckUnderflowOverflow>
-                                <AllowUnsafe>false</AllowUnsafe>
-                                <WarningLevel>4</WarningLevel>
-                                <WarningsAsErrors>false</WarningsAsErrors>
-                                <SuppressWarnings>1591;219;1573;1572;168</SuppressWarnings>
-                                <OutputPath>..\bin</OutputPath>
-                                <DebugInformation>true</DebugInformation>
-                                <RegisterComInterop>false</RegisterComInterop>
-                                <IncrementalBuild>true</IncrementalBuild>
-                                <BaseAddress>285212672</BaseAddress>
-                                <FileAlignment>4096</FileAlignment>
-                                <NoStdLib>false</NoStdLib>
-                                <XmlDocFile>Docs.xml</XmlDocFile>
-                        </Options>
-                </Configuration>
-                <Configuration name="Release">
-                        <Options>
-                                <CompilerDefines>TRACE</CompilerDefines>
-                                <OptimizeCode>true</OptimizeCode>
-                                <CheckUnderflowOverflow>false</CheckUnderflowOverflow>
-                                <AllowUnsafe>false</AllowUnsafe>
-                                <WarningLevel>4</WarningLevel>
-                                <WarningsAsErrors>false</WarningsAsErrors>
-                                <SuppressWarnings>1591;219;1573;1572;168</SuppressWarnings>
-                                <OutputPath>..\bin</OutputPath>
-                                <DebugInformation>false</DebugInformation>
-                                <RegisterComInterop>false</RegisterComInterop>
-                                <IncrementalBuild>true</IncrementalBuild>
-                                <BaseAddress>285212672</BaseAddress>
-                                <FileAlignment>4096</FileAlignment>
-                                <NoStdLib>false</NoStdLib>
-                                <XmlDocFile>Docs.xml</XmlDocFile>                               
-                        </Options>
-                </Configuration>
-                <Project name="RealmForge.Utility" path="Utility" type="Library" assemblyName="RealmForge.Utility" rootNamespace="RealmForge">
-                        <Configuration name="Debug">
-                                <Options>
-                                        <OutputPath>..\bin\lib\Utility</OutputPath>
-                                        <XmlDocFile>RealmForge.Utility.xml</XmlDocFile>
-                                </Options>
-                        </Configuration>
-                        <Configuration name="Release">
-                                <Options>
-                                        <OutputPath>..\bin\lib\Utility</OutputPath>
-                                        <XmlDocFile>RealmForge.Utility.xml</XmlDocFile>
-                                </Options>
-                        </Configuration>
-                        <ReferencePath>../bin</ReferencePath>
-                        <Reference name="System"/>
-                        <Reference name="System.Data"/> 
-                        <Reference name="System.Drawing"/>
-                        <Reference name="System.Xml"/>
-                        <Reference name="System.Runtime.Serialization.Formatters.Soap"/>
-                        <Reference name="ICSharpCode.SharpZipLib"/>
-                        <Files>
-                                <Match pattern="*.cs" recurse="true"/>
-                        </Files>
-                </Project>
-                <Project name="RealmForge.Framework" path="Framework" type="Library" assemblyName="RealmForge.Framework" rootNamespace="RealmForge">
-                        <Configuration name="Debug">
-                                <Options>
-                                        <OutputPath>..\bin\lib\Framework</OutputPath>
-                                        <XmlDocFile>RealmForge.Framework.xml</XmlDocFile>
-                                </Options>
-                        </Configuration>
-                        <Configuration name="Release">
-                                <Options>
-                                        <OutputPath>..\bin\lib\Framework</OutputPath>
-                                        <XmlDocFile>RealmForge.Framework.xml</XmlDocFile>
-                                </Options>
-                        </Configuration>
-                        <ReferencePath>../bin</ReferencePath>
-                        <Reference name="System"/>
-                        <Reference name="System.Data"/> 
-                        <Reference name="System.Xml"/>
-                        <Reference name="System.Windows.Forms"/>
-                        <Reference name="System.Drawing"/>
-                        <Reference name="Axiom.MathLib"/>
-                        <Reference name="RealmForge.Utility"/>
-                        <Reference name="Tao.OpenAl"/>
-                        <Reference name="ICSharpCode.SharpZipLib"/>
-                        <Reference name="csogg"/>
-                        <Reference name="csvorbis"/>
-                        <Files>
-                                <Match pattern="*.cs" recurse="true"/>
-                                <Match pattern="*.txt" recurse="true"/>
-                        </Files>
-                </Project>
-                <Project name="RealmForge.Genres" path="Genres" type="Library" assemblyName="RealmForge.Genres" rootNamespace="RealmForge">
-                        <Configuration name="Debug">
-                                <Options>
-                                        <OutputPath>..\bin\lib\Genres</OutputPath>
-                                        <XmlDocFile>RealmForge.Genres.xml</XmlDocFile>
-                                </Options>
-                        </Configuration>
-                        <Configuration name="Release">
-                                <Options>
-                                        <OutputPath>..\bin\lib\Genres</OutputPath>
-                                        <XmlDocFile>RealmForge.Genres.xml</XmlDocFile>
-                                </Options>
-                        </Configuration>
-                        <ReferencePath>../bin</ReferencePath>
-                        <Reference name="System"/>
-                        <Reference name="System.Data"/> 
-                        <Reference name="System.Xml"/>
-                        <Reference name="System.Windows.Forms"/>
-                        <Reference name="System.Drawing"/>
-                        <Reference name="Axiom.MathLib"/>
-                        <Reference name="RealmForge.Utility"/>
-                        <Reference name="RealmForge.Framework"/>
-                        <Files>
-                                <Match pattern="*.cs" recurse="true"/>
-                        </Files>
-                </Project>
-                                
-                <Project name="RealmForge.UI.Forms" path="Forms" type="Library" assemblyName="RealmForge.UI.Forms" rootNamespace="RealmForge">
-                        <Configuration name="Debug">
-                                <Options>
-                                        <OutputPath>..\bin\lib\Forms</OutputPath>       
-                                        <XmlDocFile>RealmForge.UI.Forms.xml</XmlDocFile>
-                                        <AllowUnsafe>true</AllowUnsafe>
-                                </Options>
-                        </Configuration>
-                        <Configuration name="Release">
-                                <Options>
-                                        <OutputPath>..\bin\lib\Forms</OutputPath>
-                                        <XmlDocFile>RealmForge.UI.Forms.xml</XmlDocFile>
-                                        <AllowUnsafe>true</AllowUnsafe>
-                                </Options>
-                        </Configuration>
-                        <ReferencePath>../bin</ReferencePath>
-                        <Reference name="System"/>
-                        <Reference name="System.Drawing"/>
-                        <Reference name="System.Data"/>
-                        <Reference name="System.Design"/>
-                        <Reference name="System.Windows.Forms"/>
-                        <Reference name="System.Xml"/>
-                        <Reference name="Axiom.MathLib"/>
-                        <Reference name="wx.NET"/>
-                        <Reference name="RealmForge.Framework"/>
-                        <Reference name="RealmForge.Utility"/>
-                        <Files>
-                                <File buildAction="EmbeddedResource">IDE\Resources\ImagesCaptionIDE.bmp</File>
-                                <File buildAction="EmbeddedResource">IDE\Resources\ImagesCaptionPlain.bmp</File>
-                                <File buildAction="EmbeddedResource">IDE\Resources\ImagesMenuControl.bmp</File>
-                                <File buildAction="EmbeddedResource">IDE\Resources\ImagesPopupMenu.bmp</File>
-                                <File buildAction="EmbeddedResource">IDE\Resources\ImagesTabbedGroups.bmp</File>
-                                <File buildAction="EmbeddedResource">IDE\Resources\ImagesTabControl.bmp</File>
-                                <File buildAction="EmbeddedResource">IDE\Resources\LibraryIcon.ico</File>
-                                <File buildAction="EmbeddedResource">IDE\Resources\TabbedInvalid.cur</File>
-                                <File buildAction="EmbeddedResource">IDE\Resources\TabbedValid.cur</File>
-                                <File buildAction="EmbeddedResource">IDE\Resources\WizardPicture.bmp</File>
-                                <File buildAction="EmbeddedResource">Controls\Trees\tv_minus.bmp</File>
-                                <File buildAction="EmbeddedResource">Controls\Trees\tv_plus.bmp</File>
-                                <File buildAction="EmbeddedResource">Controls\Trees\treeview.bmp</File>
-                                <File buildAction="EmbeddedResource">Controls\Trees\listview.bmp</File>
-                                <File buildAction="EmbeddedResource">IDE\Menus\MenuControl.bmp</File>
-                                <File buildAction="EmbeddedResource">IDE\Controls\InertButton.bmp</File>
-                                <File buildAction="EmbeddedResource">IDE\Controls\TabbedGroups.bmp</File>
-                                <File buildAction="EmbeddedResource">IDE\Controls\TabCOntrol.bmp</File>
-                                <File buildAction="EmbeddedResource">IDE\Controls\WizardControl.bmp</File>
-                                <File buildAction="EmbeddedResource">Forms\IDETest.resx</File>
-                                <File buildAction="EmbeddedResource">Forms\IDEWindow.resx</File>
-                                <File buildAction="EmbeddedResource">Forms\Launcher.resx</File>
-                                <File buildAction="EmbeddedResource">Forms\MainRenderFrame.resx</File>
-                                <Match pattern="*.cs" recurse="true"/>
-                        </Files>
-                </Project>
-                
-                <Project name="RealmForge.RAGE" path="RAGE" type="Library" assemblyName="RealmForge.RAGE" rootNamespace="RealmForge">
-                        <Configuration name="Debug">
-                                <Options>
-                                        <OutputPath>..\bin\lib\RAGE</OutputPath>        
-                                        <XmlDocFile>RealmForge.RAGE.xml</XmlDocFile>
-                                </Options>
-                        </Configuration>
-                        <Configuration name="Release">
-                                <Options>
-                                        <OutputPath>..\bin\lib\RAGE</OutputPath>
-                                        <XmlDocFile>RealmForge.RAGE.xml</XmlDocFile>
-                                </Options>
-                        </Configuration>
-                                <ReferencePath>../bin</ReferencePath>
-                                <ReferencePath>../bin</ReferencePath>
-                                <Reference name="System"/>
-                                <Reference name="System.XML"/>
-                                <Reference name="System.Windows.Forms"/>
-                                <Reference name="System.Drawing"/>
-                                <Reference name="Axiom.Plugins.CgProgramManager"/>
-                                <Reference name="Axiom.Engine"/>
-                                <Reference name="Axiom.MathLib"/>
-                                <Reference name="Axiom.Plugins.ParticleFX"/>
-                                <Reference name="Axiom.Platforms.Win32"/>
-                                <Reference name="Axiom.RenderSystems.DirectX9"/>
-                                <Reference localCopy="false" name="Axiom.RenderSystems.OpenGL"/>
-                                <Reference name="Axiom.SceneManagers.Octree"/>
-                                <Reference name="ICSharpCode.SharpZipLib"/>
-                                <Reference name="System.Data"/>
-                                <Reference name="RealmForge.Framework"/>
-                                <Reference name="RealmForge.Utility"/>
-                                <Reference name="ode"/>
-                        <Files>
-                                <Match pattern="*.cs" recurse="true"/>
-                        </Files>
-                </Project>
-                <Project name="RealmForge.ScriptLibrary" path="ScriptLibrary" type="Library" assemblyName="RealmForge.ScriptLibrary" rootNamespace="RSL">
-                        <Configuration name="Debug">
-                                <Options>
-                                        <OutputPath>..\bin\ScriptLibrary</OutputPath>
-                                        <XmlDocFile>RealmForge.ScriptLibrary.xml</XmlDocFile>
-                                </Options>
-                        </Configuration>
-                        <Configuration name="Release">
-                                <Options>
-                                        <OutputPath>..\bin\ScriptLibrary</OutputPath>
-                                        <XmlDocFile>RealmForge.ScriptLibrary.xml</XmlDocFile>   
-                                </Options>
-                        </Configuration>
-                        <ReferencePath>../bin</ReferencePath>
-                        <Reference name="System"/>
-                        <Reference name="System.XML"/>
-                        <Reference name="System.Windows.Forms"/>
-                        <Reference name="System.Drawing"/>
-                        <Reference name="Axiom.MathLib"/>
-                        <Reference name="wx.NET"/>
-                        <Reference name="RealmForge.UI.Forms"/>
-                        <Reference name="RealmForge.RAGE"/>
-                        <Reference name="RealmForge.Framework"/>
-                        <Reference name="RealmForge.Utility"/>
-                        <Files>
-                                <Match pattern="*.cs" recurse="true"/>
-                        </Files>
-                </Project>
-                
-                <Project name="Updater" path="Updater" type="WinExe" icon="..\bin\Updater.ico" assemblyName="Updater" rootNamespace="RealmForge">
-                        <Configuration name="Debug">
-                                <Options>
-                                        <OutputPath>..\bin\lib\Updater</OutputPath>
-                                        <XmlDocFile>Updater.xml</XmlDocFile>    
-                                </Options>
-                        </Configuration>
-                        <Configuration name="Release">
-                                <Options>
-                                        <OutputPath>..\bin\lib\Updater</OutputPath>
-                                        <XmlDocFile>Updater.xml</XmlDocFile>            
-                                </Options>
-                        </Configuration>
-                        <ReferencePath>../bin</ReferencePath>
-                        <Reference name="System"/>
-                        <Reference name="RealmForge.UI.Forms"/>
-                        <Reference name="RealmForge.Framework"/>
-                        <Reference name="RealmForge.Utility"/>
-                        <Files>
-                                <Match pattern="*.cs" recurse="true"/>
-                        </Files>
-                </Project>
-                <Project name="DemoGame" path="DemoGame" type="WinExe" icon="..\bin\RealmForge.ico" assemblyName="DemoGame" rootNamespace="RealmForge">
-                        <Configuration name="Debug">
-                                <Options>
-                                        <OutputPath>..\bin</OutputPath>
-                                        <XmlDocFile>DemoGame.xml</XmlDocFile>
-                                </Options>
-                        </Configuration>
-                        <Configuration name="Release">
-                                <Options>
-                                        <OutputPath>..\bin</OutputPath>
-                                        <XmlDocFile>DemoGame.xml</XmlDocFile>           
-                                </Options>
-                        </Configuration>
-                        <ReferencePath>../bin</ReferencePath>
-                        <Reference name="System"/>
-                        <Reference name="RealmForge.UI.Forms"/>
-                        <Reference name="RealmForge.ScriptLibrary"/>
-                        <Reference name="RealmForge.RAGE"/>
-                        <Reference name="RealmForge.Framework"/>
-                        <Reference name="RealmForge.Utility"/>
-                        <Files>
-                                <Match pattern="*.cs" recurse="true"/>
-                        </Files>
-                </Project>
-                
-        </Solution>
-</Prebuild>
-        
diff --git a/Prebuild/doc/prebuild-example2.xml b/Prebuild/doc/prebuild-example2.xml
deleted file mode 100644
index 02276f6..0000000
--- a/Prebuild/doc/prebuild-example2.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?> 
-<Prebuild xmlns="http://dnpb.sourceforge.net/schemas/prebuild-1.6.xsd">
-    <Solution name="Prebuild">
-        <Configuration name="Debug">
-            <Options>
-                <?if OS = "Win32" ?>
-                <CompilerDefines>DEBUG;TRACE;WIN32;NET</CompilerDefines>
-                <?else ?>
-                <CompilerDefines>DEBUG;TRACE;POSIX</CompilerDefines>
-                <?endif ?>
-                <OptimizeCode>false</OptimizeCode>
-                <OutputPath>bin\Debug</OutputPath>
-                <DebugInformation>true</DebugInformation>
-                <SuppressWarnings>1595</SuppressWarnings>
-            </Options>
-        </Configuration>
-        <Configuration name="Release">
-            <Options>
-                <?if OS = "Win32" ?>
-                <CompilerDefines>TRACE;WIN32;NET</CompilerDefines>
-                <?else ?>
-                <CompilerDefines>TRACE;POSIX</CompilerDefines>
-                <?endif ?>
-                <OutputPath>bin\Release</OutputPath>
-                <OptimizeCode>true</OptimizeCode>
-                <DebugInformation>false</DebugInformation>
-                <SuppressWarnings>1595</SuppressWarnings>
-            </Options>
-        </Configuration>
-        <Files>
-            <File>prebuild.xml</File>
-            <Match path="doc" pattern="*.txt"/>
-        </Files>
-        <Project name="Prebuild" path="src" language="C#" assemblyName="Prebuild" icon="App.ico" type="Exe" rootNamespace="Prebuild" startupObject="Prebuild.Prebuild">
-            <Configuration name="Debug">
-                <Options>
-                    <?if OS = "Win32" ?>
-                    <CompilerDefines>DEBUG;TRACE;WIN32;NET</CompilerDefines>
-                    <?else ?>
-                    <CompilerDefines>DEBUG;TRACE;POSIX</CompilerDefines>
-                    <?endif ?>
-                    <OptimizeCode>false</OptimizeCode>
-                    <OutputPath>bin\Debug</OutputPath>
-                    <DebugInformation>true</DebugInformation>
-                    <XmlDocFile>Prebuild.xml</XmlDocFile>
-                    <SuppressWarnings>1595</SuppressWarnings>
-                </Options>
-            </Configuration>
-            <Configuration name="Release">
-                <Options>
-                    <?if OS = "Win32" ?>
-                    <CompilerDefines>TRACE;WIN32;NET</CompilerDefines>
-                    <?else ?>
-                    <CompilerDefines>TRACE;POSIX</CompilerDefines>
-                    <?endif ?>
-                    <OutputPath>bin\Release</OutputPath>
-                    <OptimizeCode>true</OptimizeCode>
-                    <DebugInformation>false</DebugInformation>
-                    <XmlDocFile>Prebuild.xml</XmlDocFile>
-                    <SuppressWarnings>1595</SuppressWarnings>
-                </Options>
-            </Configuration>
-            <Reference name="System.Xml" />
-            <Reference name="System" />
-            <Files>
-                <Match pattern="App.ico" buildAction="EmbeddedResource"/>
-                <Match path="data" pattern="prebuild-1.6.xsd" buildAction="EmbeddedResource"/>
-                <Match pattern="*.cs" recurse="true"/>                  
-            </Files>
-        </Project>
-    </Solution>
-</Prebuild>
diff --git a/Prebuild/doc/prebuild-example3.xml b/Prebuild/doc/prebuild-example3.xml
deleted file mode 100644
index 1ba38f7..0000000
--- a/Prebuild/doc/prebuild-example3.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-    <!--The version of the XML schema specified in the version and xmlns attributes should match the one for which the version of Prebuild.exe used was compiled for.  In this example it is the version 1.6 schema, you can find the XSD schema file at the url specified in the xmlns attribute. -->
-    <Prebuild version="1.6" xmlns="http://dnpb.sourceforge.net/schemas/prebuild-1.6.xsd">
-        <Solution name="RealmForge"> <!--The title and file name for the solution, combine, workspace, or project group (depending on what development tool you are using)-->
-                       <!--Configurations found as children of Solution are used as templates for the configurations found in the project, this allows you to avoid writing the same options in each project (and maintaining each of these).  You can provide defaults and then override them in the configurations defined for each project. All options are optional.-->
-                <Configuration name="Debug">
-                        <Options>
-                                <!-- simple logically expressions can be evaluated, if, else, elseif, and endif are valid statements.  Note that it is not neccisary to define POSIX or WIN32 -->
-                                <?if OS = "Win32" ?>
-                                        <CompilerDefines>DEBUG;TRACE;WIN32</CompilerDefines>
-                                <?else ?>
-                                        <CompilerDefines>DEBUG;TRACE;POSIX</CompilerDefines>
-                                <?endif ?>
-                                <OptimizeCode>false</OptimizeCode>
-                                <CheckUnderflowOverflow>false</CheckUnderflowOverflow>
-                                <AllowUnsafe>false</AllowUnsafe>
-                                <WarningLevel>4</WarningLevel>   
-                                <!--The filter for the number of warnings or errors shown and the tolerance level as to what is an error. This is value from 0 to 4 where 4 is the most strict (least tolerent).-->
-                                <WarningsAsErrors>false</WarningsAsErrors>
-                                <SuppressWarnings>1591;219;1573;1572;168</SuppressWarnings> 
-                                <!-- A semicolon ';'  delimited list of the warnings that are filtered and not shown in the output window during compiling a project.  Only include the number portion of the warning codes that are shown in output during compilation (eg CS1591, should be entered as 1591)-->
-                                <OutputPath>..\bin</OutputPath>
-                                <DebugInformation>true</DebugInformation>
-                                <RegisterComInterop>false</RegisterComInterop>
-                                <IncrementalBuild>true</IncrementalBuild>
-                                <BaseAddress>285212672</BaseAddress>
-                                <FileAlignment>4096</FileAlignment>
-                                <NoStdLib>false</NoStdLib>
-                                <XmlDocFile>Docs.xml</XmlDocFile>
-                        </Options>
-                </Configuration>
-                <Configuration name="Release"> <!-- You can define multple configurations that projects can have, but there is no way to define which one is selected by default as this is a part of the user preferences for a project, not the solution or project files -->
-                        <Options>
-                                <CompilerDefines>TRACE</CompilerDefines>
-                                <OptimizeCode>true</OptimizeCode>
-                                <CheckUnderflowOverflow>false</CheckUnderflowOverflow>
-                                <AllowUnsafe>false</AllowUnsafe>
-                                <WarningLevel>4</WarningLevel>
-                                <WarningsAsErrors>false</WarningsAsErrors>
-                                <SuppressWarnings>1591;219;1573;1572;168</SuppressWarnings>
-                                <OutputPath>..\bin</OutputPath>
-                                <DebugInformation>false</DebugInformation>
-                                <RegisterComInterop>false</RegisterComInterop>
-                                <IncrementalBuild>true</IncrementalBuild>
-                                <BaseAddress>285212672</BaseAddress>
-                                <FileAlignment>4096</FileAlignment>
-                                <NoStdLib>false</NoStdLib>
-                                <XmlDocFile>Docs.xml</XmlDocFile>                               
-                        </Options>
-                </Configuration>
-                <!-- One of the projects that is included in the Solution -->
-                <Project name="RealmForge.Utility" path="Utility" type="Library" assemblyName="RealmForge.Utility" rootNamespace="RealmForge">
-                        <Configuration name="Debug">
-                                <Options>
-                                        <OutputPath>..\bin\lib\Utility</OutputPath>
-                                        <XmlDocFile>RealmForge.Utility.xml</XmlDocFile>
-                                </Options>
-                        </Configuration>
-                        <Configuration name="Release">
-                                <Options>
-                                        <OutputPath>..\bin\lib\Utility</OutputPath>
-                                        <XmlDocFile>RealmForge.Utility.xml</XmlDocFile>
-                                </Options>
-                        </Configuration>
-                        <ReferencePath>../bin</ReferencePath>
-                        <Reference name="System"/>
-                        <Reference name="System.Data"/> 
-                        <Reference name="System.Drawing"/>
-                        <Reference name="System.Xml"/>
-                        <Reference name="System.Runtime.Serialization.Formatters.Soap"/>
-                        <Reference name="ICSharpCode.SharpZipLib"/>
-                        <Files>
-                                <Match pattern="*.cs" recurse="true"/>
-                        </Files>
-                </Project>
-                <!-- Another projects that is included in the Solution -->
-                <Project name="DemoGame" path="DemoGame" type="WinExe" icon="..\bin\RealmForge.ico" assemblyName="DemoGame" rootNamespace="RealmForge">
-                                <!-- icon is used to define the location of the .ico file that is embeeded in the assembly when the project is compiled.  This is relative to the project path -->
-                                <!--type defines the type of project, valid types are Library (.dll), WinExe (.exe), and Exe (.exe).  WinExe is not windows specific, it just defines that it is a GUI application and that no Console or Command window will show when it is started-->
-                        <Configuration name="Debug">
-                                <Options>
-                                        <OutputPath>..\bin</OutputPath>
-                                        <XmlDocFile>DemoGame.xml</XmlDocFile>
-                                </Options>
-                        </Configuration>
-                        <Configuration name="Release">
-                                <Options>
-                                        <OutputPath>..\bin</OutputPath>
-                                        <XmlDocFile>DemoGame.xml</XmlDocFile>           
-                                </Options>
-                        </Configuration>
-                        <ReferencePath>../bin</ReferencePath>
-                        <Reference name="System"/> <!-- Assemblies that are located in the GAC (installed, global) can be referenced-->
-                        <Reference name="ode"/>  <!-- Assemblies that are located in the output directory to which the file is built can be referenced -->
-                        <Reference name="RealmForge.Utility"/> <!-- When you reference the name of another project, then that project (and it's output) will be referenced instead of looking for a pre-built assembly-->
-                        <Files>
-                                <!-- path defaults to . or the directory that prebuild.exe resides in -->
-                                <Match path="." pattern="*.cs" recurse="true"/>
-                                <Match pattern="*.bmp" recurse="true" buildAction="EmbeddedResource"/>
-                                <Match pattern="[^a]*\.(png|jpg)" useRegex="true" buildAction="EmbeddedResource"/>
-                                
-                                <!-- Uses a regex or regular expression to find all files that end with .png or .jpg but dont have the letter 'a' in their name and add them to the project as EmbeddedResource's.  Because recurse enabled (default is false), only the values in the files in that are directly in the project directory (not child directories) are checked.-->
-                                <!--EmbeddedResource, Content, and Compile are valid buildAction's-->
-                        </Files>
-                </Project>
-                
-        </Solution>
-</Prebuild>
diff --git a/Prebuild/doc/prebuild-example4.xml b/Prebuild/doc/prebuild-example4.xml
deleted file mode 100644
index c6c223f..0000000
--- a/Prebuild/doc/prebuild-example4.xml
+++ /dev/null
@@ -1,715 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Prebuild xmlns="http://dnpb.sourceforge.net/schemas/prebuild-1.6.xsd" version="1.6">
-    <Solution name="SdlDotNet">
-        <Configuration name="Debug">
-            <Options>
-                <CompilerDefines>DEBUG;TRACE</CompilerDefines>
-                <OptimizeCode>false</OptimizeCode>
-                <AllowUnsafe>false</AllowUnsafe>
-                <OutputPath>bin\Debug</OutputPath>
-                <DebugInformation>true</DebugInformation>
-                <WarningLevel>4</WarningLevel>
-                <SuppressWarnings>1595</SuppressWarnings>
-            </Options>
-        </Configuration>
-        <Configuration name="Release">
-            <Options>
-                <CompilerDefines>TRACE</CompilerDefines>
-                <OptimizeCode>true</OptimizeCode>
-                <AllowUnsafe>false</AllowUnsafe>
-                <OutputPath>bin\Release</OutputPath>
-                <DebugInformation>false</DebugInformation>
-                <WarningLevel>1</WarningLevel>
-                <SuppressWarnings>1595</SuppressWarnings>
-            </Options>
-        </Configuration>
-        <Files>
-            <File buildAction="Content">SdlDotNet.build</File>
-            <File buildAction="Content">prebuild.xml</File>
-        </Files>
-        <Project name="SdlDotNet" path="src" language="C#" type="Library" assemblyName="SdlDotNet" rootNamespace="SdlDotNet">
-            <Configuration name="Debug">
-                <Options>
-                    <CompilerDefines>DEBUG;TRACE</CompilerDefines>
-                    <OptimizeCode>false</OptimizeCode>
-                    <AllowUnsafe>false</AllowUnsafe>
-                    <OutputPath>bin\Debug</OutputPath>
-                    <DebugInformation>true</DebugInformation>
-                    <XmlDocFile>SdlDotNet.xml</XmlDocFile>
-                    <WarningLevel>4</WarningLevel>
-                    <SuppressWarnings>1595</SuppressWarnings>
-                </Options>
-            </Configuration>
-            <Configuration name="Release">
-                <Options>
-                    <CompilerDefines>TRACE</CompilerDefines>
-                    <OptimizeCode>true</OptimizeCode>
-                    <AllowUnsafe>false</AllowUnsafe>
-                    <OutputPath>bin\Release</OutputPath>
-                    <XmlDocFile>SdlDotNet.xml</XmlDocFile>
-                    <DebugInformation>false</DebugInformation>
-                    <WarningLevel>1</WarningLevel>
-                    <SuppressWarnings>1595</SuppressWarnings>
-                </Options>
-            </Configuration>
-            <Reference name="System" />
-            <Reference name="System.Windows.Forms" />
-            <Reference name="System.Drawing" /> 
-            <Reference name="Tao.Sdl" localCopy="true" path="..\\lib"/>
-            <Files>
-                <Match path="." pattern="SurfaceControl.cs" subType="Component" recurse="true"/>
-                <Match path="." pattern="*.bmp" buildAction="EmbeddedResource" recurse="true"/>
-                <Match path="." pattern="*.cs" recurse="true">
-                    <Exclude name="SurfaceControl.cs"/>
-                </Match>
-            </Files>
-        </Project>
-        <Project name="Rectangles" path="examples\\Rectangles" language="C#" type="WinExe" startupObject="SdlDotNet.Examples.Rectangles.Rectangles" assemblyName="Rectangles" rootNamespace="SdlDotNet.Examples.Rectangles" icon="App.ico">
-            <Configuration name="Debug">
-                <Options>
-                    <CompilerDefines>DEBUG;TRACE</CompilerDefines>
-                    <OptimizeCode>false</OptimizeCode>
-                    <AllowUnsafe>false</AllowUnsafe>
-                    <OutputPath>bin\Debug</OutputPath>
-                    <DebugInformation>true</DebugInformation>
-                    <XmlDocFile>Rectangles.xml</XmlDocFile>
-                    <WarningLevel>4</WarningLevel>
-                    <SuppressWarnings>1595</SuppressWarnings>
-                </Options>
-            </Configuration>
-            <Configuration name="Release">
-                <Options>
-                    <CompilerDefines>TRACE</CompilerDefines>
-                    <OptimizeCode>true</OptimizeCode>
-                    <AllowUnsafe>false</AllowUnsafe>
-                    <OutputPath>bin\Release</OutputPath>
-                    <DebugInformation>false</DebugInformation>
-                    <XmlDocFile>Rectangles.xml</XmlDocFile>
-                    <WarningLevel>1</WarningLevel>
-                    <SuppressWarnings>1595</SuppressWarnings>
-                </Options>
-            </Configuration>
-            <Reference name="System" /> 
-            <Reference name="System.Drawing" /> 
-            <Reference name="SdlDotNet" localCopy="true"/>
-            <Files>
-                <File buildAction="EmbeddedResource">App.ico</File>
-                <Match path="." pattern="*.cs" recurse="true"/>
-            </Files>
-        </Project>
-        <Project name="Gears" path="examples\\Gears" language="C#" type="WinExe" startupObject="SdlDotNet.Examples.Gears.Gears" assemblyName="Gears" rootNamespace="SdlDotNet.Examples.Gears" icon="App.ico">
-            <Configuration name="Debug">
-                <Options>
-                    <CompilerDefines>DEBUG;TRACE</CompilerDefines>
-                    <OptimizeCode>false</OptimizeCode>
-                    <AllowUnsafe>false</AllowUnsafe>
-                    <OutputPath>bin\Debug</OutputPath>
-                    <DebugInformation>true</DebugInformation>
-                    <XmlDocFile>Gears.xml</XmlDocFile>
-                    <WarningLevel>4</WarningLevel>
-                    <SuppressWarnings>1595</SuppressWarnings>
-                </Options>
-            </Configuration>
-            <Configuration name="Release">
-                <Options>
-                    <CompilerDefines>TRACE</CompilerDefines>
-                    <OptimizeCode>true</OptimizeCode>
-                    <AllowUnsafe>false</AllowUnsafe>
-                    <OutputPath>bin\Release</OutputPath>
-                    <DebugInformation>false</DebugInformation>
-                    <XmlDocFile>Gears.xml</XmlDocFile>
-                    <WarningLevel>1</WarningLevel>
-                    <SuppressWarnings>1595</SuppressWarnings>
-                </Options>
-            </Configuration>
-            <Reference name="System" /> 
-            <Reference name="System.Drawing" /> 
-            <Reference name="SdlDotNet" localCopy="true"/>
-            <Reference name="Tao.OpenGl" localCopy="true" path="..\\..\\lib"/>
-            <Files>
-                <File buildAction="EmbeddedResource">App.ico</File>
-                <Match path="." pattern="*.cs" recurse="true"/>
-            </Files>
-        </Project>
-        <Project name="CDPlayer" path="examples\\CDPlayer" language="C#" type="WinExe" startupObject="SdlDotNet.Examples.CDPlayer.CDPlayer" assemblyName="CDPlayer" rootNamespace="SdlDotNet.Examples.CDPlayer" icon="App.ico">
-            <Configuration name="Debug">
-                <Options>
-                    <CompilerDefines>DEBUG;TRACE</CompilerDefines>
-                    <OptimizeCode>false</OptimizeCode>
-                    <AllowUnsafe>false</AllowUnsafe>
-                    <OutputPath>bin\Debug</OutputPath>
-                    <DebugInformation>true</DebugInformation>
-                    <XmlDocFile>CDPlayer.xml</XmlDocFile>
-                    <WarningLevel>4</WarningLevel>
-                    <SuppressWarnings>1595</SuppressWarnings>
-                </Options>
-            </Configuration>
-            <Configuration name="Release">
-                <Options>
-                    <CompilerDefines>TRACE</CompilerDefines>
-                    <OptimizeCode>true</OptimizeCode>
-                    <AllowUnsafe>false</AllowUnsafe>
-                    <OutputPath>bin\Release</OutputPath>
-                    <DebugInformation>false</DebugInformation>
-                    <XmlDocFile>CDPlayer.xml</XmlDocFile>
-                    <WarningLevel>1</WarningLevel>
-                    <SuppressWarnings>1595</SuppressWarnings>
-                </Options>
-            </Configuration>
-            <Reference name="System" /> 
-            <Reference name="System.Drawing" /> 
-            <Reference name="System.Windows.Forms" /> 
-            <Reference name="SdlDotNet" localCopy="true"/>
-            <Files>
-                <File buildAction="EmbeddedResource">App.ico</File>
-                <File subType="Form">CDPlayer.cs</File>
-                <Match path="." pattern="*.cs" recurse="true">
-                    <Exclude name="CDPlayer.cs"/>                   
-                </Match>
-            </Files>
-        </Project>
-        <Project name="MoviePlayer" path="examples\\MoviePlayer" language="C#" type="WinExe" startupObject="SdlDotNet.Examples.MoviePlayer.MoviePlayer" assemblyName="MoviePlayer" rootNamespace="SdlDotNet.Examples.MoviePlayer" icon="App.ico">
-            <Configuration name="Debug">
-                <Options>
-                    <CompilerDefines>DEBUG;TRACE</CompilerDefines>
-                    <OptimizeCode>false</OptimizeCode>
-                    <AllowUnsafe>false</AllowUnsafe>
-                    <OutputPath>bin\Debug</OutputPath>
-                    <DebugInformation>true</DebugInformation>
-                    <XmlDocFile>MoviePlayer.xml</XmlDocFile>
-                    <WarningLevel>4</WarningLevel>
-                    <SuppressWarnings>1595</SuppressWarnings>
-                </Options>
-            </Configuration>
-            <Configuration name="Release">
-                <Options>
-                    <CompilerDefines>TRACE</CompilerDefines>
-                    <OptimizeCode>true</OptimizeCode>
-                    <AllowUnsafe>false</AllowUnsafe>
-                    <OutputPath>bin\Release</OutputPath>
-                    <DebugInformation>false</DebugInformation>
-                    <XmlDocFile>MoviePlayer.xml</XmlDocFile>
-                    <WarningLevel>1</WarningLevel>
-                    <SuppressWarnings>1595</SuppressWarnings>
-                </Options>
-            </Configuration>
-            <Reference name="System" /> 
-            <Reference name="System.Drawing" /> 
-            <Reference name="SdlDotNet" localCopy="true"/>
-            <Files>
-                <File buildAction="EmbeddedResource">App.ico</File>
-                <Match path="." pattern="*.cs" recurse="true"/>
-            </Files>
-        </Project>
-        <Project name="SimpleGame" path="examples\\SimpleGame" language="C#" type="WinExe" startupObject="SdlDotNet.Examples.SimpleGame.GameMain" assemblyName="SimpleGame" rootNamespace="SdlDotNet.Examples.SimpleGame" icon="App.ico">
-            <Configuration name="Debug">
-                <Options>
-                    <CompilerDefines>DEBUG;TRACE</CompilerDefines>
-                    <OptimizeCode>false</OptimizeCode>
-                    <AllowUnsafe>false</AllowUnsafe>
-                    <OutputPath>bin\Debug</OutputPath>
-                    <DebugInformation>true</DebugInformation>
-                    <XmlDocFile>SimpleGame.xml</XmlDocFile>
-                    <WarningLevel>4</WarningLevel>
-                    <SuppressWarnings>1595</SuppressWarnings>
-                </Options>
-            </Configuration>
-            <Configuration name="Release">
-                <Options>
-                    <CompilerDefines>TRACE</CompilerDefines>
-                    <OptimizeCode>true</OptimizeCode>
-                    <AllowUnsafe>false</AllowUnsafe>
-                    <OutputPath>bin\Release</OutputPath>
-                    <DebugInformation>false</DebugInformation>
-                    <XmlDocFile>SimpleGame.xml</XmlDocFile>
-                    <WarningLevel>1</WarningLevel>
-                    <SuppressWarnings>1595</SuppressWarnings>
-                </Options>
-            </Configuration>
-            <Reference name="System" /> 
-            <Reference name="System.Drawing" /> 
-            <Reference name="SdlDotNet" localCopy="true"/>
-            <Files>
-                <File buildAction="EmbeddedResource">App.ico</File>
-                <Match path="." pattern="*.cs" recurse="true"/>
-            </Files>
-        </Project>
-        <Project name="BombRun" path="examples\\BombRun" language="C#" type="WinExe" startupObject="SdlDotNet.Examples.BombRun.BombRun" assemblyName="BombRun" rootNamespace="SdlDotNet.Examples.BombRun" icon="App.ico">
-            <Configuration name="Debug">
-                <Options>
-                    <CompilerDefines>DEBUG;TRACE</CompilerDefines>
-                    <OptimizeCode>false</OptimizeCode>
-                    <AllowUnsafe>false</AllowUnsafe>
-                    <OutputPath>bin\Debug</OutputPath>
-                    <DebugInformation>true</DebugInformation>
-                    <XmlDocFile>BombRun.xml</XmlDocFile>
-                    <WarningLevel>4</WarningLevel>
-                    <SuppressWarnings>1595</SuppressWarnings>
-                </Options>
-            </Configuration>
-            <Configuration name="Release">
-                <Options>
-                    <CompilerDefines>TRACE</CompilerDefines>
-                    <OptimizeCode>true</OptimizeCode>
-                    <AllowUnsafe>false</AllowUnsafe>
-                    <OutputPath>bin\Release</OutputPath>
-                    <DebugInformation>false</DebugInformation>
-                    <XmlDocFile>BombRun.xml</XmlDocFile>
-                    <WarningLevel>1</WarningLevel>
-                    <SuppressWarnings>1595</SuppressWarnings>
-                </Options>
-            </Configuration>
-            <Reference name="System" /> 
-            <Reference name="System.Drawing" /> 
-            <Reference name="SdlDotNet" localCopy="true"/>
-            <Files>
-                <File buildAction="EmbeddedResource">App.ico</File>
-                <Match path="." pattern="*.cs" recurse="true"/>
-            </Files>
-        </Project>
-        <Project name="SnowDemo" path="examples\\SnowDemo" language="C#" type="WinExe" startupObject="SdlDotNet.Examples.SnowDemo.SnowDemo" assemblyName="SnowDemo" rootNamespace="SdlDotNet.Examples.SnowDemo" icon="App.ico">
-            <Configuration name="Debug">
-                <Options>
-                    <CompilerDefines>DEBUG;TRACE</CompilerDefines>
-                    <OptimizeCode>false</OptimizeCode>
-                    <AllowUnsafe>false</AllowUnsafe>
-                    <OutputPath>bin\Debug</OutputPath>
-                    <DebugInformation>true</DebugInformation>
-                    <XmlDocFile>SnowDemo.xml</XmlDocFile>
-                    <WarningLevel>4</WarningLevel>
-                    <SuppressWarnings>1595</SuppressWarnings>
-                </Options>
-            </Configuration>
-            <Configuration name="Release">
-                <Options>
-                    <CompilerDefines>TRACE</CompilerDefines>
-                    <OptimizeCode>true</OptimizeCode>
-                    <AllowUnsafe>false</AllowUnsafe>
-                    <OutputPath>bin\Release</OutputPath>
-                    <DebugInformation>false</DebugInformation>
-                    <XmlDocFile>SnowDemo.xml</XmlDocFile>
-                    <WarningLevel>1</WarningLevel>
-                    <SuppressWarnings>1595</SuppressWarnings>
-                </Options>
-            </Configuration>
-            <Reference name="System" /> 
-            <Reference name="System.Drawing" /> 
-            <Reference name="SdlDotNet" localCopy="true"/>
-            <Files>
-                <File buildAction="EmbeddedResource">App.ico</File>
-                <Match path="." pattern="*.cs" recurse="true"/>
-            </Files>
-        </Project>
-        <Project name="BounceSprites" path="examples\\BounceSprites" language="C#" type="WinExe" startupObject="SdlDotNet.Examples.BounceSprites.BounceSprites" assemblyName="BounceSprites" rootNamespace="SdlDotNet.Examples.BounceSprites" icon="App.ico">
-            <Configuration name="Debug">
-                <Options>
-                    <CompilerDefines>DEBUG;TRACE</CompilerDefines>
-                    <OptimizeCode>false</OptimizeCode>
-                    <AllowUnsafe>false</AllowUnsafe>
-                    <OutputPath>bin\Debug</OutputPath>
-                    <DebugInformation>true</DebugInformation>
-                    <XmlDocFile>BounceSprites.xml</XmlDocFile>
-                    <WarningLevel>4</WarningLevel>
-                    <SuppressWarnings>1595</SuppressWarnings>
-                </Options>
-            </Configuration>
-            <Configuration name="Release">
-                <Options>
-                    <CompilerDefines>TRACE</CompilerDefines>
-                    <OptimizeCode>true</OptimizeCode>
-                    <AllowUnsafe>false</AllowUnsafe>
-                    <OutputPath>bin\Release</OutputPath>
-                    <DebugInformation>false</DebugInformation>
-                    <XmlDocFile>BounceSprites.xml</XmlDocFile>
-                    <WarningLevel>1</WarningLevel>
-                    <SuppressWarnings>1595</SuppressWarnings>
-                </Options>
-            </Configuration>
-            <Reference name="System" /> 
-            <Reference name="System.Drawing" /> 
-            <Reference name="SdlDotNet" localCopy="true"/>
-            <Files>
-                <File buildAction="EmbeddedResource">App.ico</File>
-                <Match path="." pattern="*.cs" recurse="true"/>
-            </Files>
-        </Project>
-        <Project name="Triad" path="examples\\Triad" language="C#" type="WinExe" startupObject="SdlDotNet.Examples.Triad.MainObject" assemblyName="Triad" rootNamespace="SdlDotNet.Examples.Triad" icon="App.ico">
-            <Configuration name="Debug">
-                <Options>
-                    <CompilerDefines>DEBUG;TRACE</CompilerDefines>
-                    <OptimizeCode>false</OptimizeCode>
-                    <AllowUnsafe>false</AllowUnsafe>
-                    <OutputPath>bin\Debug</OutputPath>
-                    <DebugInformation>true</DebugInformation>
-                    <XmlDocFile>Triad.xml</XmlDocFile>
-                    <WarningLevel>4</WarningLevel>
-                    <SuppressWarnings>1595</SuppressWarnings>
-                </Options>
-            </Configuration>
-            <Configuration name="Release">
-                <Options>
-                    <CompilerDefines>TRACE</CompilerDefines>
-                    <OptimizeCode>true</OptimizeCode>
-                    <AllowUnsafe>false</AllowUnsafe>
-                    <OutputPath>bin\Release</OutputPath>
-                    <DebugInformation>false</DebugInformation>
-                    <XmlDocFile>Triad.xml</XmlDocFile>
-                    <WarningLevel>1</WarningLevel>
-                    <SuppressWarnings>1595</SuppressWarnings>
-                </Options>
-            </Configuration>
-            <Reference name="System" /> 
-            <Reference name="System.Drawing" /> 
-            <Reference name="SdlDotNet" localCopy="true"/>
-            <Reference name="nunit.framework" localCopy="true" path="..\\..\\lib"/>
-            <Files>
-                <File buildAction="EmbeddedResource">App.ico</File>
-                <Match path="." pattern="*.cs" recurse="true"/>
-            </Files>
-        </Project>
-        <Project name="GuiExample" path="examples\\GuiExample" language="C#" type="Library" assemblyName="GuiExample" rootNamespace="SdlDotNet.Examples.GuiExample">
-            <Configuration name="Debug">
-                <Options>
-                    <CompilerDefines>DEBUG;TRACE</CompilerDefines>
-                    <OptimizeCode>false</OptimizeCode>
-                    <AllowUnsafe>false</AllowUnsafe>
-                    <OutputPath>bin\Debug</OutputPath>
-                    <DebugInformation>true</DebugInformation>
-                    <XmlDocFile>GuiExample.xml</XmlDocFile>
-                    <WarningLevel>4</WarningLevel>
-                    <SuppressWarnings>1595</SuppressWarnings>
-                </Options>
-            </Configuration>
-            <Configuration name="Release">
-                <Options>
-                    <CompilerDefines>TRACE</CompilerDefines>
-                    <OptimizeCode>true</OptimizeCode>
-                    <AllowUnsafe>false</AllowUnsafe>
-                    <OutputPath>bin\Release</OutputPath>
-                    <DebugInformation>false</DebugInformation>
-                    <XmlDocFile>GuiExample.xml</XmlDocFile>
-                    <WarningLevel>1</WarningLevel>
-                    <SuppressWarnings>1595</SuppressWarnings>
-                </Options>
-            </Configuration>
-            <Reference name="System" /> 
-            <Reference name="System.Drawing" /> 
-            <Reference name="SdlDotNet" localCopy="true"/>
-            <Files>
-                <Match path="." pattern="*.cs" recurse="true"/>
-            </Files>
-        </Project>
-        <Project name="SpriteGuiDemos" path="examples\\SpriteGuiDemos" language="C#" type="WinExe" startupObject="SdlDotNet.Examples.SpriteGuiDemos.SdlDemo" assemblyName="SpriteGuiDemo" rootNamespace="SdlDotNet.Examples.SpriteGuiDemos" icon="App.ico">
-            <Configuration name="Debug">
-                <Options>
-                    <CompilerDefines>DEBUG;TRACE</CompilerDefines>
-                    <OptimizeCode>false</OptimizeCode>
-                    <AllowUnsafe>false</AllowUnsafe>
-                    <OutputPath>bin\Debug</OutputPath>
-                    <DebugInformation>true</DebugInformation>
-                    <XmlDocFile>SpriteGuiDemos.xml</XmlDocFile>
-                    <WarningLevel>4</WarningLevel>
-                    <SuppressWarnings>1595</SuppressWarnings>
-                </Options>
-            </Configuration>
-            <Configuration name="Release">
-                <Options>
-                    <CompilerDefines>TRACE</CompilerDefines>
-                    <OptimizeCode>true</OptimizeCode>
-                    <AllowUnsafe>false</AllowUnsafe>
-                    <OutputPath>bin\Release</OutputPath>
-                    <DebugInformation>false</DebugInformation>
-                    <XmlDocFile>SpriteGuiDemos.xml</XmlDocFile>
-                    <WarningLevel>1</WarningLevel>
-                    <SuppressWarnings>1595</SuppressWarnings>
-                </Options>
-            </Configuration>
-            <Reference name="System" /> 
-            <Reference name="System.Drawing" /> 
-            <Reference name="SdlDotNet" localCopy="true"/>
-            <Reference name="GuiExample" localCopy="true"/>
-            <Files>
-                <File buildAction="EmbeddedResource">App.ico</File>
-                <Match path="." pattern="*.cs" recurse="true"/>
-            </Files>
-        </Project>
-        <Project name="Tests" path="tests" language="C#" type="Library" assemblyName="SdlDotNet.Tests" rootNamespace="SdlDotNet.Tests">
-            <Configuration name="Debug">
-                <Options>
-                    <CompilerDefines>DEBUG;TRACE</CompilerDefines>
-                    <OptimizeCode>false</OptimizeCode>
-                    <AllowUnsafe>false</AllowUnsafe>
-                    <OutputPath>bin\Debug</OutputPath>
-                    <DebugInformation>true</DebugInformation>
-                    <XmlDocFile>SdlDotNet.Tests.xml</XmlDocFile>
-                    <WarningLevel>4</WarningLevel>
-                    <SuppressWarnings>1595</SuppressWarnings>
-                </Options>
-            </Configuration>
-            <Configuration name="Release">
-                <Options>
-                    <CompilerDefines>TRACE</CompilerDefines>
-                    <OptimizeCode>true</OptimizeCode>
-                    <AllowUnsafe>false</AllowUnsafe>
-                    <OutputPath>bin\Release</OutputPath>
-                    <DebugInformation>false</DebugInformation>
-                    <XmlDocFile>SdlDotNet.Tests.xml</XmlDocFile>
-                    <WarningLevel>1</WarningLevel>
-                    <SuppressWarnings>1595</SuppressWarnings>
-                </Options>
-            </Configuration>
-            <Reference name="System" /> 
-            <Reference name="System.Drawing" /> 
-            <Reference name="SdlDotNet" localCopy="true"/>
-            <Reference name="Tao.Sdl" localCopy="true" path="..\\lib"/>
-            <Reference name="GuiExample" localCopy="true"/>
-            <Reference name="nunit.framework" localCopy="true" path="..\\lib"/>
-            <Files>
-                <Match path="." pattern="*.cs" recurse="true"/>
-            </Files>
-        </Project>
-        <Project name="AudioExample" path="examples\\AudioExample" language="C#" type="WinExe" startupObject="SdlDotNet.Examples.AudioExample.AudioExample" assemblyName="AudioExample" rootNamespace="SdlDotNet.Examples.AudioExample" icon="App.ico">
-            <Configuration name="Debug">
-                <Options>
-                    <CompilerDefines>DEBUG;TRACE</CompilerDefines>
-                    <OptimizeCode>false</OptimizeCode>
-                    <AllowUnsafe>false</AllowUnsafe>
-                    <OutputPath>bin\Debug</OutputPath>
-                    <DebugInformation>true</DebugInformation>
-                    <XmlDocFile>AudioExample.xml</XmlDocFile>
-                    <WarningLevel>4</WarningLevel>
-                    <SuppressWarnings>1595</SuppressWarnings>
-                </Options>
-            </Configuration>
-            <Configuration name="Release">
-                <Options>
-                    <CompilerDefines>TRACE</CompilerDefines>
-                    <OptimizeCode>true</OptimizeCode>
-                    <AllowUnsafe>false</AllowUnsafe>
-                    <OutputPath>bin\Release</OutputPath>
-                    <DebugInformation>false</DebugInformation>
-                    <XmlDocFile>AudioExample.xml</XmlDocFile>
-                    <WarningLevel>1</WarningLevel>
-                    <SuppressWarnings>1595</SuppressWarnings>
-                </Options>
-            </Configuration>
-            <Reference name="System" /> 
-            <Reference name="System.Drawing" /> 
-            <Reference name="SdlDotNet" localCopy="true"/>
-            <Files>
-                <File buildAction="EmbeddedResource">App.ico</File>
-                <Match path="." pattern="*.cs" recurse="true"/>
-            </Files>
-        </Project>
-        <Project name="SdlDotNet.Particles" path="extras\\Particles" language="C#" type="Library" assemblyName="SdlDotNet.Particles" rootNamespace="SdlDotNet.Particles">
-            <Configuration name="Debug">
-                <Options>
-                    <CompilerDefines>DEBUG;TRACE</CompilerDefines>
-                    <OptimizeCode>false</OptimizeCode>
-                    <AllowUnsafe>false</AllowUnsafe>
-                    <OutputPath>bin\Debug</OutputPath>
-                    <DebugInformation>true</DebugInformation>
-                    <XmlDocFile>SdlDotNet.Particles.xml</XmlDocFile>
-                    <WarningLevel>4</WarningLevel>
-                    <SuppressWarnings>1595</SuppressWarnings>
-                </Options>
-            </Configuration>
-            <Configuration name="Release">
-                <Options>
-                    <CompilerDefines>TRACE</CompilerDefines>
-                    <OptimizeCode>true</OptimizeCode>
-                    <AllowUnsafe>false</AllowUnsafe>
-                    <OutputPath>bin\Release</OutputPath>
-                    <DebugInformation>false</DebugInformation>
-                    <XmlDocFile>SdlDotNet.Particles.xml</XmlDocFile>
-                    <WarningLevel>1</WarningLevel>
-                    <SuppressWarnings>1595</SuppressWarnings>
-                </Options>
-            </Configuration>
-            <Reference name="System" /> 
-            <Reference name="System.Drawing" /> 
-            <Reference name="SdlDotNet" localCopy="true"/>
-            <Files>
-                <Match path="." pattern="*.cs" recurse="true"/>
-            </Files>
-        </Project>
-        <Project name="ParticlesExample" path="examples\\ParticlesExample" language="C#" type="WinExe" startupObject="SdlDotNet.Examples.ParticlesExample.ParticlesExample" assemblyName="ParticlesExample" rootNamespace="SdlDotNet.Examples.ParticlesExample" icon="App.ico">
-            <Configuration name="Debug">
-                <Options>
-                    <CompilerDefines>DEBUG;TRACE</CompilerDefines>
-                    <OptimizeCode>false</OptimizeCode>
-                    <AllowUnsafe>false</AllowUnsafe>
-                    <OutputPath>bin\Debug</OutputPath>
-                    <DebugInformation>true</DebugInformation>
-                    <XmlDocFile>ParticlesExample.xml</XmlDocFile>
-                    <WarningLevel>4</WarningLevel>
-                    <SuppressWarnings>1595</SuppressWarnings>
-                </Options>
-            </Configuration>
-            <Configuration name="Release">
-                <Options>
-                    <CompilerDefines>TRACE</CompilerDefines>
-                    <OptimizeCode>true</OptimizeCode>
-                    <AllowUnsafe>false</AllowUnsafe>
-                    <OutputPath>bin\Release</OutputPath>
-                    <DebugInformation>false</DebugInformation>
-                    <XmlDocFile>ParticlesExample.xml</XmlDocFile>
-                    <WarningLevel>1</WarningLevel>
-                    <SuppressWarnings>1595</SuppressWarnings>
-                </Options>
-            </Configuration>
-            <Reference name="System" /> 
-            <Reference name="System.Drawing" /> 
-            <Reference name="SdlDotNet" localCopy="true"/>
-            <Reference name="SdlDotNet.Particles" localCopy="true"/>
-            <Files>
-                <File buildAction="EmbeddedResource">App.ico</File>
-                <Match path="." pattern="*.cs" recurse="true"/>
-            </Files>
-        </Project>
-        <!--<Project name="SdlDotNet.Gui" path="extras\\Gui" language="C#" type="Library" assemblyName="SdlDotNet.Gui" rootNamespace="SdlDotNet.Gui">
-            <Configuration name="Debug">
-                <Options>
-                    <CompilerDefines>DEBUG;TRACE</CompilerDefines>
-                    <OptimizeCode>false</OptimizeCode>
-                    <AllowUnsafe>false</AllowUnsafe>
-                    <OutputPath>bin\Debug</OutputPath>
-                    <DebugInformation>true</DebugInformation>
-                    <XmlDocFile>SdlDotNet.Gui.xml</XmlDocFile>
-                    <WarningLevel>4</WarningLevel>
-                </Options>
-            </Configuration>
-            <Configuration name="Release">
-                <Options>
-                    <CompilerDefines>TRACE</CompilerDefines>
-                    <OptimizeCode>true</OptimizeCode>
-                    <AllowUnsafe>false</AllowUnsafe>
-                    <OutputPath>bin\Release</OutputPath>
-                    <DebugInformation>false</DebugInformation>
-                    <XmlDocFile>SdlDotNet.Gui.xml</XmlDocFile>
-                    <WarningLevel>1</WarningLevel>
-                </Options>
-            </Configuration>
-            <Reference name="System" /> 
-            <Reference name="System.Drawing" /> 
-            <Reference name="SdlDotNet" localCopy="true"/>
-            <Files>
-                <Match path="." pattern="*.cs" recurse="true"/>
-            </Files>
-        </Project>-->
-        <Project name="NeHe" path="examples\\NeHe" language="C#" type="WinExe" startupObject="SdlDotNet.Examples.NeHe.NeHe" assemblyName="NeHe" rootNamespace="SdlDotNet.Examples.NeHe" icon="App.ico">
-            <Configuration name="Debug">
-                <Options>
-                    <CompilerDefines>DEBUG;TRACE</CompilerDefines>
-                    <OptimizeCode>false</OptimizeCode>
-                    <AllowUnsafe>false</AllowUnsafe>
-                    <OutputPath>bin\Debug</OutputPath>
-                    <DebugInformation>true</DebugInformation>
-                    <XmlDocFile>NeHe.xml</XmlDocFile>
-                    <WarningLevel>4</WarningLevel>
-                    <SuppressWarnings>1595</SuppressWarnings>
-                </Options>
-            </Configuration>
-            <Configuration name="Release">
-                <Options>
-                    <CompilerDefines>TRACE</CompilerDefines>
-                    <OptimizeCode>true</OptimizeCode>
-                    <AllowUnsafe>false</AllowUnsafe>
-                    <OutputPath>bin\Release</OutputPath>
-                    <DebugInformation>false</DebugInformation>
-                    <XmlDocFile>NeHe.xml</XmlDocFile>
-                    <WarningLevel>1</WarningLevel>
-                    <SuppressWarnings>1595</SuppressWarnings>
-                </Options>
-            </Configuration>
-            <Reference name="System" /> 
-            <Reference name="System.Drawing" /> 
-            <Reference name="System.Windows.Forms" /> 
-            <Reference name="SdlDotNet" localCopy="true"/>
-            <Reference name="Tao.OpenGl" localCopy="true" path="..\\..\\lib"/>
-            <Reference name="Tao.OpenGl.Glu" localCopy="true" path="..\\..\\lib"/>
-            <Reference name="Tao.Platform.Windows" localCopy="true" path="..\\..\\lib"/>
-            <Files>
-                <File buildAction="EmbeddedResource">App.ico</File>
-                <File subType="Form">NeHe.cs</File>
-                <Match path="." pattern="*.cs" recurse="true">
-                    <Exclude name="NeHe.cs"/>
-                </Match>
-            </Files>
-        </Project>
-        <Project name="RedBook" path="examples\\RedBook" language="C#" type="WinExe" startupObject="SdlDotNet.Examples.RedBook.RedBook" assemblyName="RedBook" rootNamespace="SdlDotNet.Examples.RedBook" icon="App.ico">
-            <Configuration name="Debug">
-                <Options>
-                    <CompilerDefines>DEBUG;TRACE</CompilerDefines>
-                    <OptimizeCode>false</OptimizeCode>
-                    <AllowUnsafe>false</AllowUnsafe>
-                    <OutputPath>bin\Debug</OutputPath>
-                    <DebugInformation>true</DebugInformation>
-                    <XmlDocFile>RedBook.xml</XmlDocFile>
-                    <WarningLevel>4</WarningLevel>
-                    <SuppressWarnings>1595</SuppressWarnings>
-                </Options>
-            </Configuration>
-            <Configuration name="Release">
-                <Options>
-                    <CompilerDefines>TRACE</CompilerDefines>
-                    <OptimizeCode>true</OptimizeCode>
-                    <AllowUnsafe>false</AllowUnsafe>
-                    <OutputPath>bin\Release</OutputPath>
-                    <DebugInformation>false</DebugInformation>
-                    <XmlDocFile>RedBook.xml</XmlDocFile>
-                    <WarningLevel>1</WarningLevel>
-                    <SuppressWarnings>1595</SuppressWarnings>
-                </Options>
-            </Configuration>
-            <Reference name="System" /> 
-            <Reference name="System.Drawing" /> 
-            <Reference name="System.Windows.Forms" /> 
-            <Reference name="SdlDotNet" localCopy="true"/>
-            <Reference name="Tao.OpenGl" localCopy="true" path="..\\..\\lib"/>
-            <Reference name="Tao.OpenGl.Glu" localCopy="true" path="..\\..\\lib"/>
-            <Reference name="Tao.FreeGlut" localCopy="true" path="..\\..\\lib"/>
-            <Files>
-                <File buildAction="EmbeddedResource">App.ico</File>
-                <File subType="Form">RedBook.cs</File>
-                <Match path="." pattern="*.cs" recurse="true">
-                    <Exclude name="RedBook.cs" />
-                </Match>
-            </Files>
-        </Project>
-        <Project name="PhysFsTest" path="examples\\PhysFsTest" language="C#" type="WinExe" startupObject="SdlDotNet.Examples.PhysFsTest.PhysFsTest" assemblyName="PhysFsTest" rootNamespace="SdlDotNet.Examples.PhysFsTest" icon="App.ico">
-            <Configuration name="Debug">
-                <Options>
-                    <CompilerDefines>DEBUG;TRACE</CompilerDefines>
-                    <OptimizeCode>false</OptimizeCode>
-                    <AllowUnsafe>false</AllowUnsafe>
-                    <OutputPath>bin\Debug</OutputPath>
-                    <DebugInformation>true</DebugInformation>
-                    <XmlDocFile>PhysFsTest.xml</XmlDocFile>
-                    <WarningLevel>4</WarningLevel>
-                    <SuppressWarnings>1595</SuppressWarnings>
-                </Options>
-            </Configuration>
-            <Configuration name="Release">
-                <Options>
-                    <CompilerDefines>TRACE</CompilerDefines>
-                    <OptimizeCode>true</OptimizeCode>
-                    <AllowUnsafe>false</AllowUnsafe>
-                    <OutputPath>bin\Release</OutputPath>
-                    <DebugInformation>false</DebugInformation>
-                    <XmlDocFile>PhysFsTest.xml</XmlDocFile>
-                    <WarningLevel>1</WarningLevel>
-                    <SuppressWarnings>1595</SuppressWarnings>
-                </Options>
-            </Configuration>
-            <Reference name="System" /> 
-            <Reference name="System.Drawing" /> 
-            <Reference name="SdlDotNet" localCopy="true"/>
-            <Reference name="Tao.PhysFs" localCopy="true" path="..\\..\\lib"/>
-            <Files>
-                <File buildAction="EmbeddedResource">App.ico</File>
-                <Match path="." pattern="*.cs" recurse="true"/>
-            </Files>
-        </Project>
-    </Solution>
-</Prebuild>
diff --git a/Prebuild/doc/prebuild-example5.xml b/Prebuild/doc/prebuild-example5.xml
deleted file mode 100644
index 5221547..0000000
--- a/Prebuild/doc/prebuild-example5.xml
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Prebuild xmlns="http://dnpb.sourceforge.net/schemas/prebuild-1.6.xsd" version="1.6">
-    <Solution name="Tao.Sdl">
-        <Configuration name="Debug">
-            <Options>
-                <CompilerDefines>DEBUG;TRACE;WIN32</CompilerDefines>
-                <OptimizeCode>false</OptimizeCode>
-                <AllowUnsafe>true</AllowUnsafe>
-                <OutputPath>bin\Debug</OutputPath>
-                <XmlDocFile>Tao.Sdl.xml</XmlDocFile>
-                <DebugInformation>true</DebugInformation>
-            </Options>
-        </Configuration>
-        <Configuration name="Release">
-            <Options>
-                <CompilerDefines>TRACE;WIN32</CompilerDefines>
-                <OptimizeCode>true</OptimizeCode>
-                <AllowUnsafe>true</AllowUnsafe>
-                <OutputPath>bin\Release</OutputPath>
-                <XmlDocFile>Tao.Sdl.xml</XmlDocFile>
-                <DebugInformation>false</DebugInformation>
-            </Options>
-        </Configuration>
-        <Files>
-            <File>Tao.Sdl.License.txt</File>
-            <File>Tao.Sdl.Readme.txt</File>
-            <File>Tao.Sdl.snk</File>
-            <File>Tao.Sdl.dll.config</File>
-        </Files>
-        <Project name="Tao.Sdl" path="." language="C#" type="Library">
-            <Reference name="System" /> 
-            <Files>
-                <File>AssemblyInfo.cs</File>
-                <File>Sdl.cs</File>
-                <File>SdlImage.cs</File>
-                <File>SdlMixer.cs</File>
-                <File>SdlTtf.cs</File>
-                <File>SdlNet.cs</File>
-                <File>SdlGfx.cs</File>
-                <File>Smpeg.cs</File>
-                <File>DelegateCallingConventionCdeclAttribute.cs</File>
-            </Files>
-        </Project>
-        <Project name="Tao.Sdl.Tests" path="..\\..\\tests\\Sdl\\" language="C#" type="Library">
-            <Configuration name="Debug">
-                <Options>
-                    <CompilerDefines>DEBUG;TRACE;WIN32</CompilerDefines>
-                    <OptimizeCode>false</OptimizeCode>
-                    <AllowUnsafe>false</AllowUnsafe>
-                    <OutputPath>bin\Debug</OutputPath>
-                    <XmlDocFile>Tao.Sdl.Tests.xml</XmlDocFile>
-                    <DebugInformation>true</DebugInformation>
-                </Options>
-            </Configuration>
-            <Configuration name="Release">
-                <Options>
-                    <CompilerDefines>TRACE;WIN32</CompilerDefines>
-                    <OptimizeCode>true</OptimizeCode>
-                    <AllowUnsafe>false</AllowUnsafe>
-                    <OutputPath>bin\Release</OutputPath>
-                    <XmlDocFile>Tao.Sdl.Tests.xml</XmlDocFile>
-                    <DebugInformation>false</DebugInformation>
-                </Options>
-            </Configuration>
-            <Reference name="System" /> 
-            <Reference name="nunit.framework.dll"/>
-            <Reference name="Tao.Sdl" />
-            <Files>
-                <File>AssemblyInfo.cs</File>
-                <File>SdlTest.cs</File>
-                <File>SdlTestVideo.cs</File>
-                <File>SdlTestImage.cs</File>
-                <File>SdlTestTtf.cs</File>
-                <File>SdlTestMixer.cs</File>
-                <File>SdlTestGfx.cs</File>
-                <File>SmpegTest.cs</File>
-            </Files>
-        </Project>
-        <Project name="SdlExamples.Rectangles" path="..\\..\\examples\\SdlExamples\\Rectangles" language="C#" type="WinExe" startupObject="SdlExamples.Rectangles">
-            <Configuration name="Debug">
-                <Options>
-                    <CompilerDefines>DEBUG;TRACE;WIN32</CompilerDefines>
-                    <OptimizeCode>false</OptimizeCode>
-                    <AllowUnsafe>false</AllowUnsafe>
-                    <OutputPath>bin\Debug</OutputPath>
-                    <DebugInformation>true</DebugInformation>
-                </Options>
-            </Configuration>
-            <Configuration name="Release">
-                <Options>
-                    <CompilerDefines>TRACE;WIN32</CompilerDefines>
-                    <OptimizeCode>true</OptimizeCode>
-                    <AllowUnsafe>false</AllowUnsafe>
-                    <OutputPath>bin\Release</OutputPath>
-                    <DebugInformation>false</DebugInformation>
-                </Options>
-            </Configuration>
-            <Reference name="System" /> 
-            <Reference name="Tao.Sdl" />
-            <Files>
-                <File>AssemblyInfo.cs</File>
-                <File>Rectangles.cs</File>
-            </Files>
-        </Project>
-        <Project name="SdlExamples.SmpegPlayer" path="..\\..\\examples\\SdlExamples\\SmpegPlayer" language="C#" type="WinExe" startupObject="SdlExamples.SmpegPlayer">
-            <Configuration name="Debug">
-                <Options>
-                    <CompilerDefines>DEBUG;TRACE;WIN32</CompilerDefines>
-                    <OptimizeCode>false</OptimizeCode>
-                    <AllowUnsafe>false</AllowUnsafe>
-                    <OutputPath>bin\Debug</OutputPath>
-                    <DebugInformation>true</DebugInformation>
-                </Options>
-            </Configuration>
-            <Configuration name="Release">
-                <Options>
-                    <CompilerDefines>TRACE;WIN32</CompilerDefines>
-                    <OptimizeCode>true</OptimizeCode>
-                    <AllowUnsafe>false</AllowUnsafe>
-                    <OutputPath>bin\Release</OutputPath>
-                    <DebugInformation>false</DebugInformation>
-                </Options>
-            </Configuration>
-            <Reference name="System" /> 
-            <Reference name="Tao.Sdl" />
-            <Files>
-                <File>AssemblyInfo.cs</File>
-                <File>SmpegPlayer.cs</File>
-            </Files>
-        </Project>
-        <Project name="SdlExamples.GfxPrimitives" path="..\\..\\examples\\SdlExamples\\GfxPrimitives" language="C#" type="WinExe" startupObject="SdlExamples.GfxPrimitives">
-            <Configuration name="Debug">
-                <Options>
-                    <CompilerDefines>DEBUG;TRACE;WIN32</CompilerDefines>
-                    <OptimizeCode>false</OptimizeCode>
-                    <AllowUnsafe>false</AllowUnsafe>
-                    <OutputPath>bin\Debug</OutputPath>
-                    <DebugInformation>true</DebugInformation>
-                </Options>
-            </Configuration>
-            <Configuration name="Release">
-                <Options>
-                    <CompilerDefines>TRACE;WIN32</CompilerDefines>
-                    <OptimizeCode>true</OptimizeCode>
-                    <AllowUnsafe>false</AllowUnsafe>
-                    <OutputPath>bin\Release</OutputPath>
-                    <DebugInformation>false</DebugInformation>
-                </Options>
-            </Configuration>
-            <Reference name="System" /> 
-            <Reference name="Tao.Sdl" />
-            <Files>
-                <File>AssemblyInfo.cs</File>
-                <File>GfxPrimitives.cs</File>
-            </Files>
-        </Project>
-        <Project name="Tao.PostProcess" path="..\\Tao.PostProcess\\" language="C#" type="Exe">
-        <Configuration name="Debug">
-                <Options>
-                    <CompilerDefines>DEBUG;TRACE;WIN32</CompilerDefines>
-                    <OptimizeCode>false</OptimizeCode>
-                    <AllowUnsafe>false</AllowUnsafe>
-                    <OutputPath>bin\Debug</OutputPath>
-                    <DebugInformation>true</DebugInformation>
-                </Options>
-            </Configuration>
-            <Configuration name="Release">
-                <Options>
-                    <CompilerDefines>TRACE;WIN32</CompilerDefines>
-                    <OptimizeCode>true</OptimizeCode>
-                    <AllowUnsafe>false</AllowUnsafe>
-                    <OutputPath>bin\Release</OutputPath>
-                    <DebugInformation>false</DebugInformation>
-                </Options>
-            </Configuration>
-            <Reference name="System" />
-            <Files>
-                <File>AssemblyInfo.cs</File>
-                <File>AppMain.cs</File>
-                <File>BuildProcessor.cs</File>
-                <File>Options.cs</File>
-                <File>ReleaseBuildProcessor.cs</File>
-                <File>UsageHelp.cs</File>
-            </Files>
-        </Project>
-    </Solution>
-</Prebuild>
diff --git a/Prebuild/prebuild b/Prebuild/prebuild
deleted file mode 100644
index 0dc648d..0000000
--- a/Prebuild/prebuild
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec mono [PREFIX]/prebuild.exe "$@"
diff --git a/Prebuild/scripts/Clean.bat b/Prebuild/scripts/Clean.bat
deleted file mode 100644
index 39fa685..0000000
--- a/Prebuild/scripts/Clean.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-cd ..
-Prebuild.exe /clean /yes /removedir obj /file prebuild.xml /build NET_2_0 /pause
diff --git a/Prebuild/scripts/Help.bat b/Prebuild/scripts/Help.bat
deleted file mode 100644
index a7d3db4..0000000
--- a/Prebuild/scripts/Help.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-cd ..
-Prebuild.exe /usage /pause
-\ No newline at end of file
diff --git a/Prebuild/scripts/MonoDevelop.sh b/Prebuild/scripts/MonoDevelop.sh
deleted file mode 100644
index dae3cf4..0000000
--- a/Prebuild/scripts/MonoDevelop.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-prebuild /target monodev /file ../prebuild.xml /build NET_1_1 /pause
diff --git a/Prebuild/scripts/Prebuild.nsi b/Prebuild/scripts/Prebuild.nsi
deleted file mode 100644
index 0c6e2bc..0000000
--- a/Prebuild/scripts/Prebuild.nsi
+++ /dev/null
@@ -1,231 +0,0 @@
-!verbose 3
-!define PRODUCT_NAME "Prebuild"
-!define PRODUCT_VERSION "1.3.1"
-!define PRODUCT_PUBLISHER "Prebuild"
-!define PRODUCT_PACKAGE "prebuild"
-!define PRODUCT_WEB_SITE "http://dnpb.sourceforge.net"
-!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\Prebuild"
-!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\Prebuild"
-!define PRODUCT_UNINST_ROOT_KEY "HKLM"
-!define PRODUCT_PATH ".."
-;!define MUI_WELCOMEFINISHPAGE_BITMAP "PrebuildLogo.bmp"
-;!define MUI_WELCOMEFINISHPAGE_BITMAP_NOSTRETCH
-;!define MUI_UNWELCOMEFINISHPAGE_BITMAP "PrebuildLogo.bmp"
-;!define MUI_UNWELCOMEFINISHPAGE_BITMAP_NOSTRETCH
-BrandingText "� 2003-2006 David Hudson, http://dnpb.sourceforge.net/"
-SetCompressor lzma
-CRCCheck on
-; File Association defines
-;!include "fileassoc.nsh"
-; MUI 1.67 compatible ------
-!include "MUI.nsh"
-; MUI Settings
-!define MUI_ABORTWARNING
-!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\modern-install.ico"
-!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico"
-;--------------------------------
-;Variables
-;--------------------------------
-;Installer Pages
-; Welcome page
-!insertmacro MUI_PAGE_WELCOME
-; License page
-!insertmacro MUI_PAGE_LICENSE "..\doc\license.txt"
-; Directory page
-!insertmacro MUI_PAGE_DIRECTORY
-; Instfiles page
-!insertmacro MUI_PAGE_INSTFILES
-; Finish page
-!insertmacro MUI_PAGE_FINISH
-;------------------------------------
-; Uninstaller pages
-!insertmacro MUI_UNPAGE_CONFIRM
-!insertmacro MUI_UNPAGE_INSTFILES
-!insertmacro MUI_UNPAGE_FINISH
-;------------------------------------
-; Language files
-!insertmacro MUI_LANGUAGE "English"
-; Reserve files
-!insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
-; MUI end ------
-Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
-OutFile "..\${PRODUCT_PACKAGE}-${PRODUCT_VERSION}-setup.exe"
-InstallDir "$PROGRAMFILES\Prebuild"
-InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
-ShowInstDetails show
-ShowUnInstDetails show
-; .NET Framework check
-; http://msdn.microsoft.com/netframework/default.aspx?pull=/library/en-us/dnnetdep/html/redistdeploy1_1.asp
-; Section "Detecting that the .NET Framework 1.1 is installed"
-Function .onInit
-        ReadRegDWORD $R0 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP\v1.1.4322" Install
-        StrCmp $R0 "" 0 CheckPreviousVersion
-        MessageBox MB_OK "Microsoft .NET Framework 1.1 was not found on this system.$\r$\n$\r$\nUnable to continue this installation."
-        Abort
-  CheckPreviousVersion:
-        ReadRegStr $R0 ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName"
-        StrCmp $R0 "" CheckOSVersion 0
-        MessageBox MB_OK "An old version of Prebuild is installed on this computer, please uninstall first.$\r$\n$\r$\nUnable to continue this installation."
-        Abort
-        
-  CheckOSVersion:
-        Call IsSupportedWindowsVersion
-        Pop $R0
-        StrCmp $R0 "False" NoAbort 0
-        MessageBox MB_OK "The operating system you are using is not supported by Prebuild (95/98/ME/NT3.x/NT4.x)."
-        Abort
-  NoAbort:
-FunctionEnd
-Section "Source" SecSource
-  SetOverwrite ifnewer
-  SetOutPath "$INSTDIR\src"
-  File /r /x *.swp /x .svn /x *.xml /x *.csproj /x *.user /x *.build /x *.prjx /x *.mdp /x bin /x obj /x *.nsi ${PRODUCT_PATH}\src\*.*
-  ;Store installation folder
-  WriteRegStr HKCU "Software\Prebuild" "" $INSTDIR
-  
-SectionEnd
-Section "Runtime" SecRuntime
-  SetOverwrite ifnewer
-  SetOutPath "$INSTDIR"
-  File /r /x *.swp /x .svn /x *.nsi /x src /x *.sln /x *.cmbx /x *.mds ${PRODUCT_PATH}\Prebuild.exe ${PRODUCT_PATH}\prebuild.xml
-  ;Store installation folder
-  WriteRegStr HKCU "Software\Prebuild" "" $INSTDIR
-  
-SectionEnd
-Section "Documentation" SecDocs
-  SetOverwrite ifnewer
-  SetOutPath "$INSTDIR\doc"
-  File /r /x *.swp /x .svn /x *.exe ${PRODUCT_PATH}\doc\*.*
-  ;Store installation folder
-  WriteRegStr HKCU "Software\Prebuild" "" $INSTDIR
-SectionEnd
-Section "Scripts" SecScripts
-  SetOverwrite ifnewer
-  SetOutPath "$INSTDIR\scripts"
-  File /r /x *.swp /x .svn /x *.nsi /x *.exe ${PRODUCT_PATH}\scripts\*.*
-  ;Store installation folder
-  WriteRegStr HKCU "Software\Prebuild" "" $INSTDIR
-SectionEnd
-;Language strings
-Section -AdditionalIcons
-  WriteIniStr "$INSTDIR\${PRODUCT_NAME}.url" "InternetShortcut" "URL" "${PRODUCT_WEB_SITE}"
-SectionEnd
-Section -Post
-  WriteUninstaller "$INSTDIR\uninst.exe"
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe"
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"
-SectionEnd
-Section Uninstall
-  DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
-  DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}"
-  RMDir /r "$INSTDIR"
-SectionEnd
-; GetWindowsVersion, taken from NSIS help, modified for our purposes
-Function IsSupportedWindowsVersion
-   Push $R0
-   Push $R1
-   ReadRegStr $R0 HKLM \
-   "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion
-   IfErrors 0 lbl_winnt
-   ; we are not NT
-   ReadRegStr $R0 HKLM \
-   "SOFTWARE\Microsoft\Windows\CurrentVersion" VersionNumber
-   StrCpy $R1 $R0 1
-   StrCmp $R1 '4' 0 lbl_error
-   StrCpy $R1 $R0 3
-   StrCmp $R1 '4.0' lbl_win32_95
-   StrCmp $R1 '4.9' lbl_win32_ME lbl_win32_98
-   lbl_win32_95:
-     StrCpy $R0 'False'
-   Goto lbl_done
-   lbl_win32_98:
-     StrCpy $R0 'False'
-   Goto lbl_done
-   lbl_win32_ME:
-     StrCpy $R0 'False'
-   Goto lbl_done
-   lbl_winnt:
-   StrCpy $R1 $R0 1
-   StrCmp $R1 '3' lbl_winnt_x
-   StrCmp $R1 '4' lbl_winnt_x
-   StrCpy $R1 $R0 3
-   StrCmp $R1 '5.0' lbl_winnt_2000
-   StrCmp $R1 '5.1' lbl_winnt_XP
-   StrCmp $R1 '5.2' lbl_winnt_2003 lbl_error
-   lbl_winnt_x:
-     StrCpy $R0 'False'
-   Goto lbl_done
-   lbl_winnt_2000:
-     Strcpy $R0 'True'
-   Goto lbl_done
-   lbl_winnt_XP:
-     Strcpy $R0 'True'
-   Goto lbl_done
-   lbl_winnt_2003:
-     Strcpy $R0 'True'
-   Goto lbl_done
-   lbl_error:
-     Strcpy $R0 'False'
-   lbl_done:
-   Pop $R1
-   Exch $R0
-FunctionEnd
diff --git a/Prebuild/scripts/SharpDevelop.bat b/Prebuild/scripts/SharpDevelop.bat
deleted file mode 100644
index 483d9c9..0000000
--- a/Prebuild/scripts/SharpDevelop.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-@rem Generates a combine (.cmbx) and a set of project files (.prjx) 
-@rem for SharpDevelop (http://icsharpcode.net/OpenSource/SD/Default.aspx)
-cd ..
-Prebuild.exe /target sharpdev /file prebuild.xml /build NET_1_1 /pause
diff --git a/Prebuild/scripts/SharpDevelop2.bat b/Prebuild/scripts/SharpDevelop2.bat
deleted file mode 100644
index 4ca0272..0000000
--- a/Prebuild/scripts/SharpDevelop2.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-@rem Generates a combine (.cmbx) and a set of project files (.prjx) 
-@rem for SharpDevelop (http://icsharpcode.net/OpenSource/SD/Default.aspx)
-cd ..
-Prebuild.exe /target sharpdev2 /file prebuild.xml /pause
diff --git a/Prebuild/scripts/VS2002.bat b/Prebuild/scripts/VS2002.bat
deleted file mode 100644
index a11740e..0000000
--- a/Prebuild/scripts/VS2002.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-@rem Generates a solution (.sln) and a set of project files (.csproj) 
-@rem for Microsoft Visual Studio .NET 2002
-cd ..
-Prebuild.exe /target vs2002 /file prebuild.xml /build NET_1_1 /pause
diff --git a/Prebuild/scripts/VS2003.bat b/Prebuild/scripts/VS2003.bat
deleted file mode 100644
index 1be57f8..0000000
--- a/Prebuild/scripts/VS2003.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-@rem Generates a solution (.sln) and a set of project files (.csproj) 
-@rem for Microsoft Visual Studio .NET 2002
-cd ..
-Prebuild.exe /target vs2003 /file prebuild.xml /build NET_1_1 /pause
diff --git a/Prebuild/scripts/VS2005.bat b/Prebuild/scripts/VS2005.bat
deleted file mode 100644
index 86ad3fc..0000000
--- a/Prebuild/scripts/VS2005.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-@rem Generates a solution (.sln) and a set of project files (.csproj, .vbproj, etc.)
-@rem for Microsoft Visual Studio .NET 2005
-cd ..
-Prebuild.exe /target vs2005 /file prebuild.xml /build NET_2_0 /pause
diff --git a/Prebuild/scripts/autotools.bat b/Prebuild/scripts/autotools.bat
deleted file mode 100644
index 1fd3469..0000000
--- a/Prebuild/scripts/autotools.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-@rem Generates Makefiles 
-@rem for autotools
-cd ..
-Prebuild.exe /target autotools /file prebuild.xml /pause
diff --git a/Prebuild/scripts/autotools.sh b/Prebuild/scripts/autotools.sh
deleted file mode 100644
index 18cd46f..0000000
--- a/Prebuild/scripts/autotools.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-prebuild /target autotools /file ../prebuild.xml /build NET_2_0 /pause
diff --git a/Prebuild/scripts/nant.bat b/Prebuild/scripts/nant.bat
deleted file mode 100644
index 2a6ae60..0000000
--- a/Prebuild/scripts/nant.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-@rem Generates a .build files 
-@rem for NAnt
-cd ..
-Prebuild.exe /target nant /file prebuild.xml /pause
diff --git a/Prebuild/scripts/nant.sh b/Prebuild/scripts/nant.sh
deleted file mode 100644
index 54a8254..0000000
--- a/Prebuild/scripts/nant.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-prebuild /target nant /file ../prebuild.xml /pause
diff --git a/Prebuild/src/App.ico b/Prebuild/src/App.ico
deleted file mode 100644
index ac4ea6f..0000000
--- a/Prebuild/src/App.ico
+++ /dev/null
Binary files differ
diff --git a/Prebuild/src/Core/Attributes/DataNodeAttribute.cs b/Prebuild/src/Core/Attributes/DataNodeAttribute.cs
deleted file mode 100644
index dbdaf0b..0000000
--- a/Prebuild/src/Core/Attributes/DataNodeAttribute.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-#region BSD License
-/*
-Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (dan05a@gmail.com)
-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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
-*/
-#endregion
-#region CVS Information
-/*
- * $Source$
- * $Author: jendave $
- * $Date: 2006-01-28 01:49:58 +0100 (lö, 28 jan 2006) $
- * $Revision: 71 $
- */
-#endregion
-using System;
-using System.Collections.Specialized;
-namespace Prebuild.Core.Attributes
-{
-        /// <summary>
-        /// 
-        /// </summary>
-        [AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct)]
-        public sealed class DataNodeAttribute : Attribute
-        {
-                #region Fields
-                private string m_Name = "unknown";
-                #endregion
-                #region Constructors
-                /// <summary>
-                /// Initializes a new instance of the <see cref="DataNodeAttribute"/> class.
-                /// </summary>
-                /// <param name="name">The name.</param>
-                public DataNodeAttribute(string name)
-                {
-                        m_Name = name;
-                }
-                #endregion
-                #region Properties
-                /// <summary>
-                /// Gets the name.
-                /// </summary>
-                /// <value>The name.</value>
-                public string Name
-                {
-                        get
-                        {
-                                return m_Name;
-                        }
-                }
-                #endregion
-        }
-}
diff --git a/Prebuild/src/Core/Attributes/OptionNodeAttribute.cs b/Prebuild/src/Core/Attributes/OptionNodeAttribute.cs
deleted file mode 100644
index edda56d..0000000
--- a/Prebuild/src/Core/Attributes/OptionNodeAttribute.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-#region BSD License
-/*
-Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (dan05a@gmail.com)
-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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
-*/
-#endregion
-#region CVS Information
-/*
- * $Source$
- * $Author: jendave $
- * $Date: 2006-01-28 01:49:58 +0100 (lö, 28 jan 2006) $
- * $Revision: 71 $
- */
-#endregion
-using System;
-namespace Prebuild.Core.Attributes
-{
-        /// <summary>
-        /// 
-        /// </summary>
-        [AttributeUsage(AttributeTargets.Field)]
-        public sealed class OptionNodeAttribute : Attribute
-        {
-                #region Fields
-                private string m_NodeName;
-                #endregion
-                #region Constructors
-                /// <summary>
-                /// Initializes a new instance of the <see cref="OptionNodeAttribute"/> class.
-                /// </summary>
-                /// <param name="nodeName">Name of the node.</param>
-                public OptionNodeAttribute(string nodeName)
-                {
-                        m_NodeName = nodeName;
-                }
-                #endregion
-                #region Properties
-                /// <summary>
-                /// Gets the name of the node.
-                /// </summary>
-                /// <value>The name of the node.</value>
-                public string NodeName
-                {
-                        get
-                        {
-                                return m_NodeName;
-                        }
-                }
-                #endregion
-        }
-}
diff --git a/Prebuild/src/Core/Attributes/TargetAttribute.cs b/Prebuild/src/Core/Attributes/TargetAttribute.cs
deleted file mode 100644
index 985f180..0000000
--- a/Prebuild/src/Core/Attributes/TargetAttribute.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-#region BSD License
-/*
-Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (dan05a@gmail.com)
-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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
-*/
-#endregion
-#region CVS Information
-/*
- * $Source$
- * $Author: jendave $
- * $Date: 2006-01-28 01:49:58 +0100 (lö, 28 jan 2006) $
- * $Revision: 71 $
- */
-#endregion
-using System;
-namespace Prebuild.Core.Attributes
-{
-        /// <summary>
-        /// 
-        /// </summary>
-        [AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct)]
-        public sealed class TargetAttribute : Attribute
-        {
-                #region Fields
-                private string m_Name;
-                #endregion
-                #region Constructors
-                /// <summary>
-                /// Initializes a new instance of the <see cref="TargetAttribute"/> class.
-                /// </summary>
-                /// <param name="name">The name.</param>
-                public TargetAttribute(string name)
-                {
-                        m_Name = name;
-                }
-                #endregion
-                #region Properties
-                /// <summary>
-                /// Gets the name.
-                /// </summary>
-                /// <value>The name.</value>
-                public string Name
-                {
-                        get
-                        {
-                                return m_Name;
-                        }
-                }
-                #endregion
-        }
-}
diff --git a/Prebuild/src/Core/FatalException.cs b/Prebuild/src/Core/FatalException.cs
deleted file mode 100644
index 92aad3d..0000000
--- a/Prebuild/src/Core/FatalException.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-#region BSD License
-/*
-Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (dan05a@gmail.com)
-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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
-*/
-#endregion
-#region CVS Information
-/*
- * $Source$
- * $Author: jendave $
- * $Date: 2006-01-28 01:49:58 +0100 (lö, 28 jan 2006) $
- * $Revision: 71 $
- */
-#endregion
-using System;
-using System.Runtime.Serialization;
-namespace Prebuild.Core
-{
-        /// <summary>
-        /// 
-        /// </summary>
-        [Serializable()]
-        public class FatalException : Exception
-        {
-                #region Constructors
-                
-                /// <summary>
-                /// Initializes a new instance of the <see cref="FatalException"/> class.
-                /// </summary>
-                public FatalException()
-                {
-                }
-                /// <summary>
-                /// Initializes a new instance of the <see cref="FatalException"/> class.
-                /// </summary>
-                /// <param name="format">The format.</param>
-                /// <param name="args">The args.</param>
-                public FatalException(string format, params object[] args)
-                        : base(String.Format(format, args))
-                {
-                }
-                /// <summary>
-                /// Exception with specified string
-                /// </summary>
-                /// <param name="message">Exception message</param>
-                public FatalException(string message): base(message)
-                {
-                }
-                /// <summary>
-                /// 
-                /// </summary>
-                /// <param name="message"></param>
-                /// <param name="exception"></param>
-                public FatalException(string message, Exception exception) : base(message, exception)
-                {
-                }
-                /// <summary>
-                /// 
-                /// </summary>
-                /// <param name="info"></param>
-                /// <param name="context"></param>
-                protected FatalException(SerializationInfo info, StreamingContext context) : base( info, context )
-                {
-                }
-                #endregion
-        }
-}
diff --git a/Prebuild/src/Core/Interfaces/IDataNode.cs b/Prebuild/src/Core/Interfaces/IDataNode.cs
deleted file mode 100644
index 0bad97c..0000000
--- a/Prebuild/src/Core/Interfaces/IDataNode.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-#region BSD License
-/*
-Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (dan05a@gmail.com)
-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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
-*/
-#endregion
-#region CVS Information
-/*
- * $Source$
- * $Author: jendave $
- * $Date: 2006-01-28 01:49:58 +0100 (lö, 28 jan 2006) $
- * $Revision: 71 $
- */
-#endregion
-using System;
-using System.Xml;
-namespace Prebuild.Core.Interfaces 
-{
-        /// <summary>
-        /// 
-        /// </summary>
-        public interface IDataNode 
-        {
-                /// <summary>
-                /// Gets or sets the parent.
-                /// </summary>
-                /// <value>The parent.</value>
-                IDataNode Parent { get; set; }        
-                /// <summary>
-                /// Parses the specified node.
-                /// </summary>
-                /// <param name="node">The node.</param>
-                void Parse(XmlNode node);
-        }
-}
diff --git a/Prebuild/src/Core/Interfaces/ITarget.cs b/Prebuild/src/Core/Interfaces/ITarget.cs
deleted file mode 100644
index dac6cd6..0000000
--- a/Prebuild/src/Core/Interfaces/ITarget.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-#region BSD License
-/*
-Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (dan05a@gmail.com)
-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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
-*/
-#endregion
-#region CVS Information
-/*
- * $Source$
- * $Author: jendave $
- * $Date: 2006-01-28 01:49:58 +0100 (lö, 28 jan 2006) $
- * $Revision: 71 $
- */
-#endregion
-using System;
-namespace Prebuild.Core.Interfaces 
-{
-        /// <summary>
-        /// 
-        /// </summary>
-        public interface ITarget 
-        {
-                /// <summary>
-                /// Writes the specified kern.
-                /// </summary>
-                /// <param name="kern">The kern.</param>
-                void Write(Kernel kern);
-                /// <summary>
-                /// Cleans the specified kern.
-                /// </summary>
-                /// <param name="kern">The kern.</param>
-                void Clean(Kernel kern);
-                /// <summary>
-                /// Gets the name.
-                /// </summary>
-                /// <value>The name.</value>
-                string Name { get; }
-        }
-}
-\ No newline at end of file
diff --git a/Prebuild/src/Core/Kernel.cs b/Prebuild/src/Core/Kernel.cs
deleted file mode 100644
index 3117e7c..0000000
--- a/Prebuild/src/Core/Kernel.cs
+++ /dev/null
@@ -1,758 +0,0 @@
-#region BSD License
-/*
-Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (dan05a@gmail.com)
-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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
-*/
-#endregion
-#region CVS Information
-/*
- * $Source$
- * $Author: robloach $
- * $Date: 2006-09-26 00:30:53 +0200 (ti, 26 sep 2006) $
- * $Revision: 165 $
- */
-#endregion
-using System;
-using System.Diagnostics;
-using System.Collections;
-using System.Collections.Specialized;
-using System.IO;
-using System.Reflection;
-using System.Xml;
-using System.Xml.Schema;
-using System.Text;
-using Prebuild.Core.Attributes;
-using Prebuild.Core.Interfaces;
-using Prebuild.Core.Nodes;
-using Prebuild.Core.Parse;
-using Prebuild.Core.Utilities;
-namespace Prebuild.Core 
-{
-        /// <summary>
-        /// 
-        /// </summary>
-        public class Kernel : IDisposable
-        {
-                #region Inner Classes
-                private struct NodeEntry
-                {
-                        public Type Type;
-                        public DataNodeAttribute Attribute;
-                }
-                #endregion
-                #region Fields
-                private static Kernel m_Instance = new Kernel();
-                /// <summary>
-                /// This must match the version of the schema that is embeeded
-                /// </summary>
-                private static string m_SchemaVersion = "1.7";
-                private static string m_Schema = "prebuild-" + m_SchemaVersion + ".xsd";
-                private static string m_SchemaURI = "http://dnpb.sourceforge.net/schemas/" + m_Schema;
-                bool disposed;
-                private Version m_Version;
-                private string m_Revision = "";
-                private CommandLineCollection m_CommandLine;
-                private Log m_Log;
-                private CurrentDirectory m_CurrentWorkingDirectory;
-                private XmlSchemaCollection m_Schemas;
-        
-                private Hashtable m_Targets;
-                private Hashtable m_Nodes;
-        
-                ArrayList m_Solutions;        
-                string m_Target;
-                string m_Clean;
-                string[] m_RemoveDirectories;
-                string m_CurrentFile;
-                bool m_PauseAfterFinish;
-                string[] m_ProjectGroups;
-                StringCollection m_Refs;
-                
-                #endregion
-                #region Constructors
-                private Kernel()
-                {
-                }
-                #endregion
-                #region Properties
-                /// <summary>
-                /// Gets a value indicating whether [pause after finish].
-                /// </summary>
-                /// <value><c>true</c> if [pause after finish]; otherwise, <c>false</c>.</value>
-                public bool PauseAfterFinish 
-                {
-                        get
-                        { 
-                                return m_PauseAfterFinish; 
-                        } 
-                }
-                /// <summary>
-                /// Gets the instance.
-                /// </summary>
-                /// <value>The instance.</value>
-                public static Kernel Instance
-                {
-                        get
-                        {
-                                return m_Instance;
-                        }
-                }
-                /// <summary>
-                /// Gets the version.
-                /// </summary>
-                /// <value>The version.</value>
-                public string Version
-                {
-                        get
-                        {
-                                return String.Format("{0}.{1}.{2}{3}", m_Version.Major, m_Version.Minor, m_Version.Build, m_Revision);
-                        }
-                }
-                /// <summary>
-                /// Gets the command line.
-                /// </summary>
-                /// <value>The command line.</value>
-                public CommandLineCollection CommandLine
-                {
-                        get
-                        {
-                                return m_CommandLine;
-                        }
-                }
-                /// <summary>
-                /// Gets the targets.
-                /// </summary>
-                /// <value>The targets.</value>
-                public Hashtable Targets
-                {
-                        get
-                        {
-                                return m_Targets;
-                        }
-                }
-                /// <summary>
-                /// Gets the log.
-                /// </summary>
-                /// <value>The log.</value>
-                public Log Log
-                {
-                        get
-                        {
-                                return m_Log;
-                        }
-                }
-                /// <summary>
-                /// Gets the current working directory.
-                /// </summary>
-                /// <value>The current working directory.</value>
-                public CurrentDirectory CurrentWorkingDirectory
-                {
-                        get
-                        {
-                                return m_CurrentWorkingDirectory;
-                        }
-                }
-                /// <summary>
-                /// Gets the solutions.
-                /// </summary>
-                /// <value>The solutions.</value>
-                public ArrayList Solutions
-                {
-                        get
-                        {
-                                return m_Solutions;
-                        }
-                }
-                #endregion
-                #region Private Methods
-                private void RemoveDirectories(string rootDir, string[] dirNames) 
-                {
-                        foreach(string dir in Directory.GetDirectories(rootDir)) 
-                        {
-                                string simpleName = Path.GetFileName(dir);
-                                if(Array.IndexOf(dirNames, simpleName) != -1) 
-                                {
-                                        //delete if the name matches one of the directory names to delete
-                                        string fullDirPath = Path.GetFullPath(dir);
-                                        Directory.Delete(fullDirPath,true);
-                                } 
-                                else//not a match, so check children
-                                {
-                                        RemoveDirectories(dir,dirNames);
-                                        //recurse, checking children for them
-                                }
-                        }
-                }
-//              private void RemoveDirectoryMatches(string rootDir, string dirPattern) 
-//              {
-//                      foreach(string dir in Directory.GetDirectories(rootDir)) 
-//                      {
-//                              foreach(string match in Directory.GetDirectories(dir)) 
-//                              {//delete all child directories that match
-//                                      Directory.Delete(Path.GetFullPath(match),true);
-//                              }
-//                              //recure through the rest checking for nested matches to delete
-//                              RemoveDirectoryMatches(dir,dirPattern);
-//                      }
-//              }
-                private void LoadSchema()
-                {
-                        Assembly assembly = this.GetType().Assembly;
-                        Stream stream = assembly.GetManifestResourceStream("Prebuild.data." + m_Schema);
-                        if(stream == null) 
-                        {
-                                //try without the default namespace prepending to it in case was compiled with SharpDevelop or MonoDevelop instead of Visual Studio .NET
-                                stream = assembly.GetManifestResourceStream(m_Schema);
-                                if(stream == null)
-                                {
-                                        throw new System.Reflection.TargetException(string.Format("Could not find the scheme embedded resource file '{0}'.", m_Schema));
-                                }
-                        }
-                        XmlReader schema = new XmlTextReader(stream);
-            
-                        m_Schemas = new XmlSchemaCollection();
-                        m_Schemas.Add(m_SchemaURI, schema);
-                }
-                private void CacheVersion() 
-                {
-                        m_Version = Assembly.GetEntryAssembly().GetName().Version;
-                }
-                private void CacheTargets(Assembly assm)
-                {
-                        foreach(Type t in assm.GetTypes())
-                        {
-                                TargetAttribute ta = (TargetAttribute)Helper.CheckType(t, typeof(TargetAttribute), typeof(ITarget));
-                                if(ta == null)
-                                {
-                                        continue;
-                                }
-                                ITarget target = (ITarget)assm.CreateInstance(t.FullName);
-                                if(target == null)
-                                {
-                                        throw new MissingMethodException("Could not create ITarget instance");
-                                }
-                                m_Targets[ta.Name] = target;
-                        }
-                }
-                private void CacheNodeTypes(Assembly assm)
-                {
-                        foreach(Type t in assm.GetTypes())
-                        {
-                                DataNodeAttribute dna = (DataNodeAttribute)Helper.CheckType(t, typeof(DataNodeAttribute), typeof(IDataNode));
-                                if(dna == null)
-                                {
-                                        continue;
-                                }
-                                NodeEntry ne = new NodeEntry();
-                                ne.Type = t;
-                                ne.Attribute = dna;
-                                m_Nodes[dna.Name] = ne;
-                        }
-                }
-                private void LogBanner()
-                {
-                        m_Log.Write("Prebuild v" + this.Version);
-                        m_Log.Write("Copyright (c) Matthew Holmes, Dan Moorehead and David Hudson");
-                        m_Log.Write("See 'prebuild /usage' for help");
-                        m_Log.Write();
-                }
-                private void ProcessFile(string file)
-                {
-                        m_CurrentWorkingDirectory.Push();
-            
-                        string path = file;
-                        try
-                        {
-                                try
-                                {
-                                        path = Helper.ResolvePath(path);
-                                }
-                                catch(ArgumentException)
-                                {
-                                        m_Log.Write("Could not open Prebuild file: " + path);
-                                        m_CurrentWorkingDirectory.Pop();
-                                        return;
-                                }
-                                m_CurrentFile = path;
-                                Helper.SetCurrentDir(Path.GetDirectoryName(path));
-            
-                                
-                                XmlTextReader reader = new XmlTextReader(path);
-                Core.Parse.Preprocessor pre = new Core.Parse.Preprocessor();
-                //register command line arguments as XML variables
-                IDictionaryEnumerator dict = m_CommandLine.GetEnumerator();
-                while (dict.MoveNext())
-                {
-                    string name = dict.Key.ToString().Trim();
-                    if (name.Length > 0)
-                        pre.RegisterVariable(name, dict.Value.ToString());
-                }
-                                string xml = pre.Process(reader);//remove script and evaulate pre-proccessing to get schema-conforming XML
-                                
-                                XmlDocument doc = new XmlDocument();
-                                try
-                                {
-                                        XmlValidatingReader validator = new XmlValidatingReader(new XmlTextReader(new StringReader(xml)));
-                                        //validate while reading from string into XmlDocument DOM structure in memory
-                                        foreach(XmlSchema schema in m_Schemas) 
-                                        {
-                                                validator.Schemas.Add(schema);
-                                        }
-                                        doc.Load(validator);
-                                } 
-                                catch(XmlException e) 
-                                {
-                                        throw new XmlException(e.ToString());
-                                }
-                                //is there a purpose to writing it?  An syntax/schema problem would have been found during pre.Process() and reported with details
-                                if(m_CommandLine.WasPassed("ppo"))
-                                {
-                                        string ppoFile = m_CommandLine["ppo"];
-                                        if(ppoFile == null || ppoFile.Trim().Length < 1)
-                                        {
-                                                ppoFile = "preprocessed.xml";
-                                        }
-                                        StreamWriter writer = null;
-                                        try
-                                        {
-                                                writer = new StreamWriter(ppoFile);
-                                                writer.Write(xml);
-                                        }
-                                        catch(IOException ex)
-                                        {
-                                                Console.WriteLine("Could not write PPO file '{0}': {1}", ppoFile, ex.Message);
-                                        }
-                                        finally
-                                        {
-                                                if(writer != null)
-                                                {
-                                                        writer.Close();
-                                                }
-                                        }
-                                        return;
-                                }
-                                //start reading the xml config file
-                                XmlElement rootNode = doc.DocumentElement;
-                                //string suggestedVersion = Helper.AttributeValue(rootNode,"version","1.0");
-                                Helper.CheckForOSVariables = Helper.ParseBoolean(rootNode,"checkOsVars",false);
-                                foreach(XmlNode node in rootNode.ChildNodes)//solutions or if pre-proc instructions
-                                {
-                                        IDataNode dataNode = ParseNode(node, null);
-                                        if(dataNode is ProcessNode)
-                                        {
-                                                ProcessNode proc = (ProcessNode)dataNode;
-                                                if(proc.IsValid)
-                                                {
-                                                        ProcessFile(proc.Path);
-                                                }
-                                        }
-                                        else if(dataNode is SolutionNode)
-                                        {
-                                                m_Solutions.Add(dataNode);
-                                        }
-                                }
-                        }
-                        catch(XmlSchemaException xse)
-                        {
-                                m_Log.Write("XML validation error at line {0} in {1}:\n\n{2}",
-                                        xse.LineNumber, path, xse.Message);
-                        }
-                        finally
-                        {
-                                m_CurrentWorkingDirectory.Pop();
-                        }
-                }
-                #endregion
-                #region Public Methods
-                /// <summary>
-                /// Allows the project.
-                /// </summary>
-                /// <param name="projectGroupsFlags">The project groups flags.</param>
-                /// <returns></returns>
-                public bool AllowProject(string projectGroupsFlags) 
-                {
-                        if(m_ProjectGroups != null && m_ProjectGroups.Length > 0) 
-                        {
-                                if(projectGroupsFlags != null && projectGroupsFlags.Length == 0) 
-                                {
-                                        foreach(string group in projectGroupsFlags.Split('|')) 
-                                        {
-                                                if(Array.IndexOf(m_ProjectGroups, group) != -1) //if included in the filter list
-                                                {
-                                                        return true;
-                                                }
-                                        }
-                                }
-                                return false;//not included in the list or no groups specified for the project
-                        }
-                        return true;//no filter specified in the command line args
-                }
-                /// <summary>
-                /// Gets the type of the node.
-                /// </summary>
-                /// <param name="node">The node.</param>
-                /// <returns></returns>
-                public Type GetNodeType(XmlNode node)
-                {
-                        if( node == null )
-                        {
-                                throw new ArgumentNullException("node");
-                        }
-                        if(!m_Nodes.ContainsKey(node.Name))
-                        {
-                                return null;
-                        }
-                        NodeEntry ne = (NodeEntry)m_Nodes[node.Name];
-                        return ne.Type;
-                }
-                /// <summary>
-                /// 
-                /// </summary>
-                /// <param name="node"></param>
-                /// <param name="parent"></param>
-                /// <returns></returns>
-                public IDataNode ParseNode(XmlNode node, IDataNode parent)
-                {
-                        return ParseNode(node, parent, null);
-                }
-                //Create an instance of the data node type that is mapped to the name of the xml DOM node
-                /// <summary>
-                /// Parses the node.
-                /// </summary>
-                /// <param name="node">The node.</param>
-                /// <param name="parent">The parent.</param>
-                /// <param name="preNode">The pre node.</param>
-                /// <returns></returns>
-                public IDataNode ParseNode(XmlNode node, IDataNode parent, IDataNode preNode)
-                {
-                        IDataNode dataNode = null;
-                        try
-                        {
-                                if( node == null )
-                                {
-                                        throw new ArgumentNullException("node");
-                                }
-                                if(preNode == null)
-                                {
-                                        if(!m_Nodes.ContainsKey(node.Name))
-                                        {
-                                                //throw new XmlException("Unknown XML node: " + node.Name);
-                                                return null;
-                                        }
-                                        NodeEntry ne = (NodeEntry)m_Nodes[node.Name];
-                                        Type type = ne.Type;
-                                        //DataNodeAttribute dna = ne.Attribute;
-                                        dataNode = (IDataNode)type.Assembly.CreateInstance(type.FullName);
-                                        if(dataNode == null)
-                                        {
-                                                throw new System.Reflection.TargetException("Could not create new parser instance: " + type.FullName);
-                                        }
-                                }
-                                else
-                                        dataNode = preNode;
-                                dataNode.Parent = parent;
-                                dataNode.Parse(node);
-                        }
-                        catch(WarningException wex)
-                        {
-                                m_Log.Write(LogType.Warning, wex.Message);
-                                return null;
-                        }
-                        catch(FatalException fex)
-                        {
-                                m_Log.WriteException(LogType.Error, fex);
-                                throw;
-                        }
-                        catch(Exception ex)
-                        {
-                                m_Log.WriteException(LogType.Error, ex);
-                                throw;
-                        }
-                        return dataNode;
-                }
-                /// <summary>
-                /// Initializes the specified target.
-                /// </summary>
-                /// <param name="target">The target.</param>
-                /// <param name="args">The args.</param>
-                public void Initialize(LogTargets target, string[] args)
-                {
-                        m_Targets = new Hashtable();
-                        CacheTargets(this.GetType().Assembly);
-                        m_Nodes = new Hashtable();
-                        CacheNodeTypes(this.GetType().Assembly);
-                        CacheVersion();
-                        m_CommandLine = new CommandLineCollection(args);
-            
-                        string logFile = null;
-                        if(m_CommandLine.WasPassed("log")) 
-                        {
-                                logFile = m_CommandLine["log"];
-                                if(logFile != null && logFile.Length == 0)
-                                {
-                                        logFile = "Prebuild.log";
-                                }
-                        }
-                        else 
-                        {
-                                target = target & ~LogTargets.File;     //dont output to a file
-                        }
-            
-                        m_Log = new Log(target, logFile);
-                        LogBanner();
-                        m_CurrentWorkingDirectory = new CurrentDirectory();
-                        m_Target = m_CommandLine["target"];
-                        m_Clean = m_CommandLine["clean"];
-                        string removeDirs = m_CommandLine["removedir"];
-                        if(removeDirs != null && removeDirs.Length == 0) 
-                        {
-                                m_RemoveDirectories = removeDirs.Split('|');
-                        }
-                        string flags = m_CommandLine["allowedgroups"];//allows filtering by specifying a pipe-delimited list of groups to include
-                        if(flags != null && flags.Length == 0)
-                        {
-                                m_ProjectGroups = flags.Split('|');
-                        }
-                        m_PauseAfterFinish = m_CommandLine.WasPassed("pause");
-                        LoadSchema();
-                        m_Solutions = new ArrayList();
-                        m_Refs = new StringCollection();
-                }
-                /// <summary>
-                /// Processes this instance.
-                /// </summary>
-                public void Process()
-                {
-                        bool perfomedOtherTask = false;
-                        if(m_RemoveDirectories != null && m_RemoveDirectories.Length > 0) 
-                        {
-                                try
-                                {
-                                        RemoveDirectories(".",m_RemoveDirectories);
-                                } 
-                                catch(IOException e) 
-                                {
-                                        m_Log.Write("Failed to remove directories named {0}",m_RemoveDirectories);
-                                        m_Log.WriteException(LogType.Error,e);
-                                }
-                                catch(UnauthorizedAccessException e) 
-                                {
-                                        m_Log.Write("Failed to remove directories named {0}",m_RemoveDirectories);
-                                        m_Log.WriteException(LogType.Error,e);
-                                }
-                                perfomedOtherTask = true;
-                        }
-                        if(m_Target != null && m_Clean != null)
-                        {
-                                m_Log.Write(LogType.Error, "The options /target and /clean cannot be passed together");
-                                return;
-                        }
-                        else if(m_Target == null && m_Clean == null)
-                        {
-                                if(perfomedOtherTask) //finished
-                                {
-                                        return;
-                                }
-                                m_Log.Write(LogType.Error, "Must pass either /target or /clean to process a Prebuild file");
-                                return;
-                        }
-                        string file = "./prebuild.xml";
-                        if(m_CommandLine.WasPassed("file"))
-                        {
-                                file = m_CommandLine["file"];
-                        }
-                        ProcessFile(file);
-                        string target = (m_Target != null ? m_Target.ToLower() : m_Clean.ToLower());
-                        bool clean = (m_Target == null);
-                        if(clean && target != null && target.Length == 0)
-                        {
-                                target = "all";
-                        }
-                        if(clean && target == "all")//default to all if no target was specified for clean
-                        {
-                //check if they passed yes
-                if (!m_CommandLine.WasPassed("yes"))
-                {
-                                    Console.WriteLine("WARNING: This operation will clean ALL project files for all targets, are you sure? (y/n):");
-                                    string ret = Console.ReadLine();
-                                    if(ret == null)
-                                    {
-                                            return;
-                                    }
-                                    ret = ret.Trim().ToLower();
-                                    if((ret.ToLower() != "y" && ret.ToLower() != "yes"))
-                                    {
-                                            return;
-                    }
-                }
-                                //clean all targets (just cleaning vs2002 target didn't clean nant)
-                                foreach(ITarget targ in m_Targets.Values)
-                                {
-                                        targ.Clean(this);
-                                }
-                        }
-                        else
-                        {
-                ITarget targ = (ITarget)m_Targets[target];
-                if(clean)
-                {
-                    targ.Clean(this);
-                }
-                else
-                {
-                    targ.Write(this);
-                }
-            }
-                        m_Log.Flush();
-                }
-                #endregion        
-                #region IDisposable Members
-                /// <summary>
-                /// 
-                /// </summary>
-                public void Dispose()
-                {
-                        Dispose(true);
-                        GC.SuppressFinalize(this);
-                }
-                /// <summary>
-                /// Dispose objects
-                /// </summary>
-                /// <param name="disposing">
-                /// If true, it will dispose close the handle
-                /// </param>
-                /// <remarks>
-                /// Will dispose managed and unmanaged resources.
-                /// </remarks>
-                protected virtual void Dispose(bool disposing)
-                {
-                        if (!this.disposed)
-                        {
-                                if (disposing)
-                                {
-                                        if (this.m_Log != null)
-                                        {
-                                                this.m_Log.Close();
-                                                this.m_Log = null;
-                                        }
-                                }
-                        }
-                        this.disposed = true;
-                }
-                /// <summary>
-                /// 
-                /// </summary>
-                ~Kernel()
-                {
-                        this.Dispose(false);
-                }
-                
-                /// <summary>
-                /// Closes and destroys this object
-                /// </summary>
-                /// <remarks>
-                /// Same as Dispose(true)
-                /// </remarks>
-                public void Close() 
-                {
-                        Dispose();
-                }
-                #endregion
-        }
-}
-\ No newline at end of file
diff --git a/Prebuild/src/Core/Nodes/ConfigurationNode.cs b/Prebuild/src/Core/Nodes/ConfigurationNode.cs
deleted file mode 100644
index 390794f..0000000
--- a/Prebuild/src/Core/Nodes/ConfigurationNode.cs
+++ /dev/null
@@ -1,187 +0,0 @@
-#region BSD License
-/*
-Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (dan05a@gmail.com)
-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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
-*/
-#endregion
-#region CVS Information
-/*
- * $Source$
- * $Author: jendave $
- * $Date: 2006-01-28 01:49:58 +0100 (lö, 28 jan 2006) $
- * $Revision: 71 $
- */
-#endregion
-using System;
-using System.Xml;
-using Prebuild.Core.Attributes;
-using Prebuild.Core.Interfaces;
-using Prebuild.Core.Utilities;
-namespace Prebuild.Core.Nodes
-{
-        /// <summary>
-        /// 
-        /// </summary>
-        [DataNode("Configuration")]
-        public class ConfigurationNode : DataNode, ICloneable, IComparable
-        {
-                #region Fields
-                private string m_Name = "unknown";
-                private OptionsNode m_Options;
-                #endregion
-                #region Constructors
-                /// <summary>
-                /// Initializes a new instance of the <see cref="ConfigurationNode"/> class.
-                /// </summary>
-                public ConfigurationNode()
-                {
-                        m_Options = new OptionsNode();
-                }
-                #endregion
-                #region Properties
-                /// <summary>
-                /// Gets or sets the parent.
-                /// </summary>
-                /// <value>The parent.</value>
-                public override IDataNode Parent
-                {
-                        get
-                        {
-                                return base.Parent;
-                        }
-                        set
-                        {
-                                base.Parent = value;
-                                if(base.Parent is SolutionNode)
-                                {
-                                        SolutionNode node = (SolutionNode)base.Parent;
-                                        if(node != null && node.Options != null)
-                                        {
-                                                node.Options.CopyTo(m_Options);
-                                        }
-                                }
-                        }
-                }
-                /// <summary>
-                /// Gets the name.
-                /// </summary>
-                /// <value>The name.</value>
-                public string Name
-                {
-                        get
-                        {
-                                return m_Name;
-                        }
-                }
-                /// <summary>
-                /// Gets or sets the options.
-                /// </summary>
-                /// <value>The options.</value>
-                public OptionsNode Options
-                {
-                        get
-                        {
-                                return m_Options;
-                        }
-                        set
-                        {
-                                m_Options = value;
-                        }
-                }
-                #endregion
-                #region Public Methods
-                /// <summary>
-                /// Parses the specified node.
-                /// </summary>
-                /// <param name="node">The node.</param>
-                public override void Parse(XmlNode node)
-                {
-                        m_Name = Helper.AttributeValue(node, "name", m_Name);
-                        if( node == null )
-                        {
-                                throw new ArgumentNullException("node");
-                        }
-                        foreach(XmlNode child in node.ChildNodes)
-                        {
-                                IDataNode dataNode = Kernel.Instance.ParseNode(child, this);
-                                if(dataNode is OptionsNode)
-                                {
-                                        ((OptionsNode)dataNode).CopyTo(m_Options);
-                                }
-                        }
-                }
-                /// <summary>
-                /// Copies to.
-                /// </summary>
-                /// <param name="conf">The conf.</param>
-                public void CopyTo(ConfigurationNode conf)
-                {
-                        m_Options.CopyTo(conf.m_Options);
-                }
-                #endregion
-                #region ICloneable Members
-                /// <summary>
-                /// Creates a new object that is a copy of the current instance.
-                /// </summary>
-                /// <returns>
-                /// A new object that is a copy of this instance.
-                /// </returns>
-                public object Clone()
-                {
-                        ConfigurationNode ret = new ConfigurationNode();
-                        ret.m_Name = m_Name;
-                        m_Options.CopyTo(ret.m_Options);
-                        return ret;
-                }
-                #endregion
-        #region IComparable Members
-        public int CompareTo(object obj)
-        {
-            ConfigurationNode that = (ConfigurationNode) obj;
-            return this.m_Name.CompareTo(that.m_Name);
-        }
-        #endregion
-    }
-}
diff --git a/Prebuild/src/Core/Nodes/DataNode.cs b/Prebuild/src/Core/Nodes/DataNode.cs
deleted file mode 100644
index ef5f7ee..0000000
--- a/Prebuild/src/Core/Nodes/DataNode.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-#region BSD License
-/*
-Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (dan05a@gmail.com)
-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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
-*/
-#endregion
-#region CVS Information
-/*
- * $Source$
- * $Author: jendave $
- * $Date: 2006-01-28 01:49:58 +0100 (lö, 28 jan 2006) $
- * $Revision: 71 $
- */
-#endregion
-using System;
-using System.Xml;
-using Prebuild.Core.Attributes;
-using Prebuild.Core.Interfaces;
-namespace Prebuild.Core.Nodes
-{
-        /// <summary>
-        /// 
-        /// </summary>
-        public class DataNode : IDataNode
-        {
-                #region Fields
-                private IDataNode parent;
-                #endregion
-                #region IDataNode Members
-                /// <summary>
-                /// Gets or sets the parent.
-                /// </summary>
-                /// <value>The parent.</value>
-                public virtual IDataNode Parent
-                {
-                        get
-                        {
-                                return parent;
-                        }
-                        set
-                        {
-                                parent = value;
-                        }
-                }
-                /// <summary>
-                /// Parses the specified node.
-                /// </summary>
-                /// <param name="node">The node.</param>
-                public virtual void Parse(XmlNode node)
-                {
-                }
-                #endregion
-        }
-}
diff --git a/Prebuild/src/Core/Nodes/ExcludeNode.cs b/Prebuild/src/Core/Nodes/ExcludeNode.cs
deleted file mode 100644
index bfcebca..0000000
--- a/Prebuild/src/Core/Nodes/ExcludeNode.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-#region BSD License
-/*
-Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (dan05a@gmail.com)
-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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
-*/
-#endregion
-#region CVS Information
-/*
- * $Source$
- * $Author: jendave $
- * $Date: 2006-01-31 16:35:39 +0100 (ti, 31 jan 2006) $
- * $Revision: 74 $
- */
-#endregion
-using System;
-using System.Xml;
-using Prebuild.Core.Attributes;
-using Prebuild.Core.Interfaces;
-using Prebuild.Core.Utilities;
-namespace Prebuild.Core.Nodes
-{
-        /// <summary>
-        /// 
-        /// </summary>
-        [DataNode("Exclude")]
-        public class ExcludeNode : DataNode
-        {
-                #region Fields
-                private string m_Name = "unknown";
-                #endregion
-                #region Properties
-                /// <summary>
-                /// Gets the name.
-                /// </summary>
-                /// <value>The name.</value>
-                public string Name
-                {
-                        get
-                        {
-                                return m_Name;
-                        }
-                }
-                #endregion
-                #region Public Methods
-                /// <summary>
-                /// Parses the specified node.
-                /// </summary>
-                /// <param name="node">The node.</param>
-                public override void Parse(XmlNode node)
-                {
-                        m_Name = Helper.AttributeValue(node, "name", m_Name);
-                }
-                #endregion
-        }
-}
diff --git a/Prebuild/src/Core/Nodes/FileNode.cs b/Prebuild/src/Core/Nodes/FileNode.cs
deleted file mode 100644
index de3b69e..0000000
--- a/Prebuild/src/Core/Nodes/FileNode.cs
+++ /dev/null
@@ -1,238 +0,0 @@
-#region BSD License
-/*
-Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (dan05a@gmail.com)
-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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
-*/
-#endregion
-#region CVS Information
-/*
- * $Source$
- * $Author: jendave $
- * $Date: 2007-01-08 17:55:40 +0100 (må, 08 jan 2007) $
- * $Revision: 197 $
- */
-#endregion
-using System;
-using System.IO;
-using System.Xml;
-using Prebuild.Core.Attributes;
-using Prebuild.Core.Interfaces;
-using Prebuild.Core.Utilities;
-namespace Prebuild.Core.Nodes
-{
-        /// <summary>
-        /// 
-        /// </summary>
-        public enum BuildAction
-        {
-                /// <summary>
-                /// 
-                /// </summary>
-                None,
-                /// <summary>
-                /// 
-                /// </summary>
-                Compile,
-                /// <summary>
-                /// 
-                /// </summary>
-                Content,
-                /// <summary>
-                /// 
-                /// </summary>
-                EmbeddedResource
-        }
-        /// <summary>
-        /// 
-        /// </summary>
-        public enum SubType
-        {
-                /// <summary>
-                /// 
-                /// </summary>
-                Code,
-                /// <summary>
-                /// 
-                /// </summary>
-                Component,
-        /// <summary>
-        /// 
-        /// </summary>
-        Designer,
-                /// <summary>
-                /// 
-                /// </summary>
-                Form,
-                /// <summary>
-                /// 
-                /// </summary>
-                Settings,
-                /// <summary>
-                /// 
-                /// </summary>
-                UserControl
-        }
-        public enum CopyToOutput
-        {
-                Never,
-                Always,
-                PreserveNewest
-        }
-        /// <summary>
-        /// 
-        /// </summary>
-        [DataNode("File")]
-        public class FileNode : DataNode
-        {
-                #region Fields
-                private string m_Path;
-                private string m_ResourceName = "";
-                private BuildAction m_BuildAction = BuildAction.Compile;
-                private bool m_Valid;
-                private SubType m_SubType = SubType.Code;
-                private CopyToOutput m_CopyToOutput = CopyToOutput.Never;
-                private bool m_Link = false;
-                #endregion
-                #region Properties
-                /// <summary>
-                /// 
-                /// </summary>
-                public string Path
-                {
-                        get
-                        {
-                                return m_Path;
-                        }
-                }
-                /// <summary>
-                /// 
-                /// </summary>
-                public string ResourceName
-                {
-                        get
-                        {
-                                return m_ResourceName;
-                        }
-                }
-                /// <summary>
-                /// 
-                /// </summary>
-                public BuildAction BuildAction
-                {
-                        get
-                        {
-                                return m_BuildAction;
-                        }
-                }
-                public CopyToOutput CopyToOutput
-                {
-                        get
-                        {
-                                return this.m_CopyToOutput;
-                        }
-                }
-                public bool IsLink
-                {
-                        get
-                        {
-                                return this.m_Link;
-                        }
-                }
-                /// <summary>
-                /// 
-                /// </summary>
-                public SubType SubType
-                {
-                        get
-                        {
-                                return m_SubType;
-                        }
-                }
-                /// <summary>
-                /// 
-                /// </summary>
-                public bool IsValid
-                {
-                        get
-                        {
-                                return m_Valid;
-                        }
-                }
-                #endregion
-                #region Public Methods
-                /// <summary>
-                /// 
-                /// </summary>
-                /// <param name="node"></param>
-                public override void Parse(XmlNode node)
-                {
-                        m_BuildAction = (BuildAction)Enum.Parse(typeof(BuildAction), 
-                                Helper.AttributeValue(node, "buildAction", m_BuildAction.ToString()));
-                        m_SubType = (SubType)Enum.Parse(typeof(SubType), 
-                                Helper.AttributeValue(node, "subType", m_SubType.ToString()));
-                        m_ResourceName = Helper.AttributeValue(node, "resourceName", m_ResourceName.ToString());
-                        this.m_Link = bool.Parse(Helper.AttributeValue(node, "link", bool.FalseString));
-                        this.m_CopyToOutput = (CopyToOutput) Enum.Parse(typeof(CopyToOutput), Helper.AttributeValue(node, "copyToOutput", this.m_CopyToOutput.ToString()));
-                        if( node == null )
-                        {
-                                throw new ArgumentNullException("node");
-                        }
-                        m_Path = Helper.InterpolateForEnvironmentVariables(node.InnerText);
-                        if(m_Path == null)
-                        {
-                                m_Path = "";
-                        }
-                        m_Path = m_Path.Trim();
-                        m_Valid = true;
-                        if(!File.Exists(m_Path))
-                        {
-                                m_Valid = false;
-                                Kernel.Instance.Log.Write(LogType.Warning, "File does not exist: {0}", m_Path);
-                        }
-                }
-                #endregion
-        }
-}
diff --git a/Prebuild/src/Core/Nodes/FilesNode.cs b/Prebuild/src/Core/Nodes/FilesNode.cs
deleted file mode 100644
index d31307b..0000000
--- a/Prebuild/src/Core/Nodes/FilesNode.cs
+++ /dev/null
@@ -1,223 +0,0 @@
-#region BSD License
-/*
-Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (dan05a@gmail.com)
-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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
-*/
-#endregion
-#region CVS Information
-/*
- * $Source$
- * $Author: jendave $
- * $Date: 2006-09-20 09:42:51 +0200 (on, 20 sep 2006) $
- * $Revision: 164 $
- */
-#endregion
-using System;
-using System.Collections;
-using System.Collections.Specialized;
-using System.Xml;
-using Prebuild.Core.Attributes;
-using Prebuild.Core.Interfaces;
-namespace Prebuild.Core.Nodes
-{
-        /// <summary>
-        /// 
-        /// </summary>
-        [DataNode("Files")]
-        public class FilesNode : DataNode
-        {
-                #region Fields
-                private StringCollection m_Files;
-                private Hashtable m_BuildActions;
-                private Hashtable m_SubTypes;
-                private Hashtable m_ResourceNames;
-                private Hashtable m_CopyToOutputs;
-                private Hashtable m_Links;
-                #endregion
-                #region Constructors
-                /// <summary>
-                /// 
-                /// </summary>
-                public FilesNode()
-                {
-                        m_Files = new StringCollection();
-                        m_BuildActions = new Hashtable();
-                        m_SubTypes = new Hashtable();
-                        m_ResourceNames = new Hashtable();
-                        m_CopyToOutputs = new Hashtable();
-                        m_Links = new Hashtable();
-                }
-                #endregion
-                #region Properties
-                /// <summary>
-                /// 
-                /// </summary>
-                public int Count
-                {
-                        get
-                        {
-                                return m_Files.Count;
-                        }
-                }
-                #endregion
-                #region Public Methods
-                /// <summary>
-                /// 
-                /// </summary>
-                /// <param name="file"></param>
-                /// <returns></returns>
-                public BuildAction GetBuildAction(string file)
-                {
-                        if(!m_BuildActions.ContainsKey(file))
-                        {
-                                return BuildAction.Compile;
-                        }
-                        return (BuildAction)m_BuildActions[file];
-                }
-                public CopyToOutput GetCopyToOutput(string file)
-                {
-                        if (!this.m_CopyToOutputs.ContainsKey(file))
-                        {
-                                return CopyToOutput.Never;
-                        }
-                        return (CopyToOutput) this.m_CopyToOutputs[file];
-                }
-                public bool GetIsLink(string file)
-                {
-                        if (!this.m_Links.ContainsKey(file))
-                        {
-                                return false;
-                        }
-                        return (bool) this.m_Links[file];
-                }
-                /// <summary>
-                /// 
-                /// </summary>
-                /// <param name="file"></param>
-                /// <returns></returns>
-                public SubType GetSubType(string file)
-                {
-                        if(!m_SubTypes.ContainsKey(file))
-                        {
-                                return SubType.Code;
-                        }
-                        return (SubType)m_SubTypes[file];
-                }
-                /// <summary>
-                /// 
-                /// </summary>
-                /// <param name="file"></param>
-                /// <returns></returns>
-                public string GetResourceName(string file)
-                {
-                        if(!m_ResourceNames.ContainsKey(file))
-                        {
-                                return "";
-                        }
-                        return (string)m_ResourceNames[file];
-                }
-                /// <summary>
-                /// 
-                /// </summary>
-                /// <param name="node"></param>
-                public override void Parse(XmlNode node)
-                {
-                        if( node == null )
-                        {
-                                throw new ArgumentNullException("node");
-                        }
-                        foreach(XmlNode child in node.ChildNodes)
-                        {
-                                IDataNode dataNode = Kernel.Instance.ParseNode(child, this);
-                                if(dataNode is FileNode)
-                                {
-                                        FileNode fileNode = (FileNode)dataNode;
-                                        if(fileNode.IsValid)
-                                        {
-                                                if (!m_Files.Contains(fileNode.Path))
-                                                {
-                                                        m_Files.Add(fileNode.Path);
-                                                        m_BuildActions[fileNode.Path] = fileNode.BuildAction;
-                                                        m_SubTypes[fileNode.Path] = fileNode.SubType;
-                                                        m_ResourceNames[fileNode.Path] = fileNode.ResourceName;
-                                                        this.m_Links[fileNode.Path] = fileNode.IsLink;
-                                                        this.m_CopyToOutputs[fileNode.Path] = fileNode.CopyToOutput;
-                                                }
-                                        }
-                                }
-                                else if(dataNode is MatchNode)
-                                {
-                                        foreach(string file in ((MatchNode)dataNode).Files)
-                                        {
-                                                if (!m_Files.Contains(file))
-                                                {
-                                                        m_Files.Add(file);
-                                                        m_BuildActions[file] = ((MatchNode)dataNode).BuildAction;
-                                                        m_SubTypes[file] = ((MatchNode)dataNode).SubType;
-                                                        m_ResourceNames[file] = ((MatchNode)dataNode).ResourceName;
-                                                        this.m_Links[file] = ((MatchNode) dataNode).IsLink;
-                                                        this.m_CopyToOutputs[file] = ((MatchNode) dataNode).CopyToOutput;
-                                                }
-                                        }
-                                }
-                        }
-                }
-                // TODO: Check in to why StringCollection's enumerator doesn't implement
-                // IEnumerator?
-                /// <summary>
-                /// 
-                /// </summary>
-                /// <returns></returns>
-                public StringEnumerator GetEnumerator()
-                {
-                        return m_Files.GetEnumerator();
-                }
-                #endregion
-    }
-}
diff --git a/Prebuild/src/Core/Nodes/MatchNode.cs b/Prebuild/src/Core/Nodes/MatchNode.cs
deleted file mode 100644
index e0d2fa8..0000000
--- a/Prebuild/src/Core/Nodes/MatchNode.cs
+++ /dev/null
@@ -1,299 +0,0 @@
-#region BSD License
-/*
-Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (dan05a@gmail.com)
-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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
-*/
-#endregion
-#region CVS Information
-/*
- * $Source$
- * $Author: jendave $
- * $Date: 2006-09-20 09:42:51 +0200 (on, 20 sep 2006) $
- * $Revision: 164 $
- */
-#endregion
-using System;
-using System.Collections.Specialized;
-using System.IO;
-using System.Text.RegularExpressions;
-using System.Xml;
-using Prebuild.Core.Attributes;
-using Prebuild.Core.Interfaces;
-using Prebuild.Core.Utilities;
-namespace Prebuild.Core.Nodes
-{
-        /// <summary>
-        /// 
-        /// </summary>
-        [DataNode("Match")]
-        public class MatchNode : DataNode
-        {
-                #region Fields
-                private StringCollection m_Files;
-                private Regex m_Regex;
-                private BuildAction m_BuildAction = BuildAction.Compile;
-                private SubType m_SubType = SubType.Code;
-                string m_ResourceName = "";
-                private CopyToOutput m_CopyToOutput;
-                private bool m_Link;
-                #endregion
-                #region Constructors
-                /// <summary>
-                /// 
-                /// </summary>
-                public MatchNode()
-                {
-                        m_Files = new StringCollection();
-                }
-                #endregion
-                #region Properties
-                /// <summary>
-                /// 
-                /// </summary>
-                public StringCollection Files
-                {
-                        get
-                        {
-                                return m_Files;
-                        }
-                }
-                /// <summary>
-                /// 
-                /// </summary>
-                public BuildAction BuildAction
-                {
-                        get
-                        {
-                                return m_BuildAction;
-                        }
-                }
-                /// <summary>
-                /// 
-                /// </summary>
-                public SubType SubType
-                {
-                        get
-                        {
-                                return m_SubType;
-                        }
-                }
-                public CopyToOutput CopyToOutput
-                {
-                        get
-                        {
-                                return this.m_CopyToOutput;
-                        }
-                }
-                public bool IsLink
-                {
-                        get
-                        {
-                                return this.m_Link;
-                        }
-                }
-                /// <summary>
-                /// 
-                /// </summary>
-                public string ResourceName
-                {
-                        get
-                        {
-                                return m_ResourceName;
-                        }
-                }
-                #endregion
-                #region Private Methods
-                /// <summary>
-                /// Recurses the directories.
-                /// </summary>
-                /// <param name="path">The path.</param>
-                /// <param name="pattern">The pattern.</param>
-                /// <param name="recurse">if set to <c>true</c> [recurse].</param>
-                /// <param name="useRegex">if set to <c>true</c> [use regex].</param>
-                private void RecurseDirectories(string path, string pattern, bool recurse, bool useRegex)
-                {
-                        try
-                        {
-                                string[] files;
-                                if(!useRegex)
-                                {
-                                        files = Directory.GetFiles(path, pattern);
-                                        if(files != null)
-                                        {
-                                                string fileTemp;
-                                                foreach (string file in files)
-                                                {
-                                                        if (file.Substring(0,2) == "./" || file.Substring(0,2) == ".\\")
-                                                        {
-                                                                fileTemp = file.Substring(2);
-                                                        }
-                                                        else
-                                                        {
-                                                                fileTemp = file;
-                                                        }
-                                                        
-                                                        m_Files.Add(fileTemp);
-                                                }
-                                        }
-                                        else
-                                        {
-                                                return;
-                                        }
-                                }
-                                else
-                                {
-                                        Match match;
-                                        files = Directory.GetFiles(path);
-                                        foreach(string file in files)
-                                        {
-                                                match = m_Regex.Match(file);
-                                                if(match.Success)
-                                                {
-                                                        m_Files.Add(file);
-                                                }
-                                        }
-                                }
-                
-                                if(recurse)
-                                {
-                                        string[] dirs = Directory.GetDirectories(path);
-                                        if(dirs != null && dirs.Length > 0)
-                                        {
-                                                foreach(string str in dirs)
-                                                {
-                                                        RecurseDirectories(Helper.NormalizePath(str), pattern, recurse, useRegex);
-                                                }
-                                        }
-                                }
-                        }
-                        catch(DirectoryNotFoundException)
-                        {
-                                return;
-                        }
-                        catch(ArgumentException)
-                        {
-                                return;
-                        }
-                }
-                #endregion
-                #region Public Methods
-                /// <summary>
-                /// 
-                /// </summary>
-                /// <param name="node"></param>
-                public override void Parse(XmlNode node)
-                {
-                        if( node == null )
-                        {
-                                throw new ArgumentNullException("node");
-                        }
-                        string path = Helper.AttributeValue(node, "path", ".");
-                        string pattern = Helper.AttributeValue(node, "pattern", "*");
-                        bool recurse = (bool)Helper.TranslateValue(typeof(bool), Helper.AttributeValue(node, "recurse", "false"));
-                        bool useRegex = (bool)Helper.TranslateValue(typeof(bool), Helper.AttributeValue(node, "useRegex", "false"));
-                        m_BuildAction = (BuildAction)Enum.Parse(typeof(BuildAction), 
-                                Helper.AttributeValue(node, "buildAction", m_BuildAction.ToString()));
-                        m_SubType = (SubType)Enum.Parse(typeof(SubType), 
-                                Helper.AttributeValue(node, "subType", m_SubType.ToString()));
-                        m_ResourceName = Helper.AttributeValue(node, "resourceName", m_ResourceName.ToString());
-                        this.m_CopyToOutput = (CopyToOutput) Enum.Parse(typeof(CopyToOutput), Helper.AttributeValue(node, "copyToOutput", this.m_CopyToOutput.ToString()));
-                        this.m_Link = bool.Parse(Helper.AttributeValue(node, "link", bool.FalseString));
-                        if(path != null && path.Length == 0)
-                        {
-                                path = ".";//use current directory
-                        }
-                        //throw new WarningException("Match must have a 'path' attribute");
-                        if(pattern == null)
-                        {
-                                throw new WarningException("Match must have a 'pattern' attribute");
-                        }
-                        path = Helper.NormalizePath(path);
-                        if(!Directory.Exists(path))
-                        {
-                                throw new WarningException("Match path does not exist: {0}", path);
-                        }
-                        try
-                        {
-                                if(useRegex)
-                                {
-                                        m_Regex = new Regex(pattern);
-                                }
-                        }
-                        catch(ArgumentException ex)
-                        {
-                                throw new WarningException("Could not compile regex pattern: {0}", ex.Message);
-                        }
-                        RecurseDirectories(path, pattern, recurse, useRegex);
-                        foreach(XmlNode child in node.ChildNodes)
-                        {
-                                IDataNode dataNode = Kernel.Instance.ParseNode(child, this);
-                                if(dataNode is ExcludeNode)
-                                {
-                                        ExcludeNode excludeNode = (ExcludeNode)dataNode;
-                                        if (m_Files.Contains(Helper.NormalizePath(excludeNode.Name)))
-                                        {
-                                                m_Files.Remove(Helper.NormalizePath(excludeNode.Name));
-                                        }
-                                }
-                        }
-                        if(m_Files.Count < 1)
-                        {
-                                throw new WarningException("Match returned no files: {0}{1}", Helper.EndPath(path), pattern);
-                        }
-                        m_Regex = null;
-                }
-                #endregion
-        }
-}
diff --git a/Prebuild/src/Core/Nodes/OptionsNode.cs b/Prebuild/src/Core/Nodes/OptionsNode.cs
deleted file mode 100644
index b5a2f60..0000000
--- a/Prebuild/src/Core/Nodes/OptionsNode.cs
+++ /dev/null
@@ -1,655 +0,0 @@
-#region BSD License
-/*
-Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (dan05a@gmail.com)
-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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
-*/
-#endregion
-#region CVS Information
-/*
- * $Source$
- * $Author: jendave $
- * $Date: 2007-01-08 17:55:40 +0100 (må, 08 jan 2007) $
- * $Revision: 197 $
- */
-#endregion
-using System;
-using System.Collections;
-using System.Collections.Specialized;
-using System.Reflection;
-using System.Xml;
-using Prebuild.Core.Attributes;
-using Prebuild.Core.Interfaces;
-using Prebuild.Core.Utilities;
-namespace Prebuild.Core.Nodes
-{
-        /// <summary>
-        /// 
-        /// </summary>
-        [DataNode("Options")]
-        public class OptionsNode : DataNode
-        {
-                #region Fields
-                private static Hashtable m_OptionFields;
-                [OptionNode("CompilerDefines")]
-                private string m_CompilerDefines = "";
-                /// <summary>
-                /// 
-                /// </summary>
-                public string CompilerDefines
-                {
-                        get
-                        {
-                                return m_CompilerDefines;
-                        }
-                        set
-                        {
-                                m_CompilerDefines = value;
-                        }
-                }
-        
-                [OptionNode("OptimizeCode")]
-                private bool m_OptimizeCode;
-                /// <summary>
-                /// 
-                /// </summary>
-                public bool OptimizeCode
-                {
-                        get
-                        {
-                                return m_OptimizeCode;
-                        }
-                        set
-                        {
-                                m_OptimizeCode = value;
-                        }
-                }
-        
-                [OptionNode("CheckUnderflowOverflow")]
-                private bool m_CheckUnderflowOverflow;
-                /// <summary>
-                /// 
-                /// </summary>
-                public bool CheckUnderflowOverflow
-                {
-                        get
-                        {
-                                return m_CheckUnderflowOverflow;
-                        }
-                        set
-                        {
-                                m_CheckUnderflowOverflow = value;
-                        }
-                }
-        
-                [OptionNode("AllowUnsafe")]
-                private bool m_AllowUnsafe;
-                /// <summary>
-                /// 
-                /// </summary>
-                public bool AllowUnsafe
-                {
-                        get
-                        {
-                                return m_AllowUnsafe;
-                        }
-                        set
-                        {
-                                m_AllowUnsafe = value;
-                        }
-                }
-                
-                [OptionNode("PreBuildEvent")]
-                private string m_PreBuildEvent;
-                
-                /// <summary>
-                /// 
-                /// </summary>
-                public string PreBuildEvent 
-                {
-                        get 
-                        {
-                                return m_PreBuildEvent;
-                        }
-                        set 
-                        {
-                                m_PreBuildEvent = value;
-                        }
-                }
-                
-                [OptionNode("PostBuildEvent")]
-                private string m_PostBuildEvent;
-                
-                /// <summary>
-                /// 
-                /// </summary>
-                public string PostBuildEvent 
-                {
-                        get 
-                        {
-                                return m_PostBuildEvent;
-                        }
-                        set 
-                        {
-                                m_PostBuildEvent = value;
-                        }
-                }
-                        
-                [OptionNode("PreBuildEventArgs")]
-                private string m_PreBuildEventArgs;
-                
-                /// <summary>
-                /// 
-                /// </summary>
-                public string PreBuildEventArgs
-                {
-                        get 
-                        {
-                                return m_PreBuildEventArgs;
-                        }
-                        set 
-                        {
-                                m_PreBuildEventArgs = value;
-                        }
-                }
-                
-                [OptionNode("PostBuildEventArgs")]
-                private string m_PostBuildEventArgs;
-                
-                /// <summary>
-                /// 
-                /// </summary>
-                public string PostBuildEventArgs
-                {
-                        get 
-                        {
-                                return m_PostBuildEventArgs;
-                        }
-                        set 
-                        {
-                                m_PostBuildEventArgs = value;
-                        }
-                }
-                
-                [OptionNode("RunPostBuildEvent")]
-                private string m_RunPostBuildEvent;
-                
-                /// <summary>
-                /// 
-                /// </summary>
-                public string RunPostBuildEvent 
-                {
-                        get 
-                        {
-                                return m_RunPostBuildEvent;
-                        }
-                        set 
-                        {
-                                m_RunPostBuildEvent = value;
-                        }
-                }
-                
-                [OptionNode("RunScript")]
-                private string m_RunScript;
-                
-                /// <summary>
-                /// 
-                /// </summary>
-                public string RunScript 
-                {
-                        get 
-                        {
-                                return m_RunScript;
-                        }
-                        set 
-                        {
-                                m_RunScript = value;
-                        }
-                }
-        
-                [OptionNode("WarningLevel")]
-                private int m_WarningLevel = 4;
-                /// <summary>
-                /// 
-                /// </summary>
-                public int WarningLevel
-                {
-                        get
-                        {
-                                return m_WarningLevel;
-                        }
-                        set
-                        {
-                                m_WarningLevel = value;
-                        }
-                }
-        
-                [OptionNode("WarningsAsErrors")]
-                private bool m_WarningsAsErrors;
-                /// <summary>
-                /// 
-                /// </summary>
-                public bool WarningsAsErrors
-                {
-                        get
-                        {
-                                return m_WarningsAsErrors;
-                        }
-                        set
-                        {
-                                m_WarningsAsErrors = value;
-                        }
-                }
-                [OptionNode("SuppressWarnings")]
-                private string m_SuppressWarnings = "";
-                /// <summary>
-                /// 
-                /// </summary>
-                public string SuppressWarnings
-                {
-                        get
-                        {
-                                return m_SuppressWarnings;
-                        }
-                        set
-                        {
-                                m_SuppressWarnings = value;
-                        }
-                }
-        
-                [OptionNode("OutputPath")]
-                private string m_OutputPath = "bin/";
-                /// <summary>
-                /// 
-                /// </summary>
-                public string OutputPath
-                {
-                        get
-                        {
-                                return m_OutputPath;
-                        }
-                        set
-                        {
-                                m_OutputPath = value;
-                        }
-                }
-        [OptionNode("GenerateDocumentation")]
-        private bool m_GenerateDocumentation;
-        /// <summary>
-        /// 
-        /// </summary>
-        public bool GenerateDocumentation
-        {
-            get
-            {
-                return m_GenerateDocumentation;
-            }
-            set
-            {
-                m_GenerateDocumentation = value;
-            }
-        }
-                [OptionNode("GenerateXmlDocFile")]
-                private bool m_GenerateXmlDocFile;
-                /// <summary>
-                /// 
-                /// </summary>
-                public bool GenerateXmlDocFile
-                {
-                        get
-                        {
-                                return m_GenerateXmlDocFile;
-                        }
-                        set
-                        {
-                                m_GenerateXmlDocFile = value;
-                        }
-                }
-        
-                [OptionNode("XmlDocFile")]
-                private string m_XmlDocFile = "";
-                /// <summary>
-                /// 
-                /// </summary>
-                public string XmlDocFile
-                {
-                        get
-                        {
-                                return m_XmlDocFile;
-                        }
-                        set
-                        {
-                                m_XmlDocFile = value;
-                        }
-                }
-                [OptionNode("KeyFile")]
-                private string m_KeyFile = "";
-                /// <summary>
-                /// 
-                /// </summary>
-                public string KeyFile
-                {
-                        get
-                        {
-                                return m_KeyFile;
-                        }
-                        set
-                        {
-                                m_KeyFile = value;
-                        }
-                }
-        
-                [OptionNode("DebugInformation")]
-                private bool m_DebugInformation;
-                /// <summary>
-                /// 
-                /// </summary>
-                public bool DebugInformation
-                {
-                        get
-                        {
-                                return m_DebugInformation;
-                        }
-                        set
-                        {
-                                m_DebugInformation = value;
-                        }
-                }
-        
-                [OptionNode("RegisterComInterop")]
-                private bool m_RegisterComInterop;
-                /// <summary>
-                /// 
-                /// </summary>
-                public bool RegisterComInterop
-                {
-                        get
-                        {
-                                return m_RegisterComInterop;
-                        }
-                        set
-                        {
-                                m_RegisterComInterop = value;
-                        }
-                }
-                [OptionNode("RemoveIntegerChecks")]
-                private bool m_RemoveIntegerChecks;
-                /// <summary>
-                /// 
-                /// </summary>
-                public bool RemoveIntegerChecks
-                {
-                        get
-                        {
-                                return m_RemoveIntegerChecks;
-                        }
-                        set
-                        {
-                                m_RemoveIntegerChecks = value;
-                        }
-                }
-        
-                [OptionNode("IncrementalBuild")]
-                private bool m_IncrementalBuild;
-                /// <summary>
-                /// 
-                /// </summary>
-                public bool IncrementalBuild
-                {
-                        get
-                        {
-                                return m_IncrementalBuild;
-                        }
-                        set
-                        {
-                                m_IncrementalBuild = value;
-                        }
-                }
-        
-                [OptionNode("BaseAddress")]
-                private string m_BaseAddress = "285212672";
-                /// <summary>
-                /// 
-                /// </summary>
-                public string BaseAddress
-                {
-                        get
-                        {
-                                return m_BaseAddress;
-                        }
-                        set
-                        {
-                                m_BaseAddress = value;
-                        }
-                }
-        
-                [OptionNode("FileAlignment")]
-                private int m_FileAlignment = 4096;
-                /// <summary>
-                /// 
-                /// </summary>
-                public int FileAlignment
-                {
-                        get
-                        {
-                                return m_FileAlignment;
-                        }
-                        set
-                        {
-                                m_FileAlignment = value;
-                        }
-                }
-        
-                [OptionNode("NoStdLib")]
-                private bool m_NoStdLib;
-                /// <summary>
-                /// 
-                /// </summary>
-                public bool NoStdLib
-                {
-                        get
-                        {
-                                return m_NoStdLib;
-                        }
-                        set
-                        {
-                                m_NoStdLib = value;
-                        }
-                }
-                private StringCollection m_FieldsDefined;
-                #endregion
-                #region Constructors
-                /// <summary>
-                /// Initializes the <see cref="OptionsNode"/> class.
-                /// </summary>
-                static OptionsNode()
-                {
-                        Type t = typeof(OptionsNode);
-            
-                        m_OptionFields = new Hashtable();
-                        foreach(FieldInfo f in t.GetFields(BindingFlags.NonPublic | BindingFlags.Instance))
-                        {
-                                object[] attrs = f.GetCustomAttributes(typeof(OptionNodeAttribute), false);
-                                if(attrs == null || attrs.Length < 1)
-                                {
-                                        continue;
-                                }
-                                OptionNodeAttribute ona = (OptionNodeAttribute)attrs[0];
-                                m_OptionFields[ona.NodeName] = f;
-                        }
-                }
-                /// <summary>
-                /// Initializes a new instance of the <see cref="OptionsNode"/> class.
-                /// </summary>
-                public OptionsNode()
-                {
-                        m_FieldsDefined = new StringCollection();
-                }
-                #endregion
-                #region Properties
-                /// <summary>
-                /// Gets the <see cref="Object"/> at the specified index.
-                /// </summary>
-                /// <value></value>
-                public object this[string index]
-                {
-                        get
-                        {
-                                if(!m_OptionFields.ContainsKey(index))
-                                {
-                                        return null;
-                                }
-                                FieldInfo f = (FieldInfo)m_OptionFields[index];
-                                return f.GetValue(this);
-                        }
-                }
-                
-                /// <summary>
-                /// Gets the <see cref="Object"/> at the specified index.
-                /// </summary>
-                /// <value></value>
-                public object this[string index, object defaultValue]
-                {
-                        get
-                        {
-                                object valueObject = this[index];
-                                if(valueObject !=  null && valueObject is string && ((string)valueObject).Length == 0) 
-                                {
-                                        return defaultValue;
-                                }
-                                return valueObject;
-                        }
-                }
-                #endregion
-                #region Private Methods
-                private void FlagDefined(string name)
-                {
-                        if(!m_FieldsDefined.Contains(name))
-                        {
-                                m_FieldsDefined.Add(name);
-                        }
-                }
-                private void SetOption(string nodeName, string val)
-                {
-                        lock(m_OptionFields)
-                        {
-                                if(!m_OptionFields.ContainsKey(nodeName))
-                                {
-                                        return;
-                                }
-                                FieldInfo f = (FieldInfo)m_OptionFields[nodeName];
-                                f.SetValue(this, Helper.TranslateValue(f.FieldType, val));
-                                FlagDefined(f.Name);
-                        }
-                }
-                #endregion
-                #region Public Methods
-                /// <summary>
-                /// Parses the specified node.
-                /// </summary>
-                /// <param name="node">The node.</param>
-                public override void Parse(XmlNode node)
-                {
-                        if( node == null )
-                        {
-                                throw new ArgumentNullException("node");
-                        }
-                        foreach(XmlNode child in node.ChildNodes)
-                        {
-                                SetOption(child.Name, Helper.InterpolateForEnvironmentVariables(child.InnerText));
-                        }
-                }
-                /// <summary>
-                /// Copies to.
-                /// </summary>
-                /// <param name="opt">The opt.</param>
-                public void CopyTo(OptionsNode opt)
-                {
-                        if(opt == null)
-                        {
-                                return;
-                        }
-                        foreach(FieldInfo f in m_OptionFields.Values)
-                        {
-                                if(m_FieldsDefined.Contains(f.Name))
-                                {
-                                        f.SetValue(opt, f.GetValue(this));
-                                        opt.m_FieldsDefined.Add(f.Name);
-                                }
-                        }
-                }
-                #endregion        
-        }
-}
diff --git a/Prebuild/src/Core/Nodes/ProcessNode.cs b/Prebuild/src/Core/Nodes/ProcessNode.cs
deleted file mode 100644
index f546a4b..0000000
--- a/Prebuild/src/Core/Nodes/ProcessNode.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-#region BSD License
-/*
-Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (dan05a@gmail.com)
-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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
-*/
-#endregion
-#region CVS Information
-/*
- * $Source$
- * $Author: jendave $
- * $Date: 2006-01-28 01:49:58 +0100 (lö, 28 jan 2006) $
- * $Revision: 71 $
- */
-#endregion
-using System;
-using System.Collections;
-using System.Collections.Specialized;
-using System.Xml;
-using Prebuild.Core.Attributes;
-using Prebuild.Core.Interfaces;
-using Prebuild.Core.Utilities;
-namespace Prebuild.Core.Nodes
-{
-        /// <summary>
-        /// 
-        /// </summary>
-        [DataNode("Process")]
-        public class ProcessNode : DataNode
-        {
-                #region Fields
-                private string m_Path;
-                private bool m_IsValid = true;
-                #endregion
-                #region Properties
-                /// <summary>
-                /// Gets the path.
-                /// </summary>
-                /// <value>The path.</value>
-                public string Path
-                {
-                        get
-                        {
-                                return m_Path;
-                        }
-                }
-                /// <summary>
-                /// Gets a value indicating whether this instance is valid.
-                /// </summary>
-                /// <value><c>true</c> if this instance is valid; otherwise, <c>false</c>.</value>
-                public bool IsValid
-                {
-                        get
-                        {
-                                return m_IsValid;
-                        }
-                }
-                #endregion
-                #region Public Methods
-                /// <summary>
-                /// Parses the specified node.
-                /// </summary>
-                /// <param name="node">The node.</param>
-                public override void Parse(XmlNode node)
-                {
-                        if( node == null )
-                        {
-                                throw new ArgumentNullException("node");
-                        }
-                        m_Path = Helper.InterpolateForEnvironmentVariables(node.InnerText);
-                        if(m_Path == null)
-                        {
-                                m_Path = "";
-                        }
-                        try
-                        {
-                                m_Path = Helper.ResolvePath(m_Path);
-                        }
-                        catch(ArgumentException)
-                        {
-                                Kernel.Instance.Log.Write(LogType.Warning, "Could not find prebuild file for processing: {0}", m_Path);
-                                m_IsValid = false;
-                        }
-                }
-                #endregion
-        }
-}
diff --git a/Prebuild/src/Core/Nodes/ProjectNode.cs b/Prebuild/src/Core/Nodes/ProjectNode.cs
deleted file mode 100644
index c56dacc..0000000
--- a/Prebuild/src/Core/Nodes/ProjectNode.cs
+++ /dev/null
@@ -1,510 +0,0 @@
-#region BSD License
-/*
-Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (dan05a@gmail.com)
-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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
-*/
-#endregion
-#region CVS Information
-/*
- * $Source$
- * $Author: jendave $
- * $Date: 2006-11-11 05:43:20 +0100 (lö, 11 nov 2006) $
- * $Revision: 192 $
- */
-#endregion
-using System;
-using System.Collections;
-using System.IO;
-using System.Xml;
-using Prebuild.Core.Attributes;
-using Prebuild.Core.Interfaces;
-using Prebuild.Core.Utilities;
-namespace Prebuild.Core.Nodes
-{
-        /// <summary>
-        /// 
-        /// </summary>
-        public enum ProjectType
-        {
-                /// <summary>
-                /// 
-                /// </summary>
-                Exe,
-                /// <summary>
-                /// 
-                /// </summary>
-                WinExe,
-                /// <summary>
-                /// 
-                /// </summary>
-                Library
-        }
-        /// <summary>
-        /// 
-        /// </summary>
-        public enum ClrRuntime
-        {
-                /// <summary>
-                /// 
-                /// </summary>
-                Microsoft,
-                /// <summary>
-                /// 
-                /// </summary>
-                Mono
-        }
-        /// <summary>
-        /// 
-        /// </summary>
-        [DataNode("Project")]
-        public class ProjectNode : DataNode, IComparable
-        {
-                #region Fields
-                private string m_Name = "unknown";
-                private string m_Path = "";
-                private string m_FullPath = "";
-                private string m_AssemblyName;
-                private string m_AppIcon = "";
-                private string m_DesignerFolder = "";
-                private string m_Language = "C#";
-                private ProjectType m_Type = ProjectType.Exe;
-                private ClrRuntime m_Runtime = ClrRuntime.Microsoft;
-                private string m_StartupObject = "";
-                private string m_RootNamespace;
-                private string m_FilterGroups = "";
-                private Guid m_Guid;
-                private Hashtable m_Configurations;
-                private ArrayList m_ReferencePaths;
-                private ArrayList m_References;
-                private FilesNode m_Files;
-                #endregion
-                #region Constructors
-                /// <summary>
-                /// Initializes a new instance of the <see cref="ProjectNode"/> class.
-                /// </summary>
-                public ProjectNode()
-                {
-                        m_Configurations = new Hashtable();
-                        m_ReferencePaths = new ArrayList();
-                        m_References = new ArrayList();
-                }
-                #endregion
-                #region Properties
-                /// <summary>
-                /// Gets the name.
-                /// </summary>
-                /// <value>The name.</value>
-                public string Name
-                {
-                        get
-                        {
-                                return m_Name;
-                        }
-                }
-                /// <summary>
-                /// Gets the path.
-                /// </summary>
-                /// <value>The path.</value>
-                public string Path
-                {
-                        get
-                        {
-                                return m_Path;
-                        }
-                }
-                /// <summary>
-                /// Gets the filter groups.
-                /// </summary>
-                /// <value>The filter groups.</value>
-                public string FilterGroups 
-                { 
-                        get 
-                        { 
-                                return m_FilterGroups; 
-                        } 
-                }
-                /// <summary>
-                /// Gets the full path.
-                /// </summary>
-                /// <value>The full path.</value>
-                public string FullPath
-                {
-                        get
-                        {
-                                return m_FullPath;
-                        }
-                }
-                /// <summary>
-                /// Gets the name of the assembly.
-                /// </summary>
-                /// <value>The name of the assembly.</value>
-                public string AssemblyName
-                {
-                        get
-                        {
-                                return m_AssemblyName;
-                        }
-                }
-                /// <summary>
-                /// Gets the app icon.
-                /// </summary>
-                /// <value>The app icon.</value>
-                public string AppIcon 
-                {
-                        get 
-                        {
-                                return m_AppIcon;
-                        }
-                }
-                /// <summary>
-                /// 
-                /// </summary>
-                public string DesignerFolder 
-                {
-                        get 
-                        {
-                                return m_DesignerFolder;
-                        }
-                }
-                /// <summary>
-                /// Gets the language.
-                /// </summary>
-                /// <value>The language.</value>
-                public string Language
-                {
-                        get
-                        {
-                                return m_Language;
-                        }
-                }
-                /// <summary>
-                /// Gets the type.
-                /// </summary>
-                /// <value>The type.</value>
-                public ProjectType Type
-                {
-                        get
-                        {
-                                return m_Type;
-                        }
-                }
-                /// <summary>
-                /// Gets the runtime.
-                /// </summary>
-                /// <value>The runtime.</value>
-                public ClrRuntime Runtime
-                {
-                        get
-                        {
-                                return m_Runtime;
-                        }
-                }
-        private bool m_GenerateAssemblyInfoFile = false;
-        /// <summary>
-        /// 
-        /// </summary>
-        public bool GenerateAssemblyInfoFile
-        {
-            get
-            {
-                return m_GenerateAssemblyInfoFile;
-            }
-            set
-            {
-                m_GenerateAssemblyInfoFile = value;
-            }
-        }
-                /// <summary>
-                /// Gets the startup object.
-                /// </summary>
-                /// <value>The startup object.</value>
-                public string StartupObject
-                {
-                        get
-                        {
-                                return m_StartupObject;
-                        }
-                }
-                /// <summary>
-                /// Gets the root namespace.
-                /// </summary>
-                /// <value>The root namespace.</value>
-                public string RootNamespace
-                {
-                        get
-                        {
-                                return m_RootNamespace;
-                        }
-                }
-                /// <summary>
-                /// Gets the configurations.
-                /// </summary>
-                /// <value>The configurations.</value>
-                public ICollection Configurations
-                {
-                        get
-                        {
-                ArrayList tmp = new ArrayList( ConfigurationsTable.Values);
-                            tmp.Sort();
-                                return tmp;
-                        }
-                }
-                /// <summary>
-                /// Gets the configurations table.
-                /// </summary>
-                /// <value>The configurations table.</value>
-                public Hashtable ConfigurationsTable
-                {
-                        get
-                        {
-                                return m_Configurations;
-                        }
-                }
-                /// <summary>
-                /// Gets the reference paths.
-                /// </summary>
-                /// <value>The reference paths.</value>
-                public ArrayList ReferencePaths
-                {
-                        get
-                        {
-                ArrayList tmp = new ArrayList(m_ReferencePaths);
-                tmp.Sort();
-                return tmp;
-            }
-                }
-                /// <summary>
-                /// Gets the references.
-                /// </summary>
-                /// <value>The references.</value>
-                public ArrayList References
-                {
-                        get
-                        {
-                ArrayList tmp = new ArrayList(m_References);
-                tmp.Sort();
-                return tmp;
-                        }
-                }
-                /// <summary>
-                /// Gets the files.
-                /// </summary>
-                /// <value>The files.</value>
-                public FilesNode Files
-                {
-                        get
-                        {
-                                return m_Files;
-                        }
-                }
-                /// <summary>
-                /// Gets or sets the parent.
-                /// </summary>
-                /// <value>The parent.</value>
-                public override IDataNode Parent
-                {
-                        get
-                        {
-                                return base.Parent;
-                        }
-                        set
-                        {
-                                base.Parent = value;
-                                if(base.Parent is SolutionNode && m_Configurations.Count < 1)
-                                {
-                                        SolutionNode parent = (SolutionNode)base.Parent;
-                                        foreach(ConfigurationNode conf in parent.Configurations)
-                                        {
-                                                m_Configurations[conf.Name] = conf.Clone();
-                                        }
-                                }
-                        }
-                }
-                /// <summary>
-                /// Gets the GUID.
-                /// </summary>
-                /// <value>The GUID.</value>
-                public Guid Guid
-                {
-                        get
-                        {
-                                return m_Guid;
-                        }
-                }
-                #endregion
-                #region Private Methods
-                private void HandleConfiguration(ConfigurationNode conf)
-                {
-                        if(String.Compare(conf.Name, "all", true) == 0) //apply changes to all, this may not always be applied first,
-                                //so it *may* override changes to the same properties for configurations defines at the project level
-                        {
-                                foreach(ConfigurationNode confNode in this.m_Configurations.Values) 
-                                {
-                                        conf.CopyTo(confNode);//update the config templates defines at the project level with the overrides
-                                }
-                        }
-                        if(m_Configurations.ContainsKey(conf.Name))
-                        {
-                                ConfigurationNode parentConf = (ConfigurationNode)m_Configurations[conf.Name];
-                                conf.CopyTo(parentConf);//update the config templates defines at the project level with the overrides
-                        } 
-                        else
-                        {
-                                m_Configurations[conf.Name] = conf;
-                        }
-                }
-                #endregion
-                #region Public Methods
-                /// <summary>
-                /// Parses the specified node.
-                /// </summary>
-                /// <param name="node">The node.</param>
-                public override void Parse(XmlNode node)
-                {
-                        m_Name = Helper.AttributeValue(node, "name", m_Name);
-                        m_Path = Helper.AttributeValue(node, "path", m_Path);
-                        m_FilterGroups = Helper.AttributeValue(node, "filterGroups", m_FilterGroups);
-                        m_AppIcon = Helper.AttributeValue(node, "icon", m_AppIcon);
-                        m_DesignerFolder = Helper.AttributeValue(node, "designerFolder", m_DesignerFolder);
-                        m_AssemblyName = Helper.AttributeValue(node, "assemblyName", m_AssemblyName);
-                        m_Language = Helper.AttributeValue(node, "language", m_Language);
-                        m_Type = (ProjectType)Helper.EnumAttributeValue(node, "type", typeof(ProjectType), m_Type);
-                        m_Runtime = (ClrRuntime)Helper.EnumAttributeValue(node, "runtime", typeof(ClrRuntime), m_Runtime);
-                        m_StartupObject = Helper.AttributeValue(node, "startupObject", m_StartupObject);
-                        m_RootNamespace = Helper.AttributeValue(node, "rootNamespace", m_RootNamespace);
-                    
-            int hash = m_Name.GetHashCode();
-                    m_Guid = new Guid( hash, 0, 0, 0, 0, 0, 0,0,0,0,0 );
-                    
-            m_GenerateAssemblyInfoFile = Helper.ParseBoolean(node, "generateAssemblyInfoFile", false);
-            
-                        if(m_AssemblyName == null || m_AssemblyName.Length < 1)
-                        {
-                                m_AssemblyName = m_Name;
-                        }
-                        if(m_RootNamespace == null || m_RootNamespace.Length < 1)
-                        {
-                                m_RootNamespace = m_Name;
-                        }
-                        m_FullPath = m_Path;
-                        try
-                        {
-                                m_FullPath = Helper.ResolvePath(m_FullPath);
-                        }
-                        catch
-                        {
-                                throw new WarningException("Could not resolve Solution path: {0}", m_Path);
-                        }
-                        Kernel.Instance.CurrentWorkingDirectory.Push();
-                        try
-                        {
-                                Helper.SetCurrentDir(m_FullPath);
-                                if( node == null )
-                                {
-                                        throw new ArgumentNullException("node");
-                                }
-                                foreach(XmlNode child in node.ChildNodes)
-                                {
-                                        IDataNode dataNode = Kernel.Instance.ParseNode(child, this);
-                                        if(dataNode is ConfigurationNode)
-                                        {
-                                                HandleConfiguration((ConfigurationNode)dataNode);
-                                        }
-                                        else if(dataNode is ReferencePathNode)
-                                        {
-                                                m_ReferencePaths.Add(dataNode);
-                                        }
-                                        else if(dataNode is ReferenceNode)
-                                        {
-                                                m_References.Add(dataNode);
-                                        }
-                                        else if(dataNode is FilesNode)
-                                        {
-                                                m_Files = (FilesNode)dataNode;
-                                        }
-                                }
-                        }
-                        finally
-                        {
-                                Kernel.Instance.CurrentWorkingDirectory.Pop();
-                        }
-                }
-                #endregion
-        #region IComparable Members
-        public int CompareTo(object obj)
-        {
-            ProjectNode that = (ProjectNode)obj;
-            return this.m_Name.CompareTo(that.m_Name);
-        }
-        #endregion
-    }
-}
diff --git a/Prebuild/src/Core/Nodes/ReferenceNode.cs b/Prebuild/src/Core/Nodes/ReferenceNode.cs
deleted file mode 100644
index a2880c0..0000000
--- a/Prebuild/src/Core/Nodes/ReferenceNode.cs
+++ /dev/null
@@ -1,153 +0,0 @@
-#region BSD License
-/*
-Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (dan05a@gmail.com)
-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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
-*/
-#endregion
-#region CVS Information
-/*
- * $Source$
- * $Author: jendave $
- * $Date: 2006-07-25 18:56:49 +0200 (ti, 25 jul 2006) $
- * $Revision: 132 $
- */
-#endregion
-using System;
-using System.Xml;
-using Prebuild.Core.Attributes;
-using Prebuild.Core.Interfaces;
-using Prebuild.Core.Utilities;
-namespace Prebuild.Core.Nodes
-{
-        /// <summary>
-        /// 
-        /// </summary>
-        [DataNode("Reference")]
-        public class ReferenceNode : DataNode, IComparable
-        {
-                #region Fields
-                private string m_Name = "unknown";
-                private string m_Path;
-                private string m_LocalCopy;
-                private string m_Version;
-                #endregion
-                #region Properties
-                /// <summary>
-                /// Gets the name.
-                /// </summary>
-                /// <value>The name.</value>
-                public string Name
-                {
-                        get
-                        {
-                                return m_Name;
-                        }
-                }
-                /// <summary>
-                /// Gets the path.
-                /// </summary>
-                /// <value>The path.</value>
-                public string Path
-                {
-                        get
-                        {
-                                return m_Path;
-                        }
-                }
-                /// <summary>
-                /// Gets a value indicating whether [local copy specified].
-                /// </summary>
-                /// <value><c>true</c> if [local copy specified]; otherwise, <c>false</c>.</value>
-                public bool LocalCopySpecified 
-                {
-                        get 
-                        {
-                                return ( m_LocalCopy != null && m_LocalCopy.Length == 0);
-                        }
-                }
-                /// <summary>
-                /// Gets a value indicating whether [local copy].
-                /// </summary>
-                /// <value><c>true</c> if [local copy]; otherwise, <c>false</c>.</value>
-                public bool LocalCopy
-                {
-                        get
-                        {
-                                if( m_LocalCopy == null)
-                                {
-                                        return false;
-                                }
-                                return bool.Parse(m_LocalCopy);
-                        }
-                }
-                /// <summary>
-                /// Gets the version.
-                /// </summary>
-                /// <value>The version.</value>
-                public string Version
-                {
-                        get
-                        {
-                                return m_Version;
-                        }
-                }
-                #endregion
-                #region Public Methods
-                /// <summary>
-                /// Parses the specified node.
-                /// </summary>
-                /// <param name="node">The node.</param>
-                public override void Parse(XmlNode node)
-                {
-                        m_Name = Helper.AttributeValue(node, "name", m_Name);
-                        m_Path = Helper.AttributeValue(node, "path", m_Path);
-                        m_LocalCopy = Helper.AttributeValue(node, "localCopy", m_LocalCopy);
-                        m_Version = Helper.AttributeValue(node, "version", m_Version);
-                }
-                #endregion
-        #region IComparable Members
-        public int CompareTo(object obj)
-        {
-            ReferenceNode that = (ReferenceNode)obj;
-            return this.m_Name.CompareTo(that.m_Name);
-        }
-        #endregion
-    }
-}
diff --git a/Prebuild/src/Core/Nodes/ReferencePathNode.cs b/Prebuild/src/Core/Nodes/ReferencePathNode.cs
deleted file mode 100644
index 0563c1b..0000000
--- a/Prebuild/src/Core/Nodes/ReferencePathNode.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-#region BSD License
-/*
-Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (dan05a@gmail.com)
-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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
-*/
-#endregion
-#region CVS Information
-/*
- * $Source$
- * $Author: jendave $
- * $Date: 2006-01-28 01:49:58 +0100 (lö, 28 jan 2006) $
- * $Revision: 71 $
- */
-#endregion
-using System;
-using System.Collections;
-using System.Collections.Specialized;
-using System.Xml;
-using Prebuild.Core.Attributes;
-using Prebuild.Core.Interfaces;
-using Prebuild.Core.Utilities;
-namespace Prebuild.Core.Nodes
-{
-        /// <summary>
-        /// 
-        /// </summary>
-        [DataNode("ReferencePath")]
-        public class ReferencePathNode : DataNode, IComparable
-        {
-                #region Fields
-                private string m_Path;
-                #endregion
-                #region Properties
-                /// <summary>
-                /// Gets the path.
-                /// </summary>
-                /// <value>The path.</value>
-                public string Path
-                {
-                        get
-                        {
-                                return m_Path;
-                        }
-                }
-                #endregion
-                #region Public Methods
-                /// <summary>
-                /// Parses the specified node.
-                /// </summary>
-                /// <param name="node">The node.</param>
-                public override void Parse(XmlNode node)
-                {
-                        if( node == null )
-                        {
-                                throw new ArgumentNullException("node");
-                        }
-                        m_Path = Helper.InterpolateForEnvironmentVariables(node.InnerText);
-                        if(m_Path == null)
-                        {
-                                m_Path = "";
-                        }
-                        m_Path = m_Path.Trim();
-                }
-                #endregion
-        #region IComparable Members
-        public int CompareTo(object obj)
-        {
-            ReferencePathNode that = (ReferencePathNode)obj;
-            return this.m_Path.CompareTo(that.m_Path);
-        }
-        #endregion
-    }
-}
diff --git a/Prebuild/src/Core/Nodes/SolutionNode.cs b/Prebuild/src/Core/Nodes/SolutionNode.cs
deleted file mode 100644
index c777fa4..0000000
--- a/Prebuild/src/Core/Nodes/SolutionNode.cs
+++ /dev/null
@@ -1,288 +0,0 @@
-#region BSD License
-/*
-Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (dan05a@gmail.com)
-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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
-*/
-#endregion
-#region CVS Information
-/*
- * $Source$
- * $Author: jendave $
- * $Date: 2006-02-28 17:15:42 +0100 (ti, 28 feb 2006) $
- * $Revision: 92 $
- */
-#endregion
-using System;
-using System.Collections;
-using System.Diagnostics;
-using System.IO;
-using System.Xml;
-using Prebuild.Core.Attributes;
-using Prebuild.Core.Interfaces;
-using Prebuild.Core.Utilities;
-namespace Prebuild.Core.Nodes
-{
-        /// <summary>
-        /// 
-        /// </summary>
-        [DataNode("Solution")]
-        public class SolutionNode : DataNode
-        {
-                #region Fields
-        
-                private string m_Name = "unknown";
-                private string m_Path = "";
-                private string m_FullPath = "";
-                private string m_ActiveConfig = "Debug";
-        
-                private OptionsNode m_Options;
-                private FilesNode m_Files;
-                private Hashtable m_Configurations;
-                private Hashtable m_Projects;
-                private ArrayList m_ProjectsOrder;
-                #endregion
-                #region Constructors
-                /// <summary>
-                /// Initializes a new instance of the <see cref="SolutionNode"/> class.
-                /// </summary>
-                public SolutionNode()
-                {
-                        m_Configurations = new Hashtable();
-                        m_Projects = new Hashtable();
-                        m_ProjectsOrder = new ArrayList();
-                }
-                #endregion
-                #region Properties
-                /// <summary>
-                /// Gets or sets the active config.
-                /// </summary>
-                /// <value>The active config.</value>
-                public string ActiveConfig 
-                { 
-                        get 
-                        { 
-                                return m_ActiveConfig; 
-                        } 
-                        set 
-                        { 
-                                m_ActiveConfig = value; 
-                        } 
-                }
-                /// <summary>
-                /// Gets the name.
-                /// </summary>
-                /// <value>The name.</value>
-                public string Name 
-                {
-                        get 
-                        {
-                                return m_Name;
-                        }
-                }
-                /// <summary>
-                /// Gets the path.
-                /// </summary>
-                /// <value>The path.</value>
-                public string Path 
-                {
-                        get 
-                        {
-                                return m_Path;
-                        }
-                }
-                /// <summary>
-                /// Gets the full path.
-                /// </summary>
-                /// <value>The full path.</value>
-                public string FullPath
-                {
-                        get
-                        {
-                                return m_FullPath;
-                        }
-                }
-                /// <summary>
-                /// Gets the options.
-                /// </summary>
-                /// <value>The options.</value>
-                public OptionsNode Options
-                {
-                        get
-                        {
-                                return m_Options;
-                        }
-                }
-                /// <summary>
-                /// Gets the files.
-                /// </summary>
-                /// <value>The files.</value>
-                public FilesNode Files
-                {
-                        get
-                        {
-                                return m_Files;
-                        }
-                }
-                /// <summary>
-                /// Gets the configurations.
-                /// </summary>
-                /// <value>The configurations.</value>
-                public ICollection Configurations
-                {
-                        get
-                        {
-                ArrayList tmp = new ArrayList(ConfigurationsTable.Values);
-                tmp.Sort();
-                return tmp;
-            }
-                }
-                /// <summary>
-                /// Gets the configurations table.
-                /// </summary>
-                /// <value>The configurations table.</value>
-                public Hashtable ConfigurationsTable
-                {
-                        get
-                        {
-                                return m_Configurations;
-                        }
-                }
-        
-                /// <summary>
-                /// Gets the projects.
-                /// </summary>
-                /// <value>The projects.</value>
-                public ICollection Projects
-                {
-                        get
-                        {
-                ArrayList tmp = new ArrayList(m_Projects.Values);
-                tmp.Sort();
-                return tmp;
-                        }
-                }
-                /// <summary>
-                /// Gets the projects table.
-                /// </summary>
-                /// <value>The projects table.</value>
-                public Hashtable ProjectsTable
-                {
-                        get
-                        {
-                                return m_Projects;
-                        }
-                }
-                /// <summary>
-                /// Gets the projects table.
-                /// </summary>
-                /// <value>The projects table.</value>
-                public ArrayList ProjectsTableOrder
-                {
-                        get
-                        {
-                                return m_ProjectsOrder;
-                        }
-                }
-                #endregion
-                #region Public Methods
-                /// <summary>
-                /// Parses the specified node.
-                /// </summary>
-                /// <param name="node">The node.</param>
-                public override void Parse(XmlNode node)
-                {
-                        m_Name = Helper.AttributeValue(node, "name", m_Name);
-                        m_ActiveConfig = Helper.AttributeValue(node, "activeConfig", m_ActiveConfig);
-                        m_Path = Helper.AttributeValue(node, "path", m_Path);
-                        m_FullPath = m_Path;
-                        try
-                        {
-                                m_FullPath = Helper.ResolvePath(m_FullPath);
-                        }
-                        catch
-                        {
-                                throw new WarningException("Could not resolve solution path: {0}", m_Path);
-                        }
-                        Kernel.Instance.CurrentWorkingDirectory.Push();
-                        try
-                        {
-                                Helper.SetCurrentDir(m_FullPath);
-                                if( node == null )
-                                {
-                                        throw new ArgumentNullException("node");
-                                }
-                                foreach(XmlNode child in node.ChildNodes)
-                                {
-                                        IDataNode dataNode = Kernel.Instance.ParseNode(child, this);
-                                        if(dataNode is OptionsNode)
-                                        {
-                                                m_Options = (OptionsNode)dataNode;
-                                        }
-                                        else if(dataNode is FilesNode)
-                                        {
-                                                m_Files = (FilesNode)dataNode;
-                                        }
-                                        else if(dataNode is ConfigurationNode)
-                                        {
-                                                m_Configurations[((ConfigurationNode)dataNode).Name] = dataNode;
-                                        }
-                                        else if(dataNode is ProjectNode)
-                                        {
-                                                m_Projects[((ProjectNode)dataNode).Name] = dataNode;
-                                                m_ProjectsOrder.Add(dataNode);
-                                        }
-                                }
-                        }
-                        finally
-                        {
-                                Kernel.Instance.CurrentWorkingDirectory.Pop();
-                        }
-                }
-                #endregion
-        }
-}
diff --git a/Prebuild/src/Core/Parse/IfContext.cs b/Prebuild/src/Core/Parse/IfContext.cs
deleted file mode 100644
index 383049d..0000000
--- a/Prebuild/src/Core/Parse/IfContext.cs
+++ /dev/null
@@ -1,163 +0,0 @@
-#region BSD License
-/*
-Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (dan05a@gmail.com)
-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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
-*/
-#endregion
-#region CVS Information
-/*
- * $Source$
- * $Author: jendave $
- * $Date: 2006-01-28 01:49:58 +0100 (lö, 28 jan 2006) $
- * $Revision: 71 $
- */
-#endregion
-using System;
-namespace Prebuild.Core.Parse
-{
-        /// <summary>
-        /// 
-        /// </summary>
-        public enum IfState
-        {
-                /// <summary>
-                /// 
-                /// </summary>
-                None,
-                /// <summary>
-                /// 
-                /// </summary>
-                If,
-                /// <summary>
-                /// 
-                /// </summary>
-                ElseIf,
-                /// <summary>
-                /// 
-                /// </summary>
-                Else
-        }
-        /// <summary>
-        /// Summary description for IfContext.
-        /// </summary>
-        // Inspired by the equivalent WiX class (see www.sourceforge.net/projects/wix/)
-        public class IfContext
-        {
-                #region Properties
-                bool m_Active;
-                bool m_Keep;
-                bool m_EverKept;
-                IfState m_State = IfState.None;
-                #endregion
-                #region Constructors
-                /// <summary>
-                /// Initializes a new instance of the <see cref="IfContext"/> class.
-                /// </summary>
-                /// <param name="active">if set to <c>true</c> [active].</param>
-                /// <param name="keep">if set to <c>true</c> [keep].</param>
-                /// <param name="state">The state.</param>
-                public IfContext(bool active, bool keep, IfState state)
-                {
-                        m_Active = active;
-                        m_Keep = keep;
-                        m_EverKept = keep;
-                        m_State = state;
-                }
-                #endregion
-                #region Properties
-                /// <summary>
-                /// Gets or sets a value indicating whether this <see cref="IfContext"/> is active.
-                /// </summary>
-                /// <value><c>true</c> if active; otherwise, <c>false</c>.</value>
-                public bool Active
-                {
-                        get
-                        {
-                                return m_Active;
-                        }
-                        set
-                        {
-                                m_Active = value;
-                        }
-                }
-                /// <summary>
-                /// Gets or sets a value indicating whether this <see cref="IfContext"/> is keep.
-                /// </summary>
-                /// <value><c>true</c> if keep; otherwise, <c>false</c>.</value>
-                public bool Keep
-                {
-                        get
-                        {
-                                return m_Keep;
-                        }
-                        set
-                        {
-                                m_Keep = value;
-                                if(m_Keep)
-                                {
-                                        m_EverKept = true;
-                                }
-                        }
-                }
-                /// <summary>
-                /// Gets a value indicating whether [ever kept].
-                /// </summary>
-                /// <value><c>true</c> if [ever kept]; otherwise, <c>false</c>.</value>
-                public bool EverKept
-                {
-                        get
-                        {
-                                return m_EverKept;
-                        }
-                }
-                /// <summary>
-                /// Gets or sets the state.
-                /// </summary>
-                /// <value>The state.</value>
-                public IfState State
-                {
-                        get
-                        {
-                                return m_State;
-                        }
-                        set
-                        {
-                                m_State = value;
-                        }
-                }
-                #endregion
-        }
-}
diff --git a/Prebuild/src/Core/Parse/Preprocessor.cs b/Prebuild/src/Core/Parse/Preprocessor.cs
deleted file mode 100644
index 85e92c3..0000000
--- a/Prebuild/src/Core/Parse/Preprocessor.cs
+++ /dev/null
@@ -1,519 +0,0 @@
-#region BSD License
-/*
-Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (dan05a@gmail.com)
-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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
-*/
-#endregion
-#region CVS Information
-/*
- * $Source$
- * $Author: jendave $
- * $Date: 2006-09-01 19:55:06 +0200 (fr, 01 sep 2006) $
- * $Revision: 147 $
- */
-#endregion
-using System;
-using System.Collections;
-using System.IO;
-using System.Xml;
-namespace Prebuild.Core.Parse
-{
-        /// <summary>
-        /// 
-        /// </summary>
-        public enum OperatorSymbol
-        {
-                /// <summary>
-                /// 
-                /// </summary>
-                None,
-                /// <summary>
-                /// 
-                /// </summary>
-                Equal,
-                /// <summary>
-                /// 
-                /// </summary>
-                NotEqual,
-                /// <summary>
-                /// 
-                /// </summary>
-                LessThan,
-                /// <summary>
-                /// 
-                /// </summary>
-                GreaterThan,
-                /// <summary>
-                /// 
-                /// </summary>
-                LessThanEqual,
-                /// <summary>
-                /// 
-                /// </summary>
-                GreaterThanEqual
-        }
-        /// <summary>
-        /// 
-        /// </summary>
-        public class Preprocessor
-        {
-                #region Fields
-                XmlDocument m_OutDoc;
-                Stack m_IfStack;
-                Hashtable m_Variables;
-                #endregion
-                #region Constructors
-                /// <summary>
-                /// Initializes a new instance of the <see cref="Preprocessor"/> class.
-                /// </summary>
-                public Preprocessor()
-                {
-                        m_OutDoc = new XmlDocument();
-                        m_IfStack = new Stack();
-                        m_Variables = new Hashtable();
-                        RegisterVariable("OS", GetOS());
-                        RegisterVariable("RuntimeVersion", Environment.Version.Major);
-                        RegisterVariable("RuntimeMajor", Environment.Version.Major);
-                        RegisterVariable("RuntimeMinor", Environment.Version.Minor);
-                        RegisterVariable("RuntimeRevision", Environment.Version.Revision);
-                }
-                #endregion
-                #region Properties
-                /// <summary>
-                /// Gets the processed doc.
-                /// </summary>
-                /// <value>The processed doc.</value>
-                public XmlDocument ProcessedDoc
-                {
-                        get
-                        {
-                                return m_OutDoc;
-                        }
-                }
-                #endregion
-                #region Private Methods
-                 
-                /// <summary>
-                /// Parts of this code were taken from NAnt and is subject to the GPL
-                /// as per NAnt's license. Thanks to the NAnt guys for this little gem.
-                /// </summary>
-                /// <returns></returns>
-                public static string GetOS()
-                {
-                        PlatformID platId = Environment.OSVersion.Platform;
-                        if(platId == PlatformID.Win32NT || platId == PlatformID.Win32Windows)
-                        {
-                                return "Win32";
-                        }
-                        /*
-                         * .NET 1.x, under Mono, the UNIX code is 128. Under
-                         * .NET 2.x, Mono or MS, the UNIX code is 4
-                         */
-                        if(Environment.Version.Major == 1)
-                        {
-                                if((int)platId == 128)
-                                {
-                                        return "UNIX";
-                                }
-                        }
-                        else if((int)platId == 4)
-                        {
-                                return "UNIX";
-                        }
-                        return "Unknown";
-                }
-                private static bool CompareNum(OperatorSymbol oper, int val1, int val2)
-                {
-                        switch(oper)
-                        {
-                                case OperatorSymbol.Equal:
-                                        return (val1 == val2);
-                                case OperatorSymbol.NotEqual:
-                                        return (val1 != val2);
-                                case OperatorSymbol.LessThan:
-                                        return (val1 < val2);
-                                case OperatorSymbol.LessThanEqual:
-                                        return (val1 <= val2);
-                                case OperatorSymbol.GreaterThan:
-                                        return (val1 > val2);
-                                case OperatorSymbol.GreaterThanEqual:
-                                        return (val1 >= val2);
-                        }
-                        throw new WarningException("Unknown operator type");
-                }
-                private static bool CompareStr(OperatorSymbol oper, string val1, string val2)
-                {
-                        switch(oper)
-                        {
-                                case OperatorSymbol.Equal:
-                                        return (val1 == val2);
-                                case OperatorSymbol.NotEqual:
-                                        return (val1 != val2);
-                                case OperatorSymbol.LessThan:
-                                        return (val1.CompareTo(val2) < 0);
-                                case OperatorSymbol.LessThanEqual:
-                                        return (val1.CompareTo(val2) <= 0);
-                                case OperatorSymbol.GreaterThan:
-                                        return (val1.CompareTo(val2) > 0);
-                                case OperatorSymbol.GreaterThanEqual:
-                                        return (val1.CompareTo(val2) >= 0);
-                        }
-                        throw new WarningException("Unknown operator type");
-                }
-                private static char NextChar(int idx, string str)
-                {
-                        if((idx + 1) >= str.Length)
-                        {
-                                return Char.MaxValue;
-                        }
-                        return str[idx + 1];
-                }
-                // Very very simple expression parser. Can only match expressions of the form
-                // <var> <op> <value>:
-                // OS = Windows
-                // OS != Linux
-                // RuntimeMinor > 0
-                private bool ParseExpression(string exp)
-                {
-                        if(exp == null)
-                        {
-                                throw new ArgumentException("Invalid expression, cannot be null");
-                        }
-                        exp = exp.Trim();
-                        if(exp.Length < 1)
-                        {
-                                throw new ArgumentException("Invalid expression, cannot be 0 length");
-                        }
-                        string id = "";
-                        string str = "";
-                        OperatorSymbol oper = OperatorSymbol.None;
-                        bool inStr = false;
-                        char c;
-            
-                        for(int i = 0; i < exp.Length; i++)
-                        {
-                                c = exp[i];
-                                if(Char.IsWhiteSpace(c))
-                                {
-                                        continue;
-                                }
-                                if(Char.IsLetterOrDigit(c) || c == '_')
-                                {
-                                        if(inStr)
-                                        {
-                                                str += c;
-                                        }
-                                        else
-                                        {
-                                                id += c;
-                                        }
-                                }
-                                else if(c == '\"')
-                                {
-                                        inStr = !inStr;
-                                        if(inStr)
-                                        {
-                                                str = "";
-                                        }
-                                }
-                                else
-                                {
-                                        if(inStr)
-                                        {
-                                                str += c;
-                                        }
-                                        else
-                                        {
-                                                switch(c)
-                                                {
-                                                        case '=':
-                                                                oper = OperatorSymbol.Equal;
-                                                                break;
-                                                        case '!':
-                                                                if(NextChar(i, exp) == '=')
-                                                                {
-                                                                        oper = OperatorSymbol.NotEqual;
-                                                                }
-                                
-                                                                break;
-                                                        case '<':
-                                                                if(NextChar(i, exp) == '=')
-                                                                {
-                                                                        oper = OperatorSymbol.LessThanEqual;
-                                                                }
-                                                                else
-                                                                {
-                                                                        oper = OperatorSymbol.LessThan;
-                                                                }
-                                
-                                                                break;
-                                                        case '>':
-                                                                if(NextChar(i, exp) == '=')
-                                                                {
-                                                                        oper = OperatorSymbol.GreaterThanEqual;
-                                                                }
-                                                                else
-                                                                {
-                                                                        oper = OperatorSymbol.GreaterThan;
-                                                                }
-                                                                break;
-                                                }
-                                        }
-                                }
-                        }
-            
-                        if(inStr)
-                        {
-                                throw new WarningException("Expected end of string in expression");
-                        }
-                        if(oper == OperatorSymbol.None)
-                        {
-                                throw new WarningException("Expected operator in expression");
-                        }
-                        else if(id.Length < 1)
-                        {
-                                throw new WarningException("Expected identifier in expression");
-                        }
-                        else if(str.Length < 1)
-                        {
-                                throw new WarningException("Expected value in expression");
-                        }
-                        bool ret = false;
-                        try
-                        {
-                                object val = m_Variables[id.ToLower()];
-                                if(val == null)
-                                {
-                                        throw new WarningException("Unknown identifier '{0}'", id);
-                                }
-                                int numVal, numVal2;
-                                string strVal, strVal2;
-                                Type t = val.GetType();
-                                if(t.IsAssignableFrom(typeof(int)))
-                                {
-                                        numVal = (int)val;
-                                        numVal2 = Int32.Parse(str);
-                                        ret = CompareNum(oper, numVal, numVal2);
-                                }
-                                else
-                                {
-                                        strVal = val.ToString();
-                                        strVal2 = str;
-                                        ret = CompareStr(oper, strVal, strVal2);
-                                }
-                        }
-                        catch(ArgumentException ex)
-                        {
-                                ex.ToString();
-                                throw new WarningException("Invalid value type for system variable '{0}', expected int", id);
-                        }
-                        return ret;
-                }
-                #endregion
-                #region Public Methods
-                /// <summary>
-                /// 
-                /// </summary>
-                /// <param name="name"></param>
-                /// <param name="variableValue"></param>
-                public void RegisterVariable(string name, object variableValue)
-                {
-                        if(name == null || variableValue == null)
-                        {
-                                return;
-                        }
-                        m_Variables[name.ToLower()] = variableValue;
-                }
-                /// <summary>
-                /// Performs validation on the xml source as well as evaluates conditional and flow expresions
-                /// </summary>
-                /// <exception cref="ArgumentException">For invalid use of conditional expressions or for invalid XML syntax.  If a XmlValidatingReader is passed, then will also throw exceptions for non-schema-conforming xml</exception>
-                /// <param name="reader"></param>
-                /// <returns>the output xml </returns>
-                public string Process(XmlReader reader)
-                {
-                        if(reader == null)
-                        {
-                                throw new ArgumentException("Invalid XML reader to pre-process");
-                        }
-                        IfContext context = new IfContext(true, true, IfState.None);
-                        StringWriter xmlText = new StringWriter();
-                        XmlTextWriter writer = new XmlTextWriter(xmlText);
-                        writer.Formatting = Formatting.Indented;
-                        while(reader.Read())
-                        {
-                                if(reader.NodeType == XmlNodeType.ProcessingInstruction)
-                                {
-                                        bool ignore = false;
-                                        switch(reader.LocalName)
-                                        {
-                                                case "if":
-                                                        m_IfStack.Push(context);
-                                                        context = new IfContext(context.Keep & context.Active, ParseExpression(reader.Value), IfState.If);
-                                                        ignore = true;
-                                                        break;
-                                                case "elseif":
-                                                        if(m_IfStack.Count == 0)
-                                                        {
-                                                                throw new WarningException("Unexpected 'elseif' outside of 'if'");
-                                                        }
-                                                        else if(context.State != IfState.If && context.State != IfState.ElseIf)
-                                                        {
-                                                                throw new WarningException("Unexpected 'elseif' outside of 'if'");
-                                                        }
-                                                        context.State = IfState.ElseIf;
-                                                        if(!context.EverKept)
-                                                        {
-                                                                context.Keep = ParseExpression(reader.Value);
-                                                        }
-                                                        else
-                                                        {
-                                                                context.Keep = false;
-                                                        }
-                                                        ignore = true;
-                                                        break;
-                                                case "else":
-                                                        if(m_IfStack.Count == 0)
-                                                        {
-                                                                throw new WarningException("Unexpected 'else' outside of 'if'");
-                                                        }
-                                                        else if(context.State != IfState.If && context.State != IfState.ElseIf)
-                                                        {
-                                                                throw new WarningException("Unexpected 'else' outside of 'if'");
-                                                        }
-                                                        context.State = IfState.Else;
-                                                        context.Keep = !context.EverKept;
-                                                        ignore = true;
-                                                        break;
-                                                case "endif":
-                                                        if(m_IfStack.Count == 0)
-                                                        {
-                                                                throw new WarningException("Unexpected 'endif' outside of 'if'");
-                                                        }
-                                                        context = (IfContext)m_IfStack.Pop();
-                                                        ignore = true;
-                                                        break;
-                                        }
-                                        if(ignore)
-                                        {
-                                                continue;
-                                        }
-                                }//end pre-proc instruction
-                                if(!context.Active || !context.Keep)
-                                {
-                                        continue;
-                                }
-                                switch(reader.NodeType)
-                                {
-                                        case XmlNodeType.Element:
-                                                bool empty = reader.IsEmptyElement;
-                                                writer.WriteStartElement(reader.Name);
-                                                while (reader.MoveToNextAttribute())
-                                                {
-                                                        writer.WriteAttributeString(reader.Name, reader.Value);
-                                                }
-                                                if(empty)
-                                                {
-                                                        writer.WriteEndElement();
-                                                }
-                        
-                                                break;
-                                        case XmlNodeType.EndElement:
-                                                writer.WriteEndElement();
-                                                break;
-                                        case XmlNodeType.Text:
-                                                writer.WriteString(reader.Value);
-                                                break;
-                                        case XmlNodeType.CDATA:
-                                                writer.WriteCData(reader.Value);
-                                                break;
-                                        default:
-                                                break;
-                                }
-                        }
-                        if(m_IfStack.Count != 0)
-                        {
-                                throw new WarningException("Mismatched 'if', 'endif' pair");
-                        }
-            
-                        return xmlText.ToString();
-                }
-                #endregion
-        }
-}
diff --git a/Prebuild/src/Core/Targets/AutotoolsTarget.cs b/Prebuild/src/Core/Targets/AutotoolsTarget.cs
deleted file mode 100644
index 2b4a678..0000000
--- a/Prebuild/src/Core/Targets/AutotoolsTarget.cs
+++ /dev/null
@@ -1,926 +0,0 @@
-#region BSD License
-/*
-Copyright (c) 2004 - 2006
-Matthew Holmes        (matthew@wildfiregames.com),
-Dan     Moorehead     (dan05a@gmail.com),
-Dave    Hudson        (jendave@yahoo.com),
-C.J.    Adams-Collier (cjcollier@colliertech.org),
-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.
-* The name of the author may not be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
-*/
-#endregion
-#region CVS Information
-/*
- * $Source$
- * $Author: jendave $
- * $Date: 2006-07-28 22:43:24 -0700 (Fri, 28 Jul 2006) $
- * $Revision: 136 $
- */
-#endregion
-using System;
-using System.Collections;
-using System.Collections.Specialized;
-using System.IO;
-using System.Reflection;
-using System.Text;
-using System.Text.RegularExpressions;
-using Prebuild.Core.Attributes;
-using Prebuild.Core.Interfaces;
-using Prebuild.Core.Nodes;
-using Prebuild.Core.Parse;
-using Prebuild.Core.Utilities;
-namespace Prebuild.Core.Targets
-{
-        /// <summary>
-        /// 
-        /// </summary>
-        [Target("autotools")]
-        public class AutotoolsTarget : ITarget
-        {
-                #region Fields
-                private Kernel m_Kernel;
-                #endregion
-                #region Private Methods
-                private static string PrependPath(string path)
-                {
-                        string tmpPath = Helper.NormalizePath(path, '/');
-                        Regex regex = new Regex(@"(\w):/(\w+)");
-                        Match match = regex.Match(tmpPath);
-                        if(match.Success || tmpPath[0] == '.' || tmpPath[0] == '/')
-                        {
-                                tmpPath = Helper.NormalizePath(tmpPath);
-                        }
-                        else
-                        {
-                                tmpPath = Helper.NormalizePath("./" + tmpPath);
-                        }
-                        return tmpPath;
-                }
-                private static string BuildReference(SolutionNode solution, ReferenceNode refr)
-                {
-                        string ret = "";
-                        if(solution.ProjectsTable.ContainsKey(refr.Name))
-                        {
-                                ProjectNode project = (ProjectNode)solution.ProjectsTable[refr.Name];                           
-                                string fileRef = FindFileReference(refr.Name, project);
-                                string finalPath = Helper.NormalizePath(Helper.MakeFilePath(project.FullPath + "/$(BUILD_DIR)/$(CONFIG)/", refr.Name, "dll"), '/');
-                                ret += finalPath;
-                                return ret;
-                        }
-                        else
-                        {
-                                ProjectNode project = (ProjectNode)refr.Parent;
-                                string fileRef = FindFileReference(refr.Name, project);
-                                if(refr.Path != null || fileRef != null)
-                                {
-                                        string finalPath = (refr.Path != null) ? Helper.NormalizePath(refr.Path + "/" + refr.Name + ".dll", '/') : fileRef;
-                                        ret += Path.Combine(project.Path, finalPath);                                   
-                                        return ret;
-                                }
-                                try
-                                {
-                                        //Assembly assem = Assembly.Load(refr.Name);
-                    //if (assem != null)
-                    //{
-                    //    int index = refr.Name.IndexOf(",");
-                    //    if ( index > 0)
-                    //    {
-                    //        ret += assem.Location;
-                    //        //Console.WriteLine("Location1: " + assem.Location);
-                    //    }
-                    //    else
-                    //    {
-                    //        ret += (refr.Name + ".dll");
-                    //        //Console.WriteLine("Location2: " + assem.Location);
-                    //    }
-                    //}
-                    //else
-                    //{
-                                                int index = refr.Name.IndexOf(",");
-                                                if ( index > 0)
-                                                {
-                                                        ret += refr.Name.Substring(0, index) + ".dll";
-                                                        //Console.WriteLine("Location3: " + assem.Location);
-                                                }
-                                                else
-                                                {
-                                                        ret += (refr.Name + ".dll");
-                                                        //Console.WriteLine("Location4: " + assem.Location);
-                                                }
-                                        //}
-                                }
-                                catch (System.NullReferenceException e)
-                                {
-                                        e.ToString();
-                                        int index = refr.Name.IndexOf(",");
-                                        if ( index > 0)
-                                        {
-                                                ret += refr.Name.Substring(0, index) + ".dll";
-                                                //Console.WriteLine("Location5: " + assem.Location);
-                                        }
-                                        else
-                                        {
-                                                ret += (refr.Name + ".dll");
-                                                //Console.WriteLine("Location6: " + assem.Location);
-                                        }
-                                }
-                        }
-                        return ret;
-                }
-                private static string BuildReferencePath(SolutionNode solution, ReferenceNode refr)
-                {
-                        string ret = "";
-                        if(solution.ProjectsTable.ContainsKey(refr.Name))
-                        {
-                                ProjectNode project = (ProjectNode)solution.ProjectsTable[refr.Name];   
-                                string finalPath = Helper.NormalizePath(Helper.MakeReferencePath(project.FullPath + "/${build.dir}/"), '/');
-                                ret += finalPath;
-                                return ret;
-                        }
-                        else
-                        {
-                                ProjectNode project = (ProjectNode)refr.Parent;
-                                string fileRef = FindFileReference(refr.Name, project);
-                                
-                                if(refr.Path != null || fileRef != null)
-                                {
-                                        string finalPath = (refr.Path != null) ? Helper.NormalizePath(refr.Path, '/') : fileRef;
-                                        ret += finalPath;
-                                        return ret;
-                                }
-                                try
-                                {
-                                        Assembly assem = Assembly.Load(refr.Name);
-                                        if (assem != null)
-                                        {
-                                                ret += "";
-                                        }
-                                        else
-                                        {
-                                                ret += "";
-                                        }
-                                }
-                                catch (System.NullReferenceException e)
-                                {
-                                        e.ToString();
-                                        ret += "";
-                                }
-                        }
-                        return ret;
-                }
-                private static string FindFileReference(string refName, ProjectNode project) 
-                {
-                        foreach(ReferencePathNode refPath in project.ReferencePaths) 
-                        {
-                                string fullPath = Helper.MakeFilePath(refPath.Path, refName, "dll");
-                                if(File.Exists(fullPath)) 
-                                {
-                                        return fullPath;
-                                }
-                        }
-                        return null;
-                }
-                /// <summary>
-                /// Gets the XML doc file.
-                /// </summary>
-                /// <param name="project">The project.</param>
-                /// <param name="conf">The conf.</param>
-                /// <returns></returns>
-                public static string GetXmlDocFile(ProjectNode project, ConfigurationNode conf) 
-                {
-                        if( conf == null )
-                        {
-                                throw new ArgumentNullException("conf");
-                        }
-                        if( project == null )
-                        {
-                                throw new ArgumentNullException("project");
-                        }
-                        string docFile = (string)conf.Options["XmlDocFile"];
-                        //                      if(docFile != null && docFile.Length == 0)//default to assembly name if not specified
-                        //                      {
-                        //                              return Path.GetFileNameWithoutExtension(project.AssemblyName) + ".xml";
-                        //                      }
-                        return docFile;
-                }
-                /// <summary>
-                /// Normalizes the path.
-                /// </summary>
-                /// <param name="path">The path.</param>
-                /// <returns></returns>
-                public static string NormalizePath(string path)
-                {
-                        if(path == null)
-                        {
-                                return "";
-                        }
-                        StringBuilder tmpPath;
-                        if (Core.Parse.Preprocessor.GetOS() == "Win32")
-                        {
-                                tmpPath = new StringBuilder(path.Replace('\\', '/'));
-                                tmpPath.Replace("/", @"\\");
-                        }
-                        else
-                        {
-                                tmpPath = new StringBuilder(path.Replace('\\', '/'));
-                                tmpPath = tmpPath.Replace('/', Path.DirectorySeparatorChar);
-                        }
-                        return tmpPath.ToString();
-                }
-                private void WriteProject(SolutionNode solution, ProjectNode project)
-                {
-                        string projFile = Helper.MakeFilePath(project.FullPath, "Include", "am");
-                        StreamWriter ss = new StreamWriter(projFile);
-                        ss.NewLine = "\n";
-                        m_Kernel.CurrentWorkingDirectory.Push();
-                        Helper.SetCurrentDir(Path.GetDirectoryName(projFile));
-                        using(ss)
-                        {
-                                ss.WriteLine(Helper.AssemblyFullName(project.AssemblyName, project.Type) + ":");
-                                ss.WriteLine("\tmkdir -p " + Helper.MakePathRelativeTo(solution.FullPath, project.Path) + "/$(BUILD_DIR)/$(CONFIG)/");
-                                foreach(string file in project.Files)
-                                {
-                                        if (project.Files.GetSubType(file) != SubType.Code && project.Files.GetSubType(file) != SubType.Settings)
-                                        {
-                                                ss.Write("\tresgen ");
-                                                ss.Write(Helper.NormalizePath(Path.Combine(project.Path, file.Substring(0, file.LastIndexOf('.')) + ".resx "), '/'));
-                                                if (project.Files.GetResourceName(file) != "")
-                                                {
-                                                        ss.WriteLine(Helper.NormalizePath(Path.Combine(project.Path, project.RootNamespace + "." + project.Files.GetResourceName(file) + ".resources"), '/'));
-                                                }
-                                                else
-                                                {
-                                                        ss.WriteLine(Helper.NormalizePath(Path.Combine(project.Path, project.RootNamespace + "." + file.Substring(0, file.LastIndexOf('.')) + ".resources"), '/'));
-                                                }
-                                        }
-                                }
-                                ss.WriteLine("\t$(CSC)\t/out:" + Helper.MakePathRelativeTo(solution.FullPath, project.Path) + "/$(BUILD_DIR)/$(CONFIG)/" + Helper.AssemblyFullName(project.AssemblyName, project.Type) + " \\");
-                                ss.WriteLine("\t\t/target:" + project.Type.ToString().ToLower() + " \\");
-                                if (project.References.Count > 0)
-                                {
-                                        ss.Write("\t\t/reference:");
-                                        bool firstref = true;
-                                        foreach(ReferenceNode refr in project.References)
-                                        {
-                                                if (firstref)
-                                                {
-                                                        firstref = false;
-                                                }
-                                                else
-                                                {
-                                                        ss.Write(",");
-                                                }
-                                                ss.Write("{0}", Helper.NormalizePath(Helper.MakePathRelativeTo(solution.FullPath, BuildReference(solution, refr)), '/'));
-                                        }
-                                        ss.WriteLine(" \\");
-                                }
-                                //ss.WriteLine("\t\tProperties/AssemblyInfo.cs \\");
-                                foreach(string file in project.Files)
-                                {
-                                        switch(project.Files.GetBuildAction(file))
-                                        {
-                                                case BuildAction.EmbeddedResource:
-                                                        ss.Write("\t\t/resource:");
-                                                        ss.WriteLine(Helper.NormalizePath(Path.Combine(project.Path, file), '/') + " \\");
-                                                        break;
-                                                default:
-                                                        if (project.Files.GetSubType(file) != SubType.Code && project.Files.GetSubType(file) != SubType.Settings)
-                                                        {
-                                                                ss.Write("\t\t/resource:");
-                                                                if (project.Files.GetResourceName(file) != "")
-                                                                {
-                                                                        ss.WriteLine(Helper.NormalizePath(Path.Combine(project.Path, project.RootNamespace + "." + project.Files.GetResourceName(file) + ".resources"), '/') + "," + project.RootNamespace + "." + project.Files.GetResourceName(file) + ".resources" + " \\");
-                                                                }
-                                                                else
-                                                                {
-                                                                        ss.WriteLine(Helper.NormalizePath(Path.Combine(project.Path, project.RootNamespace + "." + file.Substring(0, file.LastIndexOf('.')) + ".resources"), '/') + "," + project.RootNamespace + "." + file.Substring(0, file.LastIndexOf('.')) + ".resources" + " \\");
-                                                                }
-                                                        }
-                                                        break;
-                                        }
-                                }
-                                
-                                foreach(ConfigurationNode conf in project.Configurations)
-                                {
-                                        if (conf.Options.KeyFile !="")
-                                        {
-                                                ss.WriteLine("\t\t/keyfile:" + Helper.NormalizePath(Path.Combine(project.Path, conf.Options.KeyFile), '/') + " \\");    
-                                                break;
-                                        }
-                                }
-                                foreach(ConfigurationNode conf in project.Configurations)
-                                {
-                                        if (conf.Options.AllowUnsafe)
-                                        {
-                                                ss.WriteLine("\t\t/unsafe \\");
-                                                break;
-                                        }
-                                }
-                                if (project.AppIcon != "")
-                                {
-                                        ss.WriteLine("\t\t/win32icon:" + Helper.NormalizePath(Path.Combine(project.Path, project.AppIcon), '/') + " \\");
-                                }
-                                foreach(ConfigurationNode conf in project.Configurations)
-                                {
-                                        ss.WriteLine("\t\t/define:{0}", conf.Options.CompilerDefines.Replace(';', ',') + " \\");
-                                        break;
-                                }
-                                
-                                foreach(ConfigurationNode conf in project.Configurations)
-                                {
-                                        if (GetXmlDocFile(project, conf) !="")
-                                        {
-                                                ss.WriteLine("\t\t/doc:" + Helper.MakePathRelativeTo(solution.FullPath, project.Path) + "/$(BUILD_DIR)/$(CONFIG)/" + project.Name + ".xml \\");
-                                                break;
-                                        }
-                                }
-                                foreach(string file in project.Files)
-                                {
-                                        switch(project.Files.GetBuildAction(file))
-                                        {
-                                                case BuildAction.Compile:
-                                                        ss.WriteLine("\t\t\\");
-                                                        ss.Write("\t\t" + NormalizePath(Path.Combine(Helper.MakePathRelativeTo(solution.FullPath, project.Path), file)));
-                                                        break;
-                                                default:
-                                                        break;
-                                        }
-                                }
-                                ss.WriteLine();
-                                ss.WriteLine();
-                                if (project.Type == ProjectType.Library)
-                                {
-                                        ss.WriteLine("install-data-local:");
-                                        ss.WriteLine("  echo \"$(GACUTIL) /i bin/Release/" + project.Name + ".dll /f $(GACUTIL_FLAGS)\";  \\");
-                                        ss.WriteLine("  $(GACUTIL) /i bin/Release/" + project.Name + ".dll /f $(GACUTIL_FLAGS) || exit 1;");
-                                        ss.WriteLine();
-                                        ss.WriteLine("uninstall-local:");
-                                        ss.WriteLine("  echo \"$(GACUTIL) /u " + project.Name + " $(GACUTIL_FLAGS)\"; \\");
-                                        ss.WriteLine("  $(GACUTIL) /u " + project.Name + " $(GACUTIL_FLAGS) || exit 1;");
-                                        ss.WriteLine();
-                                }
-                                ss.WriteLine("CLEANFILES = $(BUILD_DIR)/$(CONFIG)/" + Helper.AssemblyFullName(project.AssemblyName, project.Type) + " $(BUILD_DIR)/$(CONFIG)/" + project.AssemblyName + ".mdb $(BUILD_DIR)/$(CONFIG)/" + project.AssemblyName + ".pdb " + project.AssemblyName + ".xml");
-                                ss.WriteLine("EXTRA_DIST = \\");
-                                ss.Write("      $(FILES)");
-                                foreach(ConfigurationNode conf in project.Configurations)
-                                {
-                                        if (conf.Options.KeyFile != "")
-                                        {
-                                                ss.Write(" \\");
-                                                ss.WriteLine("\t" + conf.Options.KeyFile);
-                                        }
-                                        break;
-                                }
-                        }                
-                        m_Kernel.CurrentWorkingDirectory.Pop();
-                }
-                bool hasLibrary = false;
-                private void WriteCombine(SolutionNode solution)
-                {
-                
-                        /* TODO: These vars should be pulled from the prebuild.xml file */
-                        string releaseVersion  = "2.0.0";
-                        string assemblyVersion = "2.1.0.0";
-                        string description     = 
-                          "Tao Framework " + solution.Name + " Binding For .NET";
-                
-                        hasLibrary = false;
-                        m_Kernel.Log.Write("Creating Autotools make files");
-                        foreach(ProjectNode project in solution.Projects)
-                        {
-                                if(m_Kernel.AllowProject(project.FilterGroups)) 
-                                {
-                                        m_Kernel.Log.Write("...Creating makefile: {0}", project.Name);
-                                        WriteProject(solution, project);
-                                }
-                        }
-                        m_Kernel.Log.Write("");
-                        string combFile = Helper.MakeFilePath(solution.FullPath, "Makefile", "am");
-                        StreamWriter ss = new StreamWriter(combFile);
-                        ss.NewLine = "\n";
-                        m_Kernel.CurrentWorkingDirectory.Push();
-                        Helper.SetCurrentDir(Path.GetDirectoryName(combFile));
-            
-                        using(ss)
-                        {
-                                foreach(ProjectNode project in solution.ProjectsTableOrder)
-                                {
-                                        if (project.Type == ProjectType.Library)
-                                        {
-                                                hasLibrary = true;
-                                                break;
-                                        }
-                                }
-                                if (hasLibrary)
-                                {
-                                        ss.Write("pkgconfig_in_files = ");
-                                        foreach(ProjectNode project in solution.ProjectsTableOrder)
-                                        {
-                                                if (project.Type == ProjectType.Library)
-                                                {
-                                                        string combFilepc = Helper.MakeFilePath(solution.FullPath, project.Name, "pc.in");
-                                                        ss.Write(" " + project.Name + ".pc.in ");
-                                                        StreamWriter sspc = new StreamWriter(combFilepc);
-                                                        sspc.NewLine = "\n";
-                                                        using(sspc)
-                                                        {
-                                                                sspc.WriteLine("prefix=@prefix@");
-                                                                sspc.WriteLine("exec_prefix=${prefix}");
-                                                                sspc.WriteLine("libdir=${exec_prefix}/lib");
-                                                                sspc.WriteLine();
-                                                                sspc.WriteLine("Name: @PACKAGE_NAME@");
-                                                                sspc.WriteLine("Description: @DESCRIPTION@");
-                                                                sspc.WriteLine("Version: @ASSEMBLY_VERSION@");
-                                                                sspc.WriteLine("Libs:  -r:${libdir}/mono/gac/@PACKAGE_NAME@/@ASSEMBLY_VERSION@__@PUBKEY@/@PACKAGE_NAME@.dll");
-                                                        }
-                                                }
-                                        }
-                                
-                                        ss.WriteLine();
-                                        ss.WriteLine("pkgconfigdir=$(prefix)/lib/pkgconfig");
-                                        ss.WriteLine("pkgconfig_DATA=$(pkgconfig_in_files:.pc.in=.pc)");
-                                }
-                                ss.WriteLine();
-                                foreach(ProjectNode project in solution.ProjectsTableOrder)
-                                {
-                                        string path = Helper.MakePathRelativeTo(solution.FullPath, project.FullPath);
-                                        ss.WriteLine("-include x {0}",
-                                                Helper.NormalizePath(Helper.MakeFilePath(path, "Include", "am"),'/'));
-                                }
-                                ss.WriteLine();
-                                ss.WriteLine("all: \\");
-                                ss.Write("\t");
-                                foreach(ProjectNode project in solution.ProjectsTableOrder)
-                                {
-                                        string path = Helper.MakePathRelativeTo(solution.FullPath, project.FullPath);
-                                        ss.Write(Helper.AssemblyFullName(project.AssemblyName, project.Type) + " ");
-                                                
-                                }
-                                ss.WriteLine();
-                                if (hasLibrary)
-                                {
-                                        ss.WriteLine("EXTRA_DIST = \\");
-                                        ss.WriteLine("\t$(pkgconfig_in_files)");
-                                }
-                                else
-                                {
-                                        ss.WriteLine("EXTRA_DIST = ");
-                                }
-                                ss.WriteLine();
-                                ss.WriteLine("DISTCLEANFILES = \\");
-                                ss.WriteLine("\tconfigure \\");
-                                ss.WriteLine("\tMakefile.in  \\");
-                                ss.WriteLine("\taclocal.m4");
-                        }
-                        combFile = Helper.MakeFilePath(solution.FullPath, "configure", "ac");
-                        StreamWriter ts = new StreamWriter(combFile);
-                        ts.NewLine = "\n";
-                        using(ts)
-                        {
-                                if (this.hasLibrary)
-                                {
-                                        foreach(ProjectNode project in solution.ProjectsTableOrder)
-                                        {
-                                                if (project.Type == ProjectType.Library)
-                                                {
-                                                        ts.WriteLine("AC_INIT(" + project.Name + ".pc.in)");
-                                                        break;
-                                                }
-                                        }
-                                }
-                                else
-                                {
-                                        ts.WriteLine("AC_INIT(Makefile.am)");
-                                }
-                                ts.WriteLine("AC_PREREQ(2.53)");
-                                ts.WriteLine("AC_CANONICAL_SYSTEM");
-                                
-                                ts.WriteLine("PACKAGE_NAME={0}", solution.Name);
-                                ts.WriteLine("PACKAGE_VERSION={0}", releaseVersion);
-                                ts.WriteLine("DESCRIPTION=\"{0}\"", description);
-                                ts.WriteLine("AC_SUBST(DESCRIPTION)");
-                                ts.WriteLine("AM_INIT_AUTOMAKE([$PACKAGE_NAME],[$PACKAGE_VERSION],[$DESCRIPTION])");
-                                
-                                ts.WriteLine("ASSEMBLY_VERSION={0}", assemblyVersion);
-                                ts.WriteLine("AC_SUBST(ASSEMBLY_VERSION)");
-                                
-                                ts.WriteLine("PUBKEY=`sn -t $PACKAGE_NAME.snk | grep 'Public Key Token' | awk -F: '{print $2}' | sed -e 's/^ //'`");
-                                ts.WriteLine("AC_SUBST(PUBKEY)");
-                                
-                                ts.WriteLine();
-                                ts.WriteLine("AM_MAINTAINER_MODE");
-                                ts.WriteLine();
-                                ts.WriteLine("dnl AC_PROG_INTLTOOL([0.25])");
-                                ts.WriteLine();
-                                ts.WriteLine("AC_PROG_INSTALL");
-                                ts.WriteLine();
-                                ts.WriteLine("MONO_REQUIRED_VERSION=1.1");
-                                ts.WriteLine();
-                                ts.WriteLine("AC_MSG_CHECKING([whether we're compiling from CVS])");
-                                ts.WriteLine("if test -f \"$srcdir/.cvs_version\" ; then");
-                                ts.WriteLine("        from_cvs=yes");
-                                ts.WriteLine("else");
-                                ts.WriteLine("  if test -f \"$srcdir/.svn\" ; then");
-                                ts.WriteLine("        from_cvs=yes");
-                                ts.WriteLine("  else");
-                                ts.WriteLine("        from_cvs=no");
-                                ts.WriteLine("  fi");
-                                ts.WriteLine("fi");
-                                ts.WriteLine();
-                                ts.WriteLine("AC_MSG_RESULT($from_cvs)");
-                                ts.WriteLine();
-                                ts.WriteLine("AC_PATH_PROG(MONO, mono)");
-                                ts.WriteLine("AC_PATH_PROG(GMCS, gmcs)");
-                                ts.WriteLine("AC_PATH_PROG(GACUTIL, gacutil)");
-                                ts.WriteLine();
-                                ts.WriteLine("AC_MSG_CHECKING([for mono])");
-                                ts.WriteLine("dnl if test \"x$MONO\" = \"x\" ; then");
-                                ts.WriteLine("dnl  AC_MSG_ERROR([Can't find \"mono\" in your PATH])");
-                                ts.WriteLine("dnl else");
-                                ts.WriteLine("  AC_MSG_RESULT([found])");
-                                ts.WriteLine("dnl fi");
-                                ts.WriteLine();
-                                ts.WriteLine("AC_MSG_CHECKING([for gmcs])");
-                                ts.WriteLine("dnl if test \"x$GMCS\" = \"x\" ; then");
-                                ts.WriteLine("dnl  AC_MSG_ERROR([Can't find \"gmcs\" in your PATH])");
-                                ts.WriteLine("dnl else");
-                                ts.WriteLine("  AC_MSG_RESULT([found])");
-                                ts.WriteLine("dnl fi");
-                                ts.WriteLine();
-                //ts.WriteLine("AC_MSG_CHECKING([for gacutil])");
-                //ts.WriteLine("if test \"x$GACUTIL\" = \"x\" ; then");
-                //ts.WriteLine("  AC_MSG_ERROR([Can't find \"gacutil\" in your PATH])");
-                //ts.WriteLine("else");
-                //ts.WriteLine("  AC_MSG_RESULT([found])");
-                //ts.WriteLine("fi");
-                                ts.WriteLine();
-                                ts.WriteLine("AC_SUBST(PATH)");
-                                ts.WriteLine("AC_SUBST(LD_LIBRARY_PATH)");
-                                ts.WriteLine();
-                                ts.WriteLine("dnl CSFLAGS=\"-debug -nowarn:1574\"");
-                                ts.WriteLine("CSFLAGS=\"\"");
-                                ts.WriteLine("AC_SUBST(CSFLAGS)");
-                                ts.WriteLine();
-                                //                              ts.WriteLine("AC_MSG_CHECKING(--disable-sdl argument)");
-                                //                              ts.WriteLine("AC_ARG_ENABLE(sdl,");
-                                //                              ts.WriteLine("    [  --disable-sdl         Disable Sdl interface.],");
-                                //                              ts.WriteLine("    [disable_sdl=$disableval],");
-                                //                              ts.WriteLine("    [disable_sdl=\"no\"])");
-                                //                              ts.WriteLine("AC_MSG_RESULT($disable_sdl)");
-                                //                              ts.WriteLine("if test \"$disable_sdl\" = \"yes\"; then");
-                                //                              ts.WriteLine("  AC_DEFINE(FEAT_SDL)");
-                                //                              ts.WriteLine("fi");
-                                ts.WriteLine();
-                                ts.WriteLine("dnl Find pkg-config");
-                                ts.WriteLine("AC_PATH_PROG(PKGCONFIG, pkg-config, no)");
-                                ts.WriteLine("if test \"x$PKG_CONFIG\" = \"xno\"; then");
-                                ts.WriteLine("        AC_MSG_ERROR([You need to install pkg-config])");
-                                ts.WriteLine("fi");
-                                ts.WriteLine();
-                                ts.WriteLine("PKG_CHECK_MODULES(MONO_DEPENDENCY, mono >= $MONO_REQUIRED_VERSION, has_mono=true, has_mono=false)");
-                                ts.WriteLine("BUILD_DIR=\"bin\"");
-                                ts.WriteLine("AC_SUBST(BUILD_DIR)");
-                                ts.WriteLine("CONFIG=\"Release\"");
-                                ts.WriteLine("AC_SUBST(CONFIG)");
-                                ts.WriteLine();
-                                ts.WriteLine("if test \"x$has_mono\" = \"xtrue\"; then");
-                                ts.WriteLine("  AC_PATH_PROG(RUNTIME, mono, no)");
-                                ts.WriteLine("  AC_PATH_PROG(CSC, gmcs, no)");
-                                ts.WriteLine("  if test `uname -s` = \"Darwin\"; then");
-                                ts.WriteLine("        LIB_PREFIX=");
-                                ts.WriteLine("        LIB_SUFFIX=.dylib");
-                                ts.WriteLine("  else");
-                                ts.WriteLine("        LIB_PREFIX=.so");
-                                ts.WriteLine("        LIB_SUFFIX=");
-                                ts.WriteLine("  fi");
-                                ts.WriteLine("else");
-                                ts.WriteLine("  AC_PATH_PROG(CSC, csc.exe, no)");
-                                ts.WriteLine("  if test x$CSC = \"xno\"; then");
-                                ts.WriteLine("        AC_MSG_ERROR([You need to install either mono or .Net])");
-                                ts.WriteLine("  else");
-                                ts.WriteLine("    RUNTIME=");
-                                ts.WriteLine("    LIB_PREFIX=");
-                                ts.WriteLine("    LIB_SUFFIX=.dylib");
-                                ts.WriteLine("  fi");
-                                ts.WriteLine("fi");
-                                ts.WriteLine();
-                                ts.WriteLine("AC_SUBST(LIB_PREFIX)");
-                                ts.WriteLine("AC_SUBST(LIB_SUFFIX)");
-                                ts.WriteLine();
-                                ts.WriteLine("AC_SUBST(BASE_DEPENDENCIES_CFLAGS)");
-                                ts.WriteLine("AC_SUBST(BASE_DEPENDENCIES_LIBS)");
-                                ts.WriteLine();
-                                ts.WriteLine("dnl Find monodoc");
-                                ts.WriteLine("MONODOC_REQUIRED_VERSION=1.0");
-                                ts.WriteLine("AC_SUBST(MONODOC_REQUIRED_VERSION)");
-                                ts.WriteLine("PKG_CHECK_MODULES(MONODOC_DEPENDENCY, monodoc >= $MONODOC_REQUIRED_VERSION, enable_monodoc=yes, enable_monodoc=no)");
-                                ts.WriteLine();
-                                ts.WriteLine("if test \"x$enable_monodoc\" = \"xyes\"; then");
-                                ts.WriteLine("        AC_PATH_PROG(MONODOC, monodoc, no)");
-                                ts.WriteLine("        if test x$MONODOC = xno; then");
-                                ts.WriteLine("           enable_monodoc=no");
-                                ts.WriteLine("        fi");
-                                ts.WriteLine("else");
-                                ts.WriteLine("        MONODOC=");
-                                ts.WriteLine("fi");
-                                ts.WriteLine();
-                                ts.WriteLine("AC_SUBST(MONODOC)");
-                                ts.WriteLine("AM_CONDITIONAL(ENABLE_MONODOC, test \"x$enable_monodoc\" = \"xyes\")");
-                                ts.WriteLine();
-                                ts.WriteLine("AC_PATH_PROG(GACUTIL, gacutil, no)");
-                                ts.WriteLine("if test \"x$GACUTIL\" = \"xno\" ; then");
-                                ts.WriteLine("        AC_MSG_ERROR([No gacutil tool found])");
-                                ts.WriteLine("fi");
-                                ts.WriteLine();
-                                //                              foreach(ProjectNode project in solution.ProjectsTableOrder)
-                                //                              {
-                                //                                      if (project.Type == ProjectType.Library)
-                                //                                      {
-                                //                                      }
-                                //                              }
-                                ts.WriteLine("GACUTIL_FLAGS='/package $(PACKAGE_NAME) /gacdir $(DESTDIR)$(prefix)'");
-                                ts.WriteLine("AC_SUBST(GACUTIL_FLAGS)");
-                                ts.WriteLine();
-                                ts.WriteLine("winbuild=no");
-                                ts.WriteLine("case \"$host\" in");
-                                ts.WriteLine("       *-*-mingw*|*-*-cygwin*)");
-                                ts.WriteLine("               winbuild=yes");
-                                ts.WriteLine("               ;;");
-                                ts.WriteLine("esac");
-                                ts.WriteLine("AM_CONDITIONAL(WINBUILD, test x$winbuild = xyes)");
-                                ts.WriteLine();
-                                //                              ts.WriteLine("dnl Check for SDL");
-                                //                              ts.WriteLine();
-                                //                              ts.WriteLine("AC_PATH_PROG([SDL_CONFIG], [sdl-config])");
-                                //                              ts.WriteLine("have_sdl=no");
-                                //                              ts.WriteLine("if test -n \"${SDL_CONFIG}\"; then");
-                                //                              ts.WriteLine("    have_sdl=yes");
-                                //                              ts.WriteLine("    SDL_CFLAGS=`$SDL_CONFIG --cflags`");
-                                //                              ts.WriteLine("    SDL_LIBS=`$SDL_CONFIG --libs`");
-                                //                              ts.WriteLine("    #");
-                                //                              ts.WriteLine("    # sdl-config sometimes emits an rpath flag pointing at its library");
-                                //                              ts.WriteLine("    # installation directory.  We don't want this, as it prevents users from");
-                                //                              ts.WriteLine("    # linking sdl-viewer against, for example, a locally compiled libGL when a");
-                                //                              ts.WriteLine("    # version of the library also exists in SDL's library installation");
-                                //                              ts.WriteLine("    # directory, typically /usr/lib.");
-                                //                              ts.WriteLine("    #");
-                                //                              ts.WriteLine("    SDL_LIBS=`echo $SDL_LIBS | sed 's/-Wl,-rpath,[[^ ]]* //'`");
-                                //                              ts.WriteLine("fi");
-                                //                              ts.WriteLine("AC_SUBST([SDL_CFLAGS])");
-                                //                              ts.WriteLine("AC_SUBST([SDL_LIBS])");
-                                ts.WriteLine();
-                                ts.WriteLine("AC_OUTPUT([");
-                                ts.WriteLine("Makefile");
-                // TODO: this does not work quite right.
-                                //ts.WriteLine("Properties/AssemblyInfo.cs");
-                                foreach(ProjectNode project in solution.ProjectsTableOrder)
-                                {
-                                        if (project.Type == ProjectType.Library)
-                                        {
-                                                ts.WriteLine(project.Name + ".pc");
-                                        }
-                                        //                                      string path = Helper.MakePathRelativeTo(solution.FullPath, project.FullPath);
-                                        //                                      ts.WriteLine(Helper.NormalizePath(Helper.MakeFilePath(path, "Include"),'/'));
-                                }
-                                ts.WriteLine("])");
-                                ts.WriteLine();
-                                ts.WriteLine("#po/Makefile.in");
-                                ts.WriteLine();
-                                ts.WriteLine("echo \"---\"");
-                                ts.WriteLine("echo \"Configuration summary\"");
-                                ts.WriteLine("echo \"\"");
-                                ts.WriteLine("echo \"   * Installation prefix: $prefix\"");
-                                ts.WriteLine("echo \"   * compiler:            $CSC\"");
-                                ts.WriteLine("echo \"   * Documentation:       $enable_monodoc ($MONODOC)\"");
-                                ts.WriteLine("echo \"   * Package Name:        $PACKAGE_NAME\"");
-                                ts.WriteLine("echo \"   * Version:             $PACKAGE_VERSION\"");
-                                ts.WriteLine("echo \"   * Public Key:          $PUBKEY\"");
-                                ts.WriteLine("echo \"\"");
-                                ts.WriteLine("echo \"---\"");
-                                ts.WriteLine();
-                        }
-            ts.NewLine = "\n";
-            foreach (ProjectNode project in solution.ProjectsTableOrder)
-            {
-                if (project.GenerateAssemblyInfoFile)
-                {
-                    GenerateAssemblyInfoFile(solution, combFile);
-                }
-            }
-                }
-        private static void GenerateAssemblyInfoFile(SolutionNode solution, string combFile)
-        {
-            System.IO.Directory.CreateDirectory(Helper.MakePathRelativeTo(solution.FullPath, "Properties"));
-            combFile = Helper.MakeFilePath(solution.FullPath + "/Properties/", "AssemblyInfo.cs", "in");
-            StreamWriter ai = new StreamWriter(combFile);
-            
-            using (ai)
-            {
-                ai.WriteLine("#region License");
-                ai.WriteLine("/*");
-                ai.WriteLine("MIT License");
-                ai.WriteLine("Copyright (c)2003-2006 Tao Framework Team");
-                ai.WriteLine("http://www.taoframework.com");
-                ai.WriteLine("All rights reserved.");
-                ai.WriteLine("");
-                ai.WriteLine("Permission is hereby granted, free of charge, to any person obtaining a copy");
-                ai.WriteLine("of this software and associated documentation files (the \"Software\"), to deal");
-                ai.WriteLine("in the Software without restriction, including without limitation the rights");
-                ai.WriteLine("to use, copy, modify, merge, publish, distribute, sublicense, and/or sell");
-                ai.WriteLine("copies of the Software, and to permit persons to whom the Software is");
-                ai.WriteLine("furnished to do so, subject to the following conditions:");
-                ai.WriteLine("");
-                ai.WriteLine("The above copyright notice and this permission notice shall be included in all");
-                ai.WriteLine("copies or substantial portions of the Software.");
-                ai.WriteLine("");
-                ai.WriteLine("THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR");
-                ai.WriteLine("IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,");
-                ai.WriteLine("FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE");
-                ai.WriteLine("AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER");
-                ai.WriteLine("LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,");
-                ai.WriteLine("OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE");
-                ai.WriteLine("SOFTWARE.");
-                ai.WriteLine("*/");
-                ai.WriteLine("#endregion License");
-                ai.WriteLine("");
-                ai.WriteLine("using System;");
-                ai.WriteLine("using System.Reflection;");
-                ai.WriteLine("using System.Runtime.InteropServices;");
-                ai.WriteLine("using System.Security;");
-                ai.WriteLine("using System.Security.Permissions;");
-                ai.WriteLine("");
-                ai.WriteLine("[assembly: AllowPartiallyTrustedCallers]");
-                ai.WriteLine("[assembly: AssemblyCompany(\"Tao Framework -- http://www.taoframework.com\")]");
-                ai.WriteLine("[assembly: AssemblyConfiguration(\"Retail\")]");
-                ai.WriteLine("[assembly: AssemblyCopyright(\"Copyright (c)2003-2006 Tao Framework Team.  All rights reserved.\")]");
-                ai.WriteLine("[assembly: AssemblyCulture(\"\")]");
-                ai.WriteLine("[assembly: AssemblyDefaultAlias(\"@PACKAGE_NAME@\")]");
-                ai.WriteLine("[assembly: AssemblyDelaySign(false)]");
-                ai.WriteLine("[assembly: AssemblyDescription(\"@DESCRIPTION@\")]");
-                ai.WriteLine("[assembly: AssemblyFileVersion(\"@ASSEMBLY_VERSION@\")]");
-                ai.WriteLine("[assembly: AssemblyInformationalVersion(\"@ASSEMBLY_VERSION@\")]");
-                ai.WriteLine("[assembly: AssemblyKeyName(\"\")]");
-                ai.WriteLine("[assembly: AssemblyProduct(\"@PACKAGE_NAME@.dll\")]");
-                ai.WriteLine("[assembly: AssemblyTitle(\"@DESCRIPTION@\")]");
-                ai.WriteLine("[assembly: AssemblyTrademark(\"Tao Framework -- http://www.taoframework.com\")]");
-                ai.WriteLine("[assembly: AssemblyVersion(\"@ASSEMBLY_VERSION@\")]");
-                ai.WriteLine("[assembly: CLSCompliant(true)]");
-                ai.WriteLine("[assembly: ComVisible(false)]");
-                ai.WriteLine("[assembly: SecurityPermission(SecurityAction.RequestMinimum, Flags = SecurityPermissionFlag.Execution)]");
-                ai.WriteLine("[assembly: SecurityPermission(SecurityAction.RequestMinimum, Flags = SecurityPermissionFlag.SkipVerification)]");
-                ai.WriteLine("[assembly: SecurityPermission(SecurityAction.RequestMinimum, Flags = SecurityPermissionFlag.UnmanagedCode)]");
-            }
-            //return combFile;
-        }
-                private void CleanProject(ProjectNode project)
-                {
-                        m_Kernel.Log.Write("...Cleaning project: {0}", project.Name);
-                        string projectFile = Helper.MakeFilePath(project.FullPath, "Include", "am");
-                        Helper.DeleteIfExists(projectFile);
-                }
-                private void CleanSolution(SolutionNode solution)
-                {
-                        m_Kernel.Log.Write("Cleaning Autotools make files for", solution.Name);
-                        string slnFile = Helper.MakeFilePath(solution.FullPath, "Makefile", "am");
-                        Helper.DeleteIfExists(slnFile);
-                        slnFile = Helper.MakeFilePath(solution.FullPath, "Makefile", "in");
-                        Helper.DeleteIfExists(slnFile);
-                        slnFile = Helper.MakeFilePath(solution.FullPath, "configure", "ac");
-                        Helper.DeleteIfExists(slnFile);
-                        slnFile = Helper.MakeFilePath(solution.FullPath, "configure");
-                        Helper.DeleteIfExists(slnFile);
-                        slnFile = Helper.MakeFilePath(solution.FullPath, "Makefile");
-                        Helper.DeleteIfExists(slnFile);
-                        foreach(ProjectNode project in solution.Projects)
-                        {
-                                CleanProject(project);
-                        }
-            
-                        m_Kernel.Log.Write("");
-                }
-                #endregion
-                #region ITarget Members
-                /// <summary>
-                /// Writes the specified kern.
-                /// </summary>
-                /// <param name="kern">The kern.</param>
-                public void Write(Kernel kern)
-                {
-                        if( kern == null )
-                        {
-                                throw new ArgumentNullException("kern");
-                        }
-                        m_Kernel = kern;
-                        foreach(SolutionNode solution in kern.Solutions)
-                        {
-                                WriteCombine(solution);
-                        }
-                        m_Kernel = null;
-                }
-                /// <summary>
-                /// Cleans the specified kern.
-                /// </summary>
-                /// <param name="kern">The kern.</param>
-                public virtual void Clean(Kernel kern)
-                {
-                        if( kern == null )
-                        {
-                                throw new ArgumentNullException("kern");
-                        }
-                        m_Kernel = kern;
-                        foreach(SolutionNode sol in kern.Solutions)
-                        {
-                                CleanSolution(sol);
-                        }
-                        m_Kernel = null;
-                }
-                /// <summary>
-                /// Gets the name.
-                /// </summary>
-                /// <value>The name.</value>
-                public string Name
-                {
-                        get
-                        {
-                                return "autotools";
-                        }
-                }
-                #endregion
-        }
-}
diff --git a/Prebuild/src/Core/Targets/DebugTarget.cs b/Prebuild/src/Core/Targets/DebugTarget.cs
deleted file mode 100644
index 6baa623..0000000
--- a/Prebuild/src/Core/Targets/DebugTarget.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-#region BSD     License
-/*
-Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com),     Dan     Moorehead (dan05a@gmail.com)
-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. 
-* The name of the author may not be     used to endorse or promote products     derived from this software 
-  without specific prior written permission. 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
-*/
-#endregion
-#region CVS     Information
-/*
- * $Source$
- * $Author: jendave $
- * $Date: 2006-09-20 09:42:51 +0200 (on, 20 sep 2006) $
- * $Revision: 164 $
- */
-#endregion
-using System;
-using Prebuild.Core.Attributes;
-using Prebuild.Core.Interfaces;
-using Prebuild.Core.Nodes;
-#if     (DEBUG && _DEBUG_TARGET)
-namespace Prebuild.Core.Targets
-{
-        [Target("debug")]
-        public class DebugTarget : ITarget
-        {
-#region Fields
-                private Kernel m_Kernel = null;
-#endregion
-#region ITarget Members
-                public void     Write()
-                {
-                        foreach(SolutionNode s in m_Kernel.Solutions)
-                        {
-                                Console.WriteLine("Solution     [ {0}, {1} ]", s.Name, s.Path);
-                                foreach(string file     in s.Files)
-{
-                                        Console.WriteLine("\tFile [     {0}     ]",     file);
-}
-                                foreach(ProjectNode     proj in s.Projects)
-                                {
-                                        Console.WriteLine("\tProject [ {0},     {1}. {2} ]", proj.Name, proj.Path, proj.Language);
-                                        foreach(string file     in proj.Files)
-                                                Console.WriteLine("\t\tFile     [ {0} ]", file);
-                                }
-                        }
-                }
-                public void     Clean()
-                {
-                        Console.WriteLine("Not implemented");
-                }
-                public string Name
-                {
-                        get
-                        {
-                                return "debug";
-                        }
-                }
-                public Kernel Kernel
-                {
-                        get
-                        {
-                                return m_Kernel;
-                        }
-                        set
-                        {
-                                m_Kernel = value;
-                        }
-                }
-#endregion
-        }
-}
-#endif
diff --git a/Prebuild/src/Core/Targets/MonoDevelopTarget.cs b/Prebuild/src/Core/Targets/MonoDevelopTarget.cs
deleted file mode 100644
index 8620e4b..0000000
--- a/Prebuild/src/Core/Targets/MonoDevelopTarget.cs
+++ /dev/null
@@ -1,458 +0,0 @@
-#region BSD License
-/*
-Copyright (c) 2004 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (dan05a@gmail.com)
-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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
-*/
-#endregion
-#region CVS Information
-/*
- * $Source$
- * $Author: jendave $
- * $Date: 2007-02-13 22:07:07 +0100 (ti, 13 feb 2007) $
- * $Revision: 206 $
- */
-#endregion
-using System;
-using System.Collections;
-using System.Collections.Specialized;
-using System.IO;
-using System.Reflection;
-using System.Text.RegularExpressions;
-using Prebuild.Core.Attributes;
-using Prebuild.Core.Interfaces;
-using Prebuild.Core.Nodes;
-using Prebuild.Core.Utilities;
-namespace Prebuild.Core.Targets
-{
-        /// <summary>
-        /// 
-        /// </summary>
-        [Target("monodev")]
-        public class MonoDevelopTarget : ITarget
-        {
-                #region Fields
-                private Kernel m_Kernel;
-                #endregion
-                #region Private Methods
-                private static string PrependPath(string path)
-                {
-                        string tmpPath = Helper.NormalizePath(path, '/');
-                        Regex regex = new Regex(@"(\w):/(\w+)");
-                        Match match = regex.Match(tmpPath);
-                        if(match.Success || tmpPath[0] == '.' || tmpPath[0] == '/')
-                        {
-                                tmpPath = Helper.NormalizePath(tmpPath);
-                        }
-                        else
-                        {
-                                tmpPath = Helper.NormalizePath("./" + tmpPath);
-                        }
-                        return tmpPath;
-                }
-                private static string BuildReference(SolutionNode solution, ReferenceNode refr)
-                {
-                        string ret = "<ProjectReference type=\"";
-                        if(solution.ProjectsTable.ContainsKey(refr.Name))
-                        {
-                                ret += "Project\"";
-                                ret += " localcopy=\"" + refr.LocalCopy.ToString() +  "\" refto=\"" + refr.Name + "\" />";
-                        }
-                        else
-                        {
-                                ProjectNode project = (ProjectNode)refr.Parent;
-                                string fileRef = FindFileReference(refr.Name, project);
-                                if(refr.Path != null || fileRef != null)
-                                {
-                                        ret += "Assembly\" refto=\"";
-                                        string finalPath = (refr.Path != null) ? Helper.MakeFilePath(refr.Path, refr.Name, "dll") : fileRef;
-                                        ret += finalPath;
-                                        ret += "\" localcopy=\"" + refr.LocalCopy.ToString() + "\" />";
-                                        return ret;
-                                }
-                                ret += "Gac\"";
-                                ret += " localcopy=\"" + refr.LocalCopy.ToString() + "\"";
-                                ret += " refto=\"";
-                                try
-                                {
-                                        //Assembly assem = Assembly.Load(refr.Name);
-                                        //ret += assem.FullName;
-                    ret += refr.Name;
-                                }
-                                catch (System.NullReferenceException e)
-                                {
-                                        e.ToString();
-                                        ret += refr.Name;
-                                }
-                                ret += "\" />";
-                        }
-                        return ret;
-                }
-                private static string FindFileReference(string refName, ProjectNode project) 
-                {
-                        foreach(ReferencePathNode refPath in project.ReferencePaths) 
-                        {
-                                string fullPath = Helper.MakeFilePath(refPath.Path, refName, "dll");
-                                if(File.Exists(fullPath)) 
-                                {
-                                        return fullPath;
-                                }
-                        }
-                        return null;
-                }
-                /// <summary>
-                /// Gets the XML doc file.
-                /// </summary>
-                /// <param name="project">The project.</param>
-                /// <param name="conf">The conf.</param>
-                /// <returns></returns>
-                public static string GenerateXmlDocFile(ProjectNode project, ConfigurationNode conf) 
-                {
-                        if( conf == null )
-                        {
-                                throw new ArgumentNullException("conf");
-                        }
-                        if( project == null )
-                        {
-                                throw new ArgumentNullException("project");
-                        }
-                        string docFile = (string)conf.Options["XmlDocFile"];
-                        if(docFile != null && docFile.Length == 0)//default to assembly name if not specified
-                        {
-                                return "False";
-                        }
-                        return "True";
-                }
-                private void WriteProject(SolutionNode solution, ProjectNode project)
-                {
-                        string csComp = "Mcs";
-                        string netRuntime = "Mono";
-                        if(project.Runtime == ClrRuntime.Microsoft)
-                        {
-                                csComp = "Csc";
-                                netRuntime = "MsNet";
-                        }
-                        string projFile = Helper.MakeFilePath(project.FullPath, project.Name, "mdp");
-                        StreamWriter ss = new StreamWriter(projFile);
-                        m_Kernel.CurrentWorkingDirectory.Push();
-                        Helper.SetCurrentDir(Path.GetDirectoryName(projFile));
-                        using(ss)
-                        {
-                                ss.WriteLine(
-                                        "<Project name=\"{0}\" description=\"\" standardNamespace=\"{1}\" newfilesearch=\"None\" enableviewstate=\"True\" fileversion=\"2.0\" language=\"C#\" clr-version=\"Net_2_0\" ctype=\"DotNetProject\">",
-                                        project.Name,
-                                        project.RootNamespace
-                                        );
-                                
-                                                                int count = 0;
-                                
-                                ss.WriteLine("  <Configurations active=\"{0}\">", solution.ActiveConfig);
-                                foreach(ConfigurationNode conf in project.Configurations)
-                                {
-                                        ss.WriteLine("    <Configuration name=\"{0}\" ctype=\"DotNetProjectConfiguration\">", conf.Name);
-                                        ss.Write("      <Output");
-                                        ss.Write(" directory=\"{0}\"", Helper.EndPath(Helper.NormalizePath(".\\" + conf.Options["OutputPath"].ToString())));
-                                        ss.Write(" assembly=\"{0}\"", project.AssemblyName);
-                                        ss.Write(" executeScript=\"{0}\"", conf.Options["RunScript"]);
-                                        //ss.Write(" executeBeforeBuild=\"{0}\"", conf.Options["PreBuildEvent"]);
-                                        //ss.Write(" executeAfterBuild=\"{0}\"", conf.Options["PostBuildEvent"]);
-                                        if (conf.Options["PreBuildEvent"] != null && conf.Options["PreBuildEvent"].ToString().Length != 0)
-                                        {
-                                                ss.Write(" executeBeforeBuild=\"{0}\"", Helper.NormalizePath(conf.Options["PreBuildEvent"].ToString()));
-                                        }
-                                        else
-                                        {
-                                                ss.Write(" executeBeforeBuild=\"{0}\"", conf.Options["PreBuildEvent"]);
-                                        }
-                                        if (conf.Options["PostBuildEvent"] != null && conf.Options["PostBuildEvent"].ToString().Length != 0)
-                                        {
-                                                ss.Write(" executeAfterBuild=\"{0}\"", Helper.NormalizePath(conf.Options["PostBuildEvent"].ToString()));
-                                        }
-                                        else
-                                        {
-                                                ss.Write(" executeAfterBuild=\"{0}\"", conf.Options["PostBuildEvent"]);
-                                        }
-                                        ss.Write(" executeBeforeBuildArguments=\"{0}\"", conf.Options["PreBuildEventArgs"]);
-                                        ss.Write(" executeAfterBuildArguments=\"{0}\"", conf.Options["PreBuildEventArgs"]);
-                                        ss.WriteLine(" />");
-                                        
-                                        ss.Write("      <Build");
-                                        ss.Write(" debugmode=\"True\"");
-                                        if (project.Type == ProjectType.WinExe)
-                                        {
-                                                ss.Write(" target=\"{0}\"", ProjectType.Exe.ToString());
-                                        }
-                                        else
-                                        {
-                                                ss.Write(" target=\"{0}\"", project.Type);
-                                        }
-                                        ss.WriteLine(" />");
-                                        
-                                        ss.Write("      <Execution");
-                                        ss.Write(" runwithwarnings=\"True\"");
-                                        ss.Write(" consolepause=\"True\"");
-                                        ss.Write(" runtime=\"{0}\"", netRuntime);
-                    ss.Write(" clr-version=\"Net_2_0\"");
-                                        ss.WriteLine(" />");
-                                        
-                                        ss.Write("      <CodeGeneration");
-                                        ss.Write(" compiler=\"{0}\"", csComp);
-                                        ss.Write(" warninglevel=\"{0}\"", conf.Options["WarningLevel"]);
-                                        ss.Write(" nowarn=\"{0}\"", conf.Options["SuppressWarnings"]);
-                                        ss.Write(" includedebuginformation=\"{0}\"", conf.Options["DebugInformation"]);
-                                        ss.Write(" optimize=\"{0}\"", conf.Options["OptimizeCode"]);
-                                        ss.Write(" unsafecodeallowed=\"{0}\"", conf.Options["AllowUnsafe"]);
-                                        ss.Write(" generateoverflowchecks=\"{0}\"", conf.Options["CheckUnderflowOverflow"]);
-                                        ss.Write(" mainclass=\"{0}\"", project.StartupObject);
-                                        ss.Write(" target=\"{0}\"", project.Type);
-                                        ss.Write(" definesymbols=\"{0}\"", conf.Options["CompilerDefines"]);
-                                        ss.Write(" generatexmldocumentation=\"{0}\"", GenerateXmlDocFile(project, conf));
-                                        ss.Write(" win32Icon=\"{0}\"", project.AppIcon);
-                                        ss.Write(" ctype=\"CSharpCompilerParameters\"");
-                                        ss.WriteLine(" />");
-                                        ss.WriteLine("    </Configuration>");
-                                        count++;
-                                }                
-                                ss.WriteLine("  </Configurations>");
-                                ss.Write("  <DeploymentInformation");
-                                ss.Write(" target=\"\"");
-                                ss.Write(" script=\"\"");
-                                ss.Write(" strategy=\"File\"");
-                                ss.WriteLine(">");
-                                ss.WriteLine("    <excludeFiles />");
-                                ss.WriteLine("  </DeploymentInformation>");
-                                
-                                ss.WriteLine("  <Contents>");
-                                foreach(string file in project.Files)
-                                {
-                                        string buildAction = "Compile";
-                                        switch(project.Files.GetBuildAction(file))
-                                        {
-                                                case BuildAction.None:
-                                                        buildAction = "Nothing";
-                                                        break;
-                                                case BuildAction.Content:
-                                                        buildAction = "Exclude";
-                                                        break;
-                                                case BuildAction.EmbeddedResource:
-                                                        buildAction = "EmbedAsResource";
-                                                        break;
-                                                default:
-                                                        buildAction = "Compile";
-                                                        break;
-                                        }
-                                        // Sort of a hack, we try and resolve the path and make it relative, if we can.
-                                        string filePath = PrependPath(file);
-                                        ss.WriteLine("    <File name=\"{0}\" subtype=\"Code\" buildaction=\"{1}\" dependson=\"\" data=\"\" />", filePath, buildAction);
-                                }
-                                ss.WriteLine("  </Contents>");
-                                ss.WriteLine("  <References>");
-                                foreach(ReferenceNode refr in project.References)
-                                {
-                                        ss.WriteLine("    {0}", BuildReference(solution, refr));
-                                }
-                                ss.WriteLine("  </References>");
-                                ss.WriteLine("</Project>");
-                        }
-                        m_Kernel.CurrentWorkingDirectory.Pop();
-                }
-                private void WriteCombine(SolutionNode solution)
-                {
-                        m_Kernel.Log.Write("Creating MonoDevelop combine and project files");
-                        foreach(ProjectNode project in solution.Projects)
-                        {
-                                if(m_Kernel.AllowProject(project.FilterGroups)) 
-                                {
-                                        m_Kernel.Log.Write("...Creating project: {0}", project.Name);
-                                        WriteProject(solution, project);
-                                }
-                        }
-                        m_Kernel.Log.Write("");
-                        string combFile = Helper.MakeFilePath(solution.FullPath, solution.Name, "mds");
-                        StreamWriter ss = new StreamWriter(combFile);
-                        m_Kernel.CurrentWorkingDirectory.Push();
-                        Helper.SetCurrentDir(Path.GetDirectoryName(combFile));
-            
-            int count = 0;
-            
-                        using(ss)
-                        {
-                                ss.WriteLine("<Combine name=\"{0}\" fileversion=\"2.0\" description=\"\">", solution.Name);
-                                count = 0;
-                                foreach(ConfigurationNode conf in solution.Configurations)
-                                {
-                                        if(count == 0)
-                                        {
-                                                ss.WriteLine("  <Configurations active=\"{0}\">", conf.Name);
-                                        }
-                                        ss.WriteLine("    <Configuration name=\"{0}\" ctype=\"CombineConfiguration\">", conf.Name);
-                                        foreach(ProjectNode project in solution.Projects)
-                                        {
-                                                ss.WriteLine("      <Entry configuration=\"{1}\" build=\"True\" name=\"{0}\" />", project.Name, conf.Name);
-                                        }
-                                        ss.WriteLine("    </Configuration>");
-                                        count++;
-                                }
-                                ss.WriteLine("  </Configurations>");
-                                
-                                count = 0;
-                                
-                                foreach(ProjectNode project in solution.Projects)
-                                {                    
-                                        if(count == 0)
-                                                ss.WriteLine("  <StartMode startupentry=\"{0}\" single=\"True\">", project.Name);
-                                        ss.WriteLine("    <Execute type=\"None\" entry=\"{0}\" />", project.Name);
-                                        count++;
-                                }
-                                ss.WriteLine("  </StartMode>");
-                                
-                                ss.WriteLine("  <Entries>");
-                                foreach(ProjectNode project in solution.Projects)
-                                {
-                                        string path = Helper.MakePathRelativeTo(solution.FullPath, project.FullPath);
-                                        ss.WriteLine("    <Entry filename=\"{0}\" />",
-                                                Helper.MakeFilePath(path, project.Name, "mdp"));
-                                }
-                                ss.WriteLine("  </Entries>");
-                                
-                                ss.WriteLine("</Combine>");
-                        }
-                        m_Kernel.CurrentWorkingDirectory.Pop();
-                }
-                private void CleanProject(ProjectNode project)
-                {
-                        m_Kernel.Log.Write("...Cleaning project: {0}", project.Name);
-                        string projectFile = Helper.MakeFilePath(project.FullPath, project.Name, "mdp");
-                        Helper.DeleteIfExists(projectFile);
-                }
-                private void CleanSolution(SolutionNode solution)
-                {
-                        m_Kernel.Log.Write("Cleaning MonoDevelop combine and project files for", solution.Name);
-                        string slnFile = Helper.MakeFilePath(solution.FullPath, solution.Name, "mds");
-                        Helper.DeleteIfExists(slnFile);
-                        foreach(ProjectNode project in solution.Projects)
-                        {
-                                CleanProject(project);
-                        }
-            
-                        m_Kernel.Log.Write("");
-                }
-                #endregion
-                #region ITarget Members
-                /// <summary>
-                /// Writes the specified kern.
-                /// </summary>
-                /// <param name="kern">The kern.</param>
-                public void Write(Kernel kern)
-                {
-                        if( kern == null )
-                        {
-                                throw new ArgumentNullException("kern");
-                        }
-                        m_Kernel = kern;
-                        foreach(SolutionNode solution in kern.Solutions)
-                        {
-                                WriteCombine(solution);
-                        }
-                        m_Kernel = null;
-                }
-                /// <summary>
-                /// Cleans the specified kern.
-                /// </summary>
-                /// <param name="kern">The kern.</param>
-                public virtual void Clean(Kernel kern)
-                {
-                        if( kern == null )
-                        {
-                                throw new ArgumentNullException("kern");
-                        }
-                        m_Kernel = kern;
-                        foreach(SolutionNode sol in kern.Solutions)
-                        {
-                                CleanSolution(sol);
-                        }
-                        m_Kernel = null;
-                }
-                /// <summary>
-                /// Gets the name.
-                /// </summary>
-                /// <value>The name.</value>
-                public string Name
-                {
-                        get
-                        {
-                                return "sharpdev";
-                        }
-                }
-                #endregion
-        }
-}
diff --git a/Prebuild/src/Core/Targets/NAntTarget.cs b/Prebuild/src/Core/Targets/NAntTarget.cs
deleted file mode 100644
index 0f0deb2..0000000
--- a/Prebuild/src/Core/Targets/NAntTarget.cs
+++ /dev/null
@@ -1,621 +0,0 @@
-#region BSD License
-/*
-Copyright (c) 2004 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (dan05a@gmail.com)
-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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
-*/
-#endregion
-#region CVS Information
-/*
- * $Source$
- * $Author: jendave $
- * $Date: 2007-02-13 21:58:03 +0100 (ti, 13 feb 2007) $
- * $Revision: 205 $
- */
-#endregion
-using System;
-using System.Collections;
-using System.Collections.Specialized;
-using System.IO;
-using System.Reflection;
-using System.Text.RegularExpressions;
-using Prebuild.Core.Attributes;
-using Prebuild.Core.Interfaces;
-using Prebuild.Core.Nodes;
-using Prebuild.Core.Utilities;
-namespace Prebuild.Core.Targets
-{
-        /// <summary>
-        /// 
-        /// </summary>
-        [Target("nant")]
-        public class NAntTarget : ITarget
-        {
-                #region Fields
-                private Kernel m_Kernel;
-                #endregion
-                #region Private Methods
-                private static string PrependPath(string path)
-                {
-                        string tmpPath = Helper.NormalizePath(path, '/');
-                        Regex regex = new Regex(@"(\w):/(\w+)");
-                        Match match = regex.Match(tmpPath);
-                        //if(match.Success || tmpPath[0] == '.' || tmpPath[0] == '/')
-                        //{
-                                tmpPath = Helper.NormalizePath(tmpPath);
-                        //}
-//                      else
-//                      {
-//                              tmpPath = Helper.NormalizePath("./" + tmpPath);
-//                      }
-                        return tmpPath;
-                }
-                private static string BuildReference(SolutionNode solution, ProjectNode currentProject, ReferenceNode refr)
-                {
-                        string ret = "";
-                        if(solution.ProjectsTable.ContainsKey(refr.Name))
-                        {
-                                ProjectNode project = (ProjectNode)solution.ProjectsTable[refr.Name];
-                string finalPath = Helper.NormalizePath(((ReferencePathNode)currentProject.ReferencePaths[0]).Path + refr.Name + ".dll", '/');
-                                
-                                return finalPath;
-                        }
-                        else
-                        {
-                                ProjectNode project = (ProjectNode)refr.Parent;
-                                string fileRef = FindFileReference(refr.Name, project);
-                                if(refr.Path != null || fileRef != null)
-                                {
-                                        string finalPath = (refr.Path != null) ? Helper.NormalizePath(refr.Path + "/" + refr.Name + ".dll", '/') : fileRef;
-                                        ret += finalPath;
-                                        return ret;
-                                }
-                                try
-                                {
-                    //Assembly assem = Assembly.Load(refr.Name);
-                    //if (assem != null)
-                    //{
-                                                //ret += (refr.Name + ".dll");
-                                        //}
-                                        //else
-                                        //{
-                                                ret += (refr.Name + ".dll");
-                                        //}
-                                }
-                                catch (System.NullReferenceException e)
-                                {
-                                        e.ToString();
-                                        ret += refr.Name + ".dll";
-                                }
-                        }
-                        return ret;
-                }
-                private static string BuildReferencePath(SolutionNode solution, ReferenceNode refr)
-                {
-                        string ret = "";
-                        if(solution.ProjectsTable.ContainsKey(refr.Name))
-                        {
-                                ProjectNode project = (ProjectNode)solution.ProjectsTable[refr.Name];
-                string finalPath = Helper.NormalizePath(((ReferencePathNode)project.ReferencePaths[0]).Path, '/');
-                return finalPath;
-            }
-                        else
-                        {
-                                ProjectNode project = (ProjectNode)refr.Parent;
-                                string fileRef = FindFileReference(refr.Name, project);
-                                if(refr.Path != null || fileRef != null)
-                                {
-                                        string finalPath = (refr.Path != null) ? Helper.NormalizePath(refr.Path, '/') : fileRef;
-                                        ret += finalPath;
-                                        return ret;
-                                }
-                                try
-                                {
-                                        Assembly assem = Assembly.Load(refr.Name);
-                                        if (assem != null)
-                                        {
-                                                ret += "";
-                                        }
-                                        else
-                                        {
-                                                ret += "";
-                                        }
-                                }
-                                catch (System.NullReferenceException e)
-                                {
-                                        e.ToString();
-                                        ret += "";
-                                }
-                        }
-                        return ret;
-                }
-                private static string FindFileReference(string refName, ProjectNode project) 
-                {
-                        foreach(ReferencePathNode refPath in project.ReferencePaths) 
-                        {
-                                string fullPath = Helper.MakeFilePath(refPath.Path, refName, "dll");
-                                if(File.Exists(fullPath)) 
-                                {
-                                        return fullPath;
-                                }
-                        }
-                        return null;
-                }
-                /// <summary>
-                /// Gets the XML doc file.
-                /// </summary>
-                /// <param name="project">The project.</param>
-                /// <param name="conf">The conf.</param>
-                /// <returns></returns>
-                public static string GetXmlDocFile(ProjectNode project, ConfigurationNode conf) 
-                {
-                        if( conf == null )
-                        {
-                                throw new ArgumentNullException("conf");
-                        }
-                        if( project == null )
-                        {
-                                throw new ArgumentNullException("project");
-                        }
-                        string docFile = (string)conf.Options["XmlDocFile"];
-                        //                      if(docFile != null && docFile.Length == 0)//default to assembly name if not specified
-                        //                      {
-                        //                              return Path.GetFileNameWithoutExtension(project.AssemblyName) + ".xml";
-                        //                      }
-                        return docFile;
-                }
-                private void WriteProject(SolutionNode solution, ProjectNode project)
-                {
-                        string projFile = Helper.MakeFilePath(project.FullPath, project.Name + (project.Type == ProjectType.Library ? ".dll" : ".exe"), "build");
-                        StreamWriter ss = new StreamWriter(projFile);
-                        m_Kernel.CurrentWorkingDirectory.Push();
-                        Helper.SetCurrentDir(Path.GetDirectoryName(projFile));
-                        bool hasDoc = false;
-                        using(ss)
-                        {
-                                ss.WriteLine("<?xml version=\"1.0\" ?>");
-                                ss.WriteLine("<project name=\"{0}\" default=\"build\">", project.Name);
-                                ss.WriteLine("    <target name=\"{0}\">", "build");
-                                ss.WriteLine("        <echo message=\"Build Directory is ${project::get-base-directory()}/${build.dir}\" />");
-                                ss.WriteLine("        <mkdir dir=\"${project::get-base-directory()}/${build.dir}\" />");                                
-                                ss.WriteLine("        <copy todir=\"${project::get-base-directory()}/${build.dir}\">");
-                                ss.WriteLine("            <fileset basedir=\"${project::get-base-directory()}\">");
-                                foreach(ReferenceNode refr in project.References)
-                                {
-                                        if (refr.LocalCopy)
-                                        {
-                                                ss.WriteLine("                <include name=\"{0}", Helper.NormalizePath(Helper.MakePathRelativeTo(project.FullPath, BuildReference(solution, project, refr))+"\" />", '/'));
-                                        }
-                                }
-                                ss.WriteLine("            </fileset>");
-                                ss.WriteLine("        </copy>");
-                                ss.Write("        <csc");
-                                ss.Write(" target=\"{0}\"", project.Type.ToString().ToLower());
-                                ss.Write(" debug=\"{0}\"", "${build.debug}");
-                                foreach(ConfigurationNode conf in project.Configurations)
-                                {
-                                        if (conf.Options.KeyFile !="")
-                                        {
-                                                ss.Write(" keyfile=\"{0}\"", conf.Options.KeyFile);
-                                                break;
-                                        }
-                                }
-                                foreach(ConfigurationNode conf in project.Configurations)
-                                {
-                                        ss.Write(" unsafe=\"{0}\"", conf.Options.AllowUnsafe);
-                                        break;
-                                }
-                                foreach(ConfigurationNode conf in project.Configurations)
-                                {
-                                        ss.Write(" define=\"{0}\"", conf.Options.CompilerDefines);
-                                        break;
-                                }
-                                foreach(ConfigurationNode conf in project.Configurations)
-                                {
-                                        if (GetXmlDocFile(project, conf) !="")
-                                        {
-                                                ss.Write(" doc=\"{0}\"", "${project::get-base-directory()}/${build.dir}/" + GetXmlDocFile(project, conf));
-                                                hasDoc = true;
-                                        }
-                                        break;
-                                }
-                                ss.Write(" output=\"{0}", "${project::get-base-directory()}/${build.dir}/${project::get-name()}");
-                                if (project.Type == ProjectType.Library)
-                                {
-                                        ss.Write(".dll\"");
-                                }
-                                else
-                                {
-                                        ss.Write(".exe\"");
-                                }
-                                if(project.AppIcon != null && project.AppIcon.Length != 0)
-                                {
-                                        ss.Write(" win32icon=\"{0}\"", Helper.NormalizePath(project.AppIcon,'/'));
-                                }
-                                ss.WriteLine(">");
-                ss.WriteLine("            <resources prefix=\"{0}\" dynamicprefix=\"true\" >", project.RootNamespace);
-                foreach (string file in project.Files)
-                {
-                    switch (project.Files.GetBuildAction(file))
-                    {
-                        case BuildAction.EmbeddedResource:
-                            ss.WriteLine("                {0}", "<include name=\"" + Helper.NormalizePath(PrependPath(file), '/') + "\" />");
-                            break;
-                        default:
-                            if (project.Files.GetSubType(file) != SubType.Code && project.Files.GetSubType(file) != SubType.Settings)
-                            {
-                                ss.WriteLine("                <include name=\"{0}\" />", file.Substring(0, file.LastIndexOf('.')) + ".resx");
-                            }
-                            break;
-                    }
-                }
-                //if (project.Files.GetSubType(file).ToString() != "Code")
-                //{
-                //      ps.WriteLine("    <EmbeddedResource Include=\"{0}\">", file.Substring(0, file.LastIndexOf('.')) + ".resx");                 
-                ss.WriteLine("            </resources>");
-                                ss.WriteLine("            <sources failonempty=\"true\">");
-                                foreach(string file in project.Files)
-                                {
-                                        switch(project.Files.GetBuildAction(file))
-                                        {
-                                                case BuildAction.Compile:
-                                                        ss.WriteLine("                <include name=\"" + Helper.NormalizePath(PrependPath(file), '/') + "\" />");
-                                                        break;
-                                                default:
-                                                        break;
-                                        }
-                                }
-                                ss.WriteLine("            </sources>");
-                                ss.WriteLine("            <references basedir=\"${project::get-base-directory()}\">");
-                                ss.WriteLine("                <lib>");
-                                ss.WriteLine("                    <include name=\"${project::get-base-directory()}\" />");
-                                ss.WriteLine("                    <include name=\"${project::get-base-directory()}/${build.dir}\" />");
-                                ss.WriteLine("                </lib>");
-                                foreach(ReferenceNode refr in project.References)
-                                {
-                                    string path = Helper.NormalizePath(Helper.MakePathRelativeTo(project.FullPath, BuildReference(solution, project, refr)), '/');
-                                        ss.WriteLine("                <include name=\""+ path + "\" />" );
-                                }
-                                ss.WriteLine("            </references>");
-                
-                                ss.WriteLine("        </csc>");
-                foreach (ConfigurationNode conf in project.Configurations)
-                {
-                    if (!String.IsNullOrEmpty(conf.Options.OutputPath))
-                    {
-                        string targetDir = Helper.NormalizePath(conf.Options.OutputPath, '/');
-                        
-                        ss.WriteLine("        <echo message=\"Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/" + targetDir + "\" />");
-                        ss.WriteLine("        <mkdir dir=\"${project::get-base-directory()}/" + targetDir + "\"/>");
-                        ss.WriteLine("        <copy todir=\"${project::get-base-directory()}/" + targetDir + "\">");
-                        ss.WriteLine("            <fileset basedir=\"${project::get-base-directory()}/${build.dir}/\" >");
-                        ss.WriteLine("                <include name=\"*.dll\"/>");
-                        ss.WriteLine("                <include name=\"*.exe\"/>");
-                        ss.WriteLine("            </fileset>");
-                        ss.WriteLine("        </copy>");
-                        break;
-                    }
-                }
-                            
-                                ss.WriteLine("    </target>");
-                                ss.WriteLine("    <target name=\"clean\">");
-                                ss.WriteLine("        <delete dir=\"${bin.dir}\" failonerror=\"false\" />");
-                                ss.WriteLine("        <delete dir=\"${obj.dir}\" failonerror=\"false\" />");
-                                ss.WriteLine("    </target>");
-                                ss.WriteLine("    <target name=\"doc\" description=\"Creates documentation.\">");
-                                if (hasDoc)
-                                {
-                                        ss.WriteLine("        <property name=\"doc.target\" value=\"\" />");
-                                        ss.WriteLine("        <if test=\"${platform::is-unix()}\">");
-                                        ss.WriteLine("            <property name=\"doc.target\" value=\"Web\" />");
-                                        ss.WriteLine("        </if>");
-                                        ss.WriteLine("        <ndoc failonerror=\"false\" verbose=\"true\">");
-                                        ss.WriteLine("            <assemblies basedir=\"${project::get-base-directory()}\">");
-                                        ss.Write("                <include name=\"${build.dir}/${project::get-name()}");
-                                        if (project.Type == ProjectType.Library)
-                                        {
-                                                ss.WriteLine(".dll\" />");
-                                        }
-                                        else
-                                        {
-                                                ss.WriteLine(".exe\" />");
-                                        }
-                                        ss.WriteLine("            </assemblies>");
-                                        ss.WriteLine("            <summaries basedir=\"${project::get-base-directory()}\">");
-                                        ss.WriteLine("                <include name=\"${build.dir}/${project::get-name()}.xml\"/>");
-                                        ss.WriteLine("            </summaries>");
-                                        ss.WriteLine("            <referencepaths basedir=\"${project::get-base-directory()}\">");
-                                        ss.WriteLine("                <include name=\"${build.dir}\" />");
-                                        //                                      foreach(ReferenceNode refr in project.References)
-                                        //                                      {
-                                        //                                              string path = Helper.NormalizePath(Helper.MakePathRelativeTo(project.FullPath, BuildReferencePath(solution, refr)), '/');
-                                        //                                              if (path != "")
-                                        //                                              {
-                                        //                                                      ss.WriteLine("                <include name=\"{0}\" />", path);
-                                        //                                              }
-                                        //                                      }
-                                        ss.WriteLine("            </referencepaths>");
-                                        ss.WriteLine("            <documenters>");
-                                        ss.WriteLine("                <documenter name=\"MSDN\">");
-                    ss.WriteLine("                    <property name=\"OutputDirectory\" value=\"${project::get-base-directory()}/${build.dir}/doc/${project::get-name()}\" />");
-                                        ss.WriteLine("                    <property name=\"OutputTarget\" value=\"${doc.target}\" />");
-                                        ss.WriteLine("                    <property name=\"HtmlHelpName\" value=\"${project::get-name()}\" />");
-                                        ss.WriteLine("                    <property name=\"IncludeFavorites\" value=\"False\" />");
-                                        ss.WriteLine("                    <property name=\"Title\" value=\"${project::get-name()} SDK Documentation\" />");
-                                        ss.WriteLine("                    <property name=\"SplitTOCs\" value=\"False\" />");
-                                        ss.WriteLine("                    <property name=\"DefaulTOC\" value=\"\" />");
-                                        ss.WriteLine("                    <property name=\"ShowVisualBasic\" value=\"True\" />");
-                                        ss.WriteLine("                    <property name=\"AutoDocumentConstructors\" value=\"True\" />");
-                                        ss.WriteLine("                    <property name=\"ShowMissingSummaries\" value=\"${build.debug}\" />");
-                                        ss.WriteLine("                    <property name=\"ShowMissingRemarks\" value=\"${build.debug}\" />");
-                                        ss.WriteLine("                    <property name=\"ShowMissingParams\" value=\"${build.debug}\" />");
-                                        ss.WriteLine("                    <property name=\"ShowMissingReturns\" value=\"${build.debug}\" />");
-                                        ss.WriteLine("                    <property name=\"ShowMissingValues\" value=\"${build.debug}\" />");
-                                        ss.WriteLine("                    <property name=\"DocumentInternals\" value=\"False\" />");
-                                        ss.WriteLine("                    <property name=\"DocumentPrivates\" value=\"False\" />");
-                                        ss.WriteLine("                    <property name=\"DocumentProtected\" value=\"True\" />");
-                                        ss.WriteLine("                    <property name=\"DocumentEmptyNamespaces\" value=\"${build.debug}\" />");
-                                        ss.WriteLine("                    <property name=\"IncludeAssemblyVersion\" value=\"True\" />");
-                                        ss.WriteLine("                </documenter>");
-                                        ss.WriteLine("            </documenters>");
-                                        ss.WriteLine("        </ndoc>");
-                                }
-                                ss.WriteLine("    </target>");
-                                ss.WriteLine("</project>");
-                        }                
-                        m_Kernel.CurrentWorkingDirectory.Pop();
-                }
-                private void WriteCombine(SolutionNode solution)
-                {
-                        m_Kernel.Log.Write("Creating NAnt build files");
-                        foreach(ProjectNode project in solution.Projects)
-                        {
-                                if(m_Kernel.AllowProject(project.FilterGroups)) 
-                                {
-                                        m_Kernel.Log.Write("...Creating project: {0}", project.Name);
-                                        WriteProject(solution, project);
-                                }
-                        }
-                        m_Kernel.Log.Write("");
-                        string combFile = Helper.MakeFilePath(solution.FullPath, solution.Name, "build");
-                        StreamWriter ss = new StreamWriter(combFile);
-                        m_Kernel.CurrentWorkingDirectory.Push();
-                        Helper.SetCurrentDir(Path.GetDirectoryName(combFile));
-            
-                        using(ss)
-                        {
-                                ss.WriteLine("<?xml version=\"1.0\" ?>");
-                                ss.WriteLine("<project name=\"{0}\" default=\"build\">", solution.Name);
-                                ss.WriteLine("    <echo message=\"Using '${nant.settings.currentframework}' Framework\"/>");
-                                ss.WriteLine();
-                                //ss.WriteLine("    <property name=\"dist.dir\" value=\"dist\" />");
-                                //ss.WriteLine("    <property name=\"source.dir\" value=\"source\" />");
-                                ss.WriteLine("    <property name=\"bin.dir\" value=\"bin\" />");
-                                ss.WriteLine("    <property name=\"obj.dir\" value=\"obj\" />");
-                                ss.WriteLine("    <property name=\"doc.dir\" value=\"doc\" />");
-                                ss.WriteLine("    <property name=\"project.main.dir\" value=\"${project::get-base-directory()}\" />");
-                                foreach(ConfigurationNode conf in solution.Configurations)
-                                {
-                                        // Set the project.config to a non-debug configuration
-                                        if( conf.Options["DebugInformation"].ToString().ToLower() != "true" )
-                                        {
-                                                ss.WriteLine("    <property name=\"project.config\" value=\"{0}\" />", conf.Name);
-                                        }
-                                        ss.WriteLine();
-                                        ss.WriteLine("    <target name=\"{0}\" description=\"\">", conf.Name);
-                                        ss.WriteLine("        <property name=\"project.config\" value=\"{0}\" />", conf.Name);
-                                        ss.WriteLine("        <property name=\"build.debug\" value=\"{0}\" />", conf.Options["DebugInformation"].ToString().ToLower());
-                                        ss.WriteLine("    </target>");
-                                        ss.WriteLine();
-                                }
-                                ss.WriteLine("    <target name=\"net-1.1\" description=\"Sets framework to .NET 1.1\">");
-                                ss.WriteLine("        <property name=\"nant.settings.currentframework\" value=\"net-1.1\" />");
-                                ss.WriteLine("    </target>");
-                                ss.WriteLine();
-    
-                                ss.WriteLine("    <target name=\"net-2.0\" description=\"Sets framework to .NET 2.0\">");
-                                ss.WriteLine("        <property name=\"nant.settings.currentframework\" value=\"net-2.0\" />");
-                                ss.WriteLine("    </target>");
-                                ss.WriteLine();
-                                ss.WriteLine("    <target name=\"mono-2.0\" description=\"Sets framework to mono 2.0\">");
-                                ss.WriteLine("        <property name=\"nant.settings.currentframework\" value=\"mono-2.0\" />");
-                                ss.WriteLine("    </target>");
-                                ss.WriteLine();
-                                ss.WriteLine("    <target name=\"mono-1.0\" description=\"Sets framework to mono 1.0\">");
-                                ss.WriteLine("        <property name=\"nant.settings.currentframework\" value=\"mono-1.0\" />");
-                                ss.WriteLine("    </target>");
-                                ss.WriteLine();
-                                ss.WriteLine("    <target name=\"init\" description=\"\">");
-                                ss.WriteLine("        <call target=\"${project.config}\" />");
-                                ss.WriteLine("        <sysinfo />");
-                                ss.WriteLine("        <echo message=\"Platform ${sys.os.platform}\" />");
-                                ss.WriteLine("        <property name=\"build.dir\" value=\"${bin.dir}/${project.config}\" />");
-                                ss.WriteLine("    </target>");
-                                ss.WriteLine();
-                                
-                                ss.WriteLine("    <target name=\"clean\" description=\"\">");
-                                ss.WriteLine("        <echo message=\"Deleting all builds from all configurations\" />");
-                                //ss.WriteLine("        <delete dir=\"${dist.dir}\" failonerror=\"false\" />");
-                                ss.WriteLine("        <delete dir=\"${bin.dir}\" failonerror=\"false\" />");
-                                ss.WriteLine("        <delete dir=\"${obj.dir}\" failonerror=\"false\" />");
-                                foreach(ProjectNode project in solution.Projects)
-                                {
-                                        string path = Helper.MakePathRelativeTo(solution.FullPath, project.FullPath);
-                                        ss.Write("        <nant buildfile=\"{0}\"",
-                                                Helper.NormalizePath(Helper.MakeFilePath(path, project.Name + (project.Type == ProjectType.Library ? ".dll" : ".exe"), "build"),'/'));
-                                        ss.WriteLine(" target=\"clean\" />");
-                                }
-                                ss.WriteLine("    </target>");
-                                ss.WriteLine();
-                                ss.WriteLine("    <target name=\"build\" depends=\"init\" description=\"\">");
-                                
-                                foreach(ProjectNode project in solution.ProjectsTableOrder)
-                                {
-                                        string path = Helper.MakePathRelativeTo(solution.FullPath, project.FullPath);
-                                        ss.Write("        <nant buildfile=\"{0}\"",
-                                                Helper.NormalizePath(Helper.MakeFilePath(path, project.Name + (project.Type == ProjectType.Library ? ".dll" : ".exe"), "build"),'/'));
-                                        ss.WriteLine(" target=\"build\" />");
-                                }
-                                ss.WriteLine("    </target>");
-                                ss.WriteLine();
-                                ss.WriteLine("    <target name=\"build-release\" depends=\"Release, init, build\" description=\"Builds in Release mode\" />");
-                                ss.WriteLine();
-                                ss.WriteLine("    <target name=\"build-debug\" depends=\"Debug, init, build\" description=\"Builds in Debug mode\" />");
-                                ss.WriteLine();
-                                //ss.WriteLine("    <target name=\"package\" depends=\"clean, doc, copyfiles, zip\" description=\"Builds in Release mode\" />");
-                                ss.WriteLine("    <target name=\"package\" depends=\"clean, doc\" description=\"Builds all\" />");
-                                ss.WriteLine();
-                ss.WriteLine("    <target name=\"doc\" depends=\"build-release\">");
-                ss.WriteLine("        <echo message=\"Generating all documentation from all builds\" />");
-                foreach (ProjectNode project in solution.Projects)
-                {
-                    string path = Helper.MakePathRelativeTo(solution.FullPath, project.FullPath);
-                    ss.Write("        <nant buildfile=\"{0}\"",
-                        Helper.NormalizePath(Helper.MakeFilePath(path, project.Name + (project.Type == ProjectType.Library ? ".dll" : ".exe"), "build"), '/'));
-                    ss.WriteLine(" target=\"doc\" />");
-                }
-                                ss.WriteLine("    </target>");
-                                ss.WriteLine();    
-                                ss.WriteLine("</project>");
-                        }
-                        m_Kernel.CurrentWorkingDirectory.Pop();
-                }
-                private void CleanProject(ProjectNode project)
-                {
-                        m_Kernel.Log.Write("...Cleaning project: {0}", project.Name);
-                        string projectFile = Helper.MakeFilePath(project.FullPath, project.Name + (project.Type == ProjectType.Library ? ".dll" : ".exe"), "build");
-                        Helper.DeleteIfExists(projectFile);
-                }
-                private void CleanSolution(SolutionNode solution)
-                {
-                        m_Kernel.Log.Write("Cleaning NAnt build files for", solution.Name);
-                        string slnFile = Helper.MakeFilePath(solution.FullPath, solution.Name, "build");
-                        Helper.DeleteIfExists(slnFile);
-                        foreach(ProjectNode project in solution.Projects)
-                        {
-                                CleanProject(project);
-                        }
-            
-                        m_Kernel.Log.Write("");
-                }
-                #endregion
-                #region ITarget Members
-                /// <summary>
-                /// Writes the specified kern.
-                /// </summary>
-                /// <param name="kern">The kern.</param>
-                public void Write(Kernel kern)
-                {
-                        if( kern == null )
-                        {
-                                throw new ArgumentNullException("kern");
-                        }
-                        m_Kernel = kern;
-                        foreach(SolutionNode solution in kern.Solutions)
-                        {
-                                WriteCombine(solution);
-                        }
-                        m_Kernel = null;
-                }
-                /// <summary>
-                /// Cleans the specified kern.
-                /// </summary>
-                /// <param name="kern">The kern.</param>
-                public virtual void Clean(Kernel kern)
-                {
-                        if( kern == null )
-                        {
-                                throw new ArgumentNullException("kern");
-                        }
-                        m_Kernel = kern;
-                        foreach(SolutionNode sol in kern.Solutions)
-                        {
-                                CleanSolution(sol);
-                        }
-                        m_Kernel = null;
-                }
-                /// <summary>
-                /// Gets the name.
-                /// </summary>
-                /// <value>The name.</value>
-                public string Name
-                {
-                        get
-                        {
-                                return "nant";
-                        }
-                }
-                #endregion
-        }
-}
diff --git a/Prebuild/src/Core/Targets/SharpDevelop2Target.cs b/Prebuild/src/Core/Targets/SharpDevelop2Target.cs
deleted file mode 100644
index bc84b96..0000000
--- a/Prebuild/src/Core/Targets/SharpDevelop2Target.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-#region BSD License
-/*
-Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (dan05a@gmail.com)
-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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
-*/
-#endregion
-#region CVS Information
-/*
- * $Source$
- * $Author: jendave $
- * $Date: 2006-01-27 16:49:58 -0800 (Fri, 27 Jan 2006) $
- * $Revision: 71 $
- */
-#endregion
-using System;
-using Prebuild.Core.Attributes;
-namespace Prebuild.Core.Targets
-{
-        /// <summary>
-        /// 
-        /// </summary>
-        [Target("sharpdev2")]
-        public class SharpDevelop2Target : VS2005Target
-        {
-                #region Private Methods
-                private void SetSharpDevelop2()
-                {
-                        this.VersionName = "SharpDevelop2";
-                }
-                #endregion
-                #region Public Methods
-                /// <summary>
-                /// Writes the specified kern.
-                /// </summary>
-                /// <param name="kern">The kern.</param>
-                public override void Write(Kernel kern)
-                {
-                        SetSharpDevelop2();
-                        base.Write(kern);
-                }
-                /// <summary>
-                /// Cleans the specified kern.
-                /// </summary>
-                /// <param name="kern">The kern.</param>
-                public override void Clean(Kernel kern)
-                {
-                        SetSharpDevelop2();
-                        base.Clean(kern);
-                }
-                /// <summary>
-                /// Gets the name.
-                /// </summary>
-                /// <value>The name.</value>
-                public override string Name
-                {
-                        get
-                        {
-                                return "sharpdev2";
-                        }
-                }
-                #endregion
-        }
-}
diff --git a/Prebuild/src/Core/Targets/SharpDevelopTarget.cs b/Prebuild/src/Core/Targets/SharpDevelopTarget.cs
deleted file mode 100644
index c725730..0000000
--- a/Prebuild/src/Core/Targets/SharpDevelopTarget.cs
+++ /dev/null
@@ -1,437 +0,0 @@
-#region BSD License
-/*
-Copyright (c) 2004 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (dan05a@gmail.com)
-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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
-*/
-#endregion
-#region CVS Information
-/*
- * $Source$
- * $Author: jendave $
- * $Date: 2007-02-13 21:58:03 +0100 (ti, 13 feb 2007) $
- * $Revision: 205 $
- */
-#endregion
-using System;
-using System.Collections;
-using System.Collections.Specialized;
-using System.IO;
-using System.Text.RegularExpressions;
-using System.Reflection;
-using Prebuild.Core.Attributes;
-using Prebuild.Core.Interfaces;
-using Prebuild.Core.Nodes;
-using Prebuild.Core.Utilities;
-namespace Prebuild.Core.Targets
-{
-        /// <summary>
-        /// 
-        /// </summary>
-        [Target("sharpdev")]
-        public class SharpDevelopTarget : ITarget
-        {
-                #region Fields
-                private Kernel m_Kernel;
-                #endregion
-                #region Private Methods
-                private static string PrependPath(string path)
-                {
-                        string tmpPath = Helper.NormalizePath(path, '/');
-                        Regex regex = new Regex(@"(\w):/(\w+)");
-                        Match match = regex.Match(tmpPath);
-                        if(match.Success || tmpPath[0] == '.' || tmpPath[0] == '/')
-                        {
-                                tmpPath = Helper.NormalizePath(tmpPath);
-                        }
-                        else
-                        {
-                                tmpPath = Helper.NormalizePath("./" + tmpPath);
-                        }
-                        return tmpPath;
-                }
-                private static string BuildReference(SolutionNode solution, ReferenceNode refr)
-                {
-                        string ret = "<Reference type=\"";
-                        if(solution.ProjectsTable.ContainsKey(refr.Name))
-                        {
-                                ret += "Project\" refto=\"" + refr.Name;
-                                ret += "\" localcopy=\"" + refr.LocalCopy.ToString() + "\" />";
-                        }
-                        else
-                        {
-                                ProjectNode project = (ProjectNode)refr.Parent;
-                                string fileRef = FindFileReference(refr.Name, project);
-                                if(refr.Path != null || fileRef != null)
-                                {
-                                        ret += "Assembly\" refto=\"";
-                                        string finalPath = (refr.Path != null) ? Helper.MakeFilePath(refr.Path, refr.Name, "dll") : fileRef;
-                                        ret += finalPath;
-                                        ret += "\" localcopy=\"" + refr.LocalCopy.ToString() + "\" />";
-                                        return ret;
-                                }
-                                ret += "Gac\" refto=\"";
-                                try
-                                {
-                                        //Assembly assem = Assembly.Load(refr.Name);
-                    ret += refr.Name;// assem.FullName;
-                                }
-                                catch (System.NullReferenceException e)
-                                {
-                                        e.ToString();
-                                        ret += refr.Name;
-                                }
-                                ret += "\" localcopy=\"" + refr.LocalCopy.ToString() + "\" />";
-                        }
-                        return ret;
-                }
-                private static string FindFileReference(string refName, ProjectNode project) 
-                {
-                        foreach(ReferencePathNode refPath in project.ReferencePaths) 
-                        {
-                                string fullPath = Helper.MakeFilePath(refPath.Path, refName, "dll");
-                                if(File.Exists(fullPath)) 
-                                {
-                                        return fullPath;
-                                }
-                        }
-                        return null;
-                }
-                /// <summary>
-                /// Gets the XML doc file.
-                /// </summary>
-                /// <param name="project">The project.</param>
-                /// <param name="conf">The conf.</param>
-                /// <returns></returns>
-                public static string GenerateXmlDocFile(ProjectNode project, ConfigurationNode conf) 
-                {
-                        if( conf == null )
-                        {
-                                throw new ArgumentNullException("conf");
-                        }
-                        if( project == null )
-                        {
-                                throw new ArgumentNullException("project");
-                        }
-                        string docFile = (string)conf.Options["XmlDocFile"];
-                        if(docFile != null && docFile.Length == 0)//default to assembly name if not specified
-                        {
-                                return "False";
-                        }
-                        return "True";
-                }
-                private void WriteProject(SolutionNode solution, ProjectNode project)
-                {
-                        string csComp = "Csc";
-                        string netRuntime = "MsNet";
-                        if(project.Runtime == ClrRuntime.Mono)
-                        {
-                                csComp = "Mcs";
-                                netRuntime = "Mono";
-                        }
-                        string projFile = Helper.MakeFilePath(project.FullPath, project.Name, "prjx");
-                        StreamWriter ss = new StreamWriter(projFile);
-                        m_Kernel.CurrentWorkingDirectory.Push();
-                        Helper.SetCurrentDir(Path.GetDirectoryName(projFile));
-                        using(ss)
-                        {
-                                ss.WriteLine(
-                                        "<Project name=\"{0}\" standardNamespace=\"{1}\" description=\"\" newfilesearch=\"None\" enableviewstate=\"True\" version=\"1.1\" projecttype=\"C#\">",
-                                        project.Name,
-                                        project.RootNamespace
-                                        );
-                                ss.WriteLine("  <Contents>");
-                                foreach(string file in project.Files)
-                                {
-                                        string buildAction = "Compile";
-                                        switch(project.Files.GetBuildAction(file))
-                                        {
-                                                case BuildAction.None:
-                                                        buildAction = "Nothing";
-                                                        break;
-                                                case BuildAction.Content:
-                                                        buildAction = "Exclude";
-                                                        break;
-                                                case BuildAction.EmbeddedResource:
-                                                        buildAction = "EmbedAsResource";
-                                                        break;
-                                                default:
-                                                        buildAction = "Compile";
-                                                        break;
-                                        }
-                                        // Sort of a hack, we try and resolve the path and make it relative, if we can.
-                                        string filePath = PrependPath(file);
-                                        ss.WriteLine("    <File name=\"{0}\" subtype=\"Code\" buildaction=\"{1}\" dependson=\"\" data=\"\" />", filePath, buildAction);
-                                }
-                                ss.WriteLine("  </Contents>");
-                                ss.WriteLine("  <References>");
-                                foreach(ReferenceNode refr in project.References)
-                                {
-                                        ss.WriteLine("    {0}", BuildReference(solution, refr));
-                                }
-                                ss.WriteLine("  </References>");
-                                ss.Write("  <DeploymentInformation");
-                                ss.Write(" target=\"\"");
-                                ss.Write(" script=\"\"");
-                                ss.Write(" strategy=\"File\"");
-                                ss.WriteLine(" />");
-                                int count = 0;
-                                
-                                ss.WriteLine("  <Configurations active=\"{0}\">", solution.ActiveConfig);
-                                foreach(ConfigurationNode conf in project.Configurations)
-                                {
-                                        ss.Write("    <Configuration");
-                                        ss.Write(" runwithwarnings=\"True\"");
-                                        ss.Write(" name=\"{0}\"", conf.Name);
-                                        ss.WriteLine(">");
-                                        ss.Write("      <CodeGeneration");
-                                        ss.Write(" runtime=\"{0}\"", netRuntime);
-                                        ss.Write(" compiler=\"{0}\"", csComp);
-                                        ss.Write(" compilerversion=\"\"");
-                                        ss.Write(" warninglevel=\"{0}\"", conf.Options["WarningLevel"]);
-                                        ss.Write(" nowarn=\"{0}\"", conf.Options["SuppressWarnings"]);
-                                        ss.Write(" includedebuginformation=\"{0}\"", conf.Options["DebugInformation"]);
-                                        ss.Write(" optimize=\"{0}\"", conf.Options["OptimizeCode"]);
-                                        ss.Write(" unsafecodeallowed=\"{0}\"", conf.Options["AllowUnsafe"]);
-                                        ss.Write(" generateoverflowchecks=\"{0}\"", conf.Options["CheckUnderflowOverflow"]);
-                                        ss.Write(" mainclass=\"{0}\"", project.StartupObject);
-                                        ss.Write(" target=\"{0}\"", project.Type);
-                                        ss.Write(" definesymbols=\"{0}\"", conf.Options["CompilerDefines"]);
-                                        ss.Write(" generatexmldocumentation=\"{0}\"", GenerateXmlDocFile(project, conf));
-                                        ss.Write(" win32Icon=\"{0}\"", Helper.NormalizePath(".\\" + project.AppIcon));
-                                        ss.Write(" noconfig=\"{0}\"", "False");
-                                        ss.Write(" nostdlib=\"{0}\"", conf.Options["NoStdLib"]);
-                                        ss.WriteLine(" />");
-                                        ss.Write("      <Execution");
-                                        ss.Write(" commandlineparameters=\"\"");
-                                        ss.Write(" consolepause=\"True\"");
-                                        ss.WriteLine(" />");
-                                        ss.Write("      <Output");
-                                        ss.Write(" directory=\".\\{0}\"", Helper.NormalizePath(conf.Options["OutputPath"].ToString()));
-                                        ss.Write(" assembly=\"{0}\"", project.AssemblyName);
-                                        ss.Write(" executeScript=\"{0}\"", conf.Options["RunScript"]);
-                                        if (conf.Options["PreBuildEvent"] != null && conf.Options["PreBuildEvent"].ToString().Length != 0)
-                                        {
-                                                ss.Write(" executeBeforeBuild=\"{0}\"", Helper.NormalizePath(conf.Options["PreBuildEvent"].ToString()));
-                                        }
-                                        else
-                                        {
-                                                ss.Write(" executeBeforeBuild=\"{0}\"", conf.Options["PreBuildEvent"]);
-                                        }
-                                        if (conf.Options["PostBuildEvent"] != null && conf.Options["PostBuildEvent"].ToString().Length != 0)
-                                        {
-                                                ss.Write(" executeAfterBuild=\"{0}\"", Helper.NormalizePath(conf.Options["PostBuildEvent"].ToString()));
-                                        }
-                                        else
-                                        {
-                                                ss.Write(" executeAfterBuild=\"{0}\"", conf.Options["PostBuildEvent"]);
-                                        }
-                                        ss.Write(" executeBeforeBuildArguments=\"{0}\"", conf.Options["PreBuildEventArgs"]);
-                                        ss.Write(" executeAfterBuildArguments=\"{0}\"", conf.Options["PreBuildEventArgs"]);
-                                        ss.WriteLine(" />");
-                                        ss.WriteLine("    </Configuration>");
-                                        count++;
-                                }  
-                                ss.WriteLine("  </Configurations>");
-                                ss.WriteLine("</Project>");
-                        }
-                        m_Kernel.CurrentWorkingDirectory.Pop();
-                }
-                private void WriteCombine(SolutionNode solution)
-                {
-                        m_Kernel.Log.Write("Creating SharpDevelop combine and project files");
-                        foreach(ProjectNode project in solution.Projects)
-                        {
-                                if(m_Kernel.AllowProject(project.FilterGroups)) 
-                                {
-                                        m_Kernel.Log.Write("...Creating project: {0}", project.Name);
-                                        WriteProject(solution, project);
-                                }
-                        }
-                        m_Kernel.Log.Write("");
-                        string combFile = Helper.MakeFilePath(solution.FullPath, solution.Name, "cmbx");
-                        StreamWriter ss = new StreamWriter(combFile);
-                        m_Kernel.CurrentWorkingDirectory.Push();
-                        Helper.SetCurrentDir(Path.GetDirectoryName(combFile));
-            
-                        using(ss)
-                        {
-                                ss.WriteLine("<Combine fileversion=\"1.0\" name=\"{0}\" description=\"\">", solution.Name);
-                
-                                int count = 0;
-                                foreach(ProjectNode project in solution.Projects)
-                                {                    
-                                        if(count == 0)
-                                                ss.WriteLine("  <StartMode startupentry=\"{0}\" single=\"True\">", project.Name);
-                                        ss.WriteLine("    <Execute entry=\"{0}\" type=\"None\" />", project.Name);
-                                        count++;
-                                }
-                                ss.WriteLine("  </StartMode>");
-                
-                                ss.WriteLine("  <Entries>");
-                                foreach(ProjectNode project in solution.Projects)
-                                {
-                                        string path = Helper.MakePathRelativeTo(solution.FullPath, project.FullPath);
-                                        ss.WriteLine("    <Entry filename=\"{0}\" />",
-                                                Helper.MakeFilePath(path, project.Name, "prjx"));
-                                }
-                                ss.WriteLine("  </Entries>");
-                                count = 0;
-                                foreach(ConfigurationNode conf in solution.Configurations)
-                                {
-                                        if(count == 0)
-                                        {
-                                                ss.WriteLine("  <Configurations active=\"{0}\">", conf.Name);
-                                        }
-                                        ss.WriteLine("    <Configuration name=\"{0}\">", conf.Name);
-                                        foreach(ProjectNode project in solution.Projects)
-                                        {
-                                                ss.WriteLine("      <Entry name=\"{0}\" configurationname=\"{1}\" build=\"True\" />", project.Name, conf.Name);
-                                        }
-                                        ss.WriteLine("    </Configuration>");
-                                        count++;
-                                }
-                                ss.WriteLine("  </Configurations>");
-                                ss.WriteLine("</Combine>");
-                        }
-                        m_Kernel.CurrentWorkingDirectory.Pop();
-                }
-                private void CleanProject(ProjectNode project)
-                {
-                        m_Kernel.Log.Write("...Cleaning project: {0}", project.Name);
-                        string projectFile = Helper.MakeFilePath(project.FullPath, project.Name, "prjx");
-                        Helper.DeleteIfExists(projectFile);
-                }
-                private void CleanSolution(SolutionNode solution)
-                {
-                        m_Kernel.Log.Write("Cleaning SharpDevelop combine and project files for", solution.Name);
-                        string slnFile = Helper.MakeFilePath(solution.FullPath, solution.Name, "cmbx");
-                        Helper.DeleteIfExists(slnFile);
-                        foreach(ProjectNode project in solution.Projects)
-                        {
-                                CleanProject(project);
-                        }
-            
-                        m_Kernel.Log.Write("");
-                }
-                #endregion
-                #region ITarget Members
-                /// <summary>
-                /// Writes the specified kern.
-                /// </summary>
-                /// <param name="kern">The kern.</param>
-                public void Write(Kernel kern)
-                {
-                        if( kern == null )
-                        {
-                                throw new ArgumentNullException("kern");
-                        }
-                        m_Kernel = kern;
-                        foreach(SolutionNode solution in kern.Solutions)
-                        {
-                                WriteCombine(solution);
-                        }
-                        m_Kernel = null;
-                }
-                /// <summary>
-                /// Cleans the specified kern.
-                /// </summary>
-                /// <param name="kern">The kern.</param>
-                public virtual void Clean(Kernel kern)
-                {
-                        if( kern == null )
-                        {
-                                throw new ArgumentNullException("kern");
-                        }
-                        m_Kernel = kern;
-                        foreach(SolutionNode sol in kern.Solutions)
-                        {
-                                CleanSolution(sol);
-                        }
-                        m_Kernel = null;
-                }
-                /// <summary>
-                /// Gets the name.
-                /// </summary>
-                /// <value>The name.</value>
-                public string Name
-                {
-                        get
-                        {
-                                return "sharpdev";
-                        }
-                }
-                #endregion
-        }
-}
diff --git a/Prebuild/src/Core/Targets/VS2002Target.cs b/Prebuild/src/Core/Targets/VS2002Target.cs
deleted file mode 100644
index 66216dc..0000000
--- a/Prebuild/src/Core/Targets/VS2002Target.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-#region BSD License
-/*
-Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (dan05a@gmail.com)
-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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
-*/
-#endregion
-#region CVS Information
-/*
- * $Source$
- * $Author: jendave $
- * $Date: 2006-01-28 01:49:58 +0100 (lö, 28 jan 2006) $
- * $Revision: 71 $
- */
-#endregion
-using System;
-using Prebuild.Core.Attributes;
-namespace Prebuild.Core.Targets
-{
-        /// <summary>
-        /// 
-        /// </summary>
-        [Target("vs2002")]
-        public class VS2002Target : VS2003Target
-        {
-                #region Private Methods
-                private void SetVS2002()
-                {
-                        this.SolutionVersion = "7.00";
-                        this.ProductVersion = "7.0.9254";
-                        this.SchemaVersion = "1.0";
-                        this.VersionName = "2002";
-                        this.Version = VSVersion.VS70;
-                }
-                #endregion
-                #region Public Methods
-                /// <summary>
-                /// Writes the specified kern.
-                /// </summary>
-                /// <param name="kern">The kern.</param>
-                public override void Write(Kernel kern)
-                {
-                        SetVS2002();
-                        base.Write(kern);
-                }
-                /// <summary>
-                /// Cleans the specified kern.
-                /// </summary>
-                /// <param name="kern">The kern.</param>
-                public override void Clean(Kernel kern)
-                {
-                        SetVS2002();
-                        base.Clean(kern);
-                }
-                /// <summary>
-                /// Gets the name.
-                /// </summary>
-                /// <value>The name.</value>
-                public override string Name
-                {
-                        get
-                        {
-                                return "vs2002";
-                        }
-                }
-                #endregion
-        }
-}
diff --git a/Prebuild/src/Core/Targets/VS2003Target.cs b/Prebuild/src/Core/Targets/VS2003Target.cs
deleted file mode 100644
index b3236a8..0000000
--- a/Prebuild/src/Core/Targets/VS2003Target.cs
+++ /dev/null
@@ -1,633 +0,0 @@
-#region BSD License
-/*
-Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (dan05a@gmail.com)
-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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
-*/
-#endregion
-#region CVS Information
-/*
- * $Source$
- * $Author: jendave $
- * $Date: 2006-09-29 21:11:40 +0200 (fr, 29 sep 2006) $
- * $Revision: 177 $
- */
-#endregion
-using System;
-using System.Collections;
-using System.Collections.Specialized;
-using System.IO;
-using Prebuild.Core.Attributes;
-using Prebuild.Core.Interfaces;
-using Prebuild.Core.Nodes;
-using Prebuild.Core.Utilities;
-namespace Prebuild.Core.Targets
-{
-        /// <summary>
-        /// 
-        /// </summary>
-        public enum VSVersion
-        {
-                /// <summary>
-                /// 
-                /// </summary>
-                VS70,
-                /// <summary>
-                /// 
-                /// </summary>
-                VS71,
-                /// <summary>
-                /// 
-                /// </summary>
-                VS80
-        }
-        /// <summary>
-        /// 
-        /// </summary>
-        [Target("vs2003")]
-        public class VS2003Target : ITarget
-        {
-                #region Fields
-                string solutionVersion = "8.00";
-                string productVersion = "7.10.3077";
-                string schemaVersion = "2.0";
-                string versionName = "2003";
-                VSVersion version = VSVersion.VS71;
-                Hashtable m_Tools;
-                Kernel m_Kernel;
-                /// <summary>
-                /// Gets or sets the solution version.
-                /// </summary>
-                /// <value>The solution version.</value>
-                protected string SolutionVersion
-                {
-                        get
-                        {
-                                return this.solutionVersion;
-                        }
-                        set
-                        {
-                                this.solutionVersion = value;
-                        }
-                }
-                /// <summary>
-                /// Gets or sets the product version.
-                /// </summary>
-                /// <value>The product version.</value>
-                protected string ProductVersion
-                {
-                        get
-                        {
-                                return this.productVersion;
-                        }
-                        set
-                        {
-                                this.productVersion = value;
-                        }
-                }
-                /// <summary>
-                /// Gets or sets the schema version.
-                /// </summary>
-                /// <value>The schema version.</value>
-                protected string SchemaVersion
-                {
-                        get
-                        {
-                                return this.schemaVersion;
-                        }
-                        set
-                        {
-                                this.schemaVersion = value;
-                        }
-                }
-                /// <summary>
-                /// Gets or sets the name of the version.
-                /// </summary>
-                /// <value>The name of the version.</value>
-                protected string VersionName
-                {
-                        get
-                        {
-                                return this.versionName;
-                        }
-                        set
-                        {
-                                this.versionName = value;
-                        }
-                }
-                /// <summary>
-                /// Gets or sets the version.
-                /// </summary>
-                /// <value>The version.</value>
-                protected VSVersion Version
-                {
-                        get
-                        {
-                                return this.version;
-                        }
-                        set
-                        {
-                                this.version = value;
-                        }
-                }
-                #endregion
-                #region Constructors
-                /// <summary>
-                /// Initializes a new instance of the <see cref="VS2003Target"/> class.
-                /// </summary>
-                public VS2003Target()
-                {
-                        m_Tools = new Hashtable();
-                        m_Tools["C#"] = new ToolInfo("C#", "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}", "csproj", "CSHARP");
-                        m_Tools["VB.NET"] = new ToolInfo("VB.NET", "{F184B08F-C81C-45F6-A57F-5ABD9991F28F}", "vbproj", "VisualBasic");
-                }
-                #endregion
-                #region Private Methods
-                private string MakeRefPath(ProjectNode project)
-                {
-                        string ret = "";
-                        foreach(ReferencePathNode node in project.ReferencePaths)
-                        {
-                                try
-                                {
-                                        string fullPath = Helper.ResolvePath(node.Path);
-                                        if(ret.Length < 1)
-                                        {
-                                                ret = fullPath;
-                                        }
-                                        else
-                                        {
-                                                ret += ";" + fullPath;
-                                        }
-                                }
-                                catch(ArgumentException)
-                                {
-                                        m_Kernel.Log.Write(LogType.Warning, "Could not resolve reference path: {0}", node.Path);
-                                }
-                        }
-                        return ret;
-                }
-                private void WriteProject(SolutionNode solution, ProjectNode project)
-                {
-                        if(!m_Tools.ContainsKey(project.Language))
-                        {
-                                throw new UnknownLanguageException("Unknown .NET language: " + project.Language);
-                        }
-                        ToolInfo toolInfo = (ToolInfo)m_Tools[project.Language];
-                        string projectFile = Helper.MakeFilePath(project.FullPath, project.Name, toolInfo.FileExtension);
-                        StreamWriter ps = new StreamWriter(projectFile);
-                        m_Kernel.CurrentWorkingDirectory.Push();
-                        Helper.SetCurrentDir(Path.GetDirectoryName(projectFile));
-                        IEnumerator enumerator;
-                        //ConfigurationNode scripts;
-                        using(ps)
-                        {
-                                ps.WriteLine("<VisualStudioProject>");
-                                ps.WriteLine("    <{0}", toolInfo.XmlTag);
-                                ps.WriteLine("\t\t\t\tProjectType = \"Local\"");
-                                ps.WriteLine("\t\t\t\tProductVersion = \"{0}\"", this.ProductVersion);
-                                ps.WriteLine("\t\t\t\tSchemaVersion = \"{0}\"", this.SchemaVersion);
-                                ps.WriteLine("\t\t\t\tProjectGuid = \"{{{0}}}\"", project.Guid.ToString().ToUpper());
-                                ps.WriteLine("\t\t>");
-                                ps.WriteLine("\t\t\t\t<Build>");
-                                ps.WriteLine("            <Settings");
-                                ps.WriteLine("\t\t\t\t  ApplicationIcon = \"{0}\"",project.AppIcon);
-                                ps.WriteLine("\t\t\t\t  AssemblyKeyContainerName = \"\"");
-                                ps.WriteLine("\t\t\t\t  AssemblyName = \"{0}\"", project.AssemblyName);
-                                ps.WriteLine("\t\t\t\t  AssemblyOriginatorKeyFile = \"\"");
-                                ps.WriteLine("\t\t\t\t  DefaultClientScript = \"JScript\"");
-                                ps.WriteLine("\t\t\t\t  DefaultHTMLPageLayout = \"Grid\"");
-                                ps.WriteLine("\t\t\t\t  DefaultTargetSchema = \"IE50\"");
-                                ps.WriteLine("\t\t\t\t  DelaySign = \"false\"");
-                                if(this.Version == VSVersion.VS70)
-                                {
-                                        ps.WriteLine("\t\t\t\t  NoStandardLibraries = \"false\"");
-                                }
-                                ps.WriteLine("\t\t\t\t  OutputType = \"{0}\"", project.Type.ToString());
-                                enumerator = project.Configurations.GetEnumerator();
-                                enumerator.Reset();
-                                enumerator.MoveNext();
-                                foreach(ConfigurationNode conf in project.Configurations)
-                                {
-                                        if (conf.Options["PreBuildEvent"] != null && conf.Options["PreBuildEvent"].ToString().Length != 0)
-                                        {
-                                                ps.WriteLine("\t\t\t\t  PreBuildEvent = \"{0}\"", Helper.NormalizePath(conf.Options["PreBuildEvent"].ToString()));
-                                        }
-                                        else
-                                        {
-                                                ps.WriteLine("\t\t\t\t  PreBuildEvent = \"{0}\"", conf.Options["PreBuildEvent"]);
-                                        }
-                                        if (conf.Options["PostBuildEvent"] != null && conf.Options["PostBuildEvent"].ToString().Length != 0)
-                                        {
-                                                ps.WriteLine("\t\t\t\t  PostBuildEvent = \"{0}\"", Helper.NormalizePath(conf.Options["PostBuildEvent"].ToString()));
-                                        }
-                                        else
-                                        {
-                                                ps.WriteLine("\t\t\t\t  PostBuildEvent = \"{0}\"", conf.Options["PostBuildEvent"]);
-                                        }
-                                        if (conf.Options["RunPostBuildEvent"] == null)
-                                        {
-                                                ps.WriteLine("\t\t\t\t  RunPostBuildEvent = \"{0}\"", "OnBuildSuccess");
-                                        }
-                                        else
-                                        {
-                                                ps.WriteLine("\t\t\t\t  RunPostBuildEvent = \"{0}\"", conf.Options["RunPostBuildEvent"]);
-                                        }
-                                        break;
-                                }
-                                
-                                ps.WriteLine("\t\t\t\t  RootNamespace = \"{0}\"", project.RootNamespace);
-                                ps.WriteLine("\t\t\t\t  StartupObject = \"{0}\"", project.StartupObject);
-                                ps.WriteLine("\t\t     >");
-                                foreach(ConfigurationNode conf in project.Configurations)
-                                {
-                                        ps.WriteLine("\t\t\t\t  <Config");
-                                        ps.WriteLine("\t\t\t\t      Name = \"{0}\"", conf.Name);
-                                        ps.WriteLine("\t\t\t\t      AllowUnsafeBlocks = \"{0}\"", conf.Options["AllowUnsafe"].ToString().ToLower());
-                                        ps.WriteLine("\t\t\t\t      BaseAddress = \"{0}\"", conf.Options["BaseAddress"]);
-                                        ps.WriteLine("\t\t\t\t      CheckForOverflowUnderflow = \"{0}\"", conf.Options["CheckUnderflowOverflow"].ToString().ToLower());
-                                        ps.WriteLine("\t\t\t\t      ConfigurationOverrideFile = \"\"");
-                                        ps.WriteLine("\t\t\t\t      DefineConstants = \"{0}\"", conf.Options["CompilerDefines"]);
-                                        ps.WriteLine("\t\t\t\t      DocumentationFile = \"{0}\"", GetXmlDocFile(project, conf));//default to the assembly name
-                                        ps.WriteLine("\t\t\t\t      DebugSymbols = \"{0}\"", conf.Options["DebugInformation"].ToString().ToLower());
-                                        ps.WriteLine("\t\t\t\t      FileAlignment = \"{0}\"", conf.Options["FileAlignment"]);
-                                        ps.WriteLine("\t\t\t\t      IncrementalBuild = \"{0}\"", conf.Options["IncrementalBuild"].ToString().ToLower());
-                    
-                                        if(this.Version == VSVersion.VS71)
-                                        {
-                                                ps.WriteLine("\t\t\t\t      NoStdLib = \"{0}\"", conf.Options["NoStdLib"].ToString().ToLower());
-                                                ps.WriteLine("\t\t\t\t      NoWarn = \"{0}\"", conf.Options["SuppressWarnings"].ToString().ToLower());
-                                        }
-                                        ps.WriteLine("\t\t\t\t      Optimize = \"{0}\"", conf.Options["OptimizeCode"].ToString().ToLower());       
-                                        ps.WriteLine("                    OutputPath = \"{0}\"", 
-                                                Helper.EndPath(Helper.NormalizePath(conf.Options["OutputPath"].ToString())));
-                                        ps.WriteLine("                    RegisterForComInterop = \"{0}\"", conf.Options["RegisterComInterop"].ToString().ToLower());
-                                        ps.WriteLine("                    RemoveIntegerChecks = \"{0}\"", conf.Options["RemoveIntegerChecks"].ToString().ToLower());
-                                        ps.WriteLine("                    TreatWarningsAsErrors = \"{0}\"", conf.Options["WarningsAsErrors"].ToString().ToLower());
-                                        ps.WriteLine("                    WarningLevel = \"{0}\"", conf.Options["WarningLevel"]);
-                                        ps.WriteLine("                />");
-                                }
-                                ps.WriteLine("            </Settings>");
-                                ps.WriteLine("            <References>");
-                                foreach(ReferenceNode refr in project.References)
-                                {
-                                        ps.WriteLine("                <Reference");
-                                        ps.WriteLine("                    Name = \"{0}\"", refr.Name);
-                                        ps.WriteLine("                    AssemblyName = \"{0}\"", refr.Name);
-                                        if(solution.ProjectsTable.ContainsKey(refr.Name))
-                                        {
-                                                ProjectNode refProject = (ProjectNode)solution.ProjectsTable[refr.Name];
-                                                ps.WriteLine("                    Project = \"{{{0}}}\"", refProject.Guid.ToString().ToUpper());
-                                                ps.WriteLine("                    Package = \"{0}\"", toolInfo.Guid.ToString().ToUpper());
-                                        }
-                                        else
-                                        {
-                                                if(refr.Path != null)
-                                                {
-                                                        ps.WriteLine("                    HintPath = \"{0}\"", Helper.MakeFilePath(refr.Path, refr.Name, "dll"));
-                                                }
-                                        }
-                    
-                                        if(refr.LocalCopySpecified)
-                                        {
-                                                ps.WriteLine("                    Private = \"{0}\"",refr.LocalCopy);
-                                        }
-                                        ps.WriteLine("                />");
-                                }
-                                ps.WriteLine("            </References>");
-                                ps.WriteLine("        </Build>");
-                                ps.WriteLine("        <Files>");
-                
-                                ps.WriteLine("            <Include>");
-                                foreach(string file in project.Files)
-                                {
-                                        string fileName = file.Replace(".\\", "");
-                                        ps.WriteLine("                <File");
-                                        ps.WriteLine("                    RelPath = \"{0}\"", fileName);
-                                        ps.WriteLine("                    SubType = \"{0}\"", project.Files.GetSubType(file));
-                                        ps.WriteLine("                    BuildAction = \"{0}\"", project.Files.GetBuildAction(file));
-                                        ps.WriteLine("                />");
-                                        if (project.Files.GetSubType(file) != SubType.Code && project.Files.GetSubType(file) != SubType.Settings)
-                                        {
-                                                ps.WriteLine("                <File");
-                                                ps.WriteLine("                    RelPath = \"{0}\"", fileName.Substring(0, fileName.LastIndexOf('.')) + ".resx");
-                                                int slash = fileName.LastIndexOf('\\');
-                                                if (slash == -1)
-                                                {
-                                                        ps.WriteLine("                    DependentUpon = \"{0}\"", fileName);
-                                                }
-                                                else
-                                                {
-                                                        ps.WriteLine("                    DependentUpon = \"{0}\"", fileName.Substring(slash + 1, fileName.Length - slash - 1));
-                                                }
-                                                ps.WriteLine("                    BuildAction = \"{0}\"", "EmbeddedResource");
-                                                ps.WriteLine("                />");
-                                        }
-                                }
-                                ps.WriteLine("            </Include>");
-                
-                                ps.WriteLine("        </Files>");
-                                ps.WriteLine("    </{0}>", toolInfo.XmlTag);
-                                ps.WriteLine("</VisualStudioProject>");
-                        }
-                        ps = new StreamWriter(projectFile + ".user");
-                        using(ps)
-                        {
-                                ps.WriteLine("<VisualStudioProject>");
-                                ps.WriteLine("    <{0}>", toolInfo.XmlTag);
-                                ps.WriteLine("        <Build>");
-                                ps.WriteLine("            <Settings ReferencePath=\"{0}\">", MakeRefPath(project));
-                                foreach(ConfigurationNode conf in project.Configurations)
-                                {
-                                        ps.WriteLine("                <Config");
-                                        ps.WriteLine("                    Name = \"{0}\"", conf.Name);
-                                        ps.WriteLine("                />");
-                                }
-                                ps.WriteLine("            </Settings>");
-                                ps.WriteLine("        </Build>");
-                                ps.WriteLine("    </{0}>", toolInfo.XmlTag);
-                                ps.WriteLine("</VisualStudioProject>");
-                        }
-                        m_Kernel.CurrentWorkingDirectory.Pop();
-                }
-                /// <summary>
-                /// Gets the XML doc file.
-                /// </summary>
-                /// <param name="project">The project.</param>
-                /// <param name="conf">The conf.</param>
-                /// <returns></returns>
-                public static string GetXmlDocFile(ProjectNode project, ConfigurationNode conf) 
-                {
-                        if( conf == null )
-                        {
-                                throw new ArgumentNullException("conf");
-                        }
-                        if( project == null )
-                        {
-                                throw new ArgumentNullException("project");
-                        }
-                        //                      if(!(bool)conf.Options["GenerateXmlDocFile"]) //default to none, if the generate option is false
-                        //                      {
-                        //                              return string.Empty;
-                        //                      }
-                        //default to "AssemblyName.xml"
-                        //string defaultValue = Path.GetFileNameWithoutExtension(project.AssemblyName) + ".xml";
-                        //return (string)conf.Options["XmlDocFile", defaultValue];
-                        //default to no XmlDocFile file
-                        return (string)conf.Options["XmlDocFile", ""];
-                }
-                private void WriteSolution(SolutionNode solution)
-                {
-                        m_Kernel.Log.Write("Creating Visual Studio {0} solution and project files", this.VersionName);
-                        foreach(ProjectNode project in solution.Projects)
-                        {
-                                if(m_Kernel.AllowProject(project.FilterGroups)) 
-                                {
-                                        m_Kernel.Log.Write("...Creating project: {0}", project.Name);
-                                        WriteProject(solution, project);
-                                }
-                        }
-                        m_Kernel.Log.Write("");
-                        string solutionFile = Helper.MakeFilePath(solution.FullPath, solution.Name, "sln");
-                        StreamWriter ss = new StreamWriter(solutionFile);
-                        m_Kernel.CurrentWorkingDirectory.Push();
-                        Helper.SetCurrentDir(Path.GetDirectoryName(solutionFile));
-            
-                        using(ss)
-                        {
-                                ss.WriteLine("Microsoft Visual Studio Solution File, Format Version {0}", this.SolutionVersion);
-                                foreach(ProjectNode project in solution.Projects)
-                                {
-                                        if(!m_Tools.ContainsKey(project.Language))
-                                        {
-                                                throw new UnknownLanguageException("Unknown .NET language: " + project.Language);
-                                        }
-                                        ToolInfo toolInfo = (ToolInfo)m_Tools[project.Language];
-                
-                                        string path = Helper.MakePathRelativeTo(solution.FullPath, project.FullPath);
-                                        ss.WriteLine("Project(\"{0}\") = \"{1}\", \"{2}\", \"{{{3}}}\"",
-                                                toolInfo.Guid, project.Name, Helper.MakeFilePath(path, project.Name,
-                                                toolInfo.FileExtension), project.Guid.ToString().ToUpper());
-                                        ss.WriteLine("\tProjectSection(ProjectDependencies) = postProject");
-                                        ss.WriteLine("\tEndProjectSection");
-                                        ss.WriteLine("EndProject");
-                                }
-                                ss.WriteLine("Global");
-                                ss.WriteLine("\tGlobalSection(SolutionConfiguration) = preSolution");
-                                foreach(ConfigurationNode conf in solution.Configurations)
-                                {
-                                        ss.WriteLine("\t\t{0} = {0}", conf.Name);
-                                }
-                                ss.WriteLine("\tEndGlobalSection");
-                                ss.WriteLine("\tGlobalSection(ProjectDependencies) = postSolution");
-                                foreach(ProjectNode project in solution.Projects)
-                                {
-                                        for(int i = 0; i < project.References.Count; i++)
-                                        {
-                                                ReferenceNode refr = (ReferenceNode)project.References[i];
-                                                if(solution.ProjectsTable.ContainsKey(refr.Name))
-                                                {
-                                                        ProjectNode refProject = (ProjectNode)solution.ProjectsTable[refr.Name];
-                                                        ss.WriteLine("\t\t({{{0}}}).{1} = ({{{2}}})", 
-                                                                project.Guid.ToString().ToUpper()
-                                                                , i, 
-                                                                refProject.Guid.ToString().ToUpper()
-                                                                );
-                                                }
-                                        }
-                                }
-                                ss.WriteLine("\tEndGlobalSection");
-                                ss.WriteLine("\tGlobalSection(ProjectConfiguration) = postSolution");
-                                foreach(ProjectNode project in solution.Projects)
-                                {
-                                        foreach(ConfigurationNode conf in solution.Configurations)
-                                        {
-                                                ss.WriteLine("\t\t{{{0}}}.{1}.ActiveCfg = {1}|.NET",
-                                                        project.Guid.ToString().ToUpper(),
-                                                        conf.Name);
-                                                ss.WriteLine("\t\t{{{0}}}.{1}.Build.0 = {1}|.NET",
-                                                        project.Guid.ToString().ToUpper(),
-                                                        conf.Name);
-                                        }
-                                }
-                                ss.WriteLine("\tEndGlobalSection");
-                                if(solution.Files != null)
-                                {
-                                        ss.WriteLine("\tGlobalSection(SolutionItems) = postSolution");
-                                        foreach(string file in solution.Files)
-                                        {
-                                                ss.WriteLine("\t\t{0} = {0}", file);
-                                        }
-                                        ss.WriteLine("\tEndGlobalSection");
-                                }
-                                ss.WriteLine("\tGlobalSection(ExtensibilityGlobals) = postSolution");
-                                ss.WriteLine("\tEndGlobalSection");
-                                ss.WriteLine("\tGlobalSection(ExtensibilityAddIns) = postSolution");
-                                ss.WriteLine("\tEndGlobalSection");
-                                ss.WriteLine("EndGlobal");
-                        }
-                        m_Kernel.CurrentWorkingDirectory.Pop();
-                }
-                private void CleanProject(ProjectNode project)
-                {
-                        m_Kernel.Log.Write("...Cleaning project: {0}", project.Name);
-                        ToolInfo toolInfo = (ToolInfo)m_Tools[project.Language];
-                        string projectFile = Helper.MakeFilePath(project.FullPath, project.Name, toolInfo.FileExtension);
-                        string userFile = projectFile + ".user";
-            
-                        Helper.DeleteIfExists(projectFile);
-                        Helper.DeleteIfExists(userFile);
-                }
-                private void CleanSolution(SolutionNode solution)
-                {
-                        m_Kernel.Log.Write("Cleaning Visual Studio {0} solution and project files", this.VersionName, solution.Name);
-                        string slnFile = Helper.MakeFilePath(solution.FullPath, solution.Name, "sln");
-                        string suoFile = Helper.MakeFilePath(solution.FullPath, solution.Name, "suo");
-            
-                        Helper.DeleteIfExists(slnFile);
-                        Helper.DeleteIfExists(suoFile);
-                        foreach(ProjectNode project in solution.Projects)
-                        {
-                                CleanProject(project);
-                        }
-                        m_Kernel.Log.Write("");
-                }
-                #endregion
-                #region ITarget Members
-                /// <summary>
-                /// Writes the specified kern.
-                /// </summary>
-                /// <param name="kern">The kern.</param>
-                public virtual void Write(Kernel kern)
-                {
-                        if( kern == null )
-                        {
-                                throw new ArgumentNullException("kern");
-                        }
-                        m_Kernel = kern;
-                        foreach(SolutionNode sol in m_Kernel.Solutions)
-                        {
-                                WriteSolution(sol);
-                        }
-                        m_Kernel = null;
-                }
-                /// <summary>
-                /// Cleans the specified kern.
-                /// </summary>
-                /// <param name="kern">The kern.</param>
-                public virtual void Clean(Kernel kern)
-                {
-                        if( kern == null )
-                        {
-                                throw new ArgumentNullException("kern");
-                        }
-                        m_Kernel = kern;
-                        foreach(SolutionNode sol in m_Kernel.Solutions)
-                        {
-                                CleanSolution(sol);
-                        }
-                        m_Kernel = null;
-                }
-                /// <summary>
-                /// Gets the name.
-                /// </summary>
-                /// <value>The name.</value>
-                public virtual string Name
-                {
-                        get
-                        {
-                                return "vs2003";
-                        }
-                }
-                #endregion
-        }
-}
diff --git a/Prebuild/src/Core/Targets/VS2005Target.cs b/Prebuild/src/Core/Targets/VS2005Target.cs
deleted file mode 100644
index 23b6116..0000000
--- a/Prebuild/src/Core/Targets/VS2005Target.cs
+++ /dev/null
@@ -1,883 +0,0 @@
-#region BSD License
-/*
-Copyright (c) 2004 Matthew Holmes (matthew@wildfiregames.com)
-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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
-*/
-#endregion
-#region CVS Information
-/*
- * $Source$
- * $Author: robloach $
- * $Date: 2007-02-27 19:52:34 +0100 (ti, 27 feb 2007) $
- * $Revision: 207 $
- */
-#endregion
-using System;
-using System.Collections;
-using System.Collections.Specialized;
-using System.IO;
-using Prebuild.Core.Attributes;
-using Prebuild.Core.Interfaces;
-using Prebuild.Core.Nodes;
-using Prebuild.Core.Utilities;
-namespace Prebuild.Core.Targets
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    public struct ToolInfo
-    {
-        string name;
-        string guid;
-        string fileExtension;
-        string xmlTag;
-        string importProject;
-        /// <summary>
-        /// Gets or sets the name.
-        /// </summary>
-        /// <value>The name.</value>
-        public string Name
-        {
-            get
-            {
-                return name;
-            }
-            set
-            {
-                name = value;
-            }
-        }
-        /// <summary>
-        /// Gets or sets the GUID.
-        /// </summary>
-        /// <value>The GUID.</value>
-        public string Guid
-        {
-            get
-            {
-                return guid;
-            }
-            set
-            {
-                guid = value;
-            }
-        }
-        /// <summary>
-        /// Gets or sets the file extension.
-        /// </summary>
-        /// <value>The file extension.</value>
-        public string FileExtension
-        {
-            get
-            {
-                return fileExtension;
-            }
-            set
-            {
-                fileExtension = value;
-            }
-        }
-        /// <summary>
-        /// Gets or sets the XML tag.
-        /// </summary>
-        /// <value>The XML tag.</value>
-        public string XmlTag
-        {
-            get
-            {
-                return xmlTag;
-            }
-            set
-            {
-                xmlTag = value;
-            }
-        }
-        /// <summary>
-        /// Gets or sets the import project property.
-        /// </summary>
-        /// <value>The ImportProject tag.</value>
-        public string ImportProject
-        {
-            get
-            {
-                return importProject;
-            }
-            set
-            {
-                importProject = value;
-            }
-        }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ToolInfo"/> class.
-        /// </summary>
-        /// <param name="name">The name.</param>
-        /// <param name="guid">The GUID.</param>
-        /// <param name="fileExtension">The file extension.</param>
-        /// <param name="xml">The XML.</param>
-        /// <param name="importProject">The import project.</param>
-        public ToolInfo(string name, string guid, string fileExtension, string xml, string importProject)
-        {
-            this.name = name;
-            this.guid = guid;
-            this.fileExtension = fileExtension;
-            this.xmlTag = xml;
-            this.importProject = importProject;
-        }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ToolInfo"/> class.
-        /// </summary>
-        /// <param name="name">The name.</param>
-        /// <param name="guid">The GUID.</param>
-        /// <param name="fileExtension">The file extension.</param>
-        /// <param name="xml">The XML.</param>
-        public ToolInfo(string name, string guid, string fileExtension, string xml)
-        {
-            this.name = name;
-            this.guid = guid;
-            this.fileExtension = fileExtension;
-            this.xmlTag = xml;
-            this.importProject = "$(MSBuildBinPath)\\Microsoft." + xml + ".Targets";
-        }
-        /// <summary>
-        /// Equals operator
-        /// </summary>
-        /// <param name="obj">ToolInfo to compare</param>
-        /// <returns>true if toolInfos are equal</returns>
-        public override bool Equals(object obj)
-        {
-            if (obj == null)
-            {
-                throw new ArgumentNullException("obj");
-            }
-            if (obj.GetType() != typeof(ToolInfo))
-                return false;
-            ToolInfo c = (ToolInfo)obj;
-            return ((this.name == c.name) && (this.guid == c.guid) && (this.fileExtension == c.fileExtension) && (this.importProject == c.importProject));
-        }
-        /// <summary>
-        /// Equals operator
-        /// </summary>
-        /// <param name="c1">ToolInfo to compare</param>
-        /// <param name="c2">ToolInfo to compare</param>
-        /// <returns>True if toolInfos are equal</returns>
-        public static bool operator ==(ToolInfo c1, ToolInfo c2)
-        {
-            return ((c1.name == c2.name) && (c1.guid == c2.guid) && (c1.fileExtension == c2.fileExtension) && (c1.importProject == c2.importProject) && (c1.xmlTag == c2.xmlTag));
-        }
-        /// <summary>
-        /// Not equals operator
-        /// </summary>
-        /// <param name="c1">ToolInfo to compare</param>
-        /// <param name="c2">ToolInfo to compare</param>
-        /// <returns>True if toolInfos are not equal</returns>
-        public static bool operator !=(ToolInfo c1, ToolInfo c2)
-        {
-            return !(c1 == c2);
-        }
-        /// <summary>
-        /// Hash Code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            return name.GetHashCode() ^ guid.GetHashCode() ^ this.fileExtension.GetHashCode() ^ this.importProject.GetHashCode() ^ this.xmlTag.GetHashCode();
-        }
-    }
-    /// <summary>
-    /// 
-    /// </summary>
-    [Target("vs2005")]
-    public class VS2005Target : ITarget
-    {
-        #region Inner Classes
-        #endregion
-        #region Fields
-        string solutionVersion = "9.00";
-        string productVersion = "8.0.50727";
-        string schemaVersion = "2.0";
-        string versionName = "Visual C# 2005";
-        VSVersion version = VSVersion.VS80;
-        Hashtable tools;
-        Kernel kernel;
-        /// <summary>
-        /// Gets or sets the solution version.
-        /// </summary>
-        /// <value>The solution version.</value>
-        protected string SolutionVersion
-        {
-            get
-            {
-                return this.solutionVersion;
-            }
-            set
-            {
-                this.solutionVersion = value;
-            }
-        }
-        /// <summary>
-        /// Gets or sets the product version.
-        /// </summary>
-        /// <value>The product version.</value>
-        protected string ProductVersion
-        {
-            get
-            {
-                return this.productVersion;
-            }
-            set
-            {
-                this.productVersion = value;
-            }
-        }
-        /// <summary>
-        /// Gets or sets the schema version.
-        /// </summary>
-        /// <value>The schema version.</value>
-        protected string SchemaVersion
-        {
-            get
-            {
-                return this.schemaVersion;
-            }
-            set
-            {
-                this.schemaVersion = value;
-            }
-        }
-        /// <summary>
-        /// Gets or sets the name of the version.
-        /// </summary>
-        /// <value>The name of the version.</value>
-        protected string VersionName
-        {
-            get
-            {
-                return this.versionName;
-            }
-            set
-            {
-                this.versionName = value;
-            }
-        }
-        /// <summary>
-        /// Gets or sets the version.
-        /// </summary>
-        /// <value>The version.</value>
-        protected VSVersion Version
-        {
-            get
-            {
-                return this.version;
-            }
-            set
-            {
-                this.version = value;
-            }
-        }
-        #endregion
-        #region Constructors
-        /// <summary>
-        /// Initializes a new instance of the <see cref="VS2005Target"/> class.
-        /// </summary>
-        public VS2005Target()
-        {
-            this.tools = new Hashtable();
-            this.tools["C#"] = new ToolInfo("C#", "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}", "csproj", "CSHARP", "$(MSBuildBinPath)\\Microsoft.CSHARP.Targets");
-            this.tools["Boo"] = new ToolInfo("Boo", "{45CEA7DC-C2ED-48A6-ACE0-E16144C02365}", "booproj", "Boo", "$(BooBinPath)\\Boo.Microsoft.Build.targets");
-            this.tools["VisualBasic"] = new ToolInfo("VisualBasic", "{F184B08F-C81C-45F6-A57F-5ABD9991F28F}", "vbproj", "VisualBasic", "$(MSBuildBinPath)\\Microsoft.VisualBasic.Targets");
-        }
-        #endregion
-        #region Private Methods
-        private string MakeRefPath(ProjectNode project)
-        {
-            string ret = "";
-            foreach (ReferencePathNode node in project.ReferencePaths)
-            {
-                try
-                {
-                    string fullPath = Helper.ResolvePath(node.Path);
-                    if (ret.Length < 1)
-                    {
-                        ret = fullPath;
-                    }
-                    else
-                    {
-                        ret += ";" + fullPath;
-                    }
-                }
-                catch (ArgumentException)
-                {
-                    this.kernel.Log.Write(LogType.Warning, "Could not resolve reference path: {0}", node.Path);
-                }
-            }
-            return ret;
-        }
-        private void WriteProject(SolutionNode solution, ProjectNode project)
-        {
-            if (!tools.ContainsKey(project.Language))
-            {
-                throw new UnknownLanguageException("Unknown .NET language: " + project.Language);
-            }
-            ToolInfo toolInfo = (ToolInfo)tools[project.Language];
-            string projectFile = Helper.MakeFilePath(project.FullPath, project.Name, toolInfo.FileExtension);
-            StreamWriter ps = new StreamWriter(projectFile);
-            kernel.CurrentWorkingDirectory.Push();
-            Helper.SetCurrentDir(Path.GetDirectoryName(projectFile));
-            #region Project File
-            using (ps)
-            {
-                ps.WriteLine("<Project DefaultTargets=\"Build\" xmlns=\"http://schemas.microsoft.com/developer/msbuild/2003\">");
-                //ps.WriteLine("  <{0}", toolInfo.XMLTag);
-                ps.WriteLine("  <PropertyGroup>");
-                ps.WriteLine("    <ProjectType>Local</ProjectType>");
-                ps.WriteLine("    <ProductVersion>{0}</ProductVersion>", this.ProductVersion);
-                ps.WriteLine("    <SchemaVersion>{0}</SchemaVersion>", this.SchemaVersion);
-                ps.WriteLine("    <ProjectGuid>{{{0}}}</ProjectGuid>", project.Guid.ToString().ToUpper());
-                ps.WriteLine("    <Configuration Condition=\" '$(Configuration)' == '' \">Debug</Configuration>");
-                ps.WriteLine("    <Platform Condition=\" '$(Platform)' == '' \">AnyCPU</Platform>");
-                //ps.WriteLine("    <Build>");
-                //ps.WriteLine("      <Settings");
-                ps.WriteLine("    <ApplicationIcon>{0}</ApplicationIcon>", project.AppIcon);
-                ps.WriteLine("    <AssemblyKeyContainerName>");
-                ps.WriteLine("    </AssemblyKeyContainerName>");
-                ps.WriteLine("    <AssemblyName>{0}</AssemblyName>", project.AssemblyName);
-                foreach (ConfigurationNode conf in project.Configurations)
-                {
-                    if (conf.Options.KeyFile != "")
-                    {
-                        ps.WriteLine("    <AssemblyOriginatorKeyFile>{0}</AssemblyOriginatorKeyFile>", conf.Options.KeyFile);
-                        ps.WriteLine("    <SignAssembly>true</SignAssembly>");
-                        break;
-                    }
-                }
-                ps.WriteLine("    <DefaultClientScript>JScript</DefaultClientScript>");
-                ps.WriteLine("    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>");
-                ps.WriteLine("    <DefaultTargetSchema>IE50</DefaultTargetSchema>");
-                ps.WriteLine("    <DelaySign>false</DelaySign>");
-                //if(m_Version == VSVersion.VS70)
-                //    ps.WriteLine("        NoStandardLibraries = \"false\"");
-                ps.WriteLine("    <OutputType>{0}</OutputType>", project.Type.ToString());
-                ps.WriteLine("    <AppDesignerFolder>{0}</AppDesignerFolder>", project.DesignerFolder);
-                ps.WriteLine("    <RootNamespace>{0}</RootNamespace>", project.RootNamespace);
-                ps.WriteLine("    <StartupObject>{0}</StartupObject>", project.StartupObject);
-                //ps.WriteLine("      >");
-                ps.WriteLine("    <FileUpgradeFlags>");
-                ps.WriteLine("    </FileUpgradeFlags>");
-                ps.WriteLine("  </PropertyGroup>");
-                foreach (ConfigurationNode conf in project.Configurations)
-                {
-                    ps.Write("  <PropertyGroup ");
-                    ps.WriteLine("Condition=\" '$(Configuration)|$(Platform)' == '{0}|AnyCPU' \">", conf.Name);
-                    ps.WriteLine("    <AllowUnsafeBlocks>{0}</AllowUnsafeBlocks>", conf.Options["AllowUnsafe"]);
-                    ps.WriteLine("    <BaseAddress>{0}</BaseAddress>", conf.Options["BaseAddress"]);
-                    ps.WriteLine("    <CheckForOverflowUnderflow>{0}</CheckForOverflowUnderflow>", conf.Options["CheckUnderflowOverflow"]);
-                    ps.WriteLine("    <ConfigurationOverrideFile>");
-                    ps.WriteLine("    </ConfigurationOverrideFile>");
-                    ps.WriteLine("    <DefineConstants>{0}</DefineConstants>", conf.Options["CompilerDefines"]);
-                    ps.WriteLine("    <DocumentationFile>{0}</DocumentationFile>", conf.Options["XmlDocFile"]);
-                    ps.WriteLine("    <DebugSymbols>{0}</DebugSymbols>", conf.Options["DebugInformation"]);
-                    ps.WriteLine("    <FileAlignment>{0}</FileAlignment>", conf.Options["FileAlignment"]);
-                    //                    ps.WriteLine("    <IncrementalBuild = \"{0}\"", conf.Options["IncrementalBuild"]);
-                    //                    if(m_Version == VSVersion.VS71)
-                    //                    {
-                    //                        ps.WriteLine("          NoStdLib = \"{0}\"", conf.Options["NoStdLib"]);
-                    //                        ps.WriteLine("          NoWarn = \"{0}\"", conf.Options["SuppressWarnings"]);
-                    //                    }
-                    ps.WriteLine("    <Optimize>{0}</Optimize>", conf.Options["OptimizeCode"]);
-                    ps.WriteLine("    <OutputPath>{0}</OutputPath>",
-                        Helper.EndPath(Helper.NormalizePath(conf.Options["OutputPath"].ToString())));
-                    ps.WriteLine("    <RegisterForComInterop>{0}</RegisterForComInterop>", conf.Options["RegisterComInterop"]);
-                    ps.WriteLine("    <RemoveIntegerChecks>{0}</RemoveIntegerChecks>", conf.Options["RemoveIntegerChecks"]);
-                    ps.WriteLine("    <TreatWarningsAsErrors>{0}</TreatWarningsAsErrors>", conf.Options["WarningsAsErrors"]);
-                    ps.WriteLine("    <WarningLevel>{0}</WarningLevel>", conf.Options["WarningLevel"]);
-                    ps.WriteLine("    <NoWarn>{0}</NoWarn>", conf.Options["SuppressWarnings"]);
-                    ps.WriteLine("  </PropertyGroup>");
-                }
-                //ps.WriteLine("      </Settings>");
-                // Assembly References
-                ps.WriteLine("  <ItemGroup>");
-                string refPath = ((ReferencePathNode) project.ReferencePaths[0]).Path;
-                
-                foreach (ReferenceNode refr in project.References)
-                {
-                    if (!solution.ProjectsTable.ContainsKey(refr.Name))
-                    {
-                        ps.Write("    <Reference");
-                        ps.Write(" Include=\"");
-                        ps.Write(refr.Name);
-                        ps.WriteLine("\" >");
-                        string path;
-                        
-                        if( refr.Name.EndsWith(".dll", StringComparison.InvariantCultureIgnoreCase ))
-                        {
-                            path = Helper.NormalizePath(Path.Combine( refPath, refr.Name), '\\');
-                        }
-                        else
-                        {
-                            path = refr.Name + ".dll";
-                        }
-                        
-                        // TODO: Allow reference to *.exe files
-                        ps.WriteLine("      <HintPath>{0}</HintPath>", path );
-                        ps.WriteLine("      <Private>{0}</Private>", refr.LocalCopy);
-                        ps.WriteLine("    </Reference>");
-                    }
-                }
-                ps.WriteLine("  </ItemGroup>");
-                //Project References
-                ps.WriteLine("  <ItemGroup>");
-                foreach (ReferenceNode refr in project.References)
-                {
-                    if (solution.ProjectsTable.ContainsKey(refr.Name))
-                    {
-                        ProjectNode refProject = (ProjectNode)solution.ProjectsTable[refr.Name];
-                        // TODO: Allow reference to visual basic projects
-                        string path =
-                            Helper.MakePathRelativeTo(project.FullPath,
-                                                      Helper.MakeFilePath(refProject.FullPath, refProject.Name, "csproj"));
-                        ps.WriteLine("    <ProjectReference Include=\"{0}\">", path );
-                        //<ProjectReference Include="..\..\RealmForge\Utility\RealmForge.Utility.csproj">
-                        ps.WriteLine("      <Name>{0}</Name>", refProject.Name);
-                        //  <Name>RealmForge.Utility</Name>
-                        ps.WriteLine("      <Project>{{{0}}}</Project>", refProject.Guid.ToString().ToUpper());
-                        //  <Project>{6880D1D3-69EE-461B-B841-5319845B20D3}</Project>
-                        ps.WriteLine("      <Package>{0}</Package>", toolInfo.Guid.ToString().ToUpper());
-                        //  <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-                        ps.WriteLine("\t\t\t<Private>{0}</Private>", refr.LocalCopy);
-                        ps.WriteLine("    </ProjectReference>");
-                        //</ProjectReference>
-                    }
-                    else
-                    {
-                    }
-                }
-                ps.WriteLine("  </ItemGroup>");
-                //                ps.WriteLine("    </Build>");
-                ps.WriteLine("  <ItemGroup>");
-                //                ps.WriteLine("      <Include>");
-                ArrayList list = new ArrayList();
-                foreach (string file in project.Files)
-                {
-                    //                                  if (file == "Properties\\Bind.Designer.cs")
-                    //                                  {
-                    //                                          Console.WriteLine("Wait a minute!");
-                    //                                          Console.WriteLine(project.Files.GetSubType(file).ToString());
-                    //                                  }
-                    if (project.Files.GetSubType(file) != SubType.Code && project.Files.GetSubType(file) != SubType.Settings && project.Files.GetSubType(file) != SubType.Designer)
-                    {
-                        ps.WriteLine("    <EmbeddedResource Include=\"{0}\">", file.Substring(0, file.LastIndexOf('.')) + ".resx");
-                        int slash = file.LastIndexOf('\\');
-                        if (slash == -1)
-                        {
-                            ps.WriteLine("      <DependentUpon>{0}</DependentUpon>", file);
-                        }
-                        else
-                        {
-                            ps.WriteLine("      <DependentUpon>{0}</DependentUpon>", file.Substring(slash + 1, file.Length - slash - 1));
-                        }
-                        ps.WriteLine("      <SubType>Designer</SubType>");
-                        ps.WriteLine("    </EmbeddedResource>");
-                        //
-                    }
-                    
-                    if (project.Files.GetSubType(file) != SubType.Code && project.Files.GetSubType(file) == SubType.Designer)
-                    {
-                        ps.WriteLine("    <EmbeddedResource Include=\"{0}\">", file.Substring(0, file.LastIndexOf('.')) + ".resx");
-                        ps.WriteLine("      <SubType>" + project.Files.GetSubType(file) + "</SubType>");
-                        ps.WriteLine("      <Generator>ResXFileCodeGenerator</Generator>");
-                        ps.WriteLine("      <LastGenOutput>Resources.Designer.cs</LastGenOutput>");
-                        ps.WriteLine("    </EmbeddedResource>");
-                        ps.WriteLine("    <Compile Include=\"{0}\">", file.Substring(0, file.LastIndexOf('.')) + ".Designer.cs");
-                        ps.WriteLine("      <AutoGen>True</AutoGen>");
-                        ps.WriteLine("      <DesignTime>True</DesignTime>");
-                        ps.WriteLine("      <DependentUpon>Resources.resx</DependentUpon>");
-                        ps.WriteLine("    </Compile>");
-                        list.Add(file.Substring(0, file.LastIndexOf('.')) + ".Designer.cs");
-                    }
-                    if (project.Files.GetSubType(file).ToString() == "Settings")
-                    {
-                        //Console.WriteLine("File: " + file);
-                        //Console.WriteLine("Last index: " + file.LastIndexOf('.'));
-                        //Console.WriteLine("Length: " + file.Length);
-                        ps.Write("    <{0} ", project.Files.GetBuildAction(file));
-                        ps.WriteLine("Include=\"{0}\">", file);
-                        int slash = file.LastIndexOf('\\');
-                        string fileName = file.Substring(slash + 1, file.Length - slash - 1);
-                        if (project.Files.GetBuildAction(file) == BuildAction.None)
-                        {
-                            ps.WriteLine("      <Generator>SettingsSingleFileGenerator</Generator>");
-                            //Console.WriteLine("FileName: " + fileName);
-                            //Console.WriteLine("FileNameMain: " + fileName.Substring(0, fileName.LastIndexOf('.')));
-                            //Console.WriteLine("FileNameExt: " + fileName.Substring(fileName.LastIndexOf('.'), fileName.Length - fileName.LastIndexOf('.')));
-                            if (slash == -1)
-                            {
-                                ps.WriteLine("      <LastGenOutput>{0}</LastGenOutput>", fileName.Substring(0, fileName.LastIndexOf('.')) + ".Designer.cs");
-                            }
-                            else
-                            {
-                                ps.WriteLine("      <LastGenOutput>{0}</LastGenOutput>", fileName.Substring(0, fileName.LastIndexOf('.')) + ".Designer.cs");
-                            }
-                        }
-                        else
-                        {
-                            ps.WriteLine("      <SubType>Code</SubType>");
-                            ps.WriteLine("      <AutoGen>True</AutoGen>");
-                            ps.WriteLine("      <DesignTimeSharedInput>True</DesignTimeSharedInput>");
-                            string fileNameShort = fileName.Substring(0, fileName.LastIndexOf('.'));
-                            string fileNameShorter = fileNameShort.Substring(0, fileNameShort.LastIndexOf('.'));
-                            ps.WriteLine("      <DependentUpon>{0}</DependentUpon>", fileNameShorter + ".settings");
-                        }
-                        ps.WriteLine("    </{0}>", project.Files.GetBuildAction(file));
-                    }
-                    else if (project.Files.GetSubType(file) != SubType.Designer)
-                    {
-                        if (!list.Contains(file))
-                        {
-                            ps.Write("    <{0} ", project.Files.GetBuildAction(file));
-                            ps.WriteLine("Include=\"{0}\">", file);
-                            if (file.Contains("Designer.cs"))
-                            {
-                                ps.WriteLine("      <DependentUpon>{0}</DependentUpon>", file.Substring(0, file.IndexOf(".Designer.cs")) + ".cs");
-                            }
-                            if (project.Files.GetIsLink(file))
-                            {
-                                ps.WriteLine("      <Link>{0}</Link>", Path.GetFileName(file));
-                            }
-                            else if (project.Files.GetBuildAction(file) != BuildAction.None)
-                            {
-                                if (project.Files.GetBuildAction(file) != BuildAction.EmbeddedResource)
-                                {
-                                    ps.WriteLine("      <SubType>{0}</SubType>", project.Files.GetSubType(file));
-                                }
-                            }
-                            if (project.Files.GetCopyToOutput(file) != CopyToOutput.Never)
-                            {
-                                ps.WriteLine("      <CopyToOutputDirectory>{0}</CopyToOutputDirectory>", project.Files.GetCopyToOutput(file));
-                            }
-                            ps.WriteLine("    </{0}>", project.Files.GetBuildAction(file));
-                        }
-                    }
-                }
-                //                ps.WriteLine("      </Include>");
-                ps.WriteLine("  </ItemGroup>");
-                ps.WriteLine("  <Import Project=\"" + toolInfo.ImportProject + "\" />");
-                ps.WriteLine("  <PropertyGroup>");
-                ps.WriteLine("    <PreBuildEvent>");
-                ps.WriteLine("    </PreBuildEvent>");
-                ps.WriteLine("    <PostBuildEvent>");
-                ps.WriteLine("    </PostBuildEvent>");
-                ps.WriteLine("  </PropertyGroup>");
-                //                ps.WriteLine("  </{0}>", toolInfo.XMLTag);
-                ps.WriteLine("</Project>");
-            }
-            #endregion
-            #region User File
-            ps = new StreamWriter(projectFile + ".user");
-            using (ps)
-            {
-                ps.WriteLine("<Project xmlns=\"http://schemas.microsoft.com/developer/msbuild/2003\">");
-                //ps.WriteLine( "<VisualStudioProject>" );
-                //ps.WriteLine("  <{0}>", toolInfo.XMLTag);
-                //ps.WriteLine("    <Build>");
-                ps.WriteLine("  <PropertyGroup>");
-                //ps.WriteLine("      <Settings ReferencePath=\"{0}\">", MakeRefPath(project));
-                ps.WriteLine("    <Configuration Condition=\" '$(Configuration)' == '' \">Debug</Configuration>");
-                ps.WriteLine("    <Platform Condition=\" '$(Platform)' == '' \">AnyCPU</Platform>");
-                if (projectFile.Contains( "OpenSim.csproj" ))
-                {
-                    ps.WriteLine("    <StartArguments>-loginserver -sandbox -accounts</StartArguments>");
-                }
-                ps.WriteLine("    <ReferencePath>{0}</ReferencePath>", MakeRefPath(project));
-                ps.WriteLine("    <LastOpenVersion>{0}</LastOpenVersion>", this.ProductVersion);
-                ps.WriteLine("    <ProjectView>ProjectFiles</ProjectView>");
-                ps.WriteLine("    <ProjectTrust>0</ProjectTrust>");
-                ps.WriteLine("  </PropertyGroup>");
-                foreach (ConfigurationNode conf in project.Configurations)
-                {
-                    ps.Write("  <PropertyGroup");
-                    ps.Write(" Condition = \" '$(Configuration)|$(Platform)' == '{0}|AnyCPU' \"", conf.Name);
-                    ps.WriteLine(" />");
-                }
-                
-                ps.WriteLine("</Project>");
-            }
-            #endregion
-            kernel.CurrentWorkingDirectory.Pop();
-        }
-        private void WriteSolution(SolutionNode solution)
-        {
-            kernel.Log.Write("Creating {0} solution and project files", this.VersionName);
-            foreach (ProjectNode project in solution.Projects)
-            {
-                kernel.Log.Write("...Creating project: {0}", project.Name);
-                WriteProject(solution, project);
-            }
-            kernel.Log.Write("");
-            string solutionFile = Helper.MakeFilePath(solution.FullPath, solution.Name, "sln");
-            StreamWriter ss = new StreamWriter(solutionFile);
-            kernel.CurrentWorkingDirectory.Push();
-            Helper.SetCurrentDir(Path.GetDirectoryName(solutionFile));
-            using (ss)
-            {
-                ss.WriteLine("Microsoft Visual Studio Solution File, Format Version {0}", this.SolutionVersion);
-                ss.WriteLine("# Visual Studio 2005");
-                foreach (ProjectNode project in solution.Projects)
-                {
-                    if (!tools.ContainsKey(project.Language))
-                    {
-                        throw new UnknownLanguageException("Unknown .NET language: " + project.Language);
-                    }
-                    ToolInfo toolInfo = (ToolInfo)tools[project.Language];
-                    string path = Helper.MakePathRelativeTo(solution.FullPath, project.FullPath);
-                    ss.WriteLine("Project(\"{0}\") = \"{1}\", \"{2}\", \"{{{3}}}\"",
-                        toolInfo.Guid, project.Name, Helper.MakeFilePath(path, project.Name,
-                        toolInfo.FileExtension), project.Guid.ToString().ToUpper());
-                    //ss.WriteLine("  ProjectSection(ProjectDependencies) = postProject");
-                    //ss.WriteLine("  EndProjectSection");
-                    ss.WriteLine("EndProject");
-                }
-                if (solution.Files != null)
-                {
-                    ss.WriteLine("Project(\"{0}\") = \"Solution Items\", \"Solution Items\", \"{1}\"", "{2150E333-8FDC-42A3-9474-1A3956D46DE8}", "{468F1D07-AD17-4CC3-ABD0-2CA268E4E1A6}");
-                    ss.WriteLine("\tProjectSection(SolutionItems) = preProject");
-                    foreach (string file in solution.Files)
-                        ss.WriteLine("\t\t{0} = {0}", file);
-                    ss.WriteLine("\tEndProjectSection");
-                    ss.WriteLine("EndProject");
-                }
-                ss.WriteLine("Global");
-                ss.WriteLine("  GlobalSection(SolutionConfigurationPlatforms) = preSolution");
-                foreach (ConfigurationNode conf in solution.Configurations)
-                {
-                    ss.WriteLine("    {0}|Any CPU = {0}|Any CPU", conf.Name);
-                }
-                ss.WriteLine("  EndGlobalSection");
-                if (solution.Projects.Count > 1)
-                {
-                    ss.WriteLine("  GlobalSection(ProjectDependencies) = postSolution");
-                }
-                foreach (ProjectNode project in solution.Projects)
-                {
-                    for (int i = 0; i < project.References.Count; i++)
-                    {
-                        ReferenceNode refr = (ReferenceNode)project.References[i];
-                        if (solution.ProjectsTable.ContainsKey(refr.Name))
-                        {
-                            ProjectNode refProject = (ProjectNode)solution.ProjectsTable[refr.Name];
-                            ss.WriteLine("    ({{{0}}}).{1} = ({{{2}}})",
-                                project.Guid.ToString().ToUpper()
-                                , i,
-                                refProject.Guid.ToString().ToUpper()
-                                );
-                        }
-                    }
-                }
-                if (solution.Projects.Count > 1)
-                {
-                    ss.WriteLine("  EndGlobalSection");
-                }
-                ss.WriteLine("  GlobalSection(ProjectConfigurationPlatforms) = postSolution");
-                foreach (ProjectNode project in solution.Projects)
-                {
-                    foreach (ConfigurationNode conf in solution.Configurations)
-                    {
-                        ss.WriteLine("    {{{0}}}.{1}|Any CPU.ActiveCfg = {1}|Any CPU",
-                            project.Guid.ToString().ToUpper(),
-                            conf.Name);
-                        ss.WriteLine("    {{{0}}}.{1}|Any CPU.Build.0 = {1}|Any CPU",
-                            project.Guid.ToString().ToUpper(),
-                            conf.Name);
-                    }
-                }
-                ss.WriteLine("  EndGlobalSection");
-                ss.WriteLine("  GlobalSection(SolutionProperties) = preSolution");
-                ss.WriteLine("    HideSolutionNode = FALSE");
-                ss.WriteLine("  EndGlobalSection");
-                ss.WriteLine("EndGlobal");
-            }
-            kernel.CurrentWorkingDirectory.Pop();
-        }
-        private void CleanProject(ProjectNode project)
-        {
-            kernel.Log.Write("...Cleaning project: {0}", project.Name);
-            ToolInfo toolInfo = (ToolInfo)tools[project.Language];
-            string projectFile = Helper.MakeFilePath(project.FullPath, project.Name, toolInfo.FileExtension);
-            string userFile = projectFile + ".user";
-            Helper.DeleteIfExists(projectFile);
-            Helper.DeleteIfExists(userFile);
-        }
-        private void CleanSolution(SolutionNode solution)
-        {
-            kernel.Log.Write("Cleaning {0} solution and project files", this.VersionName, solution.Name);
-            string slnFile = Helper.MakeFilePath(solution.FullPath, solution.Name, "sln");
-            string suoFile = Helper.MakeFilePath(solution.FullPath, solution.Name, "suo");
-            Helper.DeleteIfExists(slnFile);
-            Helper.DeleteIfExists(suoFile);
-            foreach (ProjectNode project in solution.Projects)
-            {
-                CleanProject(project);
-            }
-            kernel.Log.Write("");
-        }
-        #endregion
-        #region ITarget Members
-        /// <summary>
-        /// Writes the specified kern.
-        /// </summary>
-        /// <param name="kern">The kern.</param>
-        public virtual void Write(Kernel kern)
-        {
-            if (kern == null)
-            {
-                throw new ArgumentNullException("kern");
-            }
-            kernel = kern;
-            foreach (SolutionNode sol in kernel.Solutions)
-            {
-                WriteSolution(sol);
-            }
-            kernel = null;
-        }
-        /// <summary>
-        /// Cleans the specified kern.
-        /// </summary>
-        /// <param name="kern">The kern.</param>
-        public virtual void Clean(Kernel kern)
-        {
-            if (kern == null)
-            {
-                throw new ArgumentNullException("kern");
-            }
-            kernel = kern;
-            foreach (SolutionNode sol in kernel.Solutions)
-            {
-                CleanSolution(sol);
-            }
-            kernel = null;
-        }
-        /// <summary>
-        /// Gets the name.
-        /// </summary>
-        /// <value>The name.</value>
-        public virtual string Name
-        {
-            get
-            {
-                return "vs2005";
-            }
-        }
-        #endregion
-    }
-}
diff --git a/Prebuild/src/Core/UnknownLanguageException.cs b/Prebuild/src/Core/UnknownLanguageException.cs
deleted file mode 100644
index cbd1dc1..0000000
--- a/Prebuild/src/Core/UnknownLanguageException.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * $RCSfile$
- * Copyright (C) 2004, 2005 David Hudson (jendave@yahoo.com)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-using System;
-using System.Runtime.Serialization;
-namespace Prebuild.Core 
-{
-        /// <summary>
-        /// </summary>
-        [Serializable()]
-        public class UnknownLanguageException : Exception 
-        {
-                /// <summary>
-                /// Basic exception.
-                /// </summary>
-                public UnknownLanguageException() 
-                {
-                }
-                /// <summary>
-                /// Exception with specified string
-                /// </summary>
-                /// <param name="message">Exception message</param>
-                public UnknownLanguageException(string message): base(message)
-                {
-                }
-                /// <summary>
-                /// 
-                /// </summary>
-                /// <param name="message"></param>
-                /// <param name="exception"></param>
-                public UnknownLanguageException(string message, Exception exception) : base(message, exception)
-                {
-                }
-                /// <summary>
-                /// 
-                /// </summary>
-                /// <param name="info"></param>
-                /// <param name="context"></param>
-                protected UnknownLanguageException(SerializationInfo info, StreamingContext context) : base( info, context )
-                {
-                }
-        }
-}
diff --git a/Prebuild/src/Core/Utilities/CommandLineCollection.cs b/Prebuild/src/Core/Utilities/CommandLineCollection.cs
deleted file mode 100644
index 496731f..0000000
--- a/Prebuild/src/Core/Utilities/CommandLineCollection.cs
+++ /dev/null
@@ -1,162 +0,0 @@
-#region BSD License
-/*
-Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (dan05a@gmail.com)
-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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
-*/
-#endregion
-#region CVS Information
-/*
- * $Source$
- * $Author: robloach $
- * $Date: 2006-09-26 00:30:53 +0200 (ti, 26 sep 2006) $
- * $Revision: 165 $
- */
-#endregion
-using System;
-using System.Collections;
-using System.Collections.Specialized;
-using System.Diagnostics;
-namespace Prebuild.Core.Utilities
-{    
-        /// <summary>
-        /// The CommandLine class parses and interprets the command-line arguments passed to
-        /// prebuild.
-        /// </summary>
-        public class CommandLineCollection
-        {
-                #region Fields
-                // The raw OS arguments
-                private string[] m_RawArgs;
-                // Command-line argument storage
-                private Hashtable m_Arguments;
-        
-                #endregion
-        
-                #region Constructors
-        
-                /// <summary>
-                /// Create a new CommandLine instance and set some internal variables.
-                /// </summary>
-                public CommandLineCollection(string[] args) 
-                {
-                        m_RawArgs = args;
-                        m_Arguments = new Hashtable();
-            
-                        Parse();
-                }
-                #endregion
-                #region Private Methods
-                private void Parse() 
-                {
-                        if(m_RawArgs.Length < 1)
-                                return;
-                        int idx = 0;
-                        string arg = null, lastArg = null;
-                        while(idx <m_RawArgs.Length) 
-                        {
-                                arg = m_RawArgs[idx];
-                                if(arg.Length > 2 && arg[0] == '/') 
-                                {
-                                        arg = arg.Substring(1);
-                                        lastArg = arg;
-                                        m_Arguments[arg] = "";
-                                } 
-                                else 
-                                {
-                                        if(lastArg != null)
-                                        {
-                                                m_Arguments[lastArg] = arg;
-                                                lastArg = null;
-                                        }
-                                }
-                                idx++;
-                        }
-                }
-                #endregion
-                #region Public Methods
-                /// <summary>
-                /// Wases the passed.
-                /// </summary>
-                /// <param name="arg">The arg.</param>
-                /// <returns></returns>
-                public bool WasPassed(string arg)
-                {
-                        return (m_Arguments.ContainsKey(arg));
-                }
-                #endregion
-                #region Properties
-                /// <summary>
-                /// Gets the parameter associated with the command line option
-                /// </summary>
-                /// <remarks>Returns null if option was not specified,
-                /// null string if no parameter was specified, and the value if a parameter was specified</remarks>
-                public string this[string index] 
-                {
-                        get 
-                        {
-                                if(m_Arguments.ContainsKey(index))
-                                {
-                                        return (string)(m_Arguments[index]);
-                                }
-                                else
-                                {
-                                        return null;
-                                }
-                        }
-                }
-                #endregion
-                #region IEnumerable Members
-                /// <summary>
-                /// Returns an enumerator that can iterate through a collection.
-                /// </summary>
-                /// <returns>
-                /// An <see cref="T:System.Collections.IDictionaryEnumerator"/>
-                /// that can be used to iterate through the collection.
-                /// </returns>
-                public IDictionaryEnumerator GetEnumerator() 
-                {
-                        return m_Arguments.GetEnumerator();
-                }
-                #endregion
-        }
-}
diff --git a/Prebuild/src/Core/Utilities/CurrentDirectory.cs b/Prebuild/src/Core/Utilities/CurrentDirectory.cs
deleted file mode 100644
index a76d844..0000000
--- a/Prebuild/src/Core/Utilities/CurrentDirectory.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-#region BSD License
-/*
-Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (dan05a@gmail.com)
-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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
-*/
-#endregion
-#region CVS Information
-/*
- * $Source$
- * $Author: jendave $
- * $Date: 2006-01-28 01:49:58 +0100 (lö, 28 jan 2006) $
- * $Revision: 71 $
- */
-#endregion
-using System;
-using System.Collections;
-namespace Prebuild.Core.Utilities
-{
-        /// <summary>
-        /// 
-        /// </summary>
-        public class CurrentDirectory
-        {
-                #region Fields
-                private Stack m_Stack;
-                #endregion
-                #region Constructors
-                /// <summary>
-                /// Initializes a new instance of the <see cref="CurrentDirectory"/> class.
-                /// </summary>
-                public CurrentDirectory()
-                {
-                        m_Stack = new Stack();
-                }
-                #endregion
-                #region Public Methods
-                /// <summary>
-                /// Pushes this instance.
-                /// </summary>
-                public void Push()
-                {
-                        m_Stack.Push(Environment.CurrentDirectory);
-                }
-                /// <summary>
-                /// Pops this instance.
-                /// </summary>
-                public void Pop()
-                {
-                        if(m_Stack.Count < 1)
-                        {
-                                return;
-                        }
-            
-                        string cwd = (string)m_Stack.Pop();
-                        Helper.SetCurrentDir(cwd);
-                }
-                #endregion
-        }
-}
diff --git a/Prebuild/src/Core/Utilities/Helper.cs b/Prebuild/src/Core/Utilities/Helper.cs
deleted file mode 100644
index 33c9618..0000000
--- a/Prebuild/src/Core/Utilities/Helper.cs
+++ /dev/null
@@ -1,661 +0,0 @@
-#region BSD License
-/*
-Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (dan05a@gmail.com)
-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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
-*/
-#endregion
-#region CVS Information
-/*
- * $Source$
- * $Author: jendave $
- * $Date: 2007-02-13 21:58:03 +0100 (ti, 13 feb 2007) $
- * $Revision: 205 $
- */
-#endregion
-using System;
-using System.Collections;
-using System.Diagnostics;
-using System.IO;
-using System.Runtime.InteropServices;
-using System.Text.RegularExpressions;
-using System.Collections.Specialized;
-using System.Xml;
-using Prebuild.Core.Nodes;
-namespace Prebuild.Core.Utilities
-{
-        /// <summary>
-        /// 
-        /// </summary>
-        public class Helper
-        {
-                #region Fields
-                private static Stack dirStack;
-                private static Regex varRegex;
-                static bool checkForOSVariables;
-                /// <summary>
-                /// 
-                /// </summary>
-                public static bool CheckForOSVariables
-                {
-                        get
-                        {
-                                return checkForOSVariables;
-                        }
-                        set
-                        {
-                                checkForOSVariables = value;
-                        }
-                }
-                #endregion
-                #region Constructors
-                /// <summary>
-                /// Initializes the <see cref="Helper"/> class.
-                /// </summary>
-                static Helper()
-                {
-                        dirStack = new Stack();
-                        //m_VarRegex = new Regex(@"\${(?<var>[\w|_]+)}");
-                }
-                #endregion
-                #region Properties
-                /// <summary>
-                /// 
-                /// </summary>
-                public static Stack DirStack
-                {
-                        get
-                        {
-                                return dirStack;
-                        }
-                }
-                /// <summary>
-                /// 
-                /// </summary>
-                public static Regex VarRegex
-                {
-                        get
-                        {
-                                return varRegex;
-                        }
-                        set
-                        {
-                                varRegex = value;
-                        }
-                }
-                #endregion
-        
-                #region Public Methods
-                #region String Parsing
-                #region Inner Classes and Delegates
-                /// <summary>
-                /// 
-                /// </summary>
-                public delegate string StringLookup(string key);
-                
-                #endregion
-                /// <summary>
-                /// Gets a collection of StringLocationPair objects that represent the matches
-                /// </summary>
-                /// <param name="target">The target.</param>
-                /// <param name="beforeGroup">The before group.</param>
-                /// <param name="afterGroup">The after group.</param>
-                /// <param name="includeDelimitersInSubstrings">if set to <c>true</c> [include delimiters in substrings].</param>
-                /// <returns></returns>
-                public static StringCollection FindGroups(string target, string beforeGroup, string afterGroup, bool includeDelimitersInSubstrings) 
-                {
-                        if( beforeGroup == null )
-                        {
-                                throw new ArgumentNullException("beforeGroup");
-                        }
-                        if( afterGroup == null )
-                        {
-                                throw new ArgumentNullException("afterGroup");
-                        }
-                        StringCollection results = new StringCollection();
-                        if(target == null || target.Length == 0)
-                        {
-                                return results;
-                        }
-                        int beforeMod = 0;
-                        int afterMod = 0;
-                        if(includeDelimitersInSubstrings) 
-                        {
-                                //be sure to not exlude the delims
-                                beforeMod = beforeGroup.Length;
-                                afterMod = afterGroup.Length;
-                        }
-                        int startIndex = 0;
-                        while((startIndex = target.IndexOf(beforeGroup,startIndex)) != -1) {
-                                int endIndex = target.IndexOf(afterGroup,startIndex);//the index of the char after it
-                                if(endIndex == -1)
-                                {
-                                        break;
-                                }
-                                int length = endIndex - startIndex - beforeGroup.Length;//move to the first char in the string
-                                string substring = substring = target.Substring(startIndex + beforeGroup.Length - beforeMod,
-                                        length - afterMod);
-                                results.Add(substring);
-                                //results.Add(new StringLocationPair(substring,startIndex));
-                                startIndex = endIndex + 1;
-                                //the Interpolate*() methods will not work if expressions are expandded inside expression due to an optimization
-                                //so start after endIndex
-                                
-                        }
-                        return results;
-                }
-                /// <summary>
-                /// Replaces the groups.
-                /// </summary>
-                /// <param name="target">The target.</param>
-                /// <param name="beforeGroup">The before group.</param>
-                /// <param name="afterGroup">The after group.</param>
-                /// <param name="lookup">The lookup.</param>
-                /// <returns></returns>
-                public static string ReplaceGroups(string target, string beforeGroup, string afterGroup, StringLookup lookup) {
-                        if( target == null )
-                        {
-                                throw new ArgumentNullException("target");
-                        }
-                        //int targetLength = target.Length;
-                        StringCollection strings = FindGroups(target,beforeGroup,afterGroup,false);
-                        if( lookup == null )
-                        {
-                                throw new ArgumentNullException("lookup");
-                        }
-                        foreach(string substring in strings) 
-                        {
-                                target = target.Replace(beforeGroup + substring + afterGroup, lookup(substring) );
-                        }
-                        return target;
-                }
-                /// <summary>
-                /// Replaces ${var} statements in a string with the corresonding values as detirmined by the lookup delegate
-                /// </summary>
-                /// <param name="target">The target.</param>
-                /// <param name="lookup">The lookup.</param>
-                /// <returns></returns>
-                public static string InterpolateForVariables(string target, StringLookup lookup) 
-                {
-                        return ReplaceGroups(target, "${" , "}" , lookup);
-                }
-                /// <summary>
-                /// Replaces ${var} statements in a string with the corresonding environment variable with name var
-                /// </summary>
-                /// <param name="target"></param>
-                /// <returns></returns>
-                public static string InterpolateForEnvironmentVariables(string target) 
-                {
-                        return InterpolateForVariables(target, new StringLookup(Environment.GetEnvironmentVariable));
-                }
-                #endregion
-                /// <summary>
-                /// Translates the value.
-                /// </summary>
-                /// <param name="translateType">Type of the translate.</param>
-                /// <param name="translationItem">The translation item.</param>
-                /// <returns></returns>
-                public static object TranslateValue(Type translateType, string translationItem)
-                {
-                        if(translationItem == null)
-                        {
-                                return null;
-                        }
-                        try
-                        {
-                                string lowerVal = translationItem.ToLower();
-                                if(translateType == typeof(bool))
-                                {
-                                        return (lowerVal == "true" || lowerVal == "1" || lowerVal == "y" || lowerVal == "yes" || lowerVal == "on");
-                                }
-                                else if(translateType == typeof(int))
-                                {
-                                        return (Int32.Parse(translationItem));
-                                }
-                                else
-                                {
-                                        return translationItem;
-                                }
-                        }
-                        catch(FormatException)
-                        {
-                                return null;
-                        }
-                }
-                /// <summary>
-                /// Deletes if exists.
-                /// </summary>
-                /// <param name="file">The file.</param>
-                /// <returns></returns>
-                public static bool DeleteIfExists(string file)
-                {
-                        string resFile = null;
-                        try
-                        {
-                                resFile = ResolvePath(file);
-                        }
-                        catch(ArgumentException)
-                        {
-                                return false;
-                        }
-                        if(!File.Exists(resFile))
-                        {
-                                return false;
-                        }
-                        File.Delete(resFile);
-                        return true;
-                }
-                // This little gem was taken from the NeL source, thanks guys!
-                /// <summary>
-                /// Makes a relative path
-                /// </summary>
-                /// <param name="startPath">Path to start from</param>
-                /// <param name="endPath">Path to end at</param>
-                /// <returns>Path that will get from startPath to endPath</returns>
-                public static string MakePathRelativeTo(string startPath, string endPath)
-                {
-                        string tmp = NormalizePath(startPath, '/');
-                        string src = NormalizePath(endPath, '/');
-                        string prefix = "";
-                        while(true)
-                        {
-                                if((String.Compare(tmp, 0, src, 0, tmp.Length) == 0))
-                                {
-                                        string ret;
-                                        int size = tmp.Length;
-                                        if(size == src.Length)
-                                        {
-                                                return "./";
-                                        }
-                                        if  ((src.Length > tmp.Length) && src[tmp.Length-1] != '/' && src[tmp.Length-1] != '\\')
-                                        {
-                                        }
-                                        else
-                                        {
-                                                ret = prefix + endPath.Substring(size, endPath.Length - size);
-                                                ret = ret.Trim();
-                                                if(ret[0] == '/' || ret[0] == '\\')
-                                                {
-                                                        ret = "." + ret;
-                                                }
-                                                return NormalizePath(ret);
-                                        }
-                                        
-                                }
-                                if(tmp.Length < 2)
-                                {
-                                        break;
-                                }
-                                int lastPos = tmp.LastIndexOf('/', tmp.Length - 2);
-                                int prevPos = tmp.IndexOf('/');
-                                if((lastPos == prevPos) || (lastPos == -1))
-                                {
-                                        break;
-                                }
-                                tmp = tmp.Substring(0, lastPos + 1);
-                                prefix += "../";
-                        }
-                        return endPath;
-                }
-                /// <summary>
-                /// Resolves the path.
-                /// </summary>
-                /// <param name="path">The path.</param>
-                /// <returns></returns>
-                public static string ResolvePath(string path)
-                {
-                        string tmpPath = NormalizePath(path);
-                        if(tmpPath.Length < 1)
-                        {
-                                tmpPath = ".";
-                        }
-            
-                        tmpPath = Path.GetFullPath(tmpPath);
-                        if(!File.Exists(tmpPath) && !Directory.Exists(tmpPath))
-                        {
-                                throw new ArgumentException("Path could not be resolved: " + tmpPath);
-                        }
-                        return tmpPath;
-                }
-                /// <summary>
-                /// Normalizes the path.
-                /// </summary>
-                /// <param name="path">The path.</param>
-                /// <param name="separatorCharacter">The separator character.</param>
-                /// <returns></returns>
-                public static string NormalizePath(string path, char separatorCharacter)
-                {
-                        if(path == null || path == "" || path.Length < 1)
-                        {
-                                return "";
-                        }
-                        string tmpPath = path.Replace('\\', '/');
-                        tmpPath = tmpPath.Replace('/', separatorCharacter);
-                        return tmpPath;
-                }
-                /// <summary>
-                /// Normalizes the path.
-                /// </summary>
-                /// <param name="path">The path.</param>
-                /// <returns></returns>
-                public static string NormalizePath(string path)
-                {
-                        return NormalizePath(path, Path.DirectorySeparatorChar);
-                }
-        
-                /// <summary>
-                /// Ends the path.
-                /// </summary>
-                /// <param name="path">The path.</param>
-                /// <param name="separatorCharacter">The separator character.</param>
-                /// <returns></returns>
-                public static string EndPath(string path, char separatorCharacter)
-                {
-                        if(path == null || path == "" || path.Length < 1)
-                        {
-                                return "";
-                        }
-                        if(!path.EndsWith(separatorCharacter.ToString()))
-                        {
-                                return (path + separatorCharacter);
-                        }
-                        return path;
-                }
-                /// <summary>
-                /// Ends the path.
-                /// </summary>
-                /// <param name="path">The path.</param>
-                /// <returns></returns>
-                public static string EndPath(string path)
-                {
-                        return EndPath(path, Path.DirectorySeparatorChar);
-                }
-                /// <summary>
-                /// Makes the file path.
-                /// </summary>
-                /// <param name="path">The path.</param>
-                /// <param name="name">The name.</param>
-                /// <param name="ext">The ext.</param>
-                /// <returns></returns>
-                public static string MakeFilePath(string path, string name, string ext)
-                {
-                        string ret = EndPath(NormalizePath(path));
-            
-                        if( name == null )
-                        {
-                                throw new ArgumentNullException("name");
-                        }
-                        ret += name;
-                        if(!name.EndsWith("." + ext))
-                        {
-                                ret += "." + ext;
-                        }
-            
-            //foreach(char c in Path.GetInvalidPathChars())
-            //{
-            //    ret = ret.Replace(c, '_');
-            //}
-                        return ret;
-                }
-                /// <summary>
-                /// Makes the file path.
-                /// </summary>
-                /// <param name="path">The path.</param>
-                /// <param name="name">The name.</param>
-                /// <returns></returns>
-                public static string MakeFilePath(string path, string name)
-                {
-                        string ret = EndPath(NormalizePath(path));
-            
-                        if( name == null )
-                        {
-                                throw new ArgumentNullException("name");
-                        }
-                        ret += name;
-            //foreach (char c in Path.GetInvalidPathChars())
-            //{
-            //    ret = ret.Replace(c, '_');
-            //}
-                        return ret;
-                }
-                /// <summary>
-                /// 
-                /// </summary>
-                /// <param name="path"></param>
-                /// <returns></returns>
-                public static string MakeReferencePath(string path)
-                {
-                        string ret = EndPath(NormalizePath(path));
-            //foreach (char c in Path.GetInvalidPathChars())
-            //{
-            //    ret = ret.Replace(c, '_');
-            //}
-                        return ret;
-                }
-                /// <summary>
-                /// Sets the current dir.
-                /// </summary>
-                /// <param name="path">The path.</param>
-                public static void SetCurrentDir(string path)
-                {
-                        if( path == null )
-                        {
-                                throw new ArgumentNullException("path");
-                        }
-                        if(path.Length < 1)
-                        {
-                                return;
-                        }
-                        Environment.CurrentDirectory = path;
-                }
-                /// <summary>
-                /// Checks the type.
-                /// </summary>
-                /// <param name="typeToCheck">The type to check.</param>
-                /// <param name="attr">The attr.</param>
-                /// <param name="inter">The inter.</param>
-                /// <returns></returns>
-                public static object CheckType(Type typeToCheck, Type attr, Type inter)
-                {
-                        if(typeToCheck == null || attr == null)
-                        {
-                                return null;
-                        }
-                        object[] attrs = typeToCheck.GetCustomAttributes(attr, false);
-                        if(attrs == null || attrs.Length < 1)
-                        {
-                                return null;
-                        }
-                        if( inter == null )
-                        {
-                                throw new ArgumentNullException("inter");
-                        }
-                        if(typeToCheck.GetInterface(inter.FullName) == null)
-                        {
-                                return null;
-                        }
-                        return attrs[0];
-                }
-                /* A bit of overhead for simple group parsing, there are problems with Regex in Mono
-                public static string ParseValue(string val)
-                {
-                        if(val == null || val.Length < 1 || !CheckForOSVariables)
-                                return val;
-                        string tmp = val;
-                        Match m = m_VarRegex.Match(val);
-                        while(m.Success)
-                        {
-                                if(m.Groups["var"] == null)
-                                        continue;
-                                Capture c = m.Groups["var"].Captures[0];
-                                if(c == null)
-                                        continue;
-                                string var = c.Value;
-                                string envVal = Environment.GetEnvironmentVariable(var);
-                                if(envVal == null)
-                                        envVal = "";
-                                tmp = tmp.Replace("${" + var + "}", envVal);
-                                m = m.NextMatch();
-                        }
-                        return tmp;
-                }*/
-                /// <summary>
-                /// Attributes the value.
-                /// </summary>
-                /// <param name="node">The node.</param>
-                /// <param name="attr">The attr.</param>
-                /// <param name="def">The def.</param>
-                /// <returns></returns>
-                public static string AttributeValue(XmlNode node, string attr, string def)
-                {
-                        if( node == null )
-                        {
-                                throw new ArgumentNullException("node");
-                        }
-                        if(node.Attributes[attr] == null)
-                        {
-                                return def;
-                        }
-                        string val = node.Attributes[attr].Value;
-                        if(!CheckForOSVariables)
-                        {
-                                return val;
-                        }
-                        return InterpolateForEnvironmentVariables(val);
-                }
-                /// <summary>
-                /// Parses the boolean.
-                /// </summary>
-                /// <param name="node">The node.</param>
-                /// <param name="attr">The attr.</param>
-                /// <param name="defaultValue">if set to <c>true</c> [default value].</param>
-                /// <returns></returns>
-                public static bool ParseBoolean(XmlNode node, string attr, bool defaultValue) 
-                {
-                        if( node == null )
-                        {
-                                throw new ArgumentNullException("node");
-                        }
-                        if(node.Attributes[attr] == null)
-                        {
-                                return defaultValue;
-                        }
-                        return bool.Parse(node.Attributes[attr].Value);
-                }
-                /// <summary>
-                /// Enums the attribute value.
-                /// </summary>
-                /// <param name="node">The node.</param>
-                /// <param name="attr">The attr.</param>
-                /// <param name="enumType">Type of the enum.</param>
-                /// <param name="def">The def.</param>
-                /// <returns></returns>
-                public static object EnumAttributeValue(XmlNode node, string attr, Type enumType, object def)
-                {
-                        if( def == null )
-                        {
-                                throw new ArgumentNullException("def");
-                        }
-                        string val = AttributeValue(node, attr, def.ToString());
-                        return Enum.Parse(enumType, val, true);
-                }
-                /// <summary>
-                /// 
-                /// </summary>
-                /// <param name="assemblyName"></param>
-                /// <param name="projectType"></param>
-                /// <returns></returns>
-                public static string AssemblyFullName(string assemblyName, ProjectType projectType)
-                {
-                        return assemblyName + (projectType == ProjectType.Library ? ".dll" : ".exe");
-                }
-                #endregion
-        }
-}
diff --git a/Prebuild/src/Core/Utilities/Log.cs b/Prebuild/src/Core/Utilities/Log.cs
deleted file mode 100644
index da2cc96..0000000
--- a/Prebuild/src/Core/Utilities/Log.cs
+++ /dev/null
@@ -1,279 +0,0 @@
-#region BSD License
-/*
-Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (dan05a@gmail.com)
-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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
-*/
-#endregion
-#region CVS Information
-/*
- * $Source$
- * $Author: jendave $
- * $Date: 2006-01-28 01:49:58 +0100 (lö, 28 jan 2006) $
- * $Revision: 71 $
- */
-#endregion
-using System;
-using System.IO;
-namespace Prebuild.Core.Utilities
-{
-        /// <summary>
-        /// 
-        /// </summary>
-        public enum LogType
-        {
-                /// <summary>
-                /// 
-                /// </summary>
-                None,
-                /// <summary>
-                /// 
-                /// </summary>
-                Info,
-                /// <summary>
-                /// 
-                /// </summary>
-                Warning,
-                /// <summary>
-                /// 
-                /// </summary>
-                Error
-        }
-        /// <summary>
-        /// 
-        /// </summary>
-        [Flags]
-        public enum LogTargets
-        {
-                /// <summary>
-                /// 
-                /// </summary>
-                None = 0,
-                /// <summary>
-                /// 
-                /// </summary>
-                Null = 1,
-                /// <summary>
-                /// 
-                /// </summary>
-                File = 2,
-                /// <summary>
-                /// 
-                /// </summary>
-                Console = 4
-        }
-        /// <summary>
-        /// Summary description for Log.
-        /// </summary>
-        public class Log : IDisposable
-        {
-                #region Fields
-                private StreamWriter m_Writer;
-                private LogTargets m_Target = LogTargets.Null;
-                bool disposed;
-                #endregion
-                #region Constructors
-                /// <summary>
-                /// Initializes a new instance of the <see cref="Log"/> class.
-                /// </summary>
-                /// <param name="target">The target.</param>
-                /// <param name="fileName">Name of the file.</param>
-                public Log(LogTargets target, string fileName)
-                {
-                        m_Target = target;
-            
-                        if((m_Target & LogTargets.File) != 0)
-                        {
-                                m_Writer = new StreamWriter(fileName, false);
-                        }
-                }
-                #endregion
-                #region Public Methods
-                /// <summary>
-                /// Writes this instance.
-                /// </summary>
-                public void Write() 
-                {
-                        Write(string.Empty);
-                }
-                /// <summary>
-                /// Writes the specified MSG.
-                /// </summary>
-                /// <param name="msg">The MSG.</param>
-                public void Write(string msg) 
-                {
-                        if((m_Target & LogTargets.Null) != 0)
-                        {
-                                return;
-                        }
-                        if((m_Target & LogTargets.Console) != 0)
-                        {
-                                Console.WriteLine(msg);
-                        }
-                        if((m_Target & LogTargets.File) != 0 && m_Writer != null)
-                        {
-                                m_Writer.WriteLine(msg);
-                        }
-                }
-                /// <summary>
-                /// Writes the specified format.
-                /// </summary>
-                /// <param name="format">The format.</param>
-                /// <param name="args">The args.</param>
-                public void Write(string format, params object[] args)
-                {
-                        Write(string.Format(format,args));
-                }
-                /// <summary>
-                /// Writes the specified type.
-                /// </summary>
-                /// <param name="type">The type.</param>
-                /// <param name="format">The format.</param>
-                /// <param name="args">The args.</param>
-                public void Write(LogType type, string format, params object[] args)
-                {
-                        if((m_Target & LogTargets.Null) != 0)
-                        {
-                                return;
-                        }
-                        string str = "";
-                        switch(type) 
-                        {
-                                case LogType.Info:
-                                        str = "[I] "; 
-                                        break;
-                                case LogType.Warning:
-                                        str = "[!] "; 
-                                        break;
-                                case LogType.Error:
-                                        str = "[X] "; 
-                                        break;
-                        }
-                        Write(str + format,args);
-                }
-                /// <summary>
-                /// Writes the exception.
-                /// </summary>
-                /// <param name="type">The type.</param>
-                /// <param name="ex">The ex.</param>
-                public void WriteException(LogType type, Exception ex)
-                {
-                        if(ex != null)
-                        {
-                                Write(type, ex.Message);
-                                //#if DEBUG
-                                m_Writer.WriteLine("Exception @{0} stack trace [[", ex.TargetSite.Name);
-                                m_Writer.WriteLine(ex.StackTrace);
-                                m_Writer.WriteLine("]]");
-                                //#endif
-                        }
-                }
-                /// <summary>
-                /// Flushes this instance.
-                /// </summary>
-                public void Flush()
-                {
-                        if(m_Writer != null)
-                        {
-                                m_Writer.Flush();
-                        }
-                }
-                #endregion
-                #region IDisposable Members
-                /// <summary>
-                /// Performs application-defined tasks associated with freeing, releasing, or
-                /// resetting unmanaged resources.
-                /// </summary>
-                public void Dispose()
-                {
-                        Dispose(true);
-                        GC.SuppressFinalize(this);
-                }
-                /// <summary>
-                /// Dispose objects
-                /// </summary>
-                /// <param name="disposing">
-                /// If true, it will dispose close the handle
-                /// </param>
-                /// <remarks>
-                /// Will dispose managed and unmanaged resources.
-                /// </remarks>
-                protected virtual void Dispose(bool disposing)
-                {
-                        if (!this.disposed)
-                        {
-                                if (disposing)
-                                {
-                                        if (m_Writer != null)
-                                        {
-                                                m_Writer.Close();
-                                                m_Writer = null;
-                                        }
-                                }
-                        }
-                        this.disposed = true;
-                }
-                /// <summary>
-                /// 
-                /// </summary>
-                ~Log()
-                {
-                        this.Dispose(false);
-                }
-                
-                /// <summary>
-                /// Closes and destroys this object
-                /// </summary>
-                /// <remarks>
-                /// Same as Dispose(true)
-                /// </remarks>
-                public void Close() 
-                {
-                        Dispose();
-                }
-                #endregion
-        }
-}
diff --git a/Prebuild/src/Core/WarningException.cs b/Prebuild/src/Core/WarningException.cs
deleted file mode 100644
index a200bdc..0000000
--- a/Prebuild/src/Core/WarningException.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-#region BSD License
-/*
-Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (dan05a@gmail.com)
-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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
-*/
-#endregion
-#region CVS Information
-/*
- * $Source$
- * $Author: jendave $
- * $Date: 2006-01-28 01:49:58 +0100 (lö, 28 jan 2006) $
- * $Revision: 71 $
- */
-#endregion
-using System;
-using System.Runtime.Serialization;
-namespace Prebuild.Core
-{
-        /// <summary>
-        /// 
-        /// </summary>
-        [Serializable()]
-        public class WarningException : Exception
-        {
-                #region Constructors
-                /// <summary>
-                /// 
-                /// </summary>
-                public WarningException()
-                {
-                }
-                /// <summary>
-                /// 
-                /// </summary>
-                /// <param name="format"></param>
-                /// <param name="args"></param>
-                public WarningException(string format, params object[] args)
-                        : base(String.Format(format, args))
-                {
-                }
-                /// <summary>
-                /// Exception with specified string
-                /// </summary>
-                /// <param name="message">Exception message</param>
-                public WarningException(string message): base(message)
-                {
-                }
-                /// <summary>
-                /// 
-                /// </summary>
-                /// <param name="message"></param>
-                /// <param name="exception"></param>
-                public WarningException(string message, Exception exception) : base(message, exception)
-                {
-                }
-                /// <summary>
-                /// 
-                /// </summary>
-                /// <param name="info"></param>
-                /// <param name="context"></param>
-                protected WarningException(SerializationInfo info, StreamingContext context) : base( info, context )
-                {
-                }
-                #endregion
-        }
-}
diff --git a/Prebuild/src/Prebuild.cs b/Prebuild/src/Prebuild.cs
deleted file mode 100644
index 597db68..0000000
--- a/Prebuild/src/Prebuild.cs
+++ /dev/null
@@ -1,165 +0,0 @@
-#region BSD     License
-/*
-Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com),     Dan     Moorehead (dan05a@gmail.com)
-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. 
-* The name of the author may not be     used to endorse or promote products     derived from this software 
-  without specific prior written permission. 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
-*/
-#endregion
-#region CVS     Information
-/*
- * $Source$
- * $Author: jendave $
- * $Date: 2006-09-26 23:43:35 +0200 (ti, 26 sep 2006) $
- * $Revision: 168 $
- */
-#endregion
-using System;
-using System.Collections.Specialized;
-using System.IO;
-using System.Reflection;
-using System.Runtime.InteropServices;
-using System.EnterpriseServices.Internal;
-using Prebuild.Core;
-using Prebuild.Core.Utilities;
-namespace Prebuild 
-{
-        /// <summary>
-        /// 
-        /// </summary>
-        class Prebuild
-        {
-                #region Main
-                [STAThread]
-                static void     Main(string[] args)     
-                {
-                        Kernel  kernel = null;
-                        try     
-                        {
-                                kernel = Kernel.Instance;
-                                kernel.Initialize(LogTargets.File | LogTargets.Console, args);
-                                bool exit =     false;
-                                if(kernel.CommandLine.WasPassed("usage")) 
-                                {
-                                        exit = true;
-                                        OutputUsage();
-                                }
-                                if(kernel.CommandLine.WasPassed("showtargets")) 
-                                {
-                                        exit = true;
-                                        OutputTargets(kernel);
-                                }
-                                if(kernel.CommandLine.WasPassed("install")) 
-                                {
-                                        exit = true;
-                                        InstallAssembly(kernel);
-                                }
-                                if(kernel.CommandLine.WasPassed("remove")) 
-                                {
-                                        exit = true;
-                                        RemoveAssembly(kernel);
-                                }
-                                if(!exit)
-                                {
-                                        kernel.Process();
-                                }
-                        }
-                        catch(Exception ex)     
-                        {
-                                Console.WriteLine("Unhandled error:     {0}", ex.Message);
-                                //#if DEBUG
-                                Console.WriteLine("{0}", ex.StackTrace);
-                                //#endif
-                        }
-                        finally
-                        {
-                                if(kernel.PauseAfterFinish)     
-                                {
-                                        Console.WriteLine("\nPress enter to continue...");
-                                        Console.ReadLine();
-                                }
-                        }
-                }
-                #endregion
-                #region Private Methods
-                private static void InstallAssembly(Kernel kernel)
-                {
-                        Publish publish = new Publish();
-                        string file = kernel.CommandLine["install"];
-            //Console.WriteLine(".."+file+"..");
-                        publish.GacInstall(file);
-                }
-                private static void RemoveAssembly(Kernel kernel)
-                {
-                        Publish publish = new Publish();
-                        string file = kernel.CommandLine["remove"];
-                        publish.GacRemove(file);
-                }
-                private static void     OutputUsage() 
-                {
-                        Console.WriteLine("Usage: prebuild /target <target> [options]");
-                        Console.WriteLine("Available command-line switches:");
-                        Console.WriteLine();
-                        Console.WriteLine("/target          Target for Prebuild");
-                        Console.WriteLine("/clean           Clean the build files for the given target");
-                        Console.WriteLine("/file            XML file to process");
-                        Console.WriteLine("/log             Log file to write to");
-                        Console.WriteLine("/ppo             Pre-process the file, but perform no other processing");
-                        Console.WriteLine("/pause           Pauses the application after execution to view the output");
-                        Console.WriteLine("/yes             Default to yes to any questions asked");
-                        Console.WriteLine("/install         Install assembly into the GAC");
-                        Console.WriteLine("/remove          Remove assembly from the GAC");
-                        Console.WriteLine();
-                        Console.WriteLine("See 'prebuild /showtargets for a list of available targets");
-                        Console.WriteLine("See readme.txt or check out http://dnpb.sourceforge.net for more information");
-                        Console.WriteLine();
-                }
-                private static void     OutputTargets(Kernel kern)
-                {
-                        Console.WriteLine("Targets available in Prebuild:");
-                        Console.WriteLine("");
-                        if(kern.Targets.Keys.Count > 0)
-                        {
-                                string[] targs = new string[kern.Targets.Keys.Count];
-                                kern.Targets.Keys.CopyTo(targs, 0);
-                                Array.Sort(targs);
-                                foreach(string target in targs)
-                                {
-                                        Console.WriteLine(target);
-                                }
-                        }
-                        Console.WriteLine("");
-                }
-                
-                #endregion
-        }
-}
diff --git a/Prebuild/src/Prebuild.csproj b/Prebuild/src/Prebuild.csproj
deleted file mode 100644
index c8b859c..0000000
--- a/Prebuild/src/Prebuild.csproj
+++ /dev/null
@@ -1,205 +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>{92E80C1C-0000-0000-0000-000000000000}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>App.ico</ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>Prebuild</AssemblyName>
-    <AssemblyOriginatorKeyFile>Prebuild.snk</AssemblyOriginatorKeyFile>
-    <SignAssembly>true</SignAssembly>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>Prebuild</RootNamespace>
-    <StartupObject>Prebuild.Prebuild</StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>DEBUG;TRACE</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>1595</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>1595</NoWarn>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" >
-      <HintPath>System.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.EnterpriseServices" >
-      <HintPath>System.EnterpriseServices.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Xml" >
-      <HintPath>System.Xml.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="App.ico">
-    </EmbeddedResource>
-    <EmbeddedResource Include="data\prebuild-1.7.xsd">
-    </EmbeddedResource>
-    <Compile Include="Prebuild.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Core\FatalException.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Core\Kernel.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Core\UnknownLanguageException.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Core\WarningException.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Core\Attributes\DataNodeAttribute.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Core\Attributes\OptionNodeAttribute.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Core\Attributes\TargetAttribute.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Core\Interfaces\IDataNode.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Core\Interfaces\ITarget.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Core\Nodes\ConfigurationNode.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Core\Nodes\DataNode.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Core\Nodes\ExcludeNode.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Core\Nodes\FileNode.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Core\Nodes\FilesNode.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Core\Nodes\MatchNode.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Core\Nodes\OptionsNode.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Core\Nodes\ProcessNode.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Core\Nodes\ProjectNode.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Core\Nodes\ReferenceNode.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Core\Nodes\ReferencePathNode.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Core\Nodes\SolutionNode.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Core\Parse\IfContext.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Core\Parse\Preprocessor.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Core\Targets\AutotoolsTarget.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Core\Targets\DebugTarget.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Core\Targets\MonoDevelopTarget.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Core\Targets\NAntTarget.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Core\Targets\SharpDevelop2Target.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Core\Targets\SharpDevelopTarget.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Core\Targets\VS2002Target.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Core\Targets\VS2003Target.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Core\Targets\VS2005Target.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Core\Utilities\CommandLineCollection.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Core\Utilities\CurrentDirectory.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Core\Utilities\Helper.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Core\Utilities\Log.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/Prebuild/src/Prebuild.exe.build b/Prebuild/src/Prebuild.exe.build
deleted file mode 100644
index 2851125..0000000
--- a/Prebuild/src/Prebuild.exe.build
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" ?>
-<project name="Prebuild" 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="exe" debug="${build.debug}" keyfile="Prebuild.snk" unsafe="False" define="DEBUG;TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe" win32icon="App.ico">
-            <resources prefix="Prebuild" dynamicprefix="true" >
-                <include name="App.ico" />
-                <include name="data/prebuild-1.7.xsd" />
-            </resources>
-            <sources failonempty="true">
-                <include name="Prebuild.cs" />
-                <include name="Core/FatalException.cs" />
-                <include name="Core/Kernel.cs" />
-                <include name="Core/UnknownLanguageException.cs" />
-                <include name="Core/WarningException.cs" />
-                <include name="Core/Attributes/DataNodeAttribute.cs" />
-                <include name="Core/Attributes/OptionNodeAttribute.cs" />
-                <include name="Core/Attributes/TargetAttribute.cs" />
-                <include name="Core/Interfaces/IDataNode.cs" />
-                <include name="Core/Interfaces/ITarget.cs" />
-                <include name="Core/Nodes/ConfigurationNode.cs" />
-                <include name="Core/Nodes/DataNode.cs" />
-                <include name="Core/Nodes/ExcludeNode.cs" />
-                <include name="Core/Nodes/FileNode.cs" />
-                <include name="Core/Nodes/FilesNode.cs" />
-                <include name="Core/Nodes/MatchNode.cs" />
-                <include name="Core/Nodes/OptionsNode.cs" />
-                <include name="Core/Nodes/ProcessNode.cs" />
-                <include name="Core/Nodes/ProjectNode.cs" />
-                <include name="Core/Nodes/ReferenceNode.cs" />
-                <include name="Core/Nodes/ReferencePathNode.cs" />
-                <include name="Core/Nodes/SolutionNode.cs" />
-                <include name="Core/Parse/IfContext.cs" />
-                <include name="Core/Parse/Preprocessor.cs" />
-                <include name="Core/Targets/AutotoolsTarget.cs" />
-                <include name="Core/Targets/DebugTarget.cs" />
-                <include name="Core/Targets/MonoDevelopTarget.cs" />
-                <include name="Core/Targets/NAntTarget.cs" />
-                <include name="Core/Targets/SharpDevelop2Target.cs" />
-                <include name="Core/Targets/SharpDevelopTarget.cs" />
-                <include name="Core/Targets/VS2002Target.cs" />
-                <include name="Core/Targets/VS2003Target.cs" />
-                <include name="Core/Targets/VS2005Target.cs" />
-                <include name="Core/Utilities/CommandLineCollection.cs" />
-                <include name="Core/Utilities/CurrentDirectory.cs" />
-                <include name="Core/Utilities/Helper.cs" />
-                <include name="Core/Utilities/Log.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="System.dll" />
-                <include name="System.EnterpriseServices.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/Prebuild/src/Prebuild.snk b/Prebuild/src/Prebuild.snk
deleted file mode 100644
index f9dce05..0000000
--- a/Prebuild/src/Prebuild.snk
+++ /dev/null
Binary files differ
diff --git a/Prebuild/src/Properties/AssemblyInfo.cs b/Prebuild/src/Properties/AssemblyInfo.cs
deleted file mode 100644
index bfa9829..0000000
--- a/Prebuild/src/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,101 +0,0 @@
-#region BSD License
-/*
-Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (dan05a@gmail.com)
-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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
-*/
-#endregion
-#region CVS Information
-/*
- * $Source$
- * $Author: jendave $
- * $Date: 2007-01-26 19:31:34 +0100 (fr, 26 jan 2007) $
- * $Revision: 203 $
- */
-#endregion
-using System;
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using System.Security.Permissions;
-using System.Resources;
-// FxCop recommended attributes
-[assembly: ComVisible(false)]
-[assembly: FileIOPermission(SecurityAction.RequestMinimum, Unrestricted=true)]
-[assembly: CLSCompliant(true)]
-//
-// 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(".NET Prebuild")]
-[assembly: AssemblyDescription("A .NET project file build tool")]
-[assembly: AssemblyConfiguration(".NET CLR")]
-[assembly: AssemblyCompany("The Prebuild Project")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("Copyright  2004-2006 Matthew Holmes, Dan Moorehead and David Hudson")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-[assembly: NeutralResourcesLanguageAttribute("en-US")]
-[assembly: AssemblyVersion("2.0.0.*")]
-//
-// 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:
-//
-// In order to sign your assembly you must specify a key to use. Refer to the 
-// Microsoft .NET Framework documentation for more information on assembly signing.
-//
-// Use the attributes below to control which key is used for signing. 
-//
-// Notes: 
-//   (*) If no key is specified, the assembly is not signed.
-//   (*) KeyName refers to a key that has been installed in the Crypto Service
-//       Provider (CSP) on your machine. KeyFile refers to a file which contains
-//       a key.
-//   (*) If the KeyFile and the KeyName values are both specified, the 
-//       following processing occurs:
-//       (1) If the KeyName can be found in the CSP, that key is used.
-//       (2) If the KeyName does not exist and the KeyFile does exist, the key 
-//           in the KeyFile is installed into the CSP and used.
-//   (*) In order to create a KeyFile, you can use the sn.exe (Strong Name) utility.
-//       When specifying the KeyFile, the location of the KeyFile should be
-//       relative to the project output directory which is
-//       %Project Directory%\obj\<configuration>. For example, if your KeyFile is
-//       located in the project directory, you would specify the AssemblyKeyFile 
-//       attribute as [assembly: AssemblyKeyFile("..\\..\\mykey.snk")]
-//   (*) Delay Signing is an advanced option - see the Microsoft .NET Framework
-//       documentation for more information on this.
-//
-[assembly: AssemblyDelaySign(false)]
-[assembly: AssemblyKeyName("")]
diff --git a/Prebuild/src/data/dnpb-1.0.xsd b/Prebuild/src/data/dnpb-1.0.xsd
deleted file mode 100644
index 45cab86..0000000
--- a/Prebuild/src/data/dnpb-1.0.xsd
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<xs:schema elementFormDefault="qualified" 
-        xmlns:xs="http://www.w3.org/2001/XMLSchema"
-        targetNamespace="http://dnpb.sourceforge.net/schemas/dnpb-1.0.xsd"
-        xmlns="http://dnpb.sourceforge.net/schemas/dnpb-1.0.xsd"
->
-        <xs:annotation>
-                <xs:documentation>
-                        Copyright (c) 2004 Matthew Holmes (kerion@houston.rr.com)
-                        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. 
-                        * The name of the author may not be used to endorse or promote products derived from this software 
-                          without specific prior written permission. 
-                        THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
-                </xs:documentation>
-        </xs:annotation>
-        <xs:element name="DNPreBuild">
-                <xs:complexType>
-                        <xs:sequence>
-                                <xs:element ref="Process" minOccurs="0" maxOccurs="unbounded" />
-                                <xs:element ref="Solution" minOccurs="1" maxOccurs="unbounded" />
-                        </xs:sequence>
-                        <xs:attribute name="version" use="required" />
-                </xs:complexType>
-        </xs:element>
-        <xs:element name="Process" type="xs:string" />
-        <xs:element name="Solution">
-                <xs:complexType>
-                        <xs:sequence>
-                                <xs:element ref="Options" minOccurs="0" />
-                                <xs:element ref="Configuration" minOccurs="1" maxOccurs="unbounded" />
-                                <xs:element ref="Files" minOccurs="0" />
-                                <xs:element ref="Project" minOccurs="1" maxOccurs="unbounded" />
-                        </xs:sequence>
-                        <xs:attribute name="name" type="xs:string" use="required" />
-                        <xs:attribute name="path" type="xs:string" default="" />
-                </xs:complexType>
-        </xs:element>
-        <xs:element name="Project">
-                <xs:complexType>                
-                        <xs:sequence>
-                                <xs:element name="Reference" maxOccurs="unbounded">
-                                        <xs:complexType>
-                                                <xs:attribute name="name" type="xs:string" use="required" />
-                                                <xs:attribute name="path" type="xs:string" />
-                                                <xs:attribute name="localCopy" type="xs:boolean" />
-                                                <xs:attribute name="version" type="xs:string" />
-                                        </xs:complexType>
-                                </xs:element>
-                                <xs:element ref="Files" />
-                        </xs:sequence>
-                        <xs:attribute name="name" type="xs:string" use="required" />
-                        <xs:attribute name="path" type="xs:string" default="" />
-                        <xs:attribute name="language" default="C#">
-                                <xs:simpleType>
-                                        <xs:restriction base="xs:string">
-                                                <xs:enumeration value="C#" />
-                                                <xs:enumeration value="VB.NET" />
-                                        </xs:restriction>
-                                </xs:simpleType>
-                        </xs:attribute>
-                        <xs:attribute name="type" default="Exe">
-                                <xs:simpleType>
-                                        <xs:restriction base="xs:string">
-                                                <xs:enumeration value="Exe" />
-                                                <xs:enumeration value="WinExe" />
-                                                <xs:enumeration value="Library" />
-                                        </xs:restriction>
-                                </xs:simpleType>
-                        </xs:attribute>
-                        
-                        <xs:attribute name="runtime" default="Microsoft">
-                                <xs:simpleType>
-                                        <xs:restriction base="xs:string">
-                                                <xs:enumeration value="Microsoft" />
-                                                <xs:enumeration value="Mono" />
-                                        </xs:restriction>
-                                </xs:simpleType>
-                        </xs:attribute>
-                        
-                        <xs:attribute name="startupObject" type="xs:string" default="" />
-                </xs:complexType>
-        </xs:element>
-        <xs:element name="Configuration">       
-                <xs:complexType>
-                        <xs:all>
-                                <xs:element ref="Options" minOccurs="0" />
-                        </xs:all>
-                        <xs:attribute name="name" type="xs:string" use="required" />
-                </xs:complexType>
-        </xs:element>
-        <xs:element name="Options">
-                <xs:complexType>
-                        <xs:sequence>
-                                <xs:element name="CompilerDefines" type="xs:string" minOccurs="0" />
-                                <xs:element name="OptimizeCode" type="xs:boolean" minOccurs="0" />
-                                <xs:element name="CheckUnderflowOverflow" type="xs:boolean" minOccurs="0" />
-                                <xs:element name="AllowUnsafe" type="xs:boolean" minOccurs="0" />
-                                <xs:element name="WarningLevel" minOccurs="0">
-                                        <xs:simpleType>
-                                                <xs:restriction base="xs:integer">
-                                                        <xs:minInclusive value="0" />
-                                                        <xs:maxInclusive value="4"/>
-                                                </xs:restriction>
-                                        </xs:simpleType>
-                                </xs:element>
-                                <xs:element name="WarningsAsErrors" type="xs:boolean" minOccurs="0" />
-                                <xs:element name="SupressWarnings" type="xs:string" minOccurs="0" />
-                                <xs:element name="OutputPath" type="xs:string" minOccurs="0" />
-                                <xs:element name="XmlDocFile" type="xs:string" minOccurs="0" />
-                                <xs:element name="DebugInformation" type="xs:boolean" minOccurs="0" />
-                                <xs:element name="RegisterCOMInterop" type="xs:boolean" minOccurs="0" />
-                                <xs:element name="IncrementalBuild" type="xs:boolean" minOccurs="0" />
-                                <xs:element name="BaseAddress" type="xs:string" minOccurs="0" />
-                                <xs:element name="FileAlignment" type="xs:integer" minOccurs="0" />
-                                <xs:element name="NoStdLib" type="xs:boolean" minOccurs="0" />
-                                <xs:element name="ReferencePath" type="xs:string" minOccurs="0" maxOccurs="unbounded" />
-                        </xs:sequence> 
-                </xs:complexType>
-        </xs:element>
-        <xs:element name="Files">
-                <xs:complexType>
-                        <xs:sequence>
-                                <xs:element ref="File" minOccurs="0" maxOccurs="unbounded" />
-                                <xs:element ref="Match" minOccurs="0" maxOccurs="unbounded" />
-                        </xs:sequence>
-                </xs:complexType>
-        </xs:element>
-        
-        <xs:element name="File">
-                <xs:complexType>
-                        <xs:simpleContent>
-                                <xs:extension base="xs:string">
-                                        <xs:attribute name="buildAction" default="Compile">
-                                                <xs:simpleType>
-                                                        <xs:restriction base="xs:string">
-                                                                <xs:enumeration value="Compile" />
-                                                                <xs:enumeration value="Content" />
-                                                                <xs:enumeration value="EmbeddedResource" />
-                                                        </xs:restriction>
-                                                </xs:simpleType>
-                                        </xs:attribute>
-                                </xs:extension>
-                        </xs:simpleContent>
-                </xs:complexType>
-        </xs:element>
-        <xs:element name="Match">
-                <xs:complexType>
-                        <xs:attribute name="path" type="xs:string" use="required" />
-                        <xs:attribute name="pattern" type="xs:string" use="required" />
-                        <xs:attribute name="recurse" type="xs:boolean" default="false" />
-                </xs:complexType>
-        </xs:element>
-</xs:schema>
-\ No newline at end of file
diff --git a/Prebuild/src/data/dnpb-1.1.xsd b/Prebuild/src/data/dnpb-1.1.xsd
deleted file mode 100644
index c402ceb..0000000
--- a/Prebuild/src/data/dnpb-1.1.xsd
+++ /dev/null
@@ -1,184 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<xs:schema elementFormDefault="qualified" 
-        xmlns:xs="http://www.w3.org/2001/XMLSchema"
-        targetNamespace="http://dnpb.sourceforge.net/schemas/dnpb-1.1.xsd"
-        xmlns="http://dnpb.sourceforge.net/schemas/dnpb-1.1.xsd"
->
-        <xs:annotation>
-                <xs:documentation>
-                        Copyright (c) 2004 Matthew Holmes (kerion@houston.rr.com)
-                        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. 
-                        * The name of the author may not be used to endorse or promote products derived from this software 
-                          without specific prior written permission. 
-                        THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
-                </xs:documentation>
-        </xs:annotation>
-        <xs:element name="DNPreBuild">
-                <xs:complexType>
-                        <xs:sequence>
-                                <xs:element ref="Process" minOccurs="0" maxOccurs="unbounded" />
-                                <xs:element ref="Solution" minOccurs="1" maxOccurs="unbounded" />
-                        </xs:sequence>
-                        <xs:attribute name="version" use="required" />
-                </xs:complexType>
-        </xs:element>
-        <xs:element name="Process" type="xs:string" />
-        <xs:element name="Solution">
-                <xs:complexType>
-                        <xs:sequence>
-                                <xs:element ref="Options" minOccurs="0" />
-                                <xs:element ref="Configuration" minOccurs="1" maxOccurs="unbounded" />
-                                <xs:element ref="Files" minOccurs="0" />
-                                <xs:element ref="Project" minOccurs="1" maxOccurs="unbounded" />
-                        </xs:sequence>
-                        <xs:attribute name="name" type="xs:string" use="required" />
-                        <xs:attribute name="path" type="xs:string" default="" />
-                </xs:complexType>
-        </xs:element>
-        <xs:element name="Project">
-                <xs:complexType>                
-                        <xs:sequence>
-                                <xs:element name="ReferencePath" type="xs:string" minOccurs="0" maxOccurs="unbounded" />
-                                <xs:element name="Reference" maxOccurs="unbounded">
-                                        <xs:complexType>
-                                                <xs:attribute name="name" type="xs:string" use="required" />
-                                                <xs:attribute name="path" type="xs:string" />
-                                                <xs:attribute name="localCopy" type="xs:boolean" />
-                                                <xs:attribute name="version" type="xs:string" />
-                                        </xs:complexType>
-                                </xs:element>
-                                <xs:element ref="Files" />
-                        </xs:sequence>
-                        <xs:attribute name="name" type="xs:string" use="required" />
-                        <xs:attribute name="path" type="xs:string" default="" />
-                        <xs:attribute name="language" default="C#">
-                                <xs:simpleType>
-                                        <xs:restriction base="xs:string">
-                                                <xs:enumeration value="C#" />
-                                                <xs:enumeration value="VB.NET" />
-                                        </xs:restriction>
-                                </xs:simpleType>
-                        </xs:attribute>
-                        <xs:attribute name="type" default="Exe">
-                                <xs:simpleType>
-                                        <xs:restriction base="xs:string">
-                                                <xs:enumeration value="Exe" />
-                                                <xs:enumeration value="WinExe" />
-                                                <xs:enumeration value="Library" />
-                                        </xs:restriction>
-                                </xs:simpleType>
-                        </xs:attribute>
-                        
-                        <xs:attribute name="runtime" default="Microsoft">
-                                <xs:simpleType>
-                                        <xs:restriction base="xs:string">
-                                                <xs:enumeration value="Microsoft" />
-                                                <xs:enumeration value="Mono" />
-                                        </xs:restriction>
-                                </xs:simpleType>
-                        </xs:attribute>
-                        
-                        <xs:attribute name="startupObject" type="xs:string" default="" />
-                </xs:complexType>
-        </xs:element>
-        <xs:element name="Configuration">       
-                <xs:complexType>
-                        <xs:all>
-                                <xs:element ref="Options" minOccurs="0" />
-                        </xs:all>
-                        <xs:attribute name="name" type="xs:string" use="required" />
-                </xs:complexType>
-        </xs:element>
-        <xs:element name="Options">
-                <xs:complexType>
-                        <xs:sequence>
-                                <xs:element name="CompilerDefines" type="xs:string" minOccurs="0" />
-                                <xs:element name="OptimizeCode" type="xs:boolean" minOccurs="0" />
-                                <xs:element name="CheckUnderflowOverflow" type="xs:boolean" minOccurs="0" />
-                                <xs:element name="AllowUnsafe" type="xs:boolean" minOccurs="0" />
-                                <xs:element name="WarningLevel" minOccurs="0">
-                                        <xs:simpleType>
-                                                <xs:restriction base="xs:integer">
-                                                        <xs:minInclusive value="0" />
-                                                        <xs:maxInclusive value="4"/>
-                                                </xs:restriction>
-                                        </xs:simpleType>
-                                </xs:element>
-                                <xs:element name="WarningsAsErrors" type="xs:boolean" minOccurs="0" />
-                                <xs:element name="SupressWarnings" type="xs:string" minOccurs="0" />
-                                <xs:element name="OutputPath" type="xs:string" minOccurs="0" />
-                                <xs:element name="XmlDocFile" type="xs:string" minOccurs="0" />
-                                <xs:element name="DebugInformation" type="xs:boolean" minOccurs="0" />
-                                <xs:element name="RegisterCOMInterop" type="xs:boolean" minOccurs="0" />
-                                <xs:element name="IncrementalBuild" type="xs:boolean" minOccurs="0" />
-                                <xs:element name="BaseAddress" type="xs:string" minOccurs="0" />
-                                <xs:element name="FileAlignment" type="xs:integer" minOccurs="0" />
-                                <xs:element name="NoStdLib" type="xs:boolean" minOccurs="0" />                          
-                        </xs:sequence> 
-                </xs:complexType>
-        </xs:element>
-        <xs:element name="Files">
-                <xs:complexType>
-                        <xs:sequence>
-                                <xs:element ref="File" minOccurs="0" maxOccurs="unbounded" />
-                                <xs:element ref="Match" minOccurs="0" maxOccurs="unbounded" />
-                        </xs:sequence>
-                </xs:complexType>
-        </xs:element>
-        
-        <xs:element name="File">
-                <xs:complexType>
-                        <xs:simpleContent>
-                                <xs:extension base="xs:string">
-                                        <xs:attribute name="buildAction" default="Compile">
-                                                <xs:simpleType>
-                                                        <xs:restriction base="xs:string">
-                                                                <xs:enumeration value="Compile" />
-                                                                <xs:enumeration value="Content" />
-                                                                <xs:enumeration value="EmbeddedResource" />
-                                                        </xs:restriction>
-                                                </xs:simpleType>
-                                        </xs:attribute>
-                                </xs:extension>
-                        </xs:simpleContent>
-                </xs:complexType>
-        </xs:element>
-        <xs:element name="Match">
-                <xs:complexType>
-                        <xs:attribute name="path" type="xs:string" use="required" />
-                        <xs:attribute name="pattern" type="xs:string" use="required" />
-                        <xs:attribute name="recurse" type="xs:boolean" default="false" />
-                </xs:complexType>
-        </xs:element>
-</xs:schema>
-\ No newline at end of file
diff --git a/Prebuild/src/data/dnpb-1.2.xsd b/Prebuild/src/data/dnpb-1.2.xsd
deleted file mode 100644
index 8004af7..0000000
--- a/Prebuild/src/data/dnpb-1.2.xsd
+++ /dev/null
@@ -1,198 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<xs:schema elementFormDefault="qualified" 
-        xmlns:xs="http://www.w3.org/2001/XMLSchema"
-        targetNamespace="http://dnpb.sourceforge.net/schemas/dnpb-1.2.xsd"
-        xmlns="http://dnpb.sourceforge.net/schemas/dnpb-1.2.xsd"
->
-        <xs:annotation>
-                <xs:documentation>
-                        Copyright (c) 2004 Matthew Holmes (calefaction _at_ houston _._ rr _._ com)
-                        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. 
-                        * The name of the author may not be used to endorse or promote products derived from this software 
-                          without specific prior written permission. 
-                        THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
-                </xs:documentation>
-        </xs:annotation>
-        <xs:element name="DNPreBuild">
-                <xs:complexType>
-                        <xs:sequence>
-                                <xs:element ref="Process" minOccurs="0" maxOccurs="unbounded" />
-                                <xs:element ref="Solution" minOccurs="0" maxOccurs="unbounded" />
-                        </xs:sequence>
-                        <xs:attribute name="version" use="required" />
-                </xs:complexType>
-        </xs:element>
-        <xs:element name="Process" type="xs:string" />
-        <xs:element name="Solution">
-                <xs:complexType>
-                        <xs:sequence>
-                                <xs:element ref="Options" minOccurs="0" />
-                                <xs:element ref="Configuration" minOccurs="1" maxOccurs="unbounded" />
-                                <xs:element ref="Files" minOccurs="0" />
-                                <xs:element ref="Project" minOccurs="1" maxOccurs="unbounded" />
-                        </xs:sequence>
-                        <xs:attribute name="name" type="xs:string" use="required" />
-                        <xs:attribute name="path" type="xs:string" default="" />
-                </xs:complexType>
-        </xs:element>
-        <xs:element name="Project">
-                <xs:complexType>                
-                        <xs:sequence>
-                                <xs:element ref="Configuration" minOccurs="0" maxOccurs="unbounded" />
-                                <xs:element name="ReferencePath" type="xs:string" minOccurs="0" maxOccurs="unbounded" />
-                                <xs:element name="Reference" minOccurs="0" maxOccurs="unbounded">
-                                        <xs:complexType>
-                                                <xs:attribute name="name" type="xs:string" use="required" />
-                                                <xs:attribute name="path" type="xs:string" />
-                                                <xs:attribute name="localCopy" type="xs:boolean" />
-                                                <xs:attribute name="version" type="xs:string" />
-                                        </xs:complexType>
-                                </xs:element>
-                                <xs:element ref="Files" />
-                        </xs:sequence>
-                        <xs:attribute name="name" type="xs:string" use="required" />
-                        <xs:attribute name="path" type="xs:string" default="" />
-                        <xs:attribute name="language" default="C#">
-                                <xs:simpleType>
-                                        <xs:restriction base="xs:string">
-                                                <xs:enumeration value="C#" />
-                                                <xs:enumeration value="VB.NET" />
-                                        </xs:restriction>
-                                </xs:simpleType>
-                        </xs:attribute>
-                        <xs:attribute name="type" default="Exe">
-                                <xs:simpleType>
-                                        <xs:restriction base="xs:string">
-                                                <xs:enumeration value="Exe" />
-                                                <xs:enumeration value="WinExe" />
-                                                <xs:enumeration value="Library" />
-                                        </xs:restriction>
-                                </xs:simpleType>
-                        </xs:attribute>
-                        
-                        <xs:attribute name="runtime" default="Microsoft">
-                                <xs:simpleType>
-                                        <xs:restriction base="xs:string">
-                                                <xs:enumeration value="Microsoft" />
-                                                <xs:enumeration value="Mono" />
-                                        </xs:restriction>
-                                </xs:simpleType>
-                        </xs:attribute>
-                        
-                        <xs:attribute name="startupObject" type="xs:string" default="" />
-                        <xs:attribute name="rootNamespace" type="xs:string" />
-                        <xs:attribute name="assemblyName" type="xs:string" />
-                </xs:complexType>
-        </xs:element>
-        <xs:element name="Configuration">       
-                <xs:complexType>
-                        <xs:all>
-                                <xs:element ref="Options" minOccurs="0" />
-                        </xs:all>
-                        <xs:attribute name="name" type="xs:string" use="required" />
-                </xs:complexType>
-        </xs:element>
-        <xs:element name="Options">
-                <xs:complexType>
-                        <xs:all>
-                                <xs:element name="CompilerDefines" type="xs:string" minOccurs="0" />
-                                <xs:element name="OptimizeCode" type="xs:boolean" minOccurs="0" />
-                                <xs:element name="CheckUnderflowOverflow" type="xs:boolean" minOccurs="0" />
-                                <xs:element name="AllowUnsafe" type="xs:boolean" minOccurs="0" />
-                                <xs:element name="WarningLevel" minOccurs="0">
-                                        <xs:simpleType>
-                                                <xs:restriction base="xs:integer">
-                                                        <xs:minInclusive value="0" />
-                                                        <xs:maxInclusive value="4"/>
-                                                </xs:restriction>
-                                        </xs:simpleType>
-                                </xs:element>
-                                <xs:element name="WarningsAsErrors" type="xs:boolean" minOccurs="0" />
-                                <xs:element name="SupressWarnings" type="xs:string" minOccurs="0" />
-                                <xs:element name="OutputPath" type="xs:string" minOccurs="0" />
-                                <xs:element name="XmlDocFile" type="xs:string" minOccurs="0" />
-                                <xs:element name="DebugInformation" type="xs:boolean" minOccurs="0" />
-                                <xs:element name="RegisterCOMInterop" type="xs:boolean" minOccurs="0" />
-                                <xs:element name="IncrementalBuild" type="xs:boolean" minOccurs="0" />
-                                <xs:element name="BaseAddress" type="xs:string" minOccurs="0" />
-                                <xs:element name="FileAlignment" type="xs:integer" minOccurs="0" />
-                                <xs:element name="NoStdLib" type="xs:boolean" minOccurs="0" />                          
-                        </xs:all> 
-                </xs:complexType>
-        </xs:element>
-        <xs:element name="Files">
-                <xs:complexType>
-                        <xs:sequence>
-                                <xs:element ref="File" minOccurs="0" maxOccurs="unbounded" />
-                                <xs:element ref="Match" minOccurs="0" maxOccurs="unbounded" />
-                        </xs:sequence>
-                </xs:complexType>
-        </xs:element>
-        <xs:element name="File">
-                <xs:complexType>
-                        <xs:simpleContent>
-                                <xs:extension base="xs:string">
-                        <xs:attribute name="buildAction" default="Compile">
-                                <xs:simpleType>
-                                        <xs:restriction base="xs:string">
-                                                <xs:enumeration value="Compile" />
-                                                <xs:enumeration value="Content" />
-                                                <xs:enumeration value="EmbeddedResource" />
-                                        </xs:restriction>
-                                </xs:simpleType>
-                        </xs:attribute>
-                                </xs:extension>
-                        </xs:simpleContent>
-                </xs:complexType>
-        </xs:element>
-        <xs:element name="Match">
-                <xs:complexType>
-                        <xs:attribute name="path" type="xs:string" use="required" />                    
-                        <xs:attribute name="pattern" type="xs:string" use="required" />
-                        <xs:attribute name="recurse" type="xs:boolean" default="false" />
-                        <xs:attribute name="useRegex" type="xs:boolean" default="false" />
-                <xs:attribute name="buildAction" default="Compile">
-                        <xs:simpleType>
-                                <xs:restriction base="xs:string">
-                                        <xs:enumeration value="Compile" />
-                                        <xs:enumeration value="Content" />
-                                        <xs:enumeration value="EmbeddedResource" />
-                                </xs:restriction>
-                        </xs:simpleType>
-                </xs:attribute>
-                </xs:complexType>
-        </xs:element>
-</xs:schema>
-\ No newline at end of file
diff --git a/Prebuild/src/data/dnpb-1.3.xsd b/Prebuild/src/data/dnpb-1.3.xsd
deleted file mode 100644
index 5f8ada1..0000000
--- a/Prebuild/src/data/dnpb-1.3.xsd
+++ /dev/null
@@ -1,206 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<xs:schema elementFormDefault="qualified" 
-        xmlns:xs="http://www.w3.org/2001/XMLSchema"
-        targetNamespace="http://dnpb.sourceforge.net/schemas/dnpb-1.3.xsd"
-        xmlns="http://dnpb.sourceforge.net/schemas/dnpb-1.3.xsd"
->
-        <xs:annotation>
-                <xs:documentation>
-                        Copyright (c) 2004-2005 Matthew Holmes (calefaction at houston . rr . com), Dan Moorehead (dan05a at gmail . com)
-                        
-                        .NET Pre-Build is an XML-driven pre-build tool allowing developers to
-                        easily generate project or make files for major IDE's and .NET
-                        development tools including: Visual Studio 2003, Visual Studio 2002,
-                        SharpDevelop, MonoDevelop, and NAnt.
-                        BSD License:
-                        
-                        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. 
-                        * The name of the author may not be used to endorse or promote products derived from this software 
-                          without specific prior written permission. 
-                        THIS SOFTWARE IS PROVIDED BY THE AUTHOR '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 AUTHOR 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.
-                </xs:documentation>
-        </xs:annotation>
-        <xs:element name="DNPreBuild">
-                <xs:complexType>
-                        <xs:sequence>
-                                <xs:element ref="Process" minOccurs="0" maxOccurs="unbounded" />
-                                <xs:element ref="Solution" minOccurs="0" maxOccurs="unbounded" />
-                        </xs:sequence>
-                        <xs:attribute name="version" use="required" />
-                </xs:complexType>
-        </xs:element>
-        <xs:element name="Process" type="xs:string" />
-        <xs:element name="Solution">
-                <xs:complexType>
-                        <xs:sequence>
-                                <xs:element ref="Options" minOccurs="0" />
-                                <xs:element ref="Configuration" minOccurs="1" maxOccurs="unbounded" />
-                                <xs:element ref="Files" minOccurs="0" />
-                                <xs:element ref="Project" minOccurs="1" maxOccurs="unbounded" />
-                        </xs:sequence>
-                        <xs:attribute name="name" type="xs:string" use="required" />
-                        <xs:attribute name="path" type="xs:string" default="" />
-                </xs:complexType>
-        </xs:element>
-        <xs:element name="Project">
-                <xs:complexType>                
-                        <xs:sequence>
-                                <xs:element ref="Configuration" minOccurs="0" maxOccurs="unbounded" />
-                                <xs:element name="ReferencePath" type="xs:string" minOccurs="0" maxOccurs="unbounded" />
-                                <xs:element name="Reference" minOccurs="0" maxOccurs="unbounded">
-                                        <xs:complexType>
-                                                <xs:attribute name="name" type="xs:string" use="required" />
-                                                <xs:attribute name="path" type="xs:string" />
-                                                <xs:attribute name="localCopy" type="xs:boolean" />
-                                                <xs:attribute name="version" type="xs:string" />
-                                        </xs:complexType>
-                                </xs:element>
-                                <xs:element ref="Files" />
-                        </xs:sequence>
-                        <xs:attribute name="name" type="xs:string" use="required" />
-                        <xs:attribute name="path" type="xs:string" default="" />
-                        <xs:attribute name="icon" type="xs:string" default="" />
-                        <xs:attribute name="language" default="C#">
-                                <xs:simpleType>
-                                        <xs:restriction base="xs:string">
-                                                <xs:enumeration value="C#" />
-                                                <xs:enumeration value="VB.NET" />
-                                        </xs:restriction>
-                                </xs:simpleType>
-                        </xs:attribute>
-                        <xs:attribute name="type" default="Exe">
-                                <xs:simpleType>
-                                        <xs:restriction base="xs:string">
-                                                <xs:enumeration value="Exe" />
-                                                <xs:enumeration value="WinExe" />
-                                                <xs:enumeration value="Library" />
-                                        </xs:restriction>
-                                </xs:simpleType>
-                        </xs:attribute>
-                        
-                        <xs:attribute name="runtime" default="Microsoft">
-                                <xs:simpleType>
-                                        <xs:restriction base="xs:string">
-                                                <xs:enumeration value="Microsoft" />
-                                                <xs:enumeration value="Mono" />
-                                        </xs:restriction>
-                                </xs:simpleType>
-                        </xs:attribute>
-                        
-                        <xs:attribute name="startupObject" type="xs:string" default="" />
-                        <xs:attribute name="rootNamespace" type="xs:string" />
-                        <xs:attribute name="assemblyName" type="xs:string" />
-                </xs:complexType>
-        </xs:element>
-        <xs:element name="Configuration">       
-                <xs:complexType>
-                        <xs:all>
-                                <xs:element ref="Options" minOccurs="0" />
-                        </xs:all>
-                        <xs:attribute name="name" type="xs:string" use="required" />
-                </xs:complexType>
-        </xs:element>
-        <xs:element name="Options">
-                <xs:complexType>
-                        <xs:all>
-                                <xs:element name="CompilerDefines" type="xs:string" minOccurs="0" />
-                                <xs:element name="OptimizeCode" type="xs:boolean" minOccurs="0" />
-                                <xs:element name="CheckUnderflowOverflow" type="xs:boolean" minOccurs="0" />
-                                <xs:element name="AllowUnsafe" type="xs:boolean" minOccurs="0" />
-                                <xs:element name="WarningLevel" minOccurs="0">
-                                        <xs:simpleType>
-                                                <xs:restriction base="xs:integer">
-                                                        <xs:minInclusive value="0" />
-                                                        <xs:maxInclusive value="4"/>
-                                                </xs:restriction>
-                                        </xs:simpleType>
-                                </xs:element>
-                                <xs:element name="WarningsAsErrors" type="xs:boolean" minOccurs="0" />
-                                <xs:element name="SupressWarnings" type="xs:string" minOccurs="0" />
-                                <xs:element name="OutputPath" type="xs:string" minOccurs="0" />
-                                <xs:element name="XmlDocFile" type="xs:string" minOccurs="0" />
-                                <xs:element name="DebugInformation" type="xs:boolean" minOccurs="0" />
-                                <xs:element name="RegisterCOMInterop" type="xs:boolean" minOccurs="0" />
-                                <xs:element name="IncrementalBuild" type="xs:boolean" minOccurs="0" />
-                                <xs:element name="BaseAddress" type="xs:string" minOccurs="0" />
-                                <xs:element name="FileAlignment" type="xs:integer" minOccurs="0" />
-                                <xs:element name="NoStdLib" type="xs:boolean" minOccurs="0" />                          
-                        </xs:all> 
-                </xs:complexType>
-        </xs:element>
-        <xs:element name="Files">
-                <xs:complexType>
-                        <xs:sequence>
-                                <xs:element ref="File" minOccurs="0" maxOccurs="unbounded" />
-                                <xs:element ref="Match" minOccurs="0" maxOccurs="unbounded" />
-                        </xs:sequence>
-                </xs:complexType>
-        </xs:element>
-        <xs:element name="File">
-                <xs:complexType>
-                        <xs:simpleContent>
-                                <xs:extension base="xs:string">
-                        <xs:attribute name="buildAction" default="Compile">
-                                <xs:simpleType>
-                                        <xs:restriction base="xs:string">
-                                                <xs:enumeration value="Compile" />
-                                                <xs:enumeration value="Content" />
-                                                <xs:enumeration value="EmbeddedResource" />
-                                        </xs:restriction>
-                                </xs:simpleType>
-                        </xs:attribute>
-                                </xs:extension>
-                        </xs:simpleContent>
-                </xs:complexType>
-        </xs:element>
-        <xs:element name="Match">
-                <xs:complexType>
-                        <xs:attribute name="path" type="xs:string" />                   
-                        <xs:attribute name="pattern" type="xs:string" use="required" />
-                        <xs:attribute name="recurse" type="xs:boolean" default="false" />
-                        <xs:attribute name="useRegex" type="xs:boolean" default="false" />
-                <xs:attribute name="buildAction" default="Compile">
-                        <xs:simpleType>
-                                <xs:restriction base="xs:string">
-                                        <xs:enumeration value="Compile" />
-                                        <xs:enumeration value="Content" />
-                                        <xs:enumeration value="EmbeddedResource" />
-                                </xs:restriction>
-                        </xs:simpleType>
-                </xs:attribute>
-                </xs:complexType>
-        </xs:element>
-</xs:schema>
-\ No newline at end of file
diff --git a/Prebuild/src/data/dnpb-1.4.xsd b/Prebuild/src/data/dnpb-1.4.xsd
deleted file mode 100644
index 54f9ac0..0000000
--- a/Prebuild/src/data/dnpb-1.4.xsd
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<xs:schema elementFormDefault="qualified" 
-        xmlns:xs="http://www.w3.org/2001/XMLSchema"
-        targetNamespace="http://dnpb.sourceforge.net/schemas/dnpb-1.4.xsd"
-        xmlns="http://dnpb.sourceforge.net/schemas/dnpb-1.4.xsd"
->
-        <xs:annotation>
-                <xs:documentation>
-                        Copyright (c) 2004-2005 Matthew Holmes (calefaction at houston . rr . com), Dan Moorehead (dan05a at gmail . com)
-                        .NET Prebuild is a cross-platform XML-driven pre-build tool which
-                        allows developers to easily generate project or make files for major
-                        IDE's and .NET development tools including: Visual Studio .NET 2002 and
-                        2003, SharpDevelop, MonoDevelop, and NAnt.
-                        BSD License:
-                        
-                        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. 
-                        * The name of the author may not be used to endorse or promote products derived from this software 
-                          without specific prior written permission. 
-                        THIS SOFTWARE IS PROVIDED BY THE AUTHOR '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 AUTHOR 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.
-                </xs:documentation>
-        </xs:annotation>
-        <xs:element name="DNPreBuild">
-                <xs:complexType>
-                        <xs:sequence>
-                                <xs:element ref="Process" minOccurs="0" maxOccurs="unbounded" />
-                                <xs:element ref="Solution" minOccurs="0" maxOccurs="unbounded" />
-                        </xs:sequence>
-                        <xs:attribute name="version" />
-                        <xs:attribute name="checkOsVars" />
-                </xs:complexType>
-        </xs:element>
-        <xs:element name="Process" type="xs:string" />
-        <xs:element name="Solution">
-                <xs:complexType>
-                        <xs:sequence>
-                                <xs:element ref="Options" minOccurs="0" />
-                                <xs:element ref="Configuration" minOccurs="1" maxOccurs="unbounded" />
-                                <xs:element ref="Files" minOccurs="0" />
-                                <xs:element ref="Project" minOccurs="1" maxOccurs="unbounded" />
-                        </xs:sequence>
-                        <xs:attribute name="name" type="xs:string" use="required" />
-                        <xs:attribute name="activeConfig" type="xs:string" default="Debug" />
-                        <xs:attribute name="path" type="xs:string" default="" />
-                </xs:complexType>
-        </xs:element>
-        <xs:element name="Project">
-                <xs:complexType>                
-                        <xs:sequence>
-                                <xs:element ref="Configuration" minOccurs="0" maxOccurs="unbounded" />
-                                <xs:element name="ReferencePath" type="xs:string" minOccurs="0" maxOccurs="unbounded" />
-                                <xs:element name="Reference" minOccurs="0" maxOccurs="unbounded">
-                                        <xs:complexType>
-                                                <xs:attribute name="name" type="xs:string" use="required" />
-                                                <xs:attribute name="path" type="xs:string" />
-                                                <xs:attribute name="localCopy" type="xs:boolean" />
-                                                <xs:attribute name="version" type="xs:string" />
-                                        </xs:complexType>
-                                </xs:element>
-                                <xs:element ref="Files" />
-                        </xs:sequence>
-                        <xs:attribute name="name" type="xs:string" use="required" />
-                        <xs:attribute name="path" type="xs:string" default="" />
-                        <xs:attribute name="icon" type="xs:string" default="" />
-                        <xs:attribute name="language" default="C#">
-                                <xs:simpleType>
-                                        <xs:restriction base="xs:string">
-                                                <xs:enumeration value="C#" />
-                                                <xs:enumeration value="VB.NET" />
-                                        </xs:restriction>
-                                </xs:simpleType>
-                        </xs:attribute>
-                        <xs:attribute name="type" default="Exe">
-                                <xs:simpleType>
-                                        <xs:restriction base="xs:string">
-                                                <xs:enumeration value="Exe" />
-                                                <xs:enumeration value="WinExe" />
-                                                <xs:enumeration value="Library" />
-                                        </xs:restriction>
-                                </xs:simpleType>
-                        </xs:attribute>
-                        
-                        <xs:attribute name="runtime" default="Microsoft">
-                                <xs:simpleType>
-                                        <xs:restriction base="xs:string">
-                                                <xs:enumeration value="Microsoft" />
-                                                <xs:enumeration value="Mono" />
-                                        </xs:restriction>
-                                </xs:simpleType>
-                        </xs:attribute>
-                        
-                        <xs:attribute name="startupObject" type="xs:string" default="" />
-                        <xs:attribute name="rootNamespace" type="xs:string" />
-                        <xs:attribute name="assemblyName" type="xs:string" />
-                </xs:complexType>
-        </xs:element>
-        <xs:element name="Configuration">       
-                <xs:complexType>
-                        <xs:sequence>
-                                <xs:element ref="Options" minOccurs="0" />
-                        </xs:sequence>
-                        <xs:attribute name="name" type="xs:string" use="required" />
-                </xs:complexType>
-        </xs:element>
-        <xs:element name="Options">
-                <xs:complexType>
-                        <xs:all>
-                                <xs:element name="CompilerDefines" type="xs:string" minOccurs="0" />
-                                <xs:element name="OptimizeCode" type="xs:boolean" minOccurs="0" />
-                                <xs:element name="CheckUnderflowOverflow" type="xs:boolean" minOccurs="0" />
-                                <xs:element name="AllowUnsafe" type="xs:boolean" minOccurs="0" />
-                                <xs:element name="WarningLevel" minOccurs="0">
-                                        <xs:simpleType>
-                                                <xs:restriction base="xs:integer">
-                                                        <xs:minInclusive value="0" />
-                                                        <xs:maxInclusive value="4"/>
-                                                </xs:restriction>
-                                        </xs:simpleType>
-                                </xs:element>
-                                <xs:element name="WarningsAsErrors" type="xs:boolean" minOccurs="0" />
-                                <xs:element name="SupressWarnings" type="xs:string" minOccurs="0" />
-                                <xs:element name="OutputPath" type="xs:string" minOccurs="0" />
-                                <xs:element name="XmlDocFile" type="xs:string" minOccurs="0" />
-                                <xs:element name="DebugInformation" type="xs:boolean" minOccurs="0" />
-                                <xs:element name="RegisterCOMInterop" type="xs:boolean" minOccurs="0" />
-                                <xs:element name="IncrementalBuild" type="xs:boolean" minOccurs="0" />
-                                <xs:element name="BaseAddress" type="xs:string" minOccurs="0" />
-                                <xs:element name="FileAlignment" type="xs:integer" minOccurs="0" />
-                                <xs:element name="NoStdLib" type="xs:boolean" minOccurs="0" />                          
-                        </xs:all> 
-                </xs:complexType>
-        </xs:element>
-        <xs:element name="Files">
-                <xs:complexType>
-                        <xs:sequence>
-                                <xs:element ref="File" minOccurs="0" maxOccurs="unbounded" />
-                                <xs:element ref="Match" minOccurs="0" maxOccurs="unbounded" />
-                        </xs:sequence>
-                </xs:complexType>
-        </xs:element>
-        <xs:element name="File">
-                <xs:complexType>
-                        <xs:simpleContent>
-                                <xs:extension base="xs:string">
-                        <xs:attribute name="buildAction" default="Compile">
-                                <xs:simpleType>
-                                        <xs:restriction base="xs:string">
-                                                                <xs:enumeration value="None" />
-                                                <xs:enumeration value="Compile" />
-                                                <xs:enumeration value="Content" />
-                                                <xs:enumeration value="EmbeddedResource" />
-                                        </xs:restriction>
-                                </xs:simpleType>
-                        </xs:attribute>
-                                </xs:extension>
-                        </xs:simpleContent>
-                </xs:complexType>
-        </xs:element>
-        <xs:element name="Match">
-                <xs:complexType>
-                        <xs:attribute name="path" type="xs:string" />                   
-                        <xs:attribute name="pattern" type="xs:string" use="required" />
-                        <xs:attribute name="recurse" type="xs:boolean" default="false" />
-                        <xs:attribute name="useRegex" type="xs:boolean" default="false" />
-                <xs:attribute name="buildAction" default="Compile">
-                        <xs:simpleType>
-                                <xs:restriction base="xs:string">
-                                        <xs:enumeration value="None" />
-                                        <xs:enumeration value="Compile" />
-                                        <xs:enumeration value="Content" />
-                                        <xs:enumeration value="EmbeddedResource" />
-                                </xs:restriction>
-                        </xs:simpleType>
-                </xs:attribute>
-                </xs:complexType>
-        </xs:element>
-</xs:schema>
diff --git a/Prebuild/src/data/dnpb-1.5.xsd b/Prebuild/src/data/dnpb-1.5.xsd
deleted file mode 100644
index 2270e83..0000000
--- a/Prebuild/src/data/dnpb-1.5.xsd
+++ /dev/null
@@ -1,215 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<xs:schema elementFormDefault="qualified" 
-        xmlns:xs="http://www.w3.org/2001/XMLSchema"
-        targetNamespace="http://dnpb.sourceforge.net/schemas/dnpb-1.5.xsd"
-        xmlns="http://dnpb.sourceforge.net/schemas/dnpb-1.5.xsd"
->
-        <xs:annotation>
-                <xs:documentation>
-                        Copyright (c) 2004-2005 Matthew Holmes (calefaction at houston . rr . com), Dan Moorehead (dan05a at gmail . com)
-                        .NET Prebuild is a cross-platform XML-driven pre-build tool which
-                        allows developers to easily generate project or make files for major
-                        IDE's and .NET development tools including: Visual Studio .NET 2002 and
-                        2003, SharpDevelop, MonoDevelop, and NAnt.
-                        BSD License:
-                        
-                        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. 
-                        * The name of the author may not be used to endorse or promote products derived from this software 
-                          without specific prior written permission. 
-                        THIS SOFTWARE IS PROVIDED BY THE AUTHOR '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 AUTHOR 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.
-                </xs:documentation>
-        </xs:annotation>
-        <xs:element name="DNPreBuild">
-                <xs:complexType>
-                        <xs:sequence>
-                                <xs:element ref="Process" minOccurs="0" maxOccurs="unbounded" />
-                                <xs:element ref="Solution" minOccurs="0" maxOccurs="unbounded" />
-                        </xs:sequence>
-                        <xs:attribute name="version" />
-                        <xs:attribute name="checkOsVars" />
-                </xs:complexType>
-        </xs:element>
-        <xs:element name="Process" type="xs:string" />
-        <xs:element name="Solution">
-                <xs:complexType>
-                        <xs:sequence>
-                                <xs:element ref="Options" minOccurs="0" />
-                                <xs:element ref="Configuration" minOccurs="1" maxOccurs="unbounded" />
-                                <xs:element ref="Files" minOccurs="0" />
-                                <xs:element ref="Project" minOccurs="1" maxOccurs="unbounded" />
-                        </xs:sequence>
-                        <xs:attribute name="name" type="xs:string" use="required" />
-                        <xs:attribute name="activeConfig" type="xs:string" default="Debug" />
-                        <xs:attribute name="path" type="xs:string" default="" />
-                </xs:complexType>
-        </xs:element>
-        <xs:element name="Project">
-                <xs:complexType>                
-                        <xs:sequence>
-                                <xs:element ref="Configuration" minOccurs="0" maxOccurs="unbounded" />
-                                <xs:element name="ReferencePath" type="xs:string" minOccurs="0" maxOccurs="unbounded" />
-                                <xs:element name="Reference" minOccurs="0" maxOccurs="unbounded">
-                                        <xs:complexType>
-                                                <xs:attribute name="name" type="xs:string" use="required" />
-                                                <xs:attribute name="path" type="xs:string" />
-                                                <xs:attribute name="localCopy" type="xs:boolean" />
-                                                <xs:attribute name="version" type="xs:string" />
-                                        </xs:complexType>
-                                </xs:element>
-                                <xs:element ref="Files" />
-                        </xs:sequence>
-                        <xs:attribute name="name" type="xs:string" use="required" />
-                        <xs:attribute name="filterGroups" type="xs:string" default="" />
-                        <xs:attribute name="path" type="xs:string" default="" />
-                        <xs:attribute name="icon" type="xs:string" default="" />
-                        <xs:attribute name="language" default="C#">
-                                <xs:simpleType>
-                                        <xs:restriction base="xs:string">
-                                                <xs:enumeration value="C#" />
-                                                <xs:enumeration value="VB.NET" />
-                                        </xs:restriction>
-                                </xs:simpleType>
-                        </xs:attribute>
-                        <xs:attribute name="type" default="Exe">
-                                <xs:simpleType>
-                                        <xs:restriction base="xs:string">
-                                                <xs:enumeration value="Exe" />
-                                                <xs:enumeration value="WinExe" />
-                                                <xs:enumeration value="Library" />
-                                        </xs:restriction>
-                                </xs:simpleType>
-                        </xs:attribute>
-                        
-                        <xs:attribute name="runtime" default="Microsoft">
-                                <xs:simpleType>
-                                        <xs:restriction base="xs:string">
-                                                <xs:enumeration value="Microsoft" />
-                                                <xs:enumeration value="Mono" />
-                                        </xs:restriction>
-                                </xs:simpleType>
-                        </xs:attribute>
-                        
-                        <xs:attribute name="startupObject" type="xs:string" default="" />
-                        <xs:attribute name="rootNamespace" type="xs:string" />
-                        <xs:attribute name="assemblyName" type="xs:string" />
-                </xs:complexType>
-        </xs:element>
-        <xs:element name="Configuration">       
-                <xs:complexType>
-                        <xs:sequence>
-                                <xs:element ref="Options" minOccurs="0" />
-                        </xs:sequence>
-                        <xs:attribute name="name" type="xs:string" use="required" />
-                </xs:complexType>
-        </xs:element>
-        <xs:element name="Options">
-                <xs:complexType>
-                        <xs:all>
-                                <xs:element name="CompilerDefines" type="xs:string" minOccurs="0" />
-                                <xs:element name="OptimizeCode" type="xs:boolean" minOccurs="0" />
-                                <xs:element name="CheckUnderflowOverflow" type="xs:boolean" minOccurs="0" />
-                                <xs:element name="AllowUnsafe" type="xs:boolean" minOccurs="0" />
-                                <xs:element name="WarningLevel" minOccurs="0">
-                                        <xs:simpleType>
-                                                <xs:restriction base="xs:integer">
-                                                        <xs:minInclusive value="0" />
-                                                        <xs:maxInclusive value="4"/>
-                                                </xs:restriction>
-                                        </xs:simpleType>
-                                </xs:element>
-                                <xs:element name="WarningsAsErrors" type="xs:boolean" minOccurs="0" />
-                                <xs:element name="SupressWarnings" type="xs:string" minOccurs="0" />
-                                <xs:element name="OutputPath" type="xs:string" minOccurs="0" />
-                                <xs:element name="GenerateXmlDocFile" type="xs:boolean" minOccurs="0" />
-                                <xs:element name="XmlDocFile" type="xs:string" minOccurs="0" />
-                                <xs:element name="DebugInformation" type="xs:boolean" minOccurs="0" />
-                                <xs:element name="RegisterCOMInterop" type="xs:boolean" minOccurs="0" />
-                                <xs:element name="RemoveIntegerChecks" type="xs:boolean" minOccurs="0" />
-                                <xs:element name="IncrementalBuild" type="xs:boolean" minOccurs="0" />
-                                <xs:element name="BaseAddress" type="xs:string" minOccurs="0" />
-                                <xs:element name="FileAlignment" type="xs:integer" minOccurs="0" />
-                                <xs:element name="NoStdLib" type="xs:boolean" minOccurs="0" />                          
-                        </xs:all> 
-                </xs:complexType>
-        </xs:element>
-        <xs:element name="Files">
-                <xs:complexType>
-                        <xs:sequence>
-                                <xs:element ref="File" minOccurs="0" maxOccurs="unbounded" />
-                                <xs:element ref="Match" minOccurs="0" maxOccurs="unbounded" />
-                        </xs:sequence>
-                </xs:complexType>
-        </xs:element>
-        <xs:element name="File">
-                <xs:complexType>
-                        <xs:simpleContent>
-                                <xs:extension base="xs:string">
-                        <xs:attribute name="buildAction" default="Compile">
-                                <xs:simpleType>
-                                        <xs:restriction base="xs:string">
-                                                                <xs:enumeration value="None" />
-                                                <xs:enumeration value="Compile" />
-                                                <xs:enumeration value="Content" />
-                                                <xs:enumeration value="EmbeddedResource" />
-                                        </xs:restriction>
-                                </xs:simpleType>
-                        </xs:attribute>
-                                </xs:extension>
-                        </xs:simpleContent>
-                </xs:complexType>
-        </xs:element>
-        <xs:element name="Match">
-                <xs:complexType>
-                        <xs:attribute name="path" type="xs:string" />                   
-                        <xs:attribute name="pattern" type="xs:string" use="required" />
-                        <xs:attribute name="recurse" type="xs:boolean" default="false" />
-                        <xs:attribute name="useRegex" type="xs:boolean" default="false" />
-                <xs:attribute name="buildAction" default="Compile">
-                        <xs:simpleType>
-                                <xs:restriction base="xs:string">
-                                        <xs:enumeration value="None" />
-                                        <xs:enumeration value="Compile" />
-                                        <xs:enumeration value="Content" />
-                                        <xs:enumeration value="EmbeddedResource" />
-                                </xs:restriction>
-                        </xs:simpleType>
-                </xs:attribute>
-                </xs:complexType>
-        </xs:element>
-</xs:schema>
diff --git a/Prebuild/src/data/prebuild-1.6.xsd b/Prebuild/src/data/prebuild-1.6.xsd
deleted file mode 100644
index f944faf..0000000
--- a/Prebuild/src/data/prebuild-1.6.xsd
+++ /dev/null
@@ -1,231 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<xs:schema elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://dnpb.sourceforge.net/schemas/prebuild-1.6.xsd"
-        xmlns="http://dnpb.sourceforge.net/schemas/prebuild-1.6.xsd">
-        <xs:annotation>
-                <xs:documentation>
-                        Copyright (c) 2004-2005 Matthew Holmes (calefaction at houston . rr . com), Dan Moorehead (dan05a at gmail . com)
-                        .NET Prebuild is a cross-platform XML-driven pre-build tool which
-                        allows developers to easily generate project or make files for major
-                        IDE's and .NET development tools including: Visual Studio .NET 2002 and
-                        2003, SharpDevelop, MonoDevelop, and NAnt.
-                        BSD License:
-                        
-                        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. 
-                        * The name of the author may not be used to endorse or promote products derived from this software 
-                          without specific prior written permission. 
-                        THIS SOFTWARE IS PROVIDED BY THE AUTHOR '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 AUTHOR 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.
-                </xs:documentation>
-        </xs:annotation>
-        <xs:element name="Prebuild">
-                <xs:complexType>
-                        <xs:sequence>
-                                <xs:element ref="Process" minOccurs="0" maxOccurs="unbounded" />
-                                <xs:element ref="Solution" minOccurs="0" maxOccurs="unbounded" />
-                        </xs:sequence>
-                        <xs:attribute name="version" />
-                        <xs:attribute name="checkOsVars" />
-                </xs:complexType>
-        </xs:element>
-        <xs:element name="Process" type="xs:string" />
-        <xs:element name="Solution">
-                <xs:complexType>
-                        <xs:sequence>
-                                <xs:element ref="Options" minOccurs="0" />
-                                <xs:element ref="Configuration" minOccurs="1" maxOccurs="unbounded" />
-                                <xs:element ref="Files" minOccurs="0" />
-                                <xs:element ref="Project" minOccurs="1" maxOccurs="unbounded" />
-                        </xs:sequence>
-                        <xs:attribute name="name" type="xs:string" use="required" />
-                        <xs:attribute name="activeConfig" type="xs:string" default="Debug" />
-                        <xs:attribute name="path" type="xs:string" default="" />
-                </xs:complexType>
-        </xs:element>
-        <xs:element name="Project">
-                <xs:complexType>
-                        <xs:sequence>
-                                <xs:element ref="Configuration" minOccurs="0" maxOccurs="unbounded" />
-                                <xs:element name="ReferencePath" type="xs:string" minOccurs="0" maxOccurs="unbounded" />
-                                <xs:element name="Reference" minOccurs="0" maxOccurs="unbounded">
-                                        <xs:complexType>
-                                                <xs:attribute name="name" type="xs:string" use="required" />
-                                                <xs:attribute name="path" type="xs:string" />
-                                                <xs:attribute name="localCopy" type="xs:boolean" />
-                                                <xs:attribute name="version" type="xs:string" />
-                                        </xs:complexType>
-                                </xs:element>
-                                <xs:element ref="Files" />
-                        </xs:sequence>
-                        <xs:attribute name="name" type="xs:string" use="required" />
-                        <xs:attribute name="filterGroups" type="xs:string" default="" />
-                        <xs:attribute name="path" type="xs:string" default="" />
-                        <xs:attribute name="icon" type="xs:string" default="" />
-                        <xs:attribute name="language" default="C#">
-                                <xs:simpleType>
-                                        <xs:restriction base="xs:string">
-                                                <xs:enumeration value="C#" />
-                                                <xs:enumeration value="VB.NET" />
-                                        </xs:restriction>
-                                </xs:simpleType>
-                        </xs:attribute>
-                        <xs:attribute name="type" default="Exe">
-                                <xs:simpleType>
-                                        <xs:restriction base="xs:string">
-                                                <xs:enumeration value="Exe" />
-                                                <xs:enumeration value="WinExe" />
-                                                <xs:enumeration value="Library" />
-                                        </xs:restriction>
-                                </xs:simpleType>
-                        </xs:attribute>
-                        <xs:attribute name="runtime" default="Microsoft">
-                                <xs:simpleType>
-                                        <xs:restriction base="xs:string">
-                                                <xs:enumeration value="Microsoft" />
-                                                <xs:enumeration value="Mono" />
-                                        </xs:restriction>
-                                </xs:simpleType>
-                        </xs:attribute>
-                        <xs:attribute name="startupObject" type="xs:string" default="" />
-                        <xs:attribute name="rootNamespace" type="xs:string" />
-                        <xs:attribute name="assemblyName" type="xs:string" />
-                </xs:complexType>
-        </xs:element>
-        <xs:element name="Configuration">
-                <xs:complexType>
-                        <xs:sequence>
-                                <xs:element ref="Options" minOccurs="0" />
-                        </xs:sequence>
-                        <xs:attribute name="name" type="xs:string" use="required" />
-                </xs:complexType>
-        </xs:element>
-        <xs:element name="Options">
-                <xs:complexType>
-                        <xs:all>
-                                <xs:element name="CompilerDefines" type="xs:string" minOccurs="0" />
-                                <xs:element name="OptimizeCode" type="xs:boolean" minOccurs="0" />
-                                <xs:element name="CheckUnderflowOverflow" type="xs:boolean" minOccurs="0" />
-                                <xs:element name="AllowUnsafe" type="xs:boolean" minOccurs="0" />
-                                <xs:element name="PreBuildEvent" type="xs:string" minOccurs="0" />
-                                <xs:element name="PostBuildEvent" type="xs:string" minOccurs="0" />
-                                <xs:element name="RunPostBuildEvent" minOccurs="0" default="OnBuildSuccess">
-                                        <xs:simpleType>
-                                                <xs:restriction base="xs:string">
-                                                        <xs:enumeration value="OnBuildSuccess" />
-                                                        <xs:enumeration value="Always" />
-                                                        <xs:enumeration value="OnOutputUpdated" />
-                                                </xs:restriction>
-                                        </xs:simpleType>
-                                </xs:element>
-                                <xs:element name="RunScript" type="xs:string" minOccurs="0" />
-                                <xs:element name="PreBuildEventArgs" type="xs:string" minOccurs="0" />
-                                <xs:element name="PostBuildEventArgs" type="xs:string" minOccurs="0" />
-                                <xs:element name="WarningLevel" minOccurs="0">
-                                        <xs:simpleType>
-                                                <xs:restriction base="xs:integer">
-                                                        <xs:minInclusive value="0" />
-                                                        <xs:maxInclusive value="4" />
-                                                </xs:restriction>
-                                        </xs:simpleType>
-                                </xs:element>
-                                <xs:element name="WarningsAsErrors" type="xs:boolean" minOccurs="0" />
-                                <xs:element name="SuppressWarnings" type="xs:string" minOccurs="0" />
-                                <xs:element name="OutputPath" type="xs:string" minOccurs="0" />
-                                <xs:element name="XmlDocFile" type="xs:string" minOccurs="0" />
-                                <xs:element name="DebugInformation" type="xs:boolean" minOccurs="0" />
-                                <xs:element name="RegisterComInterop" type="xs:boolean" minOccurs="0" />
-                                <xs:element name="RemoveIntegerChecks" type="xs:boolean" minOccurs="0" />
-                                <xs:element name="IncrementalBuild" type="xs:boolean" minOccurs="0" />
-                                <xs:element name="BaseAddress" type="xs:string" minOccurs="0" />
-                                <xs:element name="FileAlignment" type="xs:integer" minOccurs="0" />
-                                <xs:element name="NoStdLib" type="xs:boolean" minOccurs="0" />
-                        </xs:all>
-                </xs:complexType>
-        </xs:element>
-        <xs:element name="Files">
-                <xs:complexType>
-                        <xs:sequence>
-                                <xs:element ref="File" minOccurs="0" maxOccurs="unbounded" />
-                                <xs:element ref="Match" minOccurs="0" maxOccurs="unbounded" />
-                        </xs:sequence>
-                </xs:complexType>
-        </xs:element>
-        <xs:element name="File">
-                <xs:complexType>
-                        <xs:simpleContent>
-                                <xs:extension base="xs:string">
-                                        <xs:attribute name="buildAction" default="Compile">
-                                                <xs:simpleType>
-                                                        <xs:restriction base="xs:string">
-                                                                <xs:enumeration value="None" />
-                                                                <xs:enumeration value="Compile" />
-                                                                <xs:enumeration value="Content" />
-                                                                <xs:enumeration value="EmbeddedResource" />
-                                                        </xs:restriction>
-                                                </xs:simpleType>
-                                        </xs:attribute>
-                                        <xs:attribute name="subType" default="Code">
-                                                <xs:simpleType>
-                                                        <xs:restriction base="xs:string">
-                                                                <xs:enumeration value="Code" />
-                                                                <xs:enumeration value="Component" />
-                                                                <xs:enumeration value="Form" />
-                                                                <xs:enumeration value="UserControl" />
-                                                        </xs:restriction>
-                                                </xs:simpleType>
-                                        </xs:attribute>
-                                </xs:extension>
-                        </xs:simpleContent>
-                </xs:complexType>
-        </xs:element>
-        <xs:element name="Match">
-                <xs:complexType>
-                        <xs:sequence>
-                                <xs:element ref="Exclude" minOccurs="0" />
-                        </xs:sequence>
-                        <xs:attribute name="path" type="xs:string" />
-                        <xs:attribute name="pattern" type="xs:string" use="required" />
-                        <xs:attribute name="recurse" type="xs:boolean" default="false" />
-                        <xs:attribute name="useRegex" type="xs:boolean" default="false" />
-                        <xs:attribute name="buildAction" default="Compile">
-                                <xs:simpleType>
-                                        <xs:restriction base="xs:string">
-                                                <xs:enumeration value="None" />
-                                                <xs:enumeration value="Compile" />
-                                                <xs:enumeration value="Content" />
-                                                <xs:enumeration value="EmbeddedResource" />
-                                        </xs:restriction>
-                                </xs:simpleType>
-                        </xs:attribute>
-                        <xs:attribute name="subType" default="Code">
-                                <xs:simpleType>
-                                        <xs:restriction base="xs:string">
-                                                <xs:enumeration value="Code" />
-                                                <xs:enumeration value="Component" />
-                                                <xs:enumeration value="Form" />
-                                                <xs:enumeration value="UserControl" />
-                                        </xs:restriction>
-                                </xs:simpleType>
-                        </xs:attribute>
-                </xs:complexType>
-        </xs:element>
-                <xs:element name="Exclude">
-                        <xs:complexType>
-                                <xs:attribute name="name" type="xs:string" use="required" />
-                        </xs:complexType>
-                </xs:element>
-</xs:schema>
diff --git a/Prebuild/src/data/prebuild-1.7.xsd b/Prebuild/src/data/prebuild-1.7.xsd
deleted file mode 100644
index 9d63ce6..0000000
--- a/Prebuild/src/data/prebuild-1.7.xsd
+++ /dev/null
@@ -1,261 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<xs:schema elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://dnpb.sourceforge.net/schemas/prebuild-1.7.xsd"
-        xmlns="http://dnpb.sourceforge.net/schemas/prebuild-1.7.xsd">
-        <xs:annotation>
-                <xs:documentation>
-                        Copyright (c) 2004-2005 Matthew Holmes (calefaction at houston . rr . com), Dan Moorehead (dan05a at gmail . com), David Hudson (jendave at  yahoo dot com)
-                        .NET Prebuild is a cross-platform XML-driven pre-build tool which
-                        allows developers to easily generate project or make files for major
-                        IDE's and .NET development tools including: Visual Studio .NET 2002 and
-                        2003, SharpDevelop, MonoDevelop, and NAnt.
-                        BSD License:
-                        
-                        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. 
-                        * The name of the author may not be used to endorse or promote products derived from this software 
-                          without specific prior written permission. 
-                        THIS SOFTWARE IS PROVIDED BY THE AUTHOR '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 AUTHOR 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.
-                </xs:documentation>
-        </xs:annotation>
-        <xs:element name="Prebuild">
-                <xs:complexType>
-                        <xs:sequence>
-                                <xs:element ref="Process" minOccurs="0" maxOccurs="unbounded" />
-                                <xs:element ref="Solution" minOccurs="0" maxOccurs="unbounded" />
-                        </xs:sequence>
-                        <xs:attribute name="version" />
-                        <xs:attribute name="checkOsVars" />
-                </xs:complexType>
-        </xs:element>
-        <xs:element name="Process" type="xs:string" />
-        <xs:element name="Solution">
-                <xs:complexType>
-                        <xs:sequence>
-                                <xs:element ref="Options" minOccurs="0" />
-                                <xs:element ref="Configuration" minOccurs="1" maxOccurs="unbounded" />
-                                <xs:element ref="Files" minOccurs="0" />
-                                <xs:element ref="Project" minOccurs="1" maxOccurs="unbounded" />
-                        </xs:sequence>
-                        <xs:attribute name="name" type="xs:string" use="required" />
-                        <xs:attribute name="activeConfig" type="xs:string" default="Debug" />
-                        <xs:attribute name="path" type="xs:string" default="" />
-                        <xs:attribute name="version" type="xs:string" default="1.0.0" />
-                </xs:complexType>
-        </xs:element>
-        <xs:element name="Project">
-                <xs:complexType>
-                        <xs:sequence>
-                                <xs:element ref="Configuration" minOccurs="0" maxOccurs="unbounded" />
-                                <xs:element name="ReferencePath" type="xs:string" minOccurs="0" maxOccurs="unbounded" />
-                                <xs:element name="Reference" minOccurs="0" maxOccurs="unbounded">
-                                        <xs:complexType>
-                                                <xs:attribute name="name" type="xs:string" use="required" />
-                                                <xs:attribute name="path" type="xs:string" />
-                                                <xs:attribute name="localCopy" type="xs:boolean" />
-                                                <xs:attribute name="version" type="xs:string" default="1.0.0"/>
-                                        </xs:complexType>
-                                </xs:element>
-                                <xs:element ref="Files" />
-                        </xs:sequence>
-                        <xs:attribute name="name" type="xs:string" use="required" />
-                        <xs:attribute name="designerFolder" type="xs:string" default="" />
-                        <xs:attribute name="filterGroups" type="xs:string" default="" />
-                        <xs:attribute name="path" type="xs:string" default="" />
-                        <xs:attribute name="icon" type="xs:string" default="" />
-                        <xs:attribute name="language" default="C#">
-                                <xs:simpleType>
-                                        <xs:restriction base="xs:string">
-                                                <xs:enumeration value="C#" />
-                                                <xs:enumeration value="VB.NET" />
-                                        </xs:restriction>
-                                </xs:simpleType>
-                        </xs:attribute>
-                        <xs:attribute name="type" default="Exe">
-                                <xs:simpleType>
-                                        <xs:restriction base="xs:string">
-                                                <xs:enumeration value="Exe" />
-                                                <xs:enumeration value="WinExe" />
-                                                <xs:enumeration value="Library" />
-                                        </xs:restriction>
-                                </xs:simpleType>
-                        </xs:attribute>
-                        <xs:attribute name="runtime" default="Microsoft">
-                                <xs:simpleType>
-                                        <xs:restriction base="xs:string">
-                                                <xs:enumeration value="Microsoft" />
-                                                <xs:enumeration value="Mono" />
-                                        </xs:restriction>
-                                </xs:simpleType>
-                        </xs:attribute>
-                        <xs:attribute name="startupObject" type="xs:string" default="" />
-                        <xs:attribute name="rootNamespace" type="xs:string" />
-                        <xs:attribute name="assemblyName" type="xs:string" />
-      <xs:attribute name="generateAssemblyInfoFile" type="xs:boolean" default="false"/>
-    </xs:complexType>
-        </xs:element>
-        <xs:element name="Configuration">
-                <xs:complexType>
-                        <xs:sequence>
-                                <xs:element ref="Options" minOccurs="0" />
-                        </xs:sequence>
-                        <xs:attribute name="name" type="xs:string" use="required" />
-                </xs:complexType>
-        </xs:element>
-        <xs:element name="Options">
-                <xs:complexType>
-                        <xs:all>
-                                <xs:element name="CompilerDefines" type="xs:string" minOccurs="0" />
-                                <xs:element name="OptimizeCode" type="xs:boolean" minOccurs="0" />
-                                <xs:element name="CheckUnderflowOverflow" type="xs:boolean" minOccurs="0" />
-                                <xs:element name="AllowUnsafe" type="xs:boolean" minOccurs="0" />
-                                <xs:element name="PreBuildEvent" type="xs:string" minOccurs="0" />
-                                <xs:element name="PostBuildEvent" type="xs:string" minOccurs="0" />
-                                <xs:element name="RunPostBuildEvent" minOccurs="0" default="OnBuildSuccess">
-                                        <xs:simpleType>
-                                                <xs:restriction base="xs:string">
-                                                        <xs:enumeration value="OnBuildSuccess" />
-                                                        <xs:enumeration value="Always" />
-                                                        <xs:enumeration value="OnOutputUpdated" />
-                                                </xs:restriction>
-                                        </xs:simpleType>
-                                </xs:element>
-                                <xs:element name="RunScript" type="xs:string" minOccurs="0" />
-                                <xs:element name="PreBuildEventArgs" type="xs:string" minOccurs="0" />
-                                <xs:element name="PostBuildEventArgs" type="xs:string" minOccurs="0" />
-                                <xs:element name="WarningLevel" minOccurs="0">
-                                        <xs:simpleType>
-                                                <xs:restriction base="xs:integer">
-                                                        <xs:minInclusive value="0" />
-                                                        <xs:maxInclusive value="4" />
-                                                </xs:restriction>
-                                        </xs:simpleType>
-                                </xs:element>
-                                <xs:element name="WarningsAsErrors" type="xs:boolean" minOccurs="0" />
-                                <xs:element name="SuppressWarnings" type="xs:string" minOccurs="0" />
-                                <xs:element name="OutputPath" type="xs:string" minOccurs="0" />
-                                <xs:element name="GenerateDocumentation" type="xs:boolean" minOccurs="0" />
-                                <xs:element name="XmlDocFile" type="xs:string" minOccurs="0" />
-                                <xs:element name="DebugInformation" type="xs:boolean" minOccurs="0" />
-                                <xs:element name="RegisterComInterop" type="xs:boolean" minOccurs="0" />
-                                <xs:element name="RemoveIntegerChecks" type="xs:boolean" minOccurs="0" />
-                                <xs:element name="IncrementalBuild" type="xs:boolean" minOccurs="0" />
-                                <xs:element name="BaseAddress" type="xs:string" minOccurs="0" />
-                                <xs:element name="FileAlignment" type="xs:integer" minOccurs="0" />
-                                <xs:element name="NoStdLib" type="xs:boolean" minOccurs="0" />
-                                <xs:element name="KeyFile" type="xs:string" minOccurs="0" />
-        </xs:all>
-                </xs:complexType>
-        </xs:element>
-        <xs:element name="Files">
-                <xs:complexType>
-                        <xs:sequence>
-                                <xs:element ref="File" minOccurs="0" maxOccurs="unbounded" />
-                                <xs:element ref="Match" minOccurs="0" maxOccurs="unbounded" />
-                        </xs:sequence>
-                </xs:complexType>
-        </xs:element>
-        <xs:element name="File">
-                <xs:complexType>
-                        <xs:simpleContent>
-                                <xs:extension base="xs:string">
-                                        <xs:attribute name="resourceName" type="xs:string" default="" />
-                                        <xs:attribute name="buildAction" default="Compile">
-                                                <xs:simpleType>
-                                                        <xs:restriction base="xs:string">
-                                                                <xs:enumeration value="None" />
-                                                                <xs:enumeration value="Compile" />
-                                                                <xs:enumeration value="Content" />
-                                                                <xs:enumeration value="EmbeddedResource" />
-                                                        </xs:restriction>
-                                                </xs:simpleType>
-                                        </xs:attribute>
-                                        <xs:attribute name="subType" default="Code">
-                                                <xs:simpleType>
-                                                        <xs:restriction base="xs:string">
-                                                                <xs:enumeration value="Code" />
-                                                                <xs:enumeration value="Component" />
-                                                                <xs:enumeration value="Form" />
-                                                                <xs:enumeration value="Settings" />
-                                                                <xs:enumeration value="UserControl" />
-                                                        </xs:restriction>
-                                                </xs:simpleType>
-                                        </xs:attribute>
-                                        <xs:attribute name="link" type="xs:boolean" />
-                                        <xs:attribute name="copyToOutput" default="Never">
-                                                <xs:simpleType>
-                                                        <xs:restriction base="xs:string">
-                                                                <xs:enumeration value="Never" />
-                                                                <xs:enumeration value="Always" />
-                                                                <xs:enumeration value="PreserveNewest" />
-                                                        </xs:restriction>
-                                                </xs:simpleType>
-                                        </xs:attribute>
-                                </xs:extension>
-                        </xs:simpleContent>
-                </xs:complexType>
-        </xs:element>
-        <xs:element name="Match">
-                <xs:complexType>
-                        <xs:sequence>
-                                <xs:element ref="Exclude" minOccurs="0" maxOccurs="unbounded" />
-                        </xs:sequence>
-                        <xs:attribute name="path" type="xs:string" />
-                        <xs:attribute name="pattern" type="xs:string" use="required" />
-                        <xs:attribute name="recurse" type="xs:boolean" default="false" />
-                        <xs:attribute name="useRegex" type="xs:boolean" default="false" />
-                        <xs:attribute name="buildAction" default="Compile">
-                                <xs:simpleType>
-                                        <xs:restriction base="xs:string">
-                                                <xs:enumeration value="None" />
-                                                <xs:enumeration value="Compile" />
-                                                <xs:enumeration value="Content" />
-                                                <xs:enumeration value="EmbeddedResource" />
-                                        </xs:restriction>
-                                </xs:simpleType>
-                        </xs:attribute>
-                        <xs:attribute name="resourceName" type="xs:string" default="" />
-                        <xs:attribute name="subType" default="Code">
-                                <xs:simpleType>
-                                        <xs:restriction base="xs:string">
-                                                <xs:enumeration value="Code" />
-                                                <xs:enumeration value="Component" />
-                                                <xs:enumeration value="Designer" />
-                                                <xs:enumeration value="Form" />
-                                                <xs:enumeration value="Settings" />
-                                                <xs:enumeration value="UserControl" />
-                                        </xs:restriction>
-                                </xs:simpleType>
-                        </xs:attribute>
-                        <xs:attribute name="link" type="xs:boolean" />
-                        <xs:attribute name="copyToOutput" default="Never">
-                                <xs:simpleType>
-                                        <xs:restriction base="xs:string">
-                                                <xs:enumeration value="Never" />
-                                                <xs:enumeration value="Always" />
-                                                <xs:enumeration value="PreserveNewest" />
-                                        </xs:restriction>
-                                </xs:simpleType>
-                        </xs:attribute>
-                </xs:complexType>
-        </xs:element>
-        <xs:element name="Exclude">
-                <xs:complexType>
-                        <xs:attribute name="name" type="xs:string" use="required" />
-                </xs:complexType>
-        </xs:element>
-</xs:schema>
diff --git a/bin/Axiom.MathLib.dll b/bin/Axiom.MathLib.dll
deleted file mode 100644
index 21ce3a8..0000000
--- a/bin/Axiom.MathLib.dll
+++ /dev/null
Binary files differ
diff --git a/bin/Db4objects.Db4o.dll b/bin/Db4objects.Db4o.dll
deleted file mode 100644
index be976a1..0000000
--- a/bin/Db4objects.Db4o.dll
+++ /dev/null
Binary files differ
diff --git a/bin/Kds.Serialization.dll b/bin/Kds.Serialization.dll
deleted file mode 100644
index 7f03277..0000000
--- a/bin/Kds.Serialization.dll
+++ /dev/null
Binary files differ
diff --git a/bin/MySql.Data.dll b/bin/MySql.Data.dll
deleted file mode 100644
index 0467dd6..0000000
--- a/bin/MySql.Data.dll
+++ /dev/null
Binary files differ
diff --git a/bin/Ode.NET.dll b/bin/Ode.NET.dll
deleted file mode 100644
index 40f15a5..0000000
--- a/bin/Ode.NET.dll
+++ /dev/null
Binary files differ
diff --git a/bin/OpenSimAPI.java b/bin/OpenSimAPI.java
deleted file mode 100644
index 472b947..0000000
--- a/bin/OpenSimAPI.java
+++ /dev/null
@@ -1,36 +0,0 @@
-public class OpenSimAPI {
-        public static int GetEntityID()
-    {
-        return 0;
-    }
-    
-    public static int GetRandomAvatarID()
-    {
-        return 0;
-    }
-    
-        public static float GetEntityPositionX(int id)
-        {
-                return 0.0f;
-        }
-        
-        public static float GetEntityPositionY(int id)
-        {
-                return 0.0f;
-        }
-        public static float GetEntityPositionZ(int id)
-        {
-                return 0.0f;
-        }
-        
-        public static void SetEntityPosition(int id, float x, float y, float z)
-    {
-    }
-}
-\ No newline at end of file
diff --git a/bin/PhysX-wrapper.dll b/bin/PhysX-wrapper.dll
deleted file mode 100644
index 5259ffc..0000000
--- a/bin/PhysX-wrapper.dll
+++ /dev/null
Binary files differ
diff --git a/bin/PhysX_Wrapper_Dotnet.dll b/bin/PhysX_Wrapper_Dotnet.dll
deleted file mode 100644
index c66bf3a..0000000
--- a/bin/PhysX_Wrapper_Dotnet.dll
+++ /dev/null
Binary files differ
diff --git a/bin/Prebuild.exe b/bin/Prebuild.exe
deleted file mode 100644
index 34d9bce..0000000
--- a/bin/Prebuild.exe
+++ /dev/null
Binary files differ
diff --git a/bin/System.Data.SQLite.dll b/bin/System.Data.SQLite.dll
deleted file mode 100644
index 70d84e7..0000000
--- a/bin/System.Data.SQLite.dll
+++ /dev/null
Binary files differ
diff --git a/bin/TerrainDatafiles/Alien/HOWTO.txt b/bin/TerrainDatafiles/Alien/HOWTO.txt
deleted file mode 100644
index 00a65d7..0000000
--- a/bin/TerrainDatafiles/Alien/HOWTO.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-Use the "terrain load" command to import these datafiles.
-They are stored as Float-32 arrays, use the F32 import type.
-These files are formatted on a scale of 0 to 1, they are designed for a range of 0..58.81
-use the 'multiply' command to multiply them by 58.81 to achieve correct height values.
-Example ------------------
-Region# : terrain load f32 c:\opensim\datafiles\output_x0_y0.r32
-Region# : terrain multiply 58.81
-        <AdamZaius>     0,0 - 1,0 - 2,0
-        <AdamZaius>     0,1 - 1,1 - 2,1
-        <AdamZaius>     0,2 - 1,2, 2,2
-for a 3x3 area on the grid
diff --git a/bin/TerrainDatafiles/Alien/alienworld.bmp b/bin/TerrainDatafiles/Alien/alienworld.bmp
deleted file mode 100644
index 0e2405e..0000000
--- a/bin/TerrainDatafiles/Alien/alienworld.bmp
+++ /dev/null
Binary files differ
diff --git a/bin/TerrainDatafiles/Alien/alienworld_0_0.bmp b/bin/TerrainDatafiles/Alien/alienworld_0_0.bmp
deleted file mode 100644
index 0a3afc0..0000000
--- a/bin/TerrainDatafiles/Alien/alienworld_0_0.bmp
+++ /dev/null
Binary files differ
diff --git a/bin/TerrainDatafiles/Alien/alienworld_0_0.r32 b/bin/TerrainDatafiles/Alien/alienworld_0_0.r32
deleted file mode 100644
index 299dc8c..0000000
--- a/bin/TerrainDatafiles/Alien/alienworld_0_0.r32
+++ /dev/null
Binary files differ
diff --git a/bin/TerrainDatafiles/Alien/alienworld_0_1.bmp b/bin/TerrainDatafiles/Alien/alienworld_0_1.bmp
deleted file mode 100644
index ec3b5d2..0000000
--- a/bin/TerrainDatafiles/Alien/alienworld_0_1.bmp
+++ /dev/null
Binary files differ
diff --git a/bin/TerrainDatafiles/Alien/alienworld_0_1.r32 b/bin/TerrainDatafiles/Alien/alienworld_0_1.r32
deleted file mode 100644
index 0dd41fc..0000000
--- a/bin/TerrainDatafiles/Alien/alienworld_0_1.r32
+++ /dev/null
Binary files differ
diff --git a/bin/TerrainDatafiles/Alien/alienworld_0_2.bmp b/bin/TerrainDatafiles/Alien/alienworld_0_2.bmp
deleted file mode 100644
index ce341e5..0000000
--- a/bin/TerrainDatafiles/Alien/alienworld_0_2.bmp
+++ /dev/null
Binary files differ
diff --git a/bin/TerrainDatafiles/Alien/alienworld_0_2.r32 b/bin/TerrainDatafiles/Alien/alienworld_0_2.r32
deleted file mode 100644
index 28df00a..0000000
--- a/bin/TerrainDatafiles/Alien/alienworld_0_2.r32
+++ /dev/null
Binary files differ
diff --git a/bin/TerrainDatafiles/Alien/alienworld_1_0.bmp b/bin/TerrainDatafiles/Alien/alienworld_1_0.bmp
deleted file mode 100644
index 7fb3d96..0000000
--- a/bin/TerrainDatafiles/Alien/alienworld_1_0.bmp
+++ /dev/null
Binary files differ
diff --git a/bin/TerrainDatafiles/Alien/alienworld_1_0.r32 b/bin/TerrainDatafiles/Alien/alienworld_1_0.r32
deleted file mode 100644
index 99d5072..0000000
--- a/bin/TerrainDatafiles/Alien/alienworld_1_0.r32
+++ /dev/null
Binary files differ
diff --git a/bin/TerrainDatafiles/Alien/alienworld_1_1.bmp b/bin/TerrainDatafiles/Alien/alienworld_1_1.bmp
deleted file mode 100644
index bd5d31a..0000000
--- a/bin/TerrainDatafiles/Alien/alienworld_1_1.bmp
+++ /dev/null
Binary files differ
diff --git a/bin/TerrainDatafiles/Alien/alienworld_1_1.r32 b/bin/TerrainDatafiles/Alien/alienworld_1_1.r32
deleted file mode 100644
index fdb3acf..0000000
--- a/bin/TerrainDatafiles/Alien/alienworld_1_1.r32
+++ /dev/null
Binary files differ
diff --git a/bin/TerrainDatafiles/Alien/alienworld_1_2.bmp b/bin/TerrainDatafiles/Alien/alienworld_1_2.bmp
deleted file mode 100644
index a5a719d..0000000
--- a/bin/TerrainDatafiles/Alien/alienworld_1_2.bmp
+++ /dev/null
Binary files differ
diff --git a/bin/TerrainDatafiles/Alien/alienworld_1_2.r32 b/bin/TerrainDatafiles/Alien/alienworld_1_2.r32
deleted file mode 100644
index 4e0155b..0000000
--- a/bin/TerrainDatafiles/Alien/alienworld_1_2.r32
+++ /dev/null
Binary files differ
diff --git a/bin/TerrainDatafiles/Alien/alienworld_2_0.bmp b/bin/TerrainDatafiles/Alien/alienworld_2_0.bmp
deleted file mode 100644
index a5c6792..0000000
--- a/bin/TerrainDatafiles/Alien/alienworld_2_0.bmp
+++ /dev/null
Binary files differ
diff --git a/bin/TerrainDatafiles/Alien/alienworld_2_0.r32 b/bin/TerrainDatafiles/Alien/alienworld_2_0.r32
deleted file mode 100644
index 0c12470..0000000
--- a/bin/TerrainDatafiles/Alien/alienworld_2_0.r32
+++ /dev/null
Binary files differ
diff --git a/bin/TerrainDatafiles/Alien/alienworld_2_1.bmp b/bin/TerrainDatafiles/Alien/alienworld_2_1.bmp
deleted file mode 100644
index e1f6376..0000000
--- a/bin/TerrainDatafiles/Alien/alienworld_2_1.bmp
+++ /dev/null
Binary files differ
diff --git a/bin/TerrainDatafiles/Alien/alienworld_2_1.r32 b/bin/TerrainDatafiles/Alien/alienworld_2_1.r32
deleted file mode 100644
index 96534b8..0000000
--- a/bin/TerrainDatafiles/Alien/alienworld_2_1.r32
+++ /dev/null
Binary files differ
diff --git a/bin/TerrainDatafiles/Alien/alienworld_2_2.bmp b/bin/TerrainDatafiles/Alien/alienworld_2_2.bmp
deleted file mode 100644
index eabdd93..0000000
--- a/bin/TerrainDatafiles/Alien/alienworld_2_2.bmp
+++ /dev/null
Binary files differ
diff --git a/bin/TerrainDatafiles/Alien/alienworld_2_2.r32 b/bin/TerrainDatafiles/Alien/alienworld_2_2.r32
deleted file mode 100644
index 20724c3..0000000
--- a/bin/TerrainDatafiles/Alien/alienworld_2_2.r32
+++ /dev/null
Binary files differ
diff --git a/bin/TerrainDatafiles/Alien/alienworld_gray.bmp b/bin/TerrainDatafiles/Alien/alienworld_gray.bmp
deleted file mode 100644
index 9cc3699..0000000
--- a/bin/TerrainDatafiles/Alien/alienworld_gray.bmp
+++ /dev/null
Binary files differ
diff --git a/bin/TerrainDatafiles/Coastal/HOWTO.txt b/bin/TerrainDatafiles/Coastal/HOWTO.txt
deleted file mode 100644
index bbc40cf..0000000
--- a/bin/TerrainDatafiles/Coastal/HOWTO.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Use the "terrain load" command to import these datafiles.
-They are stored as Float-32 arrays, use the F32 import type.
-These files are formatted on a scale of 0 to 1, they are designed for a range of 0..77.14
-use the 'multiply' command to multiply them by 77.14 to achieve correct height values.
-Example ------------------
-Region# : terrain load f32 c:\opensim\datafiles\output_x0_y0.r32
-Region# : terrain multiply 77.14
-\ No newline at end of file
diff --git a/bin/TerrainDatafiles/Coastal/output.bmp b/bin/TerrainDatafiles/Coastal/output.bmp
deleted file mode 100644
index 15b53e3..0000000
--- a/bin/TerrainDatafiles/Coastal/output.bmp
+++ /dev/null
Binary files differ
diff --git a/bin/TerrainDatafiles/Coastal/output_x0_y0.r32 b/bin/TerrainDatafiles/Coastal/output_x0_y0.r32
deleted file mode 100644
index bbe2b1f..0000000
--- a/bin/TerrainDatafiles/Coastal/output_x0_y0.r32
+++ /dev/null
Binary files differ
diff --git a/bin/TerrainDatafiles/Coastal/output_x0_y1.r32 b/bin/TerrainDatafiles/Coastal/output_x0_y1.r32
deleted file mode 100644
index 8f9568a..0000000
--- a/bin/TerrainDatafiles/Coastal/output_x0_y1.r32
+++ /dev/null
Binary files differ
diff --git a/bin/TerrainDatafiles/Coastal/output_x1_y0.r32 b/bin/TerrainDatafiles/Coastal/output_x1_y0.r32
deleted file mode 100644
index a366176..0000000
--- a/bin/TerrainDatafiles/Coastal/output_x1_y0.r32
+++ /dev/null
Binary files differ
diff --git a/bin/TerrainDatafiles/Coastal/output_x1_y1.r32 b/bin/TerrainDatafiles/Coastal/output_x1_y1.r32
deleted file mode 100644
index c0fd227..0000000
--- a/bin/TerrainDatafiles/Coastal/output_x1_y1.r32
+++ /dev/null
Binary files differ
diff --git a/bin/assets/base_shape.dat b/bin/assets/base_shape.dat
deleted file mode 100644
index 920c775..0000000
--- a/bin/assets/base_shape.dat
+++ /dev/null
@@ -1,105 +0,0 @@
-LLWearable version 22
-Female Shape and Outfit 3 Shape
-Created by system from avatar's appearance.
-        permissions 0
-        {
-                base_mask       00082000
-                owner_mask      00082000
-                group_mask      00082000
-                everyone_mask   00082000
-                next_owner_mask 00082000
-                creator_id      3d924400-038e-6ad9-920b-cfbb9b40585c
-                owner_id        542ffb8e-8932-49b9-8664-58f53e442797
-                last_owner_id   3d924400-038e-6ad9-920b-cfbb9b40585c
-                group_id        00000000-0000-0000-0000-000000000000
-        }
-        sale_info       0
-        {
-                sale_type       not
-                sale_price      0
-        }
-type 0
-parameters 82
-1 .21
-2 -.5
-4 -.11
-5 -.1
-6 -.3
-7 -.4
-8 -.5
-10 .7
-11 .34
-12 -.5
-13 0
-14 .04
-15 .58
-17 .56
-18 -.26
-19 -.73
-20 -.34
-21 -.01
-22 1
-23 -.5
-24 -.63
-25 .44
-27 .05
-33 -.24
-34 -.7
-35 -.16
-36 -.2
-37 -.98
-38 -.5
-80 0
-105 .07
-155 -.22
-157 0
-185 -1
-193 .86
-196 -.74
-505 .65
-506 .12
-507 -1.5
-515 0
-517 .16
-518 .8
-629 0
-637 0
-646 .4
-647 1
-649 .36
-650 .85
-652 .49
-653 -1
-656 0
-659 .65
-662 .5
-663 0
-664 0
-665 0
-675 -.15
-676 .26
-678 .28
-682 .27
-683 -.19
-684 -.09
-685 0
-690 .45
-692 .4
-693 -0
-753 -.5
-756 -.08
-758 .24
-759 .6
-760 .11
-764 -.38
-765 -.3
-769 .42
-773 .51
-795 .16
-796 .11
-799 .36
-841 0
-842 -.82
-879 0
-880 0
-textures 0
diff --git a/bin/assets/bricks.jp2 b/bin/assets/bricks.jp2
deleted file mode 100644
index 09c65ab..0000000
--- a/bin/assets/bricks.jp2
+++ /dev/null
Binary files differ
diff --git a/bin/assets/granite.jp2 b/bin/assets/granite.jp2
deleted file mode 100644
index b842eb8..0000000
--- a/bin/assets/granite.jp2
+++ /dev/null
Binary files differ
diff --git a/bin/assets/hardwood.jp2 b/bin/assets/hardwood.jp2
deleted file mode 100644
index 8ae695e..0000000
--- a/bin/assets/hardwood.jp2
+++ /dev/null
Binary files differ
diff --git a/bin/assets/map1.jp2 b/bin/assets/map1.jp2
deleted file mode 100644
index cd2fd94..0000000
--- a/bin/assets/map1.jp2
+++ /dev/null
Binary files differ
diff --git a/bin/assets/map_base.jp2 b/bin/assets/map_base.jp2
deleted file mode 100644
index 5ad1fd0..0000000
--- a/bin/assets/map_base.jp2
+++ /dev/null
Binary files differ
diff --git a/bin/assets/plywood.jp2 b/bin/assets/plywood.jp2
deleted file mode 100644
index 1643ff1..0000000
--- a/bin/assets/plywood.jp2
+++ /dev/null
Binary files differ
diff --git a/bin/assets/rocks.jp2 b/bin/assets/rocks.jp2
deleted file mode 100644
index f0bbd89..0000000
--- a/bin/assets/rocks.jp2
+++ /dev/null
Binary files differ
diff --git a/bin/assets/testpic2.jp2 b/bin/assets/testpic2.jp2
deleted file mode 100644
index e6840e2..0000000
--- a/bin/assets/testpic2.jp2
+++ /dev/null
Binary files differ
diff --git a/bin/avatar-texture.dat b/bin/avatar-texture.dat
deleted file mode 100644
index 6548a8a..0000000
--- a/bin/avatar-texture.dat
+++ /dev/null
Binary files differ
diff --git a/bin/data/LICENSE-README-IMPORTANT.txt b/bin/data/LICENSE-README-IMPORTANT.txt
deleted file mode 100644
index 3229102..0000000
--- a/bin/data/LICENSE-README-IMPORTANT.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Not all of the files in this directory are licensed under the BSD license. Some of these files come with the Second Life viewer and are considered licensed under a Creative Commons License.
-These files are:
- avataranimations.xml (Derivative work of viewerart.ini, Creative Commons Attribution+Share-Alike v2.5 License)
-\ No newline at end of file
diff --git a/bin/data/avataranimations.xml b/bin/data/avataranimations.xml
deleted file mode 100644
index 461613f..0000000
--- a/bin/data/avataranimations.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Copyright(C) 2002-2007 Linden Lab, OpenSim Developers -->
-<!-- Based on viewerart.ini packaged with the viewer. -->
-<!-- This file is a derivative work of the above while it contains default animation UUIDs -->
-<!-- Licensed under a creative commons license (By-SA) http://creativecommons.org/licenses/by-sa/2.5/ -->
-<animations>
-        <animation name="STAND">2408fe9e-df1d-1d7d-f4ff-1384fa7b350f</animation>
-        <animation name="WALK">6ed24bd8-91aa-4b12-ccc7-c97c857ab4e0</animation>
-        <animation name="FLY">aec4610c-757f-bc4e-c092-c6e9caf18daf</animation>
-</animations>
-\ No newline at end of file
diff --git a/bin/defaultstripe.png b/bin/defaultstripe.png
deleted file mode 100644
index 9db19c8..0000000
--- a/bin/defaultstripe.png
+++ /dev/null
Binary files differ
diff --git a/bin/libTerrain-BSD.dll b/bin/libTerrain-BSD.dll
deleted file mode 100644
index d9b95fc..0000000
--- a/bin/libTerrain-BSD.dll
+++ /dev/null
Binary files differ
diff --git a/bin/libdb_dotNET43.dll b/bin/libdb_dotNET43.dll
deleted file mode 100644
index 16a1cfc..0000000
--- a/bin/libdb_dotNET43.dll
+++ /dev/null
Binary files differ
diff --git a/bin/libode.a b/bin/libode.a
deleted file mode 100644
index 4df0ad1..0000000
--- a/bin/libode.a
+++ /dev/null
Binary files differ
diff --git a/bin/libode.so b/bin/libode.so
deleted file mode 100755
index 1c8565f..0000000
--- a/bin/libode.so
+++ /dev/null
Binary files differ
diff --git a/bin/libsecondlife.dll b/bin/libsecondlife.dll
deleted file mode 100644
index 364d8fb..0000000
--- a/bin/libsecondlife.dll
+++ /dev/null
Binary files differ
diff --git a/bin/log4net.dll b/bin/log4net.dll
deleted file mode 100644
index ffc57e1..0000000
--- a/bin/log4net.dll
+++ /dev/null
Binary files differ
diff --git a/bin/login.htm b/bin/login.htm
deleted file mode 100644
index 683af10..0000000
--- a/bin/login.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-<form action="javascript:setpass();" name="logon" id="logon">
-<p> Admin Password: <input type="password" id="Adminpss" size="17" maxlength="34"> </P>
-<input type="button" name="button" value="Login" 
-   onclick="javascript:setpass(this.parentNode);">
-</form>
-\ No newline at end of file
diff --git a/bin/mysql_connection.ini b/bin/mysql_connection.ini
deleted file mode 100644
index 58c6284..0000000
--- a/bin/mysql_connection.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[mysqlconnection]
-hostname=localhost
-database=database
-username=username
-password=password
-pooling=false
-port=3306
-\ No newline at end of file
diff --git a/bin/newaccountform.htm b/bin/newaccountform.htm
deleted file mode 100644
index d21b983..0000000
--- a/bin/newaccountform.htm
+++ /dev/null
@@ -1,9 +0,0 @@
-<form action="javascript:get(document.getElementById('myform'));" name="myform" id="myform">
-<p> First Name: <input type="text" id="FirstName" size="17" maxlength="44"> </P>
-<p> Last Name: 
-<input type="text" id="LastName" size="17" maxlength="44"> </p>
-<p> PassWord:
-<input type="password" id="PassWord" size="17" maxlength="44"> </p>
-<br>
-<input type="button" name="button" value="Create" onclick="javascript:get(this.parentNode);">
-</form>
-\ No newline at end of file
diff --git a/bin/ode.dll b/bin/ode.dll
deleted file mode 100644
index b226096..0000000
--- a/bin/ode.dll
+++ /dev/null
Binary files differ
diff --git a/bin/openjpegnet.dll b/bin/openjpegnet.dll
deleted file mode 100755
index 1812fa9..0000000
--- a/bin/openjpegnet.dll
+++ /dev/null
Binary files differ
diff --git a/bin/script1.txt b/bin/script1.txt
deleted file mode 100644
index 63780c2..0000000
--- a/bin/script1.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-<Script><ScriptEngine:OpenSimJVM,Test1>public class Test1 {
-    
-    public static void OnFrame()
-    {
-      int own = 0;
-      own = OpenSimAPI.GetEntityID();
-      int avid = OpenSimAPI.GetRandomAvatarID();
-      float x = OpenSimAPI.GetEntityPositionX(own);
-      float avx =  OpenSimAPI.GetEntityPositionX(avid);
-      float y = OpenSimAPI.GetEntityPositionY(own);
-      float avy = OpenSimAPI.GetEntityPositionY(avid);
-      
-     if(x> avx)
-     {
-        x = x -1f;
-     }
-     else
-     {
-        x = x+ 1f;
-     }
-     
-     if(y > avy)
-     {
-        y= y -1f;
-     }
-     else
-     {
-        y = y +1f;
-     }
-     
-     OpenSimAPI.SetEntityPosition(own, x, y, 0);
-    }
-    
-}</Script>
-\ No newline at end of file
diff --git a/bin/testadmin.htm b/bin/testadmin.htm
deleted file mode 100644
index 62a860d..0000000
--- a/bin/testadmin.htm
+++ /dev/null
@@ -1,125 +0,0 @@
-<html>
-<head>
-<script type="text/javascript">
-var http_request
-var adminpadd
-function loadXMLDoc(url)
-{
-http_request=null
-// code for Mozilla, etc.
-if (window.XMLHttpRequest)
-  {
-  http_request=new XMLHttpRequest()
-  }
-// code for IE
-else if (window.ActiveXObject)
-  {
-  http_request=new ActiveXObject("Microsoft.XMLHTTP")
-  }
-if (http_request!=null)
-  {
-  http_request.onreadystatechange=state_Change
-  http_request.open("GET",url,true)
-  http_request.send(null)
-  }
-else
-  {
-  alert("Your browser does not support XMLHTTP.")
-  }
-}
-function state_Change()
-{
-// if xmlhttp shows "loaded"
-if (http_request.readyState==4)
-  {
-  // if "OK"
-  if (http_request.status==200)
-  {
-  document.getElementById('T1').innerHTML=http_request.responseText
-  }
-  else
-  {
-  alert("Problem retrieving data:" + http_request.statusText)
-  }
-  }
-}
- //var http_request = false;
-   function makePOSTRequest(url, parameters) {
-      http_request = false;
-      if (window.XMLHttpRequest) { // Mozilla, Safari,...
-         http_request = new XMLHttpRequest();
-         if (http_request.overrideMimeType) {
-                // set type accordingly to anticipated content type
-            //http_request.overrideMimeType('text/xml');
-            http_request.overrideMimeType('text/html');
-         }
-      } else if (window.ActiveXObject) { // IE
-         try {
-            http_request = new ActiveXObject("Msxml2.XMLHTTP");
-         } catch (e) {
-            try {
-               http_request = new ActiveXObject("Microsoft.XMLHTTP");
-            } catch (e) {}
-         }
-      }
-      if (!http_request) {
-         alert('Cannot create XMLHTTP instance');
-         return false;
-      }
-      http_request.onreadystatechange =state_Change
-      http_request.open('POST', url, true);
-      http_request.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
-      http_request.setRequestHeader("Content-length", parameters.length);
-      http_request.setRequestHeader("Connection", "close");
-      http_request.send(parameters);
-   }
-   function alertContents() {
-      if (http_request.readyState == 4) {
-         if (http_request.status == 200) {
-            //alert(http_request.responseText);
-            result = http_request.responseText;
-            document.getElementById('T1').innerHTML = result;
-         } else {
-            alert('There was a problem with the request.');
-         }
-      }
-   }
-   function get(obj) {
-      var poststr = "FirstName=" + encodeURI( document.getElementById("FirstName").value ) +
-                    "&LastName=" + encodeURI( document.getElementById("LastName").value )
-                    + "&PassWord=" + encodeURI( document.getElementById("PassWord").value )
-                 + "&AdminPass=" + adminpass;
-      makePOSTRequest('Admin/NewAccount', poststr);
-   }
-  function setpass(obj)
-  {
-        adminpass =  encodeURI( document.getElementById("Adminpss").value );
-        makePOSTRequest('Admin/Login', adminpass);
-  }
-</script>
-</head>
-<body onload="loadXMLDoc('Admin/Welcome')">
-<div id="T1" style="border:1px solid black;height:500;width:800">
-<br>
-</div><br />
-<button onclick="loadXMLDoc('Admin/Clients')">Clients</button>
-<button onclick="loadXMLDoc('Admin/Accounts')">Accounts</button>
-<button onclick="loadXMLDoc('Admin/Entities')">Entities</button>
-</body>
-</html>
diff --git a/libraries/libLSL/Properties/AssemblyInfo.cs b/libraries/libLSL/Properties/AssemblyInfo.cs
deleted file mode 100644
index 205dd95..0000000
--- a/libraries/libLSL/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("libLSL")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("libLSL")]
-[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("65895724-efca-49f8-8efc-211594b4c716")]
-// 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/libraries/libLSL/libLSL.csproj b/libraries/libLSL/libLSL.csproj
deleted file mode 100644
index fe8822b..0000000
--- a/libraries/libLSL/libLSL.csproj
+++ /dev/null
@@ -1,49 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{E213BD9C-85C9-4739-B613-E1B58543370C}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>libLSL</RootNamespace>
-    <AssemblyName>libLSL</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="lsl.cs" />
-    <Compile Include="lslByteCode.cs" />
-    <Compile Include="lslscript.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
-\ No newline at end of file
diff --git a/libraries/libLSL/lsl.cs b/libraries/libLSL/lsl.cs
deleted file mode 100644
index 37a6429..0000000
--- a/libraries/libLSL/lsl.cs
+++ /dev/null
@@ -1,329 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-namespace libLSL
-{
-    
-    enum lslVarType : byte
-    {
-        VARTYPE_VOID = 0,
-        VARTYPE_INTEGER = 1,
-        VARTYPE_FLOAT = 2,
-        VARTYPE_STRING = 3,
-        VARTYPE_KEY = 4,
-        VARTYPE_VECTOR = 5,
-        VARTYPE_ROTATION = 6,
-        VARTYPE_LIST = 7
-    }
-    enum lslEventType : byte
-    {
-        EVENT_STATE_ENTRY = 0,
-        EVENT_STATE_EXIT = 1,
-        EVENT_TOUCH_START = 2,
-        EVENT_TOUCH = 3,
-        EVENT_TOUCH_END = 4,
-        EVENT_COLLISION_START = 5,
-        EVENT_COLLISION = 6,
-        EVENT_COLLISION_END = 7,
-        EVENT_LAND_COLLISION_START = 8,
-        EVENT_LAND_COLLISION = 9,
-        EVENT_LAND_COLLISION_END = 10,
-        EVENT_TIMER = 11,
-        EVENT_LISTEN = 12,
-        EVENT_ON_REZ = 13,
-        EVENT_SENSOR = 14,
-        EVENT_NO_SENSOR = 15,
-        EVENT_CONTROL = 16,
-        EVENT_MONEY = 17,
-        EVENT_EMAIL = 18,
-        EVENT_AT_TARGET = 19,
-        EVENT_NOT_AT_TARGET = 20,
-        EVENT_AT_ROT_TARGET = 21,
-        EVENT_NOT_AT_ROT_TARGET = 22,
-        EVENT_RUN_TIME_PERMISSIONS = 23,
-        EVENT_CHANGED = 24,
-        EVENT_ATTACH = 25,
-        EVENT_DATASERVER = 26,
-        EVENT_LINK_MESSAGE = 27,
-        EVENT_MOVING_START = 28,
-        EVENT_MOVING_END = 29,
-        EVENT_OBJECT_REZ = 30,
-        EVENT_REMOTE_DATA = 31,
-        EVENT_HTTP_RESPONSE = 32
-    }
-    enum lslOpcodes : byte
-    {
-        // No Operation
-        OP_NOOP = 0x00,
-        // Pops
-        OP_POP = 0x01,
-        OP_POPS = 0x02,
-        OP_POPL = 0x03,
-        OP_POPV = 0x04,
-        OP_POPQ = 0x05,
-        OP_POPARG = 0x06,
-        OP_POPIP = 0x07,
-        OP_POPBP = 0x08,
-        OP_POPSP = 0x09,
-        OP_POPSLR = 0x0A,
-        // Dupes
-        OP_DUP = 0x20,
-        OP_DUPS = 0x21,
-        OP_DUPL = 0x22,
-        OP_DUPV = 0x23,
-        OP_DUPQ = 0x24,
-        // Stores
-        OP_STORE = 0x30,
-        OP_STORES = 0x31,
-        OP_STOREL = 0x32,
-        OP_STOREV = 0x33,
-        OP_STOREQ = 0x34,
-        OP_STOREG = 0x35,
-        OP_STOREGS = 0x36,
-        OP_STOREGL = 0x37,
-        OP_STOREGV = 0x38,
-        OP_STOREGQ = 0x39,
-        // Loads
-        OP_LOADP = 0x3A,
-        OP_LOADSP = 0x3B,
-        OP_LOADLP = 0x3C,
-        OP_LOADVP = 0x3D,
-        OP_LOADQP = 0x3E,
-        OP_LOADGP = 0x3F,
-        OP_LOADGSP = 0x40,
-        OP_LOADGLP = 0x41,
-        OP_LOADGVP = 0x42,
-        OP_LOADGQP = 0x43,
-        // Pushes
-        OP_PUSH = 0x50,
-        OP_PUSHS = 0x51,
-        OP_PUSHL = 0x52,
-        OP_PUSHV = 0x53,
-        OP_PUSHQ = 0x54,
-        OP_PUSHG = 0x55,
-        OP_PUSHGS = 0x56,
-        OP_PUSHGL = 0x57,
-        OP_PUSHGV = 0x58,
-        OP_PUSHGQ = 0x59,
-        OP_PUSHIP = 0x5A,
-        OP_PUSHBP = 0x5B,
-        OP_PUSHSP = 0x5C,
-        OP_PUSHARGB = 0x5D,
-        OP_PUSHARGI = 0x5E,
-        OP_PUSHARGF = 0x5F,
-        OP_PUSHARGS = 0x60,
-        OP_PUSHARGV = 0x61,
-        OP_PUSHARGQ = 0x62,
-        OP_PUSHE = 0x63,
-        OP_PUSHEV = 0x64,
-        OP_PUSHEQ = 0x65,
-        OP_PUSHARGE = 0x66,
-        // Numerics
-        OP_ADD = 0x70,
-        OP_SUB = 0x71,
-        OP_MUL = 0x72,
-        OP_DIV = 0x73, 
-        OP_MOD = 0x74,
-        OP_EQ = 0x75,
-        OP_NEQ = 0x76,
-        OP_LEQ = 0x77,
-        OP_GEQ = 0x78,
-        OP_LESS = 0x79,
-        OP_GREATER = 0x7A,
-        OP_BITAND = 0x7B,
-        OP_BITOR = 0x7C,
-        OP_BITXOR = 0x7D,
-        OP_BOOLAND = 0x7E,
-        OP_BOOLOR = 0x7F,
-        OP_NEG = 0x80,
-        OP_BITNOT = 0x81,
-        OP_BOOLNOT = 0x82,
-        
-        // Sequence
-        OP_JUMP = 0x90,
-        OP_JUMPIF = 0x91,
-        OP_JUMPNIF = 0x92,
-        OP_STATE = 0x93,
-        OP_CALL = 0x94, 
-        OP_RETURN = 0x95,
-        // Cast
-        OP_CAST = 0xA0,
-        // Stack
-        OP_STACKTOS = 0xB0,
-        OP_STACKTOL = 0xB1,
-        // Debug
-        OP_PRINT = 0xC0,
-        // Library
-        OP_CALLLIB = 0xD0,
-        OP_CALLLIB_TWO_BYTE = 0xD1,
-        
-        // More Numerics
-        OP_SHL = 0xE0,
-        OP_SHR = 0xE1
-    }
-    class lslHeader
-    {
-        int TM;     // Top of memory
-        int IP;     // Instruction pointer
-        int VN;     // Version Number (0x00000200)
-        int BP;     // Base Pointer
-        int SP;     // Stack Pointer
-        int HR;     // Heap Register
-        int HP;     // Heap Pointer
-        int CS;     // Current State
-        int NS;     // Next State
-        int CE;     // Current Events (Which events need running still?)
-        int IE;     // In Event
-        int ER;     // Event Register
-        int FR;     // Fault Register
-        int SLR;    // Sleep Register
-        int GVR;    // Global Variable Register (Pointer)
-        int GFR;    // Global Function Register (Pointer)
-        int PR;     // Parameter Register - OnRez Int?
-        int ESR;    // Energy Supply Register
-        int SR;     // State Register
-        long NCE;   // Extended Current Events
-        long NIE;   // Extended In Event
-        long NER;   // Extended Event Register
-        public void readFromBytes(byte[] data)
-        {
-        }
-    }
-    class lslStaticBlock
-    {
-        int length;        // Length (bytes)
-        lslVarType varType;// Variable Type
-        byte unknown;       // Unknown
-        Object varObject;     // Variable Object
-        public void readFromBytes(byte[] data)
-        {
-        }
-    }
-    class lslHeapBlock
-    {
-        int length;
-        lslVarType varType;
-        short referenceCount;
-        Object varObject;
-        public void readFromBytes(byte[] data)
-        {
-        }
-    }
-    class lslStatePointer
-    {
-        int location;
-        long eventMask;
-        public void readFromBytes(byte[] data)
-        {
-        }
-    }
-    class lslStateFrameBlock
-    {
-        int number;
-        lslStatePointer[] pointers;
-        public void readFromBytes(byte[] data)
-        {
-        }
-    }
-    class lslStateBlockElement
-    {
-        int pointerToCode;
-        int callFrameSize;
-        public void readFromBytes(byte[] data)
-        {
-        }
-    }
-    class lslStateBlock
-    {
-        int length;
-        byte unknown;
-        lslStateBlockElement[] handlers; // ?
-        public void readFromBytes(byte[] data)
-        {
-        }
-    }
-    class lslFunctioBlock
-    {
-        int number;
-        int[] pointers; // Relative to this -> codechunk
-        public void readFromBytes(byte[] data)
-        {
-        }
-    }
-    class lslCodeArgument
-    {
-        lslVarType type;
-        byte empty;
-        public void readFromBytes(byte[] data)
-        {
-        }
-    }
-    class lslCodeChunkHeader
-    {
-        int length;
-        string comment;
-        lslVarType returnType;
-        lslCodeArgument[] arguments;
-        byte empty;
-        public void readFromBytes(byte[] data)
-        {
-        }
-    }
-    class lslCodeChunk
-    {
-        lslCodeChunkHeader header;
-        lslByteCode bytecode;
-        public void readFromBytes(byte[] data)
-        {
-        }
-    }
-}
diff --git a/libraries/libLSL/lslByteCode.cs b/libraries/libLSL/lslByteCode.cs
deleted file mode 100644
index 4dffe22..0000000
--- a/libraries/libLSL/lslByteCode.cs
+++ /dev/null
@@ -1,133 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-namespace libLSL
-{
-    class lslByteCode
-    {
-        byte[] bytecode;
-        public void executeStep()
-        {
-            byte ins = nextInstruction();
-            lslOpcodes code = (lslOpcodes)ins;
-            Object arg1 = (Object)32;
-            Object arg2 = (Object)32;
-            switch (code)
-            {
-                case lslOpcodes.OP_NOOP:
-                    break;
-                case lslOpcodes.OP_POP:
-                    popBytes(4);
-                    break;
-                case lslOpcodes.OP_POPS:
-                case lslOpcodes.OP_POPL:
-                    // Do Stuff
-                    break;
-                case lslOpcodes.OP_POPV:
-                    popBytes(12);
-                    break;
-                case lslOpcodes.OP_POPQ:
-                    popBytes(16);
-                    break;
-                case lslOpcodes.OP_POPARG:
-                    popBytes((Int32)arg1);
-                    break;
-                case lslOpcodes.OP_POPIP:
-                    // Do Stuff
-                    break;
-                case lslOpcodes.OP_POPBP:
-                    // Do Stuff
-                    break;
-                case lslOpcodes.OP_POPSP:
-                    // Do Stuff
-                    break;
-                case lslOpcodes.OP_POPSLR:
-                    // Do Stuff
-                    break;
-                case lslOpcodes.OP_DUP:
-                    pushBytes(getBytes(4));
-                    break;
-                case lslOpcodes.OP_DUPS:
-                case lslOpcodes.OP_DUPL:
-                    // Do Stuff
-                    break;
-                case lslOpcodes.OP_DUPV:
-                    pushBytes(getBytes(12));
-                    break;
-                case lslOpcodes.OP_DUPQ:
-                    pushBytes(getBytes(16));
-                    break;
-                case lslOpcodes.OP_STORE:
-                    // Somefin.
-                    break;
-                default:
-                    break;
-            }
-        }
-        /// <summary>
-        /// Advance the instruction pointer, pull the current instruction
-        /// </summary>
-        /// <returns></returns>
-        byte nextInstruction()
-        {
-            return 0;
-        }
-        /// <summary>
-        /// Removes bytes from the stack
-        /// </summary>
-        /// <param name="num">Number of bytes</param>
-        void popBytes(int num)
-        {
-        }
-        /// <summary>
-        /// Pushes Bytes to the stack
-        /// </summary>
-        /// <param name="bytes">Ze bytes!</param>
-        void pushBytes(byte[] bytes)
-        {
-        }
-        /// <summary>
-        /// Get Bytes from the stack
-        /// </summary>
-        /// <param name="num">Number of bytes</param>
-        /// <returns>Ze bytes!</returns>
-        byte[] getBytes(int num)
-        {
-            return new byte[1];
-        }
-        /// <summary>
-        /// Saves bytes to the local frame
-        /// </summary>
-        /// <param name="bytes">Ze bytes!</param>
-        /// <param name="index">Index in local frame</param>
-        void storeBytes(byte[] bytes, int index)
-        {
-        }
-    }
-}
diff --git a/libraries/libLSL/lslscript.cs b/libraries/libLSL/lslscript.cs
deleted file mode 100644
index d9d57bd..0000000
--- a/libraries/libLSL/lslscript.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-namespace libLSL
-{
-    public class LSLScript
-    {
-    }
-}
diff --git a/prebuild.xml b/prebuild.xml
deleted file mode 100644
index d08daab..0000000
--- a/prebuild.xml
+++ /dev/null
@@ -1,916 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Prebuild xmlns="http://dnpb.sourceforge.net/schemas/prebuild-1.7.xsd" version="1.7">
-  <Solution name="OpenSim" activeConfig="Debug" path="./">
-    <Configuration name="Debug">
-      <Options>
-        <CompilerDefines>TRACE;DEBUG</CompilerDefines>
-        <OptimizeCode>false</OptimizeCode>
-        <CheckUnderflowOverflow>false</CheckUnderflowOverflow>
-        <AllowUnsafe>false</AllowUnsafe>
-        <WarningLevel>4</WarningLevel>
-        <WarningsAsErrors>false</WarningsAsErrors>
-        <SuppressWarnings></SuppressWarnings>
-        <OutputPath>bin</OutputPath>
-        <DebugInformation>true</DebugInformation>
-        <IncrementalBuild>true</IncrementalBuild>
-        <NoStdLib>false</NoStdLib>
-      </Options>
-    </Configuration>
-    <Configuration name="Release">
-      <Options>
-        <CompilerDefines>TRACE</CompilerDefines>
-        <OptimizeCode>true</OptimizeCode>
-        <CheckUnderflowOverflow>false</CheckUnderflowOverflow>
-        <AllowUnsafe>false</AllowUnsafe>
-        <WarningLevel>4</WarningLevel>
-        <WarningsAsErrors>false</WarningsAsErrors>
-        <SuppressWarnings></SuppressWarnings>
-        <OutputPath>bin</OutputPath>
-        <DebugInformation>false</DebugInformation>
-        <IncrementalBuild>true</IncrementalBuild>
-        <NoStdLib>false</NoStdLib>
-      </Options>
-    </Configuration>
-    <!-- XML-RPC -->
-     <Project name="XMLRPC" path="Common/XmlRpcCS" type="Library">
-      <Configuration name="Debug">
-        <Options>
-          <OutputPath>../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-      <Configuration name="Release">
-        <Options>
-          <OutputPath>../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-      <ReferencePath>../../bin/</ReferencePath>
-      <Reference name="System"/>
-      <Reference name="System.Xml"/>
-      <Files>
-        <Match pattern="*.cs" recurse="true"/>
-      </Files>
-    </Project>
-    <!-- Core OpenSim Projects -->
-    <Project name="OpenSim.Framework" path="Common/OpenSim.Framework" type="Library">
-      <Configuration name="Debug">
-        <Options>
-          <OutputPath>../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-      <Configuration name="Release">
-        <Options>
-          <OutputPath>../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-      <ReferencePath>../../bin/</ReferencePath>
-      <Reference name="System"/>
-      <Reference name="System.Xml"/>
-      <Reference name="libsecondlife.dll"/>
-      <Reference name="Db4objects.Db4o.dll"/>
-      <Reference name="XMLRPC"/>
-      <Files>
-        <Match pattern="*.cs" recurse="true"/>
-      </Files>
-    </Project>
-    <Project name="OpenSim.Framework.Console" path="Common/OpenSim.Framework.Console" type="Library">
-      <Configuration name="Debug">
-        <Options>
-          <OutputPath>../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-      <Configuration name="Release">
-        <Options>
-          <OutputPath>../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-      <ReferencePath>../../bin/</ReferencePath>
-      <Reference name="System" localCopy="false"/>
-      <Files>
-        <Match pattern="*.cs" recurse="true"/>
-      </Files>
-    </Project>
-    <Project name="OpenSim.Servers" path="Common/OpenSim.Servers" type="Library">
-      <Configuration name="Debug">
-        <Options>
-          <OutputPath>../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-      <Configuration name="Release">
-        <Options>
-          <OutputPath>../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-      <ReferencePath>../../bin/</ReferencePath>
-      <Reference name="System"/>
-      <Reference name="System.Xml"/>
-     <Reference name="OpenSim.Framework"/>
-     <Reference name="OpenSim.Framework.Console"/>
-     <Reference name="libsecondlife.dll"/>
-     <Reference name="XMLRPC"/>
-      <Files>
-        <Match pattern="*.cs" recurse="true"/>
-      </Files>
-    </Project>
-    <!-- Storage Plug-ins -->
-    <Project name="OpenSim.Storage.LocalStorageDb4o" path="OpenSim/OpenSim.Storage/LocalStorageDb4o" type="Library">
-      <Configuration name="Debug">
-        <Options>
-          <OutputPath>../../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-      <Configuration name="Release">
-        <Options>
-          <OutputPath>../../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-      <ReferencePath>../../../bin/</ReferencePath>
-      <Reference name="System" localCopy="false"/>
-      <Reference name="System.Xml"/>
-      <Reference name="Db4objects.Db4o.dll"/>
-      <Reference name="libsecondlife.dll"/>
-      <Reference name="OpenSim.Framework"/>
-      <Reference name="OpenSim.Framework.Console"/>
-      <Files>
-        <Match pattern="*.cs" recurse="true"/>
-      </Files>
-    </Project>
-    
-    <Project name="OpenSim.Storage.LocalStorageSQLite" path="OpenSim/OpenSim.Storage/LocalStorageSQLite" type="Library">
-      <Configuration name="Debug">
-        <Options>
-          <OutputPath>../../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-      <Configuration name="Release">
-        <Options>
-          <OutputPath>../../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-      <ReferencePath>../../../bin/</ReferencePath>
-      <Reference name="System" localCopy="false"/>
-      <Reference name="System.Xml"/>
-      <Reference name="System.Data"/>
-      <Reference name="System.Data.SQLite.dll"/>
-      <Reference name="libsecondlife.dll"/>
-      <Reference name="OpenSim.Framework"/>
-      <Reference name="OpenSim.Framework.Console"/>
-      <Files>
-        <Match pattern="*.cs" recurse="true"/>
-      </Files>
-    </Project>
-    <Project name="OpenSim.Storage.LocalStorageBerkeleyDB" path="OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB" type="Library">
-      <Configuration name="Debug">
-        <Options>
-          <OutputPath>../../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-      <Configuration name="Release">
-        <Options>
-          <OutputPath>../../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-      <ReferencePath>../../../bin/</ReferencePath>
-      <Reference name="System" localCopy="false"/>
-      <Reference name="System.Xml"/>
-      <Reference name="System.Data"/>
-      <Reference name="Kds.Serialization.dll"/>
-      <Reference name="libdb_dotNET43.dll"/>
-      <Reference name="libsecondlife.dll"/>
-      <Reference name="OpenSim.Framework"/>
-      <Reference name="OpenSim.Framework.Console"/>
-      <Files>
-        <Match pattern="*.cs" recurse="true"/>
-      </Files>
-    </Project>
-    <!-- Grid Server Plug-ins -->
-    <Project name="OpenSim.GridInterfaces.Local" path="OpenSim/OpenSim.GridInterfaces/Local" type="Library">
-      <Configuration name="Debug">
-        <Options>
-          <OutputPath>../../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-      <Configuration name="Release">
-        <Options>
-          <OutputPath>../../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-      <ReferencePath>../../../bin/</ReferencePath>
-      <Reference name="System" localCopy="false"/>
-      <Reference name="System.Xml"/>
-      <Reference name="Db4objects.Db4o.dll"/>
-      <Reference name="libsecondlife.dll"/>
-      <Reference name="OpenSim.Framework"/>
-      <Reference name="OpenSim.Framework.Console"/>
-      <Files>
-        <Match pattern="*.cs" recurse="true"/>
-      </Files>
-    </Project>
-    <Project name="OpenSim.GridInterfaces.Remote" path="OpenSim/OpenSim.GridInterfaces/Remote" type="Library">
-      <Configuration name="Debug">
-        <Options>
-          <OutputPath>../../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-      <Configuration name="Release">
-        <Options>
-          <OutputPath>../../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-      <ReferencePath>../../../bin/</ReferencePath>
-      <Reference name="System" localCopy="false"/>
-      <Reference name="System.Xml"/>
-      <Reference name="libsecondlife.dll"/>
-      <Reference name="OpenSim.Framework"/>
-      <Reference name="OpenSim.Framework.Console"/>
-      <Reference name="XMLRPC"/>
-      <Files>
-        <Match pattern="*.cs" recurse="true"/>
-      </Files>
-    </Project>
-    
-    <Project name="OpenSim.Physics.Manager" path="OpenSim/OpenSim.Physics/Manager" type="Library">
-      <Configuration name="Debug">
-        <Options>
-          <OutputPath>../../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-      <Configuration name="Release">
-        <Options>
-          <OutputPath>../../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-      <ReferencePath>../../../bin/</ReferencePath>
-      <Reference name="System" localCopy="false"/>
-      <Reference name="System.Xml" localCopy="false" />
-      <Reference name="Axiom.MathLib.dll" localCopy="false"/>
-      <Reference name="OpenSim.Framework" localCopy="false"/>
-      <Reference name="OpenSim.Framework.Console" localCopy="false"/>
-      <Files>
-        <Match pattern="*.cs" recurse="false"/>
-      </Files>
-    </Project>
-    <!-- Physics Plug-ins -->
-    <Project name="OpenSim.Physics.BasicPhysicsPlugin" path="OpenSim/OpenSim.Physics/BasicPhysicsPlugin" type="Library">
-      <Configuration name="Debug">
-        <Options>
-          <OutputPath>../../../bin/Physics/</OutputPath>
-        </Options>
-      </Configuration>
-      <Configuration name="Release">
-        <Options>
-          <OutputPath>../../../bin/Physics/</OutputPath>
-        </Options>
-      </Configuration>
-      <ReferencePath>../../../bin/</ReferencePath>
-      <Reference name="System" localCopy="false"/>
-      <Reference name="Axiom.MathLib.dll" localCopy="false"/>
-      <Reference name="OpenSim.Physics.Manager" localCopy="false"/>
-      <Files>
-        <Match pattern="*.cs" recurse="true"/>
-      </Files>
-    </Project>
-    <Project name="OpenSim.Physics.PhysXPlugin" path="OpenSim/OpenSim.Physics/PhysXPlugin" type="Library">
-      <Configuration name="Debug">
-        <Options>
-          <OutputPath>../../../bin/Physics/</OutputPath>
-        </Options>
-      </Configuration>
-      <Configuration name="Release">
-        <Options>
-          <OutputPath>../../../bin/Physics/</OutputPath>
-        </Options>
-      </Configuration>
-      <ReferencePath>../../../bin/</ReferencePath>
-      <Reference name="System" localCopy="false"/>
-      <Reference name="Axiom.MathLib.dll" localCopy="false"/>
-      <Reference name="PhysX_Wrapper_Dotnet.dll" localCopy="false"/>
-      <Reference name="OpenSim.Physics.Manager" localCopy="false"/>
-      <Files>
-        <Match pattern="*.cs" recurse="true"/>
-      </Files>
-    </Project>
-    <Project name="OpenSim.Physics.OdePlugin" path="OpenSim/OpenSim.Physics/OdePlugin" type="Library">
-      <Configuration name="Debug">
-        <Options>
-          <OutputPath>../../../bin/Physics/</OutputPath>
-        </Options>
-      </Configuration>
-      <Configuration name="Release">
-        <Options>
-          <OutputPath>../../../bin/Physics/</OutputPath>
-        </Options>
-      </Configuration>
-      <ReferencePath>../../../bin/</ReferencePath>
-      <Reference name="System" localCopy="false"/>
-      <Reference name="Axiom.MathLib.dll" localCopy="false"/>
-      <Reference name="OpenSim.Physics.Manager" localCopy="false"/>
-      <Reference name="Ode.NET.dll" localCopy="false" />      
-      <Files>
-        <Match pattern="*.cs" recurse="true"/>
-      </Files>
-    </Project>
-     <!-- Xml Config Dll -->
-     <Project name="OpenSim.GenericConfig.Xml" path="Common/OpenSim.GenericConfig/Xml" type="Library">
-      <Configuration name="Debug">
-        <Options>
-          <OutputPath>../../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-      <Configuration name="Release">
-        <Options>
-          <OutputPath>../../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-      <ReferencePath>../../../bin/</ReferencePath>
-      <Reference name="System"/>
-      <Reference name="System.Xml"/>
-     <Reference name="OpenSim.Framework"/>
-      <Files>
-        <Match pattern="*.cs" recurse="true"/>
-      </Files>
-    </Project>
-        <!-- Basic embedded JVM -->
-     <Project name="OpenSim.Scripting.EmbeddedJVM" path="OpenSim/OpenSim.Scripting/EmbeddedJVM" type="Library">
-      <Configuration name="Debug">
-        <Options>
-          <OutputPath>../../../bin/ScriptEngines/</OutputPath>
-        </Options>
-      </Configuration>
-      <Configuration name="Release">
-        <Options>
-          <OutputPath>../../../bin/ScriptEngines/</OutputPath>
-        </Options>
-      </Configuration>
-      <ReferencePath>../../../bin/</ReferencePath>
-      <Reference name="System"/>
-      <Reference name="System.Xml"/>
-     <Reference name="OpenSim.Framework"/>
-      <Files>
-        <Match pattern="*.cs" recurse="true"/>
-      </Files>
-    </Project>
-     <!-- Terrain engine -->
-     <Project name="OpenSim.Terrain.BasicTerrain" path="OpenSim/OpenSim.Terrain.BasicTerrain" type="Library">
-      <Configuration name="Debug">
-        <Options>
-          <OutputPath>../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-      <Configuration name="Release">
-        <Options>
-          <OutputPath>../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-      <ReferencePath>../../bin/</ReferencePath>
-      <Reference name="System"/>
-      <Reference name="System.Drawing"/>
-      <Reference name="System.Data"/>
-      <Reference name="System.Xml"/>
-        <Reference name="libTerrain-BSD.dll"/>
-      <Files>
-        <Match pattern="*.cs" recurse="true"/>
-      </Files>
-    </Project>
-    <Project name="OpenSim.RegionServer" path="OpenSim/OpenSim.RegionServer" type="Library">
-      <Configuration name="Debug">
-        <Options>
-          <OutputPath>../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-      <Configuration name="Release">
-        <Options>
-          <OutputPath>../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-      <ReferencePath>../../bin/</ReferencePath>
-      <Reference name="System" localCopy="false"/>
-      <Reference name="System.Xml"/>
-      <Reference name="libsecondlife.dll"/>
-      <Reference name="Axiom.MathLib.dll"/>
-      <Reference name="Db4objects.Db4o.dll"/>
-      <Reference name="OpenSim.Terrain.BasicTerrain"/>
-      <Reference name="OpenSim.Framework"/>
-      <Reference name="OpenSim.Framework.Console"/>
-      <Reference name="OpenSim.GenericConfig.Xml"/>
-      <Reference name="OpenSim.Physics.Manager"/>
-      <Reference name="OpenSim.Servers"/>
-      <Reference name="XMLRPC"/>
-      <Files>
-        <Match pattern="*.cs" recurse="true"/>
-      </Files>
-    </Project>
-    <!-- OpenSim app -->
-    <Project name="OpenSim" path="OpenSim/OpenSim" type="Exe">
-      <Configuration name="Debug">
-        <Options>
-          <OutputPath>../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-      <Configuration name="Release">
-        <Options>
-          <OutputPath>../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-      <ReferencePath>../../bin/</ReferencePath>
-      <Reference name="System" localCopy="false"/>
-      <Reference name="System.Xml"/>
-      <Reference name="libsecondlife.dll"/>
-      <Reference name="Axiom.MathLib.dll"/>
-      <Reference name="Db4objects.Db4o.dll"/>
-      <Reference name="OpenSim.Terrain.BasicTerrain"/>
-      <Reference name="OpenSim.Framework"/>
-      <Reference name="OpenSim.Framework.Console"/>
-      <Reference name="OpenSim.Physics.Manager"/>
-      <Reference name="OpenSim.Servers"/>
-      <Reference name="OpenSim.RegionServer"/>
-      <Reference name="OpenSim.GenericConfig.Xml"/>
-      <Reference name="XMLRPC"/>
-      <Files>
-        <Match pattern="*.cs" recurse="true"/>
-      </Files>
-    </Project>
-  
-</Solution>
-  
-  
-<Solution name="OpenGridServices" activeConfig="Debug" path="./">
-    <Configuration name="Debug">
-      <Options>
-        <CompilerDefines>TRACE;DEBUG</CompilerDefines>
-        <OptimizeCode>false</OptimizeCode>
-        <CheckUnderflowOverflow>false</CheckUnderflowOverflow>
-        <AllowUnsafe>false</AllowUnsafe>
-        <WarningLevel>4</WarningLevel>
-        <WarningsAsErrors>false</WarningsAsErrors>
-        <SuppressWarnings></SuppressWarnings>
-        <OutputPath>bin</OutputPath>
-        <DebugInformation>true</DebugInformation>
-        <IncrementalBuild>true</IncrementalBuild>
-        <NoStdLib>false</NoStdLib>
-      </Options>
-    </Configuration>
-    <Configuration name="Release">
-      <Options>
-        <CompilerDefines>TRACE</CompilerDefines>
-        <OptimizeCode>true</OptimizeCode>
-        <CheckUnderflowOverflow>false</CheckUnderflowOverflow>
-        <AllowUnsafe>false</AllowUnsafe>
-        <WarningLevel>4</WarningLevel>
-        <WarningsAsErrors>false</WarningsAsErrors>
-        <SuppressWarnings></SuppressWarnings>
-        <OutputPath>bin</OutputPath>
-        <DebugInformation>false</DebugInformation>
-        <IncrementalBuild>true</IncrementalBuild>
-        <NoStdLib>false</NoStdLib>
-      </Options>
-    </Configuration>
- 
-  <!-- OpenGrid Data Services -->
-    <Project name="OpenGrid.Framework.Data" path="OpenGridServices/OpenGrid.Framework.Data" type="Library">
-      <Configuration name="Debug">
-        <Options>
-          <OutputPath>../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-      <Configuration name="Release">
-        <Options>
-          <OutputPath>../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-      <ReferencePath>../../bin/</ReferencePath>
-      <Reference name="System" localCopy="false"/>
-      <Reference name="System.Xml"/>
-      <Reference name="System.Data"/>
-      <Reference name="libsecondlife.dll"/>
-      <Files>
-        <Match pattern="*.cs" recurse="true"/>
-      </Files>
-    </Project>
-    <Project name="OpenGrid.Framework.Data.MySQL" path="OpenGridServices/OpenGrid.Framework.Data.MySQL" type="Library">
-      <Configuration name="Debug">
-        <Options>
-          <OutputPath>../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-      <Configuration name="Release">
-        <Options>
-          <OutputPath>../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-      <ReferencePath>../../bin/</ReferencePath>
-      <Reference name="System" localCopy="false"/>
-      <Reference name="System.Xml"/>
-      <Reference name="System.Data"/>
-      <Reference name="OpenGrid.Framework.Data"/>
-      <Reference name="libsecondlife.dll"/>
-      <Reference name="MySql.Data.dll"/>
-      <Files>
-        <Match pattern="*.cs" recurse="true"/>
-      </Files>
-    </Project>
-    <Project name="OpenGrid.Framework.Data.DB4o" path="OpenGridServices/OpenGrid.Framework.Data.DB4o" type="Library">
-      <Configuration name="Debug">
-        <Options>
-          <OutputPath>../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-      <Configuration name="Release">
-        <Options>
-          <OutputPath>../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-      <ReferencePath>../../bin/</ReferencePath>
-      <Reference name="System" localCopy="false"/>
-      <Reference name="System.Xml"/>
-      <Reference name="System.Data"/>
-      <Reference name="OpenGrid.Framework.Data"/>
-      <Reference name="libsecondlife.dll"/>
-      <Reference name="Db4objects.Db4o.dll"/>
-      <Files>
-        <Match pattern="*.cs" recurse="true"/>
-      </Files>
-    </Project>
-    <Project name="OpenGrid.Framework.Data.MSSQL" path="OpenGridServices/OpenGrid.Framework.Data.MSSQL" type="Library">
-      <Configuration name="Debug">
-        <Options>
-          <OutputPath>../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-      <Configuration name="Release">
-        <Options>
-          <OutputPath>../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-      <ReferencePath>../../bin/</ReferencePath>
-      <Reference name="System" localCopy="false"/>
-      <Reference name="System.Xml"/>
-      <Reference name="System.Data"/>
-      <Reference name="OpenGrid.Framework.Data"/>
-      <Reference name="libsecondlife.dll"/>
-      <Files>
-        <Match pattern="*.cs" recurse="true"/>
-      </Files>
-    </Project>
-    <Project name="OpenGrid.Framework.Data.SQLite" path="OpenGridServices/OpenGrid.Framework.Data.SQLite" type="Library">
-      <Configuration name="Debug">
-        <Options>
-          <OutputPath>../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-      <Configuration name="Release">
-        <Options>
-          <OutputPath>../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-      <ReferencePath>../../bin/</ReferencePath>
-      <Reference name="System" localCopy="false"/>
-      <Reference name="System.Xml"/>
-      <Reference name="System.Data"/>
-      <Reference name="System.Data.SQLite.dll"/>
-      <Reference name="OpenGrid.Framework.Data"/>
-      <Reference name="libsecondlife.dll"/>
-      <Files>
-        <Match pattern="*.cs" recurse="true"/>
-      </Files>
-    </Project>
-    <!-- OGS projects -->    
-   
-   <Project name="OpenGrid.Framework.Manager" path="OpenGridServices/OpenGrid.Framework.Manager" type="Library">
-      <Configuration name="Debug">
-        <Options>
-          <OutputPath>../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-      <Configuration name="Release">
-        <Options>
-          <OutputPath>../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-     <ReferencePath>../../bin/</ReferencePath>
-     <Reference name="System" localCopy="false"/>
-     <Reference name="OpenSim.Framework.dll"/>
-     <Reference name="OpenSim.Servers.dll"/>
-     <Reference name="libsecondlife.dll"/>
-     <Reference name="XMLRPC"/>
-     <Files>
-       <Match pattern="*.cs" recurse="true"/>
-     </Files>
-    </Project>
-   <Project name="ServiceManager" path="OpenGridServices/ServiceManager" type="Exe">
-      <Configuration name="Debug">
-        <Options>
-          <OutputPath>../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-      <Configuration name="Release">
-        <Options>
-          <OutputPath>../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-     <ReferencePath>../../bin/</ReferencePath>
-     <Reference name="System" localCopy="false"/>
-     <Reference name="System.ServiceProcess" localCopy="false"/>
-     <Reference name="System.Xml" localCopy="false"/>
-     <Reference name="libsecondlife.dll"/>
-     <Reference name="OpenSim.GenericConfig.Xml"/>
-     <Reference name="OpenSim.Framework.dll"/>
-     <Files>
-       <Match pattern="*.cs" recurse="true"/>
-     </Files>
-    </Project>
- 
-    <Project name="OpenGridServices.GridServer" path="OpenGridServices/OpenGridServices.GridServer" type="Exe">
-      <Configuration name="Debug">
-        <Options>
-          <OutputPath>../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-      <Configuration name="Release">
-        <Options>
-          <OutputPath>../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-     <ReferencePath>../../bin/</ReferencePath>
-     <Reference name="System" localCopy="false"/>
-     <Reference name="System.Data" localCopy="false"/>
-     <Reference name="System.Xml" localCopy="false"/>
-     <Reference name="OpenSim.Framework"/>
-     <Reference name="OpenSim.Framework.Console"/>
-     <Reference name="OpenSim.Servers"/>
-     <Reference name="OpenGrid.Framework.Data"/>
-     <Reference name="OpenGrid.Framework.Manager"/>
-     <Reference name="OpenSim.GenericConfig.Xml"/>
-     <Reference name="libsecondlife.dll"/>
-     <Reference name="Db4objects.Db4o.dll"/>
-     <Reference name="XMLRPC"/>
-     <Files>
-       <Match pattern="*.cs" recurse="true"/>
-     </Files>
-    </Project>
- <Project name="OpenGridServices.AssetServer" path="OpenGridServices/OpenGridServices.AssetServer" type="Exe">
-      <Configuration name="Debug">
-        <Options>
-          <OutputPath>../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-      <Configuration name="Release">
-        <Options>
-          <OutputPath>../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-     <ReferencePath>../../bin/</ReferencePath>
-     <Reference name="System" localCopy="false"/>
-     <Reference name="System.Data" localCopy="false"/>
-     <Reference name="System.Xml" localCopy="false"/>
-     <Reference name="OpenSim.Framework"/>
-     <Reference name="OpenSim.Framework.Console"/>
-     <Reference name="OpenSim.GridInterfaces.Local"/>
-     <Reference name="OpenSim.Servers"/>
-     <Reference name="libsecondlife.dll"/>
-     <Reference name="Db4objects.Db4o.dll"/>
-     <Reference name="XMLRPC"/>
-     <Files>
-       <Match pattern="*.cs" recurse="true"/>
-     </Files>
-    </Project>
-  <Project name="OpenGridServices.InventoryServer" path="OpenGridServices/OpenGridServices.InventoryServer" type="Exe">
-    <Configuration name="Debug">
-      <Options>
-        <OutputPath>../../bin/</OutputPath>
-      </Options>
-    </Configuration>
-    <Configuration name="Release">
-      <Options>
-        <OutputPath>../../bin/</OutputPath>
-      </Options>
-    </Configuration>
-    <ReferencePath>../../bin/</ReferencePath>
-    <Reference name="System" localCopy="false"/>
-    <Reference name="System.Data" localCopy="false"/>
-    <Reference name="System.Xml" localCopy="false"/>
-    <Reference name="OpenSim.Framework"/>
-    <Reference name="OpenSim.Framework.Console"/>
-    <Reference name="OpenSim.GridInterfaces.Local"/>
-    <Reference name="OpenGrid.Framework.Data"/>
-    <Reference name="OpenSim.Servers"/>
-    <Reference name="libsecondlife.dll"/>
-    <Reference name="Db4objects.Db4o.dll"/>
-    <Reference name="XMLRPC"/>
-    <Files>
-      <Match pattern="*.cs" recurse="true"/>
-    </Files>
-  </Project>
-    <Project name="OpenGridServices.UserServer" path="OpenGridServices/OpenGridServices.UserServer" type="Exe">
-      <Configuration name="Debug">
-        <Options>
-          <OutputPath>../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-      <Configuration name="Release">
-        <Options>
-          <OutputPath>../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-      
-     <ReferencePath>../../bin/</ReferencePath>
-     <Reference name="System" localCopy="false"/>
-     <Reference name="System.Data" localCopy="false"/>
-     <Reference name="System.Xml" localCopy="false"/>
-     <Reference name="OpenSim.Framework"/>
-     <Reference name="OpenSim.Framework.Console"/>
-     <Reference name="OpenGrid.Framework.Data"/>
-     <Reference name="OpenSim.GenericConfig.Xml"/>
-     <Reference name="OpenSim.Servers"/>
-     <Reference name="libsecondlife.dll"/>
-     <Reference name="Db4objects.Db4o.dll"/>
-     <Reference name="XMLRPC"/>
-     <Files>
-       <Match pattern="*.cs" recurse="true"/>
-     </Files> 
-    </Project>
-    <Project name="OpenGrid.Config.GridConfigDb4o" path="OpenGridServices/OpenGrid.Config/GridConfigDb4o" type="Library">
-      <Configuration name="Debug">
-        <Options>
-          <OutputPath>../../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-      <Configuration name="Release">
-        <Options>
-          <OutputPath>../../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-      <ReferencePath>../../../bin/</ReferencePath>
-      <Reference name="System" localCopy="false"/>
-      <Reference name="System.Data.dll"/>
-      <Reference name="System.Xml"/>
-      <Reference name="libsecondlife.dll"/>
-      <Reference name="Db4objects.Db4o.dll"/>
-      <Reference name="OpenSim.Framework"/>
-      <Reference name="OpenSim.Framework.Console"/>
-      <Files>
-        <Match pattern="*.cs" recurse="true"/>
-      </Files>
-    </Project>
-    <Project name="OpenUser.Config.UserConfigDb4o" path="OpenGridServices/OpenUser.Config/UserConfigDb4o" type="Library">
-      <Configuration name="Debug">
-        <Options>
-          <OutputPath>../../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-      <Configuration name="Release">
-        <Options>
-          <OutputPath>../../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-      <ReferencePath>../../../bin/</ReferencePath>
-      <Reference name="System" localCopy="false"/>
-      <Reference name="System.Data.dll"/>
-      <Reference name="System.Xml"/>
-      <Reference name="libsecondlife.dll"/>
-      <Reference name="Db4objects.Db4o.dll"/>
-      <Reference name="OpenSim.Framework"/>
-      <Reference name="OpenSim.Framework.Console"/>
-      <Files>
-        <Match pattern="*.cs" recurse="true"/>
-      </Files>
-    </Project>
-  
-</Solution>
-  
-  
-  <!-- Prebuild tool -->
-  <Solution name="Prebuild" path="Prebuild/" >
-    <Configuration name="Debug">
-      <Options>
-        <CompilerDefines>DEBUG;TRACE</CompilerDefines>
-        <OptimizeCode>false</OptimizeCode>
-        <OutputPath>bin/Debug</OutputPath>
-        <DebugInformation>true</DebugInformation>
-        <SuppressWarnings>1595</SuppressWarnings>
-      </Options>
-    </Configuration>
-    <Configuration name="Release">
-      <Options>
-        <CompilerDefines>TRACE</CompilerDefines>
-        <OutputPath>bin/Release</OutputPath>
-        <OptimizeCode>true</OptimizeCode>
-        <DebugInformation>false</DebugInformation>
-        <SuppressWarnings>1595</SuppressWarnings>
-      </Options>
-    </Configuration>
-    <Project name="Prebuild" path="src/" language="C#" assemblyName="Prebuild" icon="App.ico" type="Exe" rootNamespace="Prebuild" startupObject="Prebuild.Prebuild">
-      <Configuration name="Debug">
-        <Options>
-          <CompilerDefines>DEBUG;TRACE</CompilerDefines>
-          <OptimizeCode>false</OptimizeCode>
-          <OutputPath>..\..\bin\</OutputPath>
-          <DebugInformation>true</DebugInformation>
-          <KeyFile>Prebuild.snk</KeyFile>
-          <SuppressWarnings>1595</SuppressWarnings>
-        </Options>
-      </Configuration>
-      <Configuration name="Release">
-        <Options>
-          <CompilerDefines>TRACE</CompilerDefines>
-          <OutputPath>..\..\bin\</OutputPath>
-          <OptimizeCode>true</OptimizeCode>
-          <DebugInformation>false</DebugInformation>
-          <KeyFile>Prebuild.snk</KeyFile>
-          <SuppressWarnings>1595</SuppressWarnings>
-        </Options>
-      </Configuration>
-      <ReferencePath>../../bin/</ReferencePath>
-      <Reference name="System.EnterpriseServices" />
-      <Reference name="System.Xml" />
-      <Reference name="System" />
-      <Files>
-        <Match pattern="App.ico" buildAction="EmbeddedResource"/>
-        <Match path="data" pattern="prebuild-1.7.xsd" buildAction="EmbeddedResource"/>
-        <Match pattern="*.cs" recurse="true"/>
-      </Files>
-    </Project>
-  </Solution>
-</Prebuild>
diff --git a/releng/CAUTION b/releng/CAUTION
deleted file mode 100644
index 6418046..0000000
--- a/releng/CAUTION
+++ /dev/null
@@ -1,4 +0,0 @@
-!!!!!!!!!!!!! DANGER DANGER !!!!!!!!!!!!!!!!!!!!!!!!!!!
-DO NOT RUN ANY OF THE SCRIPTS IN THIS DIRECTORY WITHOUT
-READING THEM!!!!!!!!!!!!!
-!!!!!!!!!!!!! DANGER DANGER !!!!!!!!!!!!!!!!!!!!!!!!!!!
diff --git a/releng/README b/releng/README
deleted file mode 100644
index e73f395..0000000
--- a/releng/README
+++ /dev/null
@@ -1,3 +0,0 @@
-This directory contains scripts etc for creating a tarball/package out of the SVN tree.
-Use makerel.sh to generate a tarball, do not use other scripts
-It is designed to be run before releases or by developers/users before a local install from source.
diff --git a/releng/createreldir.sh b/releng/createreldir.sh
deleted file mode 100755
index eb470b0..0000000
--- a/releng/createreldir.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-# this script creates a new opensim-major.minor directory and copies all the relevant files into it
-# not designed for direct invocation from the command line
-mkdir opensim-$OPENSIMMAJOR.$OPENSIMMINOR
-cp -R dist/* opensim-$OPENSIMMAJOR.$OPENSIMMINOR
-cp -R build/bin/* opensim-$OPENSIMMAJOR.$OPENSIMMINOR/bin
diff --git a/releng/dist/INSTALL b/releng/dist/INSTALL
deleted file mode 100644
index f67fe43..0000000
--- a/releng/dist/INSTALL
+++ /dev/null
@@ -1,33 +0,0 @@
-INSTALLING FROM SOURCE WITH WINDOWS
-1 - Ensure you have visual studio express (the C# edition)
-2 - Check you have a clean source tree with the latest VS2005 solution, if unsure run prebuild (See README file)
-3 - Open the solution in visual studio and build it
-4 - Look in bin/ for the output
-5 - ???
-6 - Profit
-INSTALLING FROM SOURCE WITH LINUX/BSD/*NIX
-1 - Ensure you have a clean source tree with latest nant build files, if not, get one or run prebuild (See README file)
-2 - Go to a shell prompt and change to the correct directory
-3 - Type the following:
-nant
-4 - Look in bin/ for the output
-5 - ???
-6 - Profit
-INSTALLING BINARY RELEASE
-Simply extract the tarball into a good location and run straight out of bin/. You may also wish to put all the binaries into /opt/opensim on *nix systems and adjust your path accordingly. At time of writing there is no official way yet to do this. Watch this space.
diff --git a/releng/dist/README b/releng/dist/README
deleted file mode 100644
index 125d5da..0000000
--- a/releng/dist/README
+++ /dev/null
@@ -1,70 +0,0 @@
-For installation notes, please read INSTALL
-RUNNING SANDBOX MODE (the standard way)
-To get up and running in sandbox mode, please start up opensim like this from the command line:
-(first ensure you are in the right directory)
-OpenSim.exe -sandbox (windows)
-mono OpenSim.exe -sandbox (linux/BSD/MacOS X)
-Then startup your second life viewer with the following parameters:
-loginuri http://yourserver:9000/
-The method to do this is dependent upon your OS. "yourserver" will be 127.0.0.1 if you accept the defaults when starting opensim.
-RUNNING SANDBOX WITH USER ACCOUNTS
-* open cmd window, go to /bin and launch 
-OpenSim.exe -sandbox -loginserver -useraccounts
-* launch web browser, go to
-http://localhost:9000/Admin
-enter password 'Admin'
-* Select 'Accounts', enter credentials, press 'Create'
-* Now, log on thru your viewer (see above) with your newly created credentials.
-* Have Fun!
-PREBUILD
-We use Prebuild to generate vs2005 solutions and nant build scripts.
-=== Building Prebuild ===
-At the moment, the Prebuild exe is shipped as /bin/Prebuild.exe so you shouldn't really have to build it.
-But here's the instructions anyway :
-The Prebuild master project is /prebuild.xml
-To build it with vs2005 :
-* build the solution /Prebuild/Prebuild.sln
-To build it with nant :
-* cd to /Prebuild/
-* type 'nant'
-After you've built it, it will land in the root /bin/ directory,
-=== Modyfying the OpenSim solution ===
-When adding or changing projects, modify the prebuild.xml and then execute
-bin/Prebuild.exe /target {target}
-where target is either 
-vs2005 - to generate new vs2005 solutions and projects
-nant - to generate new nant build scripts
-Remember to run prebuild whenever you've added or removed files as well.
diff --git a/releng/dist/SQL/mysql-agents.sql b/releng/dist/SQL/mysql-agents.sql
deleted file mode 100644
index 8194ca9..0000000
--- a/releng/dist/SQL/mysql-agents.sql
+++ /dev/null
@@ -1,24 +0,0 @@
-SET FOREIGN_KEY_CHECKS=0;
-- ----------------------------
-- Table structure for agents
-- ----------------------------
-CREATE TABLE `agents` (
-  `UUID` varchar(36) NOT NULL,
-  `sessionID` varchar(36) NOT NULL,
-  `secureSessionID` varchar(36) NOT NULL,
-  `agentIP` varchar(16) NOT NULL,
-  `agentPort` int(11) NOT NULL,
-  `agentOnline` tinyint(4) NOT NULL,
-  `loginTime` int(11) NOT NULL,
-  `logoutTime` int(11) NOT NULL,
-  `currentRegion` varchar(36) NOT NULL,
-  `currentHandle` bigint(20) unsigned NOT NULL,
-  `currentPos` varchar(64) NOT NULL,
-  PRIMARY KEY  (`UUID`),
-  UNIQUE KEY `session` (`sessionID`),
-  UNIQUE KEY `ssession` (`secureSessionID`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-- ----------------------------
-- Records 
-- ----------------------------
diff --git a/releng/dist/SQL/mysql-inventoryfolders.sql b/releng/dist/SQL/mysql-inventoryfolders.sql
deleted file mode 100644
index c30239e..0000000
--- a/releng/dist/SQL/mysql-inventoryfolders.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-CREATE TABLE `inventoryfolders` (
-  `folderID` varchar(36) NOT NULL default '',
-  `agentID` varchar(36) default NULL,
-  `parentFolderID` varchar(36) default NULL,
-  `folderName` varchar(64) default NULL,
-  PRIMARY KEY  (`folderID`),
-  KEY `owner` (`agentID`),
-  KEY `parent` (`parentFolderID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
diff --git a/releng/dist/SQL/mysql-inventoryitems.sql b/releng/dist/SQL/mysql-inventoryitems.sql
deleted file mode 100644
index 6e90005..0000000
--- a/releng/dist/SQL/mysql-inventoryitems.sql
+++ /dev/null
@@ -1,14 +0,0 @@
-CREATE TABLE `inventoryitems` (
-  `inventoryID` varchar(36) NOT NULL default '',
-  `assetID` varchar(36) default NULL,
-  `type` int(11) default NULL,
-  `parentFolderID` varchar(36) default NULL,
-  `avatarID` varchar(36) default NULL,
-  `inventoryName` varchar(64) default NULL,
-  `inventoryDescription` varchar(64) default NULL,
-  `inventoryNextPermissions` int(10) unsigned default NULL,
-  `inventoryCurrentPermissions` int(10) unsigned default NULL,
-  PRIMARY KEY  (`inventoryID`),
-  KEY `owner` (`avatarID`),
-  KEY `folder` (`parentFolderID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
diff --git a/releng/dist/SQL/mysql-logs.sql b/releng/dist/SQL/mysql-logs.sql
deleted file mode 100644
index 05c19e8..0000000
--- a/releng/dist/SQL/mysql-logs.sql
+++ /dev/null
@@ -1,10 +0,0 @@
-CREATE TABLE `logs` (
-  `logID` int(10) unsigned NOT NULL auto_increment,
-  `target` varchar(36) default NULL,
-  `server` varchar(64) default NULL,
-  `method` varchar(64) default NULL,
-  `arguments` varchar(255) default NULL,
-  `priority` int(11) default NULL,
-  `message` text,
-  PRIMARY KEY  (`logID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8
-\ No newline at end of file
diff --git a/releng/dist/SQL/mysql-regions.sql b/releng/dist/SQL/mysql-regions.sql
deleted file mode 100644
index 4f98826..0000000
--- a/releng/dist/SQL/mysql-regions.sql
+++ /dev/null
@@ -1,29 +0,0 @@
-CREATE TABLE `regions` (
-  `uuid` varchar(36) NOT NULL,
-  `regionHandle` bigint(20) unsigned NOT NULL,
-  `regionName` varchar(32) default NULL,
-  `regionRecvKey` varchar(128) default NULL,
-  `regionSendKey` varchar(128) default NULL,
-  `regionSecret` varchar(128) default NULL,
-  `regionDataURI` varchar(255) default NULL,
-  `serverIP` varchar(16) default NULL,
-  `serverPort` int(10) unsigned default NULL,
-  `serverURI` varchar(255) default NULL,
-  `locX` int(10) unsigned default NULL,
-  `locY` int(10) unsigned default NULL,
-  `locZ` int(10) unsigned default NULL,
-  `eastOverrideHandle` bigint(20) unsigned default NULL,
-  `westOverrideHandle` bigint(20) unsigned default NULL,
-  `southOverrideHandle` bigint(20) unsigned default NULL,
-  `northOverrideHandle` bigint(20) unsigned default NULL,
-  `regionAssetURI` varchar(255) default NULL,
-  `regionAssetRecvKey` varchar(128) default NULL,
-  `regionAssetSendKey` varchar(128) default NULL,
-  `regionUserURI` varchar(255) default NULL,
-  `regionUserRecvKey` varchar(128) default NULL,
-  `regionUserSendKey` varchar(128) default NULL, `regionMapTexture` varchar(36) default NULL,
-  PRIMARY KEY  (`uuid`),
-  KEY `regionName` (`regionName`),
-  KEY `regionHandle` (`regionHandle`),
-  KEY `overrideHandles` (`eastOverrideHandle`,`westOverrideHandle`,`southOverrideHandle`,`northOverrideHandle`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED
-\ No newline at end of file
diff --git a/releng/dist/SQL/mysql-users.sql b/releng/dist/SQL/mysql-users.sql
deleted file mode 100644
index 5ce4d1c..0000000
--- a/releng/dist/SQL/mysql-users.sql
+++ /dev/null
@@ -1,34 +0,0 @@
-SET FOREIGN_KEY_CHECKS=0;
-- ----------------------------
-- Table structure for users
-- ----------------------------
-CREATE TABLE `users` (
-  `UUID` varchar(36) NOT NULL default '',
-  `username` varchar(32) NOT NULL,
-  `lastname` varchar(32) NOT NULL,
-  `passwordHash` varchar(32) NOT NULL,
-  `passwordSalt` varchar(32) NOT NULL,
-  `homeRegion` bigint(20) unsigned default NULL,
-  `homeLocationX` float default NULL,
-  `homeLocationY` float default NULL,
-  `homeLocationZ` float default NULL,
-  `homeLookAtX` float default NULL,
-  `homeLookAtY` float default NULL,
-  `homeLookAtZ` float default NULL,
-  `created` int(11) NOT NULL,
-  `lastLogin` int(11) NOT NULL,
-  `userInventoryURI` varchar(255) default NULL,
-  `userAssetURI` varchar(255) default NULL,
-  `profileCanDoMask` int(10) unsigned default NULL,
-  `profileWantDoMask` int(10) unsigned default NULL,
-  `profileAboutText` text,
-  `profileFirstText` text,
-  `profileImage` varchar(36) default NULL,
-  `profileFirstImage` varchar(36) default NULL,
-  PRIMARY KEY  (`UUID`),
-  UNIQUE KEY `usernames` (`username`,`lastname`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-- ----------------------------
-- Records 
-- ----------------------------
diff --git a/releng/dist/bin/OpenSim b/releng/dist/bin/OpenSim
deleted file mode 100755
index 9b46075..0000000
--- a/releng/dist/bin/OpenSim
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-mono OpenSim.exe $*
diff --git a/releng/dobuild.sh b/releng/dobuild.sh
deleted file mode 100755
index dd324d8..0000000
--- a/releng/dobuild.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-# this script does a guaranteed clean build from SVN using a URL specified on the command line
-rm -rf build/
-mkdir build
-printf "Getting fresh source tree from SVN..."
-svn checkout $1 build
-printf "Updating templates..."
-./parsetmpl.sh templates/VersionInfo.cs.tmpl >build/OpenSim/OpenSim.RegionServer/VersionInfo.cs
-printf "Running prebuild..."
-cd build
-mono bin/Prebuild.exe /target nant
-printf "Doing the build..."
-nant -buildfile:OpenSim.build
-mono bin/Prebuild.exe /target nant
-nant -buildfile:OpenGridServices.build
diff --git a/releng/makerel.sh b/releng/makerel.sh
deleted file mode 100755
index b7bc568..0000000
--- a/releng/makerel.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-# This is the one!
-export OPENSIMMAJOR=0
-export OPENSIMMINOR=2
-export BUILD=`date +%s`
-export BRANCH=DEVEL
-export SVNURL=svn://openmetaverse.org/opensim/trunk
-# shouldn't have to change anything below here
-script dobuild.log -c "./dobuild.sh $SVNURL"
-if [ ! $? -eq 0 ]
-then
-  echo "Build failed!"
-else
-  script createrel.log -c ./createreldir.sh
-  rm -rf build
-  tar cvf opensim-$OPENSIMMAJOR.$OPENSIMMINOR-$BUILD-$BRANCH.tar opensim-$OPENSIMMAJOR.$OPENSIMMINOR/*
-  gzip opensim-$OPENSIMMAJOR.$OPENSIMMINOR-$BUILD-$BRANCH.tar
-fi
-rm -rf opensim-$OPENSIMMAJOR.$OPENSIMMINOR
-echo "Produced binary tarball ready for distribution."
diff --git a/releng/parsetmpl.sh b/releng/parsetmpl.sh
deleted file mode 100755
index 0ce6d24..0000000
--- a/releng/parsetmpl.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-# this script parses a template to replace @@ tokens
-cat $1 | sed s/@@VERSION/$OPENSIMMAJOR.$OPENSIMMINOR/g | sed s/@@BUILD/$BUILD/g | sed s/@@SVNREV/`svnversion`/g
diff --git a/releng/templates/VersionInfo.cs.tmpl b/releng/templates/VersionInfo.cs.tmpl
deleted file mode 100644
index 29159e2..0000000
--- a/releng/templates/VersionInfo.cs.tmpl
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-Copyright (c) OpenSim project, http://osgrid.org/
-*
-* 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 <organization> 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 <copyright holder> ``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 <copyright holder> 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
-{
-    /// <summary>
-    /// </summary>
-    public class VersionInfo
-    {
-        public static string Version = "@@VERSION, Build @@BUILD, Revision @@SVNREV";
-    }
-}
diff --git a/runprebuild.bat b/runprebuild.bat
deleted file mode 100644
index c1e5d0e..0000000
--- a/runprebuild.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-bin\Prebuild.exe /target nant
-bin\Prebuild.exe /target vs2005
-\ No newline at end of file
diff --git a/share/php/generateUserFunction.php b/share/php/generateUserFunction.php
deleted file mode 100644
index 52ebc9f..0000000
--- a/share/php/generateUserFunction.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-        // GenerateUser (v1.0)
-        // Creates a new user account, and returns it into an associative array.
-        // --
-        // $firstname - The users firstname
-        // $lastname - The users lastname
-        // $password - the users password
-        // $home - the regionhandle of the users home location
-        // --
-        function generateUser($firstname,$lastname,$password,$home) {
-                $user = array();
-                $user['UUID'] = sprintf( '%04x%04x-%04x-%04x-%04x-%04x%04x%04x',
-                        mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff ),
-                        mt_rand( 0, 0x0fff ) | 0x4000,
-                        mt_rand( 0, 0x3fff ) | 0x8000,
-                        mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff ) );
-                $user['username'] = $firstname;
-                $user['lastname'] = $lastname;
-                
-                $user['passwordSalt'] = md5(microtime() . mt_rand(0,0xffff));
-                $user['passwordHash'] = md5(md5($password) . ":" . $user['passwordSalt']);
-                
-                $user['homeRegion'] = $home;
-                $user['homeLocationX'] = 128;
-                $user['homeLocationY'] = 128;
-                $user['homeLocationZ'] = 128;
-                $user['homeLookAtX'] = 15;
-                $user['homeLookAtY'] = 15;
-                $user['homeLookAtZ'] = 15;
-                
-                $user['created'] = time();
-                $user['lastLogin'] = 0;
-                
-                $user['userInventoryURI'] = "http://inventory.server.tld:8004/";
-                $user['userAssetURI'] = "http://asset.server.tld:8003/";
-                
-                $user['profileCanDoMask'] = 0;
-                $user['profileWantDoMask'] = 0;
-                $user['profileAboutText'] = "I am a user.";
-                $user['profileFirstText'] = "Stuff.";
-                $user['profileImage'] = sprintf( '%04x%04x-%04x-%04x-%04x-%04x%04x%04x', 0, 0, 0, 0, 0, 0, 0, 0 );
-                $user['profileFirstImage'] = sprintf( '%04x%04x-%04x-%04x-%04x-%04x%04x%04x', 0, 0, 0, 0, 0, 0, 0, 0 );
-                
-                return $user;
-        }
-?>
-\ No newline at end of file
diff --git a/share/sql/mysql-agents.sql b/share/sql/mysql-agents.sql
deleted file mode 100644
index 8194ca9..0000000
--- a/share/sql/mysql-agents.sql
+++ /dev/null
@@ -1,24 +0,0 @@
-SET FOREIGN_KEY_CHECKS=0;
-- ----------------------------
-- Table structure for agents
-- ----------------------------
-CREATE TABLE `agents` (
-  `UUID` varchar(36) NOT NULL,
-  `sessionID` varchar(36) NOT NULL,
-  `secureSessionID` varchar(36) NOT NULL,
-  `agentIP` varchar(16) NOT NULL,
-  `agentPort` int(11) NOT NULL,
-  `agentOnline` tinyint(4) NOT NULL,
-  `loginTime` int(11) NOT NULL,
-  `logoutTime` int(11) NOT NULL,
-  `currentRegion` varchar(36) NOT NULL,
-  `currentHandle` bigint(20) unsigned NOT NULL,
-  `currentPos` varchar(64) NOT NULL,
-  PRIMARY KEY  (`UUID`),
-  UNIQUE KEY `session` (`sessionID`),
-  UNIQUE KEY `ssession` (`secureSessionID`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-- ----------------------------
-- Records 
-- ----------------------------
diff --git a/share/sql/mysql-inventoryfolders.sql b/share/sql/mysql-inventoryfolders.sql
deleted file mode 100644
index c30239e..0000000
--- a/share/sql/mysql-inventoryfolders.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-CREATE TABLE `inventoryfolders` (
-  `folderID` varchar(36) NOT NULL default '',
-  `agentID` varchar(36) default NULL,
-  `parentFolderID` varchar(36) default NULL,
-  `folderName` varchar(64) default NULL,
-  PRIMARY KEY  (`folderID`),
-  KEY `owner` (`agentID`),
-  KEY `parent` (`parentFolderID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
diff --git a/share/sql/mysql-inventoryitems.sql b/share/sql/mysql-inventoryitems.sql
deleted file mode 100644
index 6e90005..0000000
--- a/share/sql/mysql-inventoryitems.sql
+++ /dev/null
@@ -1,14 +0,0 @@
-CREATE TABLE `inventoryitems` (
-  `inventoryID` varchar(36) NOT NULL default '',
-  `assetID` varchar(36) default NULL,
-  `type` int(11) default NULL,
-  `parentFolderID` varchar(36) default NULL,
-  `avatarID` varchar(36) default NULL,
-  `inventoryName` varchar(64) default NULL,
-  `inventoryDescription` varchar(64) default NULL,
-  `inventoryNextPermissions` int(10) unsigned default NULL,
-  `inventoryCurrentPermissions` int(10) unsigned default NULL,
-  PRIMARY KEY  (`inventoryID`),
-  KEY `owner` (`avatarID`),
-  KEY `folder` (`parentFolderID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
diff --git a/share/sql/mysql-logs.sql b/share/sql/mysql-logs.sql
deleted file mode 100644
index 05c19e8..0000000
--- a/share/sql/mysql-logs.sql
+++ /dev/null
@@ -1,10 +0,0 @@
-CREATE TABLE `logs` (
-  `logID` int(10) unsigned NOT NULL auto_increment,
-  `target` varchar(36) default NULL,
-  `server` varchar(64) default NULL,
-  `method` varchar(64) default NULL,
-  `arguments` varchar(255) default NULL,
-  `priority` int(11) default NULL,
-  `message` text,
-  PRIMARY KEY  (`logID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8
-\ No newline at end of file
diff --git a/share/sql/mysql-regions.sql b/share/sql/mysql-regions.sql
deleted file mode 100644
index 4f98826..0000000
--- a/share/sql/mysql-regions.sql
+++ /dev/null
@@ -1,29 +0,0 @@
-CREATE TABLE `regions` (
-  `uuid` varchar(36) NOT NULL,
-  `regionHandle` bigint(20) unsigned NOT NULL,
-  `regionName` varchar(32) default NULL,
-  `regionRecvKey` varchar(128) default NULL,
-  `regionSendKey` varchar(128) default NULL,
-  `regionSecret` varchar(128) default NULL,
-  `regionDataURI` varchar(255) default NULL,
-  `serverIP` varchar(16) default NULL,
-  `serverPort` int(10) unsigned default NULL,
-  `serverURI` varchar(255) default NULL,
-  `locX` int(10) unsigned default NULL,
-  `locY` int(10) unsigned default NULL,
-  `locZ` int(10) unsigned default NULL,
-  `eastOverrideHandle` bigint(20) unsigned default NULL,
-  `westOverrideHandle` bigint(20) unsigned default NULL,
-  `southOverrideHandle` bigint(20) unsigned default NULL,
-  `northOverrideHandle` bigint(20) unsigned default NULL,
-  `regionAssetURI` varchar(255) default NULL,
-  `regionAssetRecvKey` varchar(128) default NULL,
-  `regionAssetSendKey` varchar(128) default NULL,
-  `regionUserURI` varchar(255) default NULL,
-  `regionUserRecvKey` varchar(128) default NULL,
-  `regionUserSendKey` varchar(128) default NULL, `regionMapTexture` varchar(36) default NULL,
-  PRIMARY KEY  (`uuid`),
-  KEY `regionName` (`regionName`),
-  KEY `regionHandle` (`regionHandle`),
-  KEY `overrideHandles` (`eastOverrideHandle`,`westOverrideHandle`,`southOverrideHandle`,`northOverrideHandle`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED
-\ No newline at end of file
diff --git a/share/sql/mysql-users.sql b/share/sql/mysql-users.sql
deleted file mode 100644
index 5ce4d1c..0000000
--- a/share/sql/mysql-users.sql
+++ /dev/null
@@ -1,34 +0,0 @@
-SET FOREIGN_KEY_CHECKS=0;
-- ----------------------------
-- Table structure for users
-- ----------------------------
-CREATE TABLE `users` (
-  `UUID` varchar(36) NOT NULL default '',
-  `username` varchar(32) NOT NULL,
-  `lastname` varchar(32) NOT NULL,
-  `passwordHash` varchar(32) NOT NULL,
-  `passwordSalt` varchar(32) NOT NULL,
-  `homeRegion` bigint(20) unsigned default NULL,
-  `homeLocationX` float default NULL,
-  `homeLocationY` float default NULL,
-  `homeLocationZ` float default NULL,
-  `homeLookAtX` float default NULL,
-  `homeLookAtY` float default NULL,
-  `homeLookAtZ` float default NULL,
-  `created` int(11) NOT NULL,
-  `lastLogin` int(11) NOT NULL,
-  `userInventoryURI` varchar(255) default NULL,
-  `userAssetURI` varchar(255) default NULL,
-  `profileCanDoMask` int(10) unsigned default NULL,
-  `profileWantDoMask` int(10) unsigned default NULL,
-  `profileAboutText` text,
-  `profileFirstText` text,
-  `profileImage` varchar(36) default NULL,
-  `profileFirstImage` varchar(36) default NULL,
-  PRIMARY KEY  (`UUID`),
-  UNIQUE KEY `usernames` (`username`,`lastname`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-- ----------------------------
-- Records 
-- ----------------------------