diff --git a/OpenMetaverse.Tests/NetworkTests.cs b/OpenMetaverse.Tests/NetworkTests.cs
index 35d53898..1814e029 100644
--- a/OpenMetaverse.Tests/NetworkTests.cs
+++ b/OpenMetaverse.Tests/NetworkTests.cs
@@ -29,7 +29,6 @@ using System.Collections.Generic;
 using System.Net;
 using OpenMetaverse;
 using OpenMetaverse.Packets;
-using OpenMetaverse.Utilities;
 using NUnit.Framework;
 
 namespace OpenMetaverse.Tests
diff --git a/OpenMetaverse.Tests/OpenMetaverse.Tests.csproj b/OpenMetaverse.Tests/OpenMetaverse.Tests.csproj
deleted file mode 100644
index 52c29ddb..00000000
--- a/OpenMetaverse.Tests/OpenMetaverse.Tests.csproj
+++ /dev/null
@@ -1,90 +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>{E0BCBBAE-A620-431A-9EB7-30173EAF195B}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>OpenMetaverse.Tests</RootNamespace>
-    <AssemblyName>OpenMetaverse.Tests</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\bin\</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\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|.NET 1.1' ">
-    <OutputPath>..\..\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release-docs|AnyCPU' ">
-    <OutputPath>bin\Release-docs\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisRuleAssemblies>C:\Program Files\Microsoft Visual Studio 8\Team Tools\Static Analysis Tools\FxCop\\rules</CodeAnalysisRuleAssemblies>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release-docs|.NET 1.1' ">
-    <OutputPath>bin\.NET 1.1\Release-docs\</OutputPath>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisRuleAssemblies>C:\Program Files\Microsoft Visual Studio 8\Team Tools\Static Analysis Tools\FxCop\\rules</CodeAnalysisRuleAssemblies>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="nunit.framework, Version=2.4.7.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\Program Files\NUnit 2.4.7\bin\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="BinaryLLSDTests.cs" />
-    <Compile Include="NotationLLSDTests.cs" />
-    <Compile Include="PacketTests.cs" />
-    <Compile Include="PrimObjectTests.cs" />
-    <Compile Include="TypeTests.cs" />
-    <Compile Include="NetworkTests.cs" />
-    <Compile Include="XmlLLSDTests.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\OpenMetaverse.csproj">
-      <Project>{D9CDEDFB-8169-4B03-B57F-0DF638F044EC}</Project>
-      <Name>OpenMetaverse</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\libsecondlife.Utilities\OpenMetaverse.Utilities.csproj">
-      <Project>{CE5E06C2-2428-416B-ADC1-F1FE16A0FB27}</Project>
-      <Name>OpenMetaverse.Utilities</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </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/OpenMetaverse.Utilities/OpenMetaverse.Utilities.csproj b/OpenMetaverse.Utilities/OpenMetaverse.Utilities.csproj
deleted file mode 100644
index 2f376a59..00000000
--- a/OpenMetaverse.Utilities/OpenMetaverse.Utilities.csproj
+++ /dev/null
@@ -1,75 +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>{CE5E06C2-2428-416B-ADC1-F1FE16A0FB27}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>OpenMetaverse.Utilities</RootNamespace>
-    <AssemblyName>libopenmetaverse.Utilities</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\bin\</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>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release-docs|AnyCPU' ">
-    <OutputPath>..\..\bin\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisRuleAssemblies>C:\Program Files\Microsoft Visual Studio 8\Team Tools\Static Analysis Tools\FxCop\\rules</CodeAnalysisRuleAssemblies>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <DocumentationFile>..\..\bin\libsecondlife.Utilities.XML</DocumentationFile>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="RegistrationApi.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Utilities.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="VoiceManager.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="VoiceManagerBlocking.cs">
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\OpenMetaverse.csproj">
-      <Project>{D9CDEDFB-8169-4B03-B57F-0DF638F044EC}</Project>
-      <Name>OpenMetaverse</Name>
-    </ProjectReference>
-  </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/OpenMetaverse.build b/OpenMetaverse.build
index 4f55cd27..c5b2bd23 100644
--- a/OpenMetaverse.build
+++ b/OpenMetaverse.build
@@ -1,197 +1,88 @@
-<?xml version="1.0"?>
-<!-- this is a nAnt build file;  use http://nant.sourceforge.net to build me -->
+<?xml version="1.0" ?>
+<project name="OpenMetaverse" default="build">
+    <echo message="Using '${nant.settings.currentframework}' Framework"/>
 
-<project name="libsecondlife" default="build">
-  <sysinfo />
+    <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()}" />
+    <property name="project.config" value="Debug" />
 
-  <!-- global framework settings -->
-  <property name="nant.settings.currentframework" value="mono-2.0" />
-  <property name="target.framework" value="${framework::get-target-framework()}" />
-  <property name="assembly.dir" value="${framework::get-assembly-directory(target.framework)}" />
-
-  <!-- default configuration -->
-  <property name="build.number"
-     value="${string::replace(string::replace(string::substring(datetime::to-string(datetime::now()),0,10),'/200','0'),'/','')}" />
-  <property name="project.version" value="${build.number}" />
-  <property name="project.config"  value="debug" /> <!-- debug|release -->
-  <property name="package.config"  value="dist" /> <!-- dist|src -->
-  <property name="bin_dir"  value="bin" /> 
-
-  <property name="temp.dir" value="/tmp" if="${platform::is-unix()}" />
-  <property name="temp.dir" value="${sys.env.TEMP}" if="${platform::is-win32()}" />
+    <target name="Debug" description="">
+        <property name="project.config" value="Debug" />
+        <property name="build.debug" value="true" />
+    </target>
 
 
-  <!-- build sets -->
-  <fileset id="apps">
-    <include name="importprimscript/*.build" />
-    <include name="SLImageUpload/*.build" />
-    <include name="SLProxy/*.build" />
-	<include name="VoiceTest/*.build" />
-  </fileset>
-  <fileset id="lib">
-    <include name="libsecondlife/*.build" />
-  </fileset>
-  <fileset id="examples">
-    <include name="libsecondlife/examples/examples.build" />
-  </fileset>
+    <target name="Release" description="">
+        <property name="project.config" value="Release" />
+        <property name="build.debug" value="false" />
+    </target>
 
-  <!-- named configurations -->
-  <target name="init" description="Initializes building properties">
-    <echo message="assembly.dir=${assembly.dir}" />
-    <call target="${project.config}" />
-  </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="init-package" description="Initializes packaging properties">
-    <call target="${package.config}" />
-  </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="debug" description="Configures a debug build">
-    <property name="build.debug" value="true" />
-    <property name="package.name" value="${project::get-name()}-${project.version}-${project.config}" />
-    <if test="${property::exists('CCNetLabel')}">
-      <property name="package.name" value="${project::get-name()}-${CCNetLabel}-${project.config}" />
-    </if>
-  </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="release" description="Configures a release build">
-    <property name="project.config" value="release" />
-    <property name="build.debug"    value="false"/>
-    <property name="package.name" value="${project::get-name()}-${project.version}" />
-    <if test="${property::exists('CCNetLabel')}">
-      <property name="package.name" value="${project::get-name()}-${CCNetLabel}-${project.config}" />
-    </if>
-  </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="dist" description="Configures a distribution package">
-    <property name="dist" value="true" />
-    <property name="src"  value="false" />
-    <property name="archive.name" value="${package.name}.zip" />
-    <property name="archive.dir" value="${temp.dir}/${project::get-name()}-${project.version}" />
-    <property name="srcarchive.name" value="${project::get-name()}-${project.version}-src.zip" />
-    <property name="srcarchive.dir" value="${temp.dir}/${project::get-name()}-${project.version}-src" />
-    
-    <if test="${property::exists('CCNetLabel')}">
-      <property name="srcarchive.name" value="${project::get-name()}-${CCNetLabel}-src.zip" />
-    </if>
-  </target>
+    <target name="init" description="">
+        <call target="${project.config}" />
+        <property name="sys.os.platform"
+                  value="${platform::get-name()}"
+                  />
+        <echo message="Platform ${sys.os.platform}" />
+        <property name="build.dir" value="${bin.dir}/${project.config}" />
+    </target>
 
-  <!-- <target name="src" description="Configures a source package">
-    <property name="package.config" value="src" />
-    <property name="dist"           value="false" />
-    <property name="src"            value="true" />
-    <property name="archive.dir"
-      value="${temp.dir}/${project::get-name()}-${project.version}" />
-    <property name="archive.name"
-      value="${project::get-name()}-${project.version}-src.zip" />
-  </target> -->
 
-  <zipfileset id="archive.set" basedir="${temp.dir}">
-      <include name="${project::get-name()}-${project.version}/**" />
-  </zipfileset>
-  
-  <zipfileset id="srcarchive.set" basedir="${temp.dir}">
-      <include name="${project::get-name()}-${project.version}-src/**" />
-  </zipfileset>
-
-  <!-- build tasks -->
-  <target name="build"
-    depends="build-lib build-examples build-apps"
-    description="Builds the current configuration">
-  </target>
-
-  <target name="build-lib" depends="init"
-    description="Builds the libsecondlife dll for the current configuration">
-    <nant target="${project.config} build">
-      <buildfiles refid="lib" />
-    </nant>
-    <copy todir="bin" overwrite="true">
-	  <fileset basedir="data">
-        <include name="*.crt" />
-        <include name="message_template.msg" />
-      </fileset>
-    </copy>
-  </target>
-
-  <target name="build-apps" depends="init"
-    description="Builds the application suite for the current configuration">
-    <nant target="${project.config} build">
-      <buildfiles refid="apps" />
-    </nant>
-  </target>
-
-  <target name="build-examples" depends="init"
-    description="Builds the libsecondlife examples for the current configuration">
-    <nant target="${project.config} build">
-      <buildfiles refid="examples" />
-    </nant>
-  </target>
-
-  <target name="clean" depends="init"
-    description="Deletes the built products"> 
-	 <delete failonerror="false">
-      <fileset basedir="${bin_dir}">
-		<include name="*" />
-		<exclude name="*openjpeg-dotnet*" />
-      </fileset>
-    </delete>
-  </target>
-
-  <target name="clean-all" depends="clean"
-    description="Deletes all built products and packagess">
-    <delete failonerror="false">
-      <fileset basedir=".">
-        <include name="*.zip" />
-      </fileset>
-    </delete>
-  </target>
-
-  <target name="package" depends="init init-package"
-    description="Creates a zip archive for the current configuration">
-    
-    <delete file="${archive.name}" failonerror="true" />
-    <delete file="${srcarchive.name}" failonerror="true" />
-    
-    <!-- <if test="${src}"> -->
-      <mkdir dir="${srcarchive.dir}" failonerror="false" />
-      <copy todir="${srcarchive.dir}" overwrite="true">
-        <fileset basedir=".">
-          <include name="**" />
-          <exclude name="*.zip" />
+    <target name="clean" description="">
+        <echo message="Deleting all builds from all configurations" />
+        <delete failonerror="false">
+        <fileset basedir="${bin.dir}">
+            <include name="OpenSim*.dll"/>
+            <include name="OpenSim*.exe"/>
+            <include name="ScriptEngines/*"/>
+            <include name="Physics/*"/>
+            <exclude name="OpenSim.32BitLaunch.exe"/>
+            <exclude name="ScriptEngines/Default.lsl"/>
         </fileset>
-      </copy>
-    <!-- </if> -->
-    
-    <if test="${dist}">
-      <call target="build" />
-      <mkdir dir="${archive.dir}" failonerror="false" />
-      <copy todir="${archive.dir}" overwrite="true">
-				<fileset basedir=".">
-				  <include name="LICENSE.txt" />
-				  <include name="README.txt" />
-				</fileset>
-      </copy>
-      <copy todir="${archive.dir}" overwrite="true">
-        <fileset basedir="bin">
-          <include name="*.exe" />
-          <include name="*.dll" />
-		    </fileset>
-      </copy>
-    </if>
-    
-    <zip zipfile="${archive.name}">
-      <fileset refid="archive.set" />
-    </zip>
-    
-    <zip zipfile="${srcarchive.name}">
-      <fileset refid="srcarchive.set" />
-    </zip>
-    
-    <delete dir="${archive.dir}" failonerror="false" />
-    <echo message="Created archive at file://${project::get-base-directory()}/${archive.name}" />
-    <echo message="Created archive at file://${project::get-base-directory()}/${srcarchive.name}" />
-  </target>
-  
-  <!--<target name="doc" depends="build"
-    description="Compiles html documentation for libsecondlife">
-  </target>-->
+        </delete>
+        <delete dir="${obj.dir}" failonerror="false" />
+        <nant buildfile="OpenMetaverse/OpenMetaverse.dll.build" target="clean" />
+        <nant buildfile="OpenMetaverse.Tests/OpenMetaverse.Tests.dll.build" target="clean" />
+        <nant buildfile="OpenMetaverse.Utilities/OpenMetaverse.Utilities.dll.build" target="clean" />
+        <nant buildfile="Programs/SLProxy/SLProxy.exe.build" target="clean" />
+    </target>
+
+    <target name="build" depends="init" description="">
+        <nant buildfile="OpenMetaverse/OpenMetaverse.dll.build" target="build" />
+        <nant buildfile="OpenMetaverse.Utilities/OpenMetaverse.Utilities.dll.build" target="build" />
+        <nant buildfile="OpenMetaverse.Tests/OpenMetaverse.Tests.dll.build" target="build" />
+        <nant buildfile="Programs/SLProxy/SLProxy.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="OpenMetaverse/OpenMetaverse.dll.build" target="doc" />
+        <nant buildfile="OpenMetaverse.Tests/OpenMetaverse.Tests.dll.build" target="doc" />
+        <nant buildfile="OpenMetaverse.Utilities/OpenMetaverse.Utilities.dll.build" target="doc" />
+        <nant buildfile="Programs/SLProxy/SLProxy.exe.build" target="doc" />
+    </target>
+
 </project>
diff --git a/OpenMetaverse/OpenMetaverse.csproj b/OpenMetaverse/OpenMetaverse.csproj
deleted file mode 100644
index 854fe6b4..00000000
--- a/OpenMetaverse/OpenMetaverse.csproj
+++ /dev/null
@@ -1,207 +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>{D9CDEDFB-8169-4B03-B57F-0DF638F044EC}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>
-    </ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>OpenMetaverse</AssemblyName>
-    <AssemblyOriginatorKeyFile>
-    </AssemblyOriginatorKeyFile>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <RootNamespace>OpenMetaverse</RootNamespace>
-    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
-    <StartupObject>
-    </StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <OutputPath>..\bin\</OutputPath>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>true</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>false</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>full</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>..\bin\</OutputPath>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>false</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>true</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>none</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release-docs|AnyCPU' ">
-    <OutputPath>..\bin\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <BaseAddress>285212672</BaseAddress>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Optimize>true</Optimize>
-    <DebugType>
-    </DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisRuleAssemblies>C:\Program Files\Microsoft Visual Studio 8\Team Tools\Static Analysis Tools\FxCop\\rules</CodeAnalysisRuleAssemblies>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <DocumentationFile>..\bin\OpenMetaverse.xml</DocumentationFile>
-    <NoWarn>1591</NoWarn>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL" />
-    <Reference Include="System">
-      <Name>System</Name>
-    </Reference>
-    <Reference Include="System.Data">
-      <Name>System.Data</Name>
-    </Reference>
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Xml">
-      <Name>System.XML</Name>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AgentManager.cs" />
-    <Compile Include="AgentManagerCamera.cs" />
-    <Compile Include="AgentManagerMovement.cs" />
-    <Compile Include="AgentThrottle.cs" />
-    <Compile Include="Animations.cs" />
-    <Compile Include="AppearanceManager.cs" />
-    <Compile Include="AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="AssetManager.cs" />
-    <Compile Include="AssetTypes.cs" />
-    <Compile Include="Avatar.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="AvatarManager.cs" />
-    <Compile Include="BitPack.cs" />
-    <Compile Include="BlockingQueue.cs" />
-    <Compile Include="Capabilities\CapsClient.cs" />
-    <Compile Include="Capabilities\CapsListener.cs" />
-    <Compile Include="Capabilities\CapsBase.cs">
-    </Compile>
-    <Compile Include="Capabilities\EventQueueClient.cs" />
-    <Compile Include="Capabilities\EventQueueListener.cs" />
-    <Compile Include="Caps.cs" />
-    <Compile Include="CapsToPacket.cs" />
-    <Compile Include="CoordinateFrame.cs" />
-    <Compile Include="EventDictionary.cs" />
-    <Compile Include="DirectoryManager.cs" />
-    <Compile Include="FriendsManager.cs" />
-    <Compile Include="GridClient.cs" />
-    <Compile Include="Imaging\BakeLayer.cs" />
-    <Compile Include="Imaging\ManagedImage.cs" />
-    <Compile Include="Imaging\OpenJPEG.cs" />
-    <Compile Include="Imaging\TGALoader.cs" />
-    <Compile Include="Inventory.cs" />
-    <Compile Include="InventoryManager.cs" />
-    <Compile Include="LLObject.cs" />
-    <Compile Include="LLSD\BinaryLLSD.cs" />
-    <Compile Include="LLSD\LLSD.cs" />
-    <Compile Include="LLSD\NotationLLSD.cs" />
-    <Compile Include="LLSD\XmlLLSD.cs" />
-    <Compile Include="Logger.cs" />
-    <Compile Include="Login.cs" />
-    <Compile Include="EstateTools.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="GridManager.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="GroupManager.cs" />
-    <Compile Include="Helpers.cs" />
-    <Compile Include="NameValue.cs" />
-    <Compile Include="NetworkManager.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ObjectManager.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ObjectPoolBase.cs" />
-    <Compile Include="ParcelManager.cs" />
-    <Compile Include="ParticleSystem.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Permissions.cs" />
-    <Compile Include="Prims.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ProtocolManager.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="InternalDictionary.cs" />
-    <Compile Include="Settings.cs" />
-    <Compile Include="Simulator.cs" />
-    <Compile Include="SoundManager.cs" />
-    <Compile Include="TerrainManager.cs" />
-    <Compile Include="TextureEntry.cs" />
-    <Compile Include="ThreadUtil.cs" />
-    <Compile Include="InventoryNode.cs" />
-    <Compile Include="InventoryNodeDictionary.cs" />
-    <Compile Include="Types.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="UDPBase.cs" />
-    <Compile Include="Voice\TCPPipe.cs" />
-    <Compile Include="Voice\VoiceAccount.cs" />
-    <Compile Include="Voice\VoiceAux.cs" />
-    <Compile Include="Voice\VoiceConnector.cs" />
-    <Compile Include="Voice\VoiceDefinitions.cs" />
-    <Compile Include="Voice\VoiceGateway.cs" />
-    <Compile Include="Voice\VoiceSession.cs" />
-    <Compile Include="_Packets_.cs" />
-    <Compile Include="_VisualParam_.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Interfaces\" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>xcopy "$(ProjectDir)Resources\*.*" "$(OutDir)libsl_data" /i /d /y
-</PostBuildEvent>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/OpenMetaverse/libsecondlife.build b/OpenMetaverse/libsecondlife.build
deleted file mode 100644
index 5a91100b..00000000
--- a/OpenMetaverse/libsecondlife.build
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0"?>
-<project name="libsecondlife" default="build">
-	<sysinfo />
-
-	<!-- global framework settings -->
-	<property name="target.framework" value="${framework::get-target-framework()}" />
-	<property name="assembly.dir" value="${framework::get-assembly-directory(target.framework)}" />
-
-	<!-- global project settings -->
-	<xmlpeek verbose="false"
-	  file="../libsecondlife.build"
-	  xpath="/project/property[@name = 'project.version']/@value"
-	  property="project.version" />
-	<property name="build.number"
-	   value="${math::abs(math::floor(timespan::get-total-days(datetime::now() - datetime::parse('01/01/2002'))))}" />
-	<property name="assembly" value="libsecondlife" />
-	<property name="bin_dir" value="../bin" />
-
-	<!-- default configuration -->
-	<property name="project.config" value="debug" />
-	<!-- debug|release -->
-
-	<!-- named configurations -->
-	<target name="init" description="Initializes build properties">
-		<call target="${project.config}" />
-	</target>
-
-	<target name="debug" description="configures a debug build">
-		<property name="build.debug" value="true" />
-		<property name="package.name"
-		  value="${project::get-name()}-${project.version}-${project.config}" />
-		<property name="assembly.configuration"
-		  value="${framework::get-target-framework()}.${platform::get-name()} [${project.config}]" />
-	</target>
-
-	<target name="release" description="configures a release build">
-		<property name="project.config" value="release" />
-		<property name="build.debug"    value="false" />
-		<property name="package.name"   value="${project::get-name()}-${project.version}" />
-		<property name="assembly.configuration"
-		  value="${framework::get-target-framework()}.${platform::get-name()}" />
-	</target>
-
-	<!-- build tasks -->
-	<target name="map" depends="init" description="generates the packet map source code">
-		<mkdir dir="${bin_dir}" failonerror="true"/>
-
-		<csc target="exe" output="../bin/mapgenerator.exe" debug="${build.debug}">
-			<sources>
-				<include name="mapgenerator/mapgenerator.cs" />
-				<include name="mapgenerator/ProtocolManager.cs" />
-			</sources>
-		</csc>
-		<!-- Does _Packets_.cs really need to be reproduced? -->
-		<!-- Don't do it unless we have must, otherwise lots of stuff recompiles. -->
-		<uptodate property="_Packets_.cs.uptodate">
-			<sourcefiles>
-				<include name="../bin/mapgenerator.exe" />
-				<include name="../data/message_template.msg" />
-				<include name="mapgenerator/template.cs" />
-			</sourcefiles>
-			<targetfiles>
-				<include name="_Packets_.cs" />
-			</targetfiles>
-		</uptodate>
-		<exec program="../bin/mapgenerator.exe" output="_Packets_.cs" useruntimeengine="true" unless="${_Packets_.cs.uptodate}">
-			<arg line="../data/message_template.msg mapgenerator/template.cs mapgenerator/unusedpackets.txt _Packets_.cs" />
-		</exec>
-	</target>
-
-	<target name="build" depends="init map" description="compiles the source code">
-	    <if test="${property::exists('CCNetLabel')}">
-			<!-- Produce AssemblyInfo.cs for libsecondlife.dll -->
-			<asminfo output="AssemblyInfo.cs" language="CSharp">
-				<imports>
-					<import namespace="System" />
-					<import namespace="System.Reflection" />
-					<import namespace="System.Runtime.InteropServices" />
-				</imports>
-				<attributes>
-					<attribute type="ComVisibleAttribute" value="false" />
-					<attribute type="CLSCompliantAttribute" value="false" />
-					<attribute type="AssemblyVersionAttribute" value="${CCNetLabel}" />
-					<attribute type="AssemblyTitleAttribute" value="libsecondlife" />
-					<attribute type="AssemblyDescriptionAttribute" value="Networking layer for Second Life" />
-					<attribute type="AssemblyCopyrightAttribute" value="Copyright © libsecondlife 2006-2008" />
-				</attributes>
-			</asminfo>
-		</if>
-
-		<!-- Make sure the bin/ directory exists -->
-		<mkdir dir="${bin_dir}" failonerror="true"/>
-		
-		<!-- Compile the library -->
-		<csc target="library" unsafe="true" output="${bin_dir}/libsecondlife.dll" doc="${bin_dir}/libsecondlife.xml" debug="${build.debug}">
-			<sources>
-				<include name="*.cs" />
-				<include name="LLSD/*.cs" />
-				<include name="Capabilities/*.cs" />
-				<include name="Imaging/*.cs" />
-				<include name="Voice/*.cs" />
-				<include name="libsecondlife.Utilities/*.cs" />
-			</sources>
-                        <resources dynamicprefix="true" prefix="libsecondlife" basedir="." failonempty="true">
-                            <include name="Resources/*.tga" />
-                            <include name="Resources/*.xml" />
-			</resources>
-			<references>
-			    <include name="${bin_dir}//log4net.dll" />
-				<include name="System.Drawing.dll" />
-			</references>
-			<nowarn>
-				<warning number="1574" />
-			    <warning number="1591" />
-			</nowarn>
-		</csc>
-		
-		<!-- Create the avatar_data directory -->
-		<mkdir dir="${bin_dir}/avatar_data" failonerror="false"/>
-		
-		<!-- Copy the resource files to the avatar_data dir -->
-		<copy todir="${bin_dir}/avatar_data">
-    		<fileset basedir="Resources">
-        		<include name="*.*" />
-    		</fileset>
-		</copy>
-	</target>
-
-	<target name="test-dll" depends="init build" description="makes the test dll">
-		<csc target="library" output="libsecondlife.Tests/tests.dll">
-			<sources>
-				<include name="libsecondlife.Tests/*.cs" />
-			</sources>
-			<references>
-				<include name="libsecondlife.dll" />
-				<include name="NUnit.dll" />
-			</references>
-		</csc>
-	</target>
-
-	<target name="clean" description="remove build output">
-		<delete failonerror="false">
-			<fileset basedir="${bin_dir}/">
-				<include name="libsecondlife.dll" />
-				<include name="libsecondlife.dll.mdb" />
-				<include name="mapgenerator.exe" />
-			</fileset>
-		</delete>
-	</target>
-</project>
diff --git a/OpenMetaverse/libsecondlife.sln b/OpenMetaverse/libsecondlife.sln
deleted file mode 100644
index cd171489..00000000
--- a/OpenMetaverse/libsecondlife.sln
+++ /dev/null
@@ -1,193 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenMetaverse", "OpenMetaverse.csproj", "{D9CDEDFB-8169-4B03-B57F-0DF638F044EC}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "sldump", "examples\sldump\sldump.csproj", "{F6258A68-C624-46A0-BA73-B55D21BB0A3B}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "slaccountant", "examples\slaccountant\slaccountant.csproj", "{FC19D5F6-076E-4923-8456-9B0E00E22896}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "name2key", "examples\name2key\name2key.csproj", "{66FFD34E-652C-4EF5-81FE-06AD011169D2}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mapgenerator", "mapgenerator\mapgenerator.csproj", "{C59B1312-57EF-4146-B6B2-1C7B6DC4638B}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "groupmanager", "examples\groupmanager\groupmanager.csproj", "{F460FAB3-0D12-4873-89EB-2696818764B8}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestClient", "examples\TestClient\TestClient.csproj", "{B87682F6-B2D7-4C4D-A529-400C24FD4880}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenMetaverse.Utilities", "libsecondlife.Utilities\OpenMetaverse.Utilities.csproj", "{CE5E06C2-2428-416B-ADC1-F1FE16A0FB27}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenMetaverse.Tests", "libsecondlife.Tests\OpenMetaverse.Tests.csproj", "{E0BCBBAE-A620-431A-9EB7-30173EAF195B}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VisualParamGenerator", "VisualParamGenerator\VisualParamGenerator.csproj", "{D2A514C5-5590-4789-9032-6E5B4C297B80}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Heightmap", "examples\Heightmap\Heightmap.csproj", "{D9669D08-AC81-4F45-AD23-82787C6EFBBA}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "key2name", "examples\Key2Name\key2name.csproj", "{4FF68142-9C61-42D1-87DC-5D37CB671C29}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Baker", "examples\Baker\Baker.csproj", "{4A32A4E5-717C-4B60-B3D7-704518684893}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Decoder", "..\Decoder\Decoder.csproj", "{7AE16AC1-E64C-4FDC-9B85-4BB6145D511C}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SecondGlance", "..\SecondGlance\SecondGlance.csproj", "{D72C92D1-559A-48A7-93F5-99F4E99F3F98}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SLProxy", "..\SLProxy\SLProxy.csproj", "{E4115DC9-FC88-47D6-B3B6-2400AD19B80D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ChatConsole", "..\SLProxy\ChatConsole.csproj", "{D8ECCBE1-AC71-4054-AAA6-2D50E5629504}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GUITestClient", "examples\GUITestClient\GUITestClient.csproj", "{9E0EE72D-AAA7-42EC-8E59-2C3EA5ED6D98}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "importprimscript", "..\importprimscript\importprimscript.csproj", "{32A7AA59-5129-4446-A6DC-2F581ED1A25C}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SLImageUpload", "..\SLImageUpload\SLImageUpload.csproj", "{F3BDC0BC-74EB-451E-8FFE-AA162474F2F2}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VoiceTest", "..\VoiceTest\VoiceTest.csproj", "{B69597A7-5DC5-4564-9089-727D0348EB4E}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Documentation", "..\docs\Documentation.csproj", "{19DE5831-C10D-4013-A054-92E7F10EC115}"
-	ProjectSection(ProjectDependencies) = postProject
-		{E0BCBBAE-A620-431A-9EB7-30173EAF195B} = {E0BCBBAE-A620-431A-9EB7-30173EAF195B}
-		{CE5E06C2-2428-416B-ADC1-F1FE16A0FB27} = {CE5E06C2-2428-416B-ADC1-F1FE16A0FB27}
-		{B87682F6-B2D7-4C4D-A529-400C24FD4880} = {B87682F6-B2D7-4C4D-A529-400C24FD4880}
-		{D9CDEDFB-8169-4B03-B57F-0DF638F044EC} = {D9CDEDFB-8169-4B03-B57F-0DF638F044EC}
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-		Release-docs|Any CPU = Release-docs|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D9CDEDFB-8169-4B03-B57F-0DF638F044EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D9CDEDFB-8169-4B03-B57F-0DF638F044EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D9CDEDFB-8169-4B03-B57F-0DF638F044EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D9CDEDFB-8169-4B03-B57F-0DF638F044EC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D9CDEDFB-8169-4B03-B57F-0DF638F044EC}.Release-docs|Any CPU.ActiveCfg = Release-docs|Any CPU
-		{D9CDEDFB-8169-4B03-B57F-0DF638F044EC}.Release-docs|Any CPU.Build.0 = Release-docs|Any CPU
-		{F6258A68-C624-46A0-BA73-B55D21BB0A3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F6258A68-C624-46A0-BA73-B55D21BB0A3B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F6258A68-C624-46A0-BA73-B55D21BB0A3B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F6258A68-C624-46A0-BA73-B55D21BB0A3B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F6258A68-C624-46A0-BA73-B55D21BB0A3B}.Release-docs|Any CPU.ActiveCfg = Release-docs|Any CPU
-		{F6258A68-C624-46A0-BA73-B55D21BB0A3B}.Release-docs|Any CPU.Build.0 = Release-docs|Any CPU
-		{FC19D5F6-076E-4923-8456-9B0E00E22896}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FC19D5F6-076E-4923-8456-9B0E00E22896}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FC19D5F6-076E-4923-8456-9B0E00E22896}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FC19D5F6-076E-4923-8456-9B0E00E22896}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FC19D5F6-076E-4923-8456-9B0E00E22896}.Release-docs|Any CPU.ActiveCfg = Release-docs|Any CPU
-		{FC19D5F6-076E-4923-8456-9B0E00E22896}.Release-docs|Any CPU.Build.0 = Release-docs|Any CPU
-		{66FFD34E-652C-4EF5-81FE-06AD011169D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{66FFD34E-652C-4EF5-81FE-06AD011169D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{66FFD34E-652C-4EF5-81FE-06AD011169D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{66FFD34E-652C-4EF5-81FE-06AD011169D2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{66FFD34E-652C-4EF5-81FE-06AD011169D2}.Release-docs|Any CPU.ActiveCfg = Release-docs|Any CPU
-		{66FFD34E-652C-4EF5-81FE-06AD011169D2}.Release-docs|Any CPU.Build.0 = Release-docs|Any CPU
-		{C59B1312-57EF-4146-B6B2-1C7B6DC4638B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C59B1312-57EF-4146-B6B2-1C7B6DC4638B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C59B1312-57EF-4146-B6B2-1C7B6DC4638B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C59B1312-57EF-4146-B6B2-1C7B6DC4638B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C59B1312-57EF-4146-B6B2-1C7B6DC4638B}.Release-docs|Any CPU.ActiveCfg = Release-docs|Any CPU
-		{C59B1312-57EF-4146-B6B2-1C7B6DC4638B}.Release-docs|Any CPU.Build.0 = Release-docs|Any CPU
-		{F460FAB3-0D12-4873-89EB-2696818764B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F460FAB3-0D12-4873-89EB-2696818764B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F460FAB3-0D12-4873-89EB-2696818764B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F460FAB3-0D12-4873-89EB-2696818764B8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F460FAB3-0D12-4873-89EB-2696818764B8}.Release-docs|Any CPU.ActiveCfg = Release-docs|Any CPU
-		{F460FAB3-0D12-4873-89EB-2696818764B8}.Release-docs|Any CPU.Build.0 = Release-docs|Any CPU
-		{B87682F6-B2D7-4C4D-A529-400C24FD4880}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B87682F6-B2D7-4C4D-A529-400C24FD4880}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B87682F6-B2D7-4C4D-A529-400C24FD4880}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B87682F6-B2D7-4C4D-A529-400C24FD4880}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B87682F6-B2D7-4C4D-A529-400C24FD4880}.Release-docs|Any CPU.ActiveCfg = Release-docs|Any CPU
-		{B87682F6-B2D7-4C4D-A529-400C24FD4880}.Release-docs|Any CPU.Build.0 = Release-docs|Any CPU
-		{CE5E06C2-2428-416B-ADC1-F1FE16A0FB27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CE5E06C2-2428-416B-ADC1-F1FE16A0FB27}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CE5E06C2-2428-416B-ADC1-F1FE16A0FB27}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CE5E06C2-2428-416B-ADC1-F1FE16A0FB27}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CE5E06C2-2428-416B-ADC1-F1FE16A0FB27}.Release-docs|Any CPU.ActiveCfg = Release-docs|Any CPU
-		{CE5E06C2-2428-416B-ADC1-F1FE16A0FB27}.Release-docs|Any CPU.Build.0 = Release-docs|Any CPU
-		{E0BCBBAE-A620-431A-9EB7-30173EAF195B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E0BCBBAE-A620-431A-9EB7-30173EAF195B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E0BCBBAE-A620-431A-9EB7-30173EAF195B}.Release-docs|Any CPU.ActiveCfg = Release-docs|Any CPU
-		{E0BCBBAE-A620-431A-9EB7-30173EAF195B}.Release-docs|Any CPU.Build.0 = Release-docs|Any CPU
-		{D2A514C5-5590-4789-9032-6E5B4C297B80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D2A514C5-5590-4789-9032-6E5B4C297B80}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D2A514C5-5590-4789-9032-6E5B4C297B80}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D2A514C5-5590-4789-9032-6E5B4C297B80}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D2A514C5-5590-4789-9032-6E5B4C297B80}.Release-docs|Any CPU.ActiveCfg = Release-docs|Any CPU
-		{D2A514C5-5590-4789-9032-6E5B4C297B80}.Release-docs|Any CPU.Build.0 = Release-docs|Any CPU
-		{D9669D08-AC81-4F45-AD23-82787C6EFBBA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D9669D08-AC81-4F45-AD23-82787C6EFBBA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D9669D08-AC81-4F45-AD23-82787C6EFBBA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D9669D08-AC81-4F45-AD23-82787C6EFBBA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D9669D08-AC81-4F45-AD23-82787C6EFBBA}.Release-docs|Any CPU.ActiveCfg = Release-docs|Any CPU
-		{D9669D08-AC81-4F45-AD23-82787C6EFBBA}.Release-docs|Any CPU.Build.0 = Release-docs|Any CPU
-		{4FF68142-9C61-42D1-87DC-5D37CB671C29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4FF68142-9C61-42D1-87DC-5D37CB671C29}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4FF68142-9C61-42D1-87DC-5D37CB671C29}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4FF68142-9C61-42D1-87DC-5D37CB671C29}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4FF68142-9C61-42D1-87DC-5D37CB671C29}.Release-docs|Any CPU.ActiveCfg = Release-docs|Any CPU
-		{4FF68142-9C61-42D1-87DC-5D37CB671C29}.Release-docs|Any CPU.Build.0 = Release-docs|Any CPU
-		{4A32A4E5-717C-4B60-B3D7-704518684893}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4A32A4E5-717C-4B60-B3D7-704518684893}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4A32A4E5-717C-4B60-B3D7-704518684893}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4A32A4E5-717C-4B60-B3D7-704518684893}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4A32A4E5-717C-4B60-B3D7-704518684893}.Release-docs|Any CPU.ActiveCfg = Release-docs|Any CPU
-		{4A32A4E5-717C-4B60-B3D7-704518684893}.Release-docs|Any CPU.Build.0 = Release-docs|Any CPU
-		{7AE16AC1-E64C-4FDC-9B85-4BB6145D511C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7AE16AC1-E64C-4FDC-9B85-4BB6145D511C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7AE16AC1-E64C-4FDC-9B85-4BB6145D511C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7AE16AC1-E64C-4FDC-9B85-4BB6145D511C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7AE16AC1-E64C-4FDC-9B85-4BB6145D511C}.Release-docs|Any CPU.ActiveCfg = Release-docs|Any CPU
-		{7AE16AC1-E64C-4FDC-9B85-4BB6145D511C}.Release-docs|Any CPU.Build.0 = Release-docs|Any CPU
-		{D72C92D1-559A-48A7-93F5-99F4E99F3F98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D72C92D1-559A-48A7-93F5-99F4E99F3F98}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D72C92D1-559A-48A7-93F5-99F4E99F3F98}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D72C92D1-559A-48A7-93F5-99F4E99F3F98}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D72C92D1-559A-48A7-93F5-99F4E99F3F98}.Release-docs|Any CPU.ActiveCfg = Release-docs|Any CPU
-		{D72C92D1-559A-48A7-93F5-99F4E99F3F98}.Release-docs|Any CPU.Build.0 = Release-docs|Any CPU
-		{E4115DC9-FC88-47D6-B3B6-2400AD19B80D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E4115DC9-FC88-47D6-B3B6-2400AD19B80D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E4115DC9-FC88-47D6-B3B6-2400AD19B80D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E4115DC9-FC88-47D6-B3B6-2400AD19B80D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E4115DC9-FC88-47D6-B3B6-2400AD19B80D}.Release-docs|Any CPU.ActiveCfg = Release-docs|Any CPU
-		{E4115DC9-FC88-47D6-B3B6-2400AD19B80D}.Release-docs|Any CPU.Build.0 = Release-docs|Any CPU
-		{D8ECCBE1-AC71-4054-AAA6-2D50E5629504}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D8ECCBE1-AC71-4054-AAA6-2D50E5629504}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D8ECCBE1-AC71-4054-AAA6-2D50E5629504}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D8ECCBE1-AC71-4054-AAA6-2D50E5629504}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D8ECCBE1-AC71-4054-AAA6-2D50E5629504}.Release-docs|Any CPU.ActiveCfg = Release-docs|Any CPU
-		{D8ECCBE1-AC71-4054-AAA6-2D50E5629504}.Release-docs|Any CPU.Build.0 = Release-docs|Any CPU
-		{9E0EE72D-AAA7-42EC-8E59-2C3EA5ED6D98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9E0EE72D-AAA7-42EC-8E59-2C3EA5ED6D98}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9E0EE72D-AAA7-42EC-8E59-2C3EA5ED6D98}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9E0EE72D-AAA7-42EC-8E59-2C3EA5ED6D98}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9E0EE72D-AAA7-42EC-8E59-2C3EA5ED6D98}.Release-docs|Any CPU.ActiveCfg = Release-docs|Any CPU
-		{9E0EE72D-AAA7-42EC-8E59-2C3EA5ED6D98}.Release-docs|Any CPU.Build.0 = Release-docs|Any CPU
-		{32A7AA59-5129-4446-A6DC-2F581ED1A25C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{32A7AA59-5129-4446-A6DC-2F581ED1A25C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{32A7AA59-5129-4446-A6DC-2F581ED1A25C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{32A7AA59-5129-4446-A6DC-2F581ED1A25C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{32A7AA59-5129-4446-A6DC-2F581ED1A25C}.Release-docs|Any CPU.ActiveCfg = Release-docs|Any CPU
-		{32A7AA59-5129-4446-A6DC-2F581ED1A25C}.Release-docs|Any CPU.Build.0 = Release-docs|Any CPU
-		{F3BDC0BC-74EB-451E-8FFE-AA162474F2F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F3BDC0BC-74EB-451E-8FFE-AA162474F2F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F3BDC0BC-74EB-451E-8FFE-AA162474F2F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F3BDC0BC-74EB-451E-8FFE-AA162474F2F2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F3BDC0BC-74EB-451E-8FFE-AA162474F2F2}.Release-docs|Any CPU.ActiveCfg = Release-docs|Any CPU
-		{F3BDC0BC-74EB-451E-8FFE-AA162474F2F2}.Release-docs|Any CPU.Build.0 = Release-docs|Any CPU
-		{B69597A7-5DC5-4564-9089-727D0348EB4E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B69597A7-5DC5-4564-9089-727D0348EB4E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B69597A7-5DC5-4564-9089-727D0348EB4E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B69597A7-5DC5-4564-9089-727D0348EB4E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B69597A7-5DC5-4564-9089-727D0348EB4E}.Release-docs|Any CPU.ActiveCfg = Release-docs|Any CPU
-		{B69597A7-5DC5-4564-9089-727D0348EB4E}.Release-docs|Any CPU.Build.0 = Release-docs|Any CPU
-		{19DE5831-C10D-4013-A054-92E7F10EC115}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{19DE5831-C10D-4013-A054-92E7F10EC115}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{19DE5831-C10D-4013-A054-92E7F10EC115}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{19DE5831-C10D-4013-A054-92E7F10EC115}.Release-docs|Any CPU.ActiveCfg = Release-docs|Any CPU
-		{19DE5831-C10D-4013-A054-92E7F10EC115}.Release-docs|Any CPU.Build.0 = Release-docs|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/Programs/SLProxy/ChatConsole.cs b/Programs/SLProxy/ChatConsole.cs
deleted file mode 100644
index c3a6b04a..00000000
--- a/Programs/SLProxy/ChatConsole.cs
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * ChatConsole.cs: sample SLProxy appliation that writes chat to the console.
- *   Typing on the console will send chat to the grid.
- *
- * Copyright (c) 2006 Austin Jennings
- * Modified by Andrew Ortman ("qode") on Decemeber 21, 2006 to work with the new pregen proxy.
- * 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.
- * - Neither the name of the openmetaverse.org nor the names 
- *   of its contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-using SLProxy;
-using OpenMetaverse;
-using OpenMetaverse.Packets;
-using Nwc.XmlRpc;
-
-using System;
-using System.Collections;
-using System.Net;
-using System.Threading;
-
-public class ChatConsole {
-	private static Proxy proxy;
-	private static LLUUID agentID;
-	private static LLUUID sessionID;
-
-	public static void Main(string[] args) {
-		// configure the proxy
-		ProxyConfig proxyConfig = new ProxyConfig("ChatConsole V2", "Austin Jennings / Andrew Ortman", args);
-		proxy = new Proxy(proxyConfig);
-
-		// set a delegate for when the client logs in
-		proxy.SetLoginResponseDelegate(new XmlRpcResponseDelegate(Login));
-
-		// add a delegate for incoming chat
-		proxy.AddDelegate(PacketType.ChatFromSimulator, Direction.Incoming, new PacketDelegate(ChatFromSimulator));
-
-		// start the proxy
-		proxy.Start();
-	}
-
-	private static void Login(XmlRpcResponse response) {
-		Hashtable values = (Hashtable)response.Value;
-		if (values.Contains("agent_id") && values.Contains("session_id")) {
-			// remember our agentID and sessionID
-			agentID = new LLUUID((string)values["agent_id"]);
-			sessionID = new LLUUID((string)values["session_id"]);
-
-			// start a new thread that reads lines from the console
-			(new Thread(new ThreadStart(ReadFromConsole))).Start();
-		}
-	}
-
-	private static void ReadFromConsole() {
-		// send text from the console in an infinite loop
-		for (;;) {
-			// read a line from the console
-			string message = Console.ReadLine();
-
-			// construct a ChatFromViewer packet
-            ChatFromViewerPacket chat = new ChatFromViewerPacket();
-            chat.ChatData.Channel = 0;
-            chat.ChatData.Message = Helpers.StringToField(message);
-            chat.ChatData.Type = (byte)1;
-
-            chat.AgentData.AgentID = agentID;
-            chat.AgentData.SessionID = sessionID;
-			// inject the packet
-			proxy.InjectPacket((Packet)chat, Direction.Outgoing);
-		}
-	}
-
-	private static Packet ChatFromSimulator(Packet packet, IPEndPoint sim) {
-		// deconstruct the packet
-        ChatFromSimulatorPacket chat = (ChatFromSimulatorPacket)packet;
-        string message = Helpers.FieldToUTF8String(chat.ChatData.Message);
-        string name = Helpers.FieldToUTF8String(chat.ChatData.FromName);
-        byte audible = chat.ChatData.Audible;
-        byte type = chat.ChatData.ChatType;
-
-		// if this was a normal, audible message, write it to the console
-		if (audible != 0 && (type == 0 || type == 1 || type == 2))
-			Console.WriteLine(name + ": " + message);
-
-		// return the packet unmodified
-		return packet;
-	}
-}
diff --git a/Programs/SLProxy/ChatConsole.csproj b/Programs/SLProxy/ChatConsole.csproj
deleted file mode 100644
index a42b771e..00000000
--- a/Programs/SLProxy/ChatConsole.csproj
+++ /dev/null
@@ -1,121 +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>{D8ECCBE1-AC71-4054-AAA6-2D50E5629504}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>
-    </ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>ChatConsole</AssemblyName>
-    <AssemblyOriginatorKeyFile>
-    </AssemblyOriginatorKeyFile>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>ChatConsole</RootNamespace>
-    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
-    <StartupObject>
-    </StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <OutputPath>..\bin\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>true</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>false</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>full</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>..\..\bin\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>false</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>true</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>none</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release-docs|AnyCPU' ">
-    <OutputPath>bin\Release-docs\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <BaseAddress>285212672</BaseAddress>
-    <Optimize>true</Optimize>
-    <DebugType>
-    </DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisRuleAssemblies>C:\Program Files\Microsoft Visual Studio 8\Team Tools\Static Analysis Tools\FxCop\\rules</CodeAnalysisRuleAssemblies>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System">
-      <Name>System</Name>
-    </Reference>
-    <Reference Include="System.Data">
-      <Name>System.Data</Name>
-    </Reference>
-    <Reference Include="System.Xml">
-      <Name>System.XML</Name>
-    </Reference>
-    <ProjectReference Include="..\libsecondlife\OpenMetaverse.csproj">
-      <Project>{D9CDEDFB-8169-4B03-B57F-0DF638F044EC}</Project>
-      <Name>OpenMetaverse</Name>
-    </ProjectReference>
-    <ProjectReference Include="SLProxy.csproj">
-      <Name>SLProxy</Name>
-      <Project>{E4115DC9-FC88-47D6-B3B6-2400AD19B80D}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="ChatConsole.cs">
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/Programs/SLProxy/ClientAO/ClientAO/ClientAO.cs b/Programs/SLProxy/ClientAO/ClientAO/ClientAO.cs
index 343a394c..8a1928b7 100644
--- a/Programs/SLProxy/ClientAO/ClientAO/ClientAO.cs
+++ b/Programs/SLProxy/ClientAO/ClientAO/ClientAO.cs
@@ -28,17 +28,17 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-using SLProxy;
-using libsecondlife;
-using libsecondlife.Packets;
-using libsecondlife.StructuredData;
-using Nwc.XmlRpc;
 using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Net;
 using System.IO;
 using System.Reflection;
+using OpenMetaverse;
+using OpenMetaverse.Packets;
+using OpenMetaverse.StructuredData;
+using Nwc.XmlRpc;
+using SLProxy;
 
 
 public class ClientAO : ProxyPlugin
diff --git a/Programs/SLProxy/SLProxy.build b/Programs/SLProxy/SLProxy.build
deleted file mode 100644
index 01eed6db..00000000
--- a/Programs/SLProxy/SLProxy.build
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="libsecondlife" default="build">
-
-  <!-- global framework settings -->
-  <property name="target.framework" value="${framework::get-target-framework()}" />
-  <property name="assembly.dir" value="${framework::get-assembly-directory(target.framework)}" />
-
-  <!-- global project settings -->
-  <xmlpeek
-    file="../libsecondlife.build"
-    xpath="/project/property[@name = 'project.version']/@value"
-    property="project.version" />
-  <property name="build.number"
-     value="${math::abs(math::floor(timespan::get-total-days(datetime::now()
-     - datetime::parse('01/01/2002'))))}" />
-  <property name="assembly" value="SLProxy"/>
-  <property name="bin_dir"  value="../bin" />
-
-  <!-- default configuration -->
-  <property name="project.config" value="debug" /> <!-- debug|release -->
-
-  <!-- named configurations -->
-  <target name="init" description="Initializes build properties">
-    <call target="${project.config}" />
-  </target>
-
-  <target name="debug" description="configures a debug build">
-    <property name="build.debug" value="true" />
-    <property name="package.name"
-	value="${project::get-name()}-${project.version}-${project.config}" />
-    <property name="assembly.configuration"
-      value="${framework::get-target-framework()}.${platform::get-name()} [${project.config}]" />
-  </target>
-
-  <target name="release" description="configures a release build">
-    <property name="project.config" value="release" />
-    <property name="build.debug" value="false" />
-    <property name="package.name"
-      value="${project::get-name()}-${project.version}" />
-    <property name="assembly.configuration"
-      value="${framework::get-target-framework()}.${platform::get-name()}" />
-  </target>
-
-  <!-- build tasks -->
-  <!-- target name="build" depends="build-analyst build-chatconsole build-main"
-     description="build analyst and chatconsole"
-       FIXME: Analyst's build is broken and Analyst and SLProxyLoader have
-              circular dependencies.  Skipping Analyst for now.  -axial -->
-  <target name="build" depends="build-analyst build-slproxy build-chatconsole build-main"
-     description="build SLProxy and chatconsole">
-  </target>
-
-  <target name="build-slproxy" depends="init"
-    description="Builds the binaries for the current configuration">
-    <echo message="Build Directory is ${bin_dir}/" />
-    <mkdir dir="${bin_dir}" failonerror="false" />
-    <csc
-      target="library"
-      debug="${build.debug}"
-      output="${bin_dir}/SLProxy.dll">
-      <sources failonempty="true">
-        <include name="SLProxy.cs" />
-        <include name="XmlRpcCS/*.cs" />
-        <include name="SLProxyLoader.cs" />
-        <!-- <include name="legacy/*.cs" /> -->
-      </sources>
-      <references basedir="${bin_dir}/">
-        <include name="libsecondlife.dll"/>
-      </references>
-    </csc>
-  </target>
-
-  <target name="build-analyst" depends="init build-slproxy"
-    description="Builds the binaries for the current configuration">
-    <echo message="Build Directory is ${bin_dir}/" />
-    <mkdir dir="${bin_dir}" failonerror="false" />
-    <csc
-      target="library"
-      debug="${build.debug}"
-      output="${bin_dir}/Analyst.dll">
-      <sources failonempty="true">
-        <include name="Analyst.cs" />
-        <!-- <include name="legacy/*.cs" /> -->
-      </sources>
-      <references basedir="${bin_dir}/">
-        <include name="libsecondlife.dll"/>
-        <include name="SLProxy.dll"/>
-      </references>
-    </csc>
-  </target>
-
-  <!-- Note - please, please, PLEASE, refrain from calling the executable
-       SLProxy.exe, as the name conflict with SLProxy.dll confuses Mono -->
-  <target name="build-main"
-    depends="init build-slproxy"
-    description="build SLProxy main">
-    <echo message="Build Directory is ${bin_dir}/" />
-    <mkdir dir="${bin_dir}" failonerror="false" />
-    <csc
-      target="exe"
-      debug="${build.debug}"
-      output="${bin_dir}/SLProxyMain.exe">
-      <sources failonempty="true">
-        <include name="SLProxyMain.cs" />
-      </sources>
-      <references basedir="${bin_dir}/">
-        <include name="libsecondlife.dll"/>
-        <include name="SLProxy.dll"/>
-        <include name="Analyst.dll"/>
-      </references>
-    </csc>
-  </target>
-
-  <target name="build-chatconsole"
-    depends="init build-slproxy"
-    description="build SLProxy ChatConsole">
-    <echo message="Build Directory is ${bin_dir}/" />
-    <mkdir dir="${bin_dir}" failonerror="false" />
-    <csc
-      target="exe"
-      debug="${build.debug}"
-      output="${bin_dir}/ChatConsole.exe">
-      <sources failonempty="true">
-        <include name="ChatConsole.cs" />
-      </sources>
-      <references basedir="${bin_dir}/">
-        <include name="libsecondlife.dll"/>
-        <include name="SLProxy.dll"/>
-      </references>
-    </csc>
-  </target>
-
-  <target name="clean" depends="init"
-    description="Deletes the current configuration">
-    <delete failonerror="false">
-      <fileset basedir="${bin_dir}/">
-        <include name="SLProxy.dll" />
-        <include name="SLProxy.dll.mdb" />
-        <include name="ChatConsole.exe" />
-        <include name="ChatConsole.exe.mdb" />
-        <include name="Analyst.exe" />
-        <include name="Analyst.exe.mdb" />
-      </fileset>
-    </delete>
-  </target>
-
-  <target
-    name="*"
-    description="Handles unknown targets">
-    <echo message="skipping unknown target" />
-  </target>
-</project>
diff --git a/Programs/SLProxy/SLProxy.csproj b/Programs/SLProxy/SLProxy.csproj
deleted file mode 100644
index 5245988f..00000000
--- a/Programs/SLProxy/SLProxy.csproj
+++ /dev/null
@@ -1,140 +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>{E4115DC9-FC88-47D6-B3B6-2400AD19B80D}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>
-    </ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>SLProxy</AssemblyName>
-    <AssemblyOriginatorKeyFile>
-    </AssemblyOriginatorKeyFile>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>SLProxy</RootNamespace>
-    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
-    <StartupObject>ProxyMain</StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <OutputPath>..\bin\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>true</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>false</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>full</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>..\bin\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>false</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>true</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>none</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release-docs|AnyCPU' ">
-    <OutputPath>bin\Release-docs\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <BaseAddress>285212672</BaseAddress>
-    <Optimize>true</Optimize>
-    <DebugType>
-    </DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisRuleAssemblies>C:\Program Files\Microsoft Visual Studio 8\Team Tools\Static Analysis Tools\FxCop\\rules</CodeAnalysisRuleAssemblies>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System">
-      <Name>System</Name>
-    </Reference>
-    <Reference Include="System.Data">
-      <Name>System.Data</Name>
-    </Reference>
-    <Reference Include="System.Xml">
-      <Name>System.XML</Name>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Analyst.cs" />
-    <Compile Include="SLProxy.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="SLProxyLoader.cs" />
-    <Compile Include="SLProxyMain.cs" />
-    <Compile Include="XmlRpcCS\Logger.cs" />
-    <Compile Include="XmlRpcCS\SimpleHttpRequest.cs" />
-    <Compile Include="XmlRpcCS\XmlRpcBoxcarRequest.cs" />
-    <Compile Include="XmlRpcCS\XmlRpcClientProxy.cs" />
-    <Compile Include="XmlRpcCS\XmlRpcDeserializer.cs" />
-    <Compile Include="XmlRpcCS\XmlRpcErrorCodes.cs" />
-    <Compile Include="XmlRpcCS\XmlRpcException.cs" />
-    <Compile Include="XmlRpcCS\XmlRpcExposedAttribute.cs" />
-    <Compile Include="XmlRpcCS\XmlRpcRequest.cs" />
-    <Compile Include="XmlRpcCS\XmlRpcRequestDeserializer.cs" />
-    <Compile Include="XmlRpcCS\XmlRpcRequestSerializer.cs" />
-    <Compile Include="XmlRpcCS\XmlRpcResponder.cs" />
-    <Compile Include="XmlRpcCS\XmlRpcResponse.cs" />
-    <Compile Include="XmlRpcCS\XmlRpcResponseDeserializer.cs" />
-    <Compile Include="XmlRpcCS\XmlRpcResponseSerializer.cs" />
-    <Compile Include="XmlRpcCS\XmlRpcSerializer.cs" />
-    <Compile Include="XmlRpcCS\XmlRpcServer.cs" />
-    <Compile Include="XmlRpcCS\XmlRpcSystemObject.cs" />
-    <Compile Include="XmlRpcCS\XmlRpcXmlTokens.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\libsecondlife\OpenMetaverse.csproj">
-      <Project>{D9CDEDFB-8169-4B03-B57F-0DF638F044EC}</Project>
-      <Name>OpenMetaverse</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/Programs/SLProxy/SLProxyMain.cs b/Programs/SLProxy/SLProxyMain.cs
index 86c8978d..f3247d12 100644
--- a/Programs/SLProxy/SLProxyMain.cs
+++ b/Programs/SLProxy/SLProxyMain.cs
@@ -7,8 +7,8 @@ class ProxyMain
     public static void Main(string[] args)
     {
         ProxyFrame p = new ProxyFrame(args);
-	ProxyPlugin analyst = new Analyst(p);
+	    ProxyPlugin analyst = new Analyst(p);
         analyst.Init(); 
-	p.proxy.Start();
+	    p.proxy.Start();
     }
 }
\ No newline at end of file
diff --git a/bin/nunit.framework.dll b/bin/nunit.framework.dll
new file mode 100644
index 00000000..d68d9f20
Binary files /dev/null and b/bin/nunit.framework.dll differ
diff --git a/prebuild.xml b/prebuild.xml
new file mode 100644
index 00000000..1b9b473e
--- /dev/null
+++ b/prebuild.xml
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Prebuild xmlns="http://dnpb.sourceforge.net/schemas/prebuild-1.7.xsd" version="1.7">
+  <Solution name="OpenMetaverse" activeConfig="Debug" path="./" version="0.6.0">
+    <Configuration name="Debug">
+      <Options>
+        <CompilerDefines>TRACE;DEBUG</CompilerDefines>
+        <OptimizeCode>false</OptimizeCode>
+        <CheckUnderflowOverflow>false</CheckUnderflowOverflow>
+        <AllowUnsafe>true</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>true</AllowUnsafe>
+        <WarningLevel>4</WarningLevel>
+        <WarningsAsErrors>false</WarningsAsErrors>
+        <SuppressWarnings></SuppressWarnings>
+        <OutputPath>bin</OutputPath>
+        <DebugInformation>false</DebugInformation>
+        <IncrementalBuild>true</IncrementalBuild>
+        <NoStdLib>false</NoStdLib>
+      </Options>
+    </Configuration>
+
+    <Project name="OpenMetaverse" path="OpenMetaverse" type="Library" rootNamespace="OpenMetaverse">
+      <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="System.Data"/>
+      <Reference name="System.Drawing"/>
+      <Reference name="log4net.dll"/>
+      <Files>
+        <Match pattern="*.cs" recurse="true"/>
+      </Files>
+    </Project>
+
+    <Project name="OpenMetaverse.Utilities" path="OpenMetaverse.Utilities" 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="System.Data"/>
+      <Reference name="OpenMetaverse"/>
+      <Files>
+        <Match pattern="*.cs" recurse="true"/>
+      </Files>
+    </Project>
+
+    <Project name="OpenMetaverse.Tests" path="OpenMetaverse.Tests" 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="System.Data"/>
+      <Reference name="nunit.framework.dll"/>
+      <Reference name="OpenMetaverse"/>
+      <Files>
+        <Match pattern="*.cs" recurse="true"/>
+      </Files>
+    </Project>
+
+    <Project name="SLProxy" path="Programs/SLProxy" 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"/>
+      <Reference name="System.Xml"/>
+      <Reference name="OpenMetaverse"/>
+
+      <Files>
+        <Match pattern="*.cs" recurse="true"/>
+      </Files>
+    </Project>
+
+  </Solution>
+</Prebuild>
diff --git a/runprebuild.bat b/runprebuild.bat
new file mode 100644
index 00000000..90f4cc8d
--- /dev/null
+++ b/runprebuild.bat
@@ -0,0 +1,4 @@
+bin\Prebuild.exe /target nant
+bin\Prebuild.exe /target vs2005
+
+echo C:\WINDOWS\Microsoft.NET\Framework\v2.0.50727\msbuild OpenMetaverse.sln > compile.bat
diff --git a/runprebuild.sh b/runprebuild.sh
new file mode 100644
index 00000000..5c4778a4
--- /dev/null
+++ b/runprebuild.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+mono bin/Prebuild.exe /target nant
+mono bin/Prebuild.exe /target monodev
+mono bin/Prebuild.exe /target vs2005
diff --git a/runprebuild2008.bat b/runprebuild2008.bat
new file mode 100644
index 00000000..dde2582d
--- /dev/null
+++ b/runprebuild2008.bat
@@ -0,0 +1,5 @@
+bin\Prebuild.exe /target nant
+bin\Prebuild.exe /target vs2008
+
+echo C:\WINDOWS\Microsoft.NET\Framework\v3.5\msbuild OpenMetaverse.sln > compile.bat
+