* LogFile now defaults to "{apptype}.log"

* cleaned away suo and user files.
* added handy string chat variety to the API
* Moved LockPhysicsEngine on World to SyncRoot on IWorld
* Introduced NextLocalId instead of World fuggliness.
* Transformed GetRegionInfo to Property on IWorld for great justice
* Extracted default wearables (good to have)
* Deleted unused BaseServer
* Used IWorld instead of World wherever possible
* The client constructor's not getting unused port any longer.
* Extracted ClientView factoring so PacketServer can be tweaked.
* Added SendLayerData to World
* Made WorldBase abstract and cleaned it up a bit
* added OpenGrid.Framework.Communications.dll.build and OpenSim.World.dll.build to svn
* Added code for two examples (but not in prebuild yet)

83 files changed, 1273 insertions, 876 deletions

diff --git a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj
index 689210b..94682be 100644
--- a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj
+++ b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj
@@ -83,31 +83,31 @@
     <Compile Include="RegionServerCommsLocal.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="RegionServerCommsOGS.cs">

+    <Compile Include="RegionServerCommsManager.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="RegionServerCommsManager.cs">

+    <Compile Include="RegionServerCommsOGS.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Properties\AssemblyInfo.cs">

+    <Compile Include="GridServer\GridCommsManagerBase.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="UserServer\UserCommsManagerOGS.cs">

+    <Compile Include="GridServer\GridCommsManagerLocal.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="UserServer\UserCommsManagerLocal.cs">

+    <Compile Include="GridServer\GridCommsManagerOGS.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="UserServer\UserCommsManagerBase.cs">

+    <Compile Include="Properties\AssemblyInfo.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="GridServer\GridCommsManagerLocal.cs">

+    <Compile Include="UserServer\UserCommsManagerBase.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="GridServer\GridCommsManagerOGS.cs">

+    <Compile Include="UserServer\UserCommsManagerLocal.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="GridServer\GridCommsManagerBase.cs">

+    <Compile Include="UserServer\UserCommsManagerOGS.cs">

       <SubType>Code</SubType>

     </Compile>

   </ItemGroup>

diff --git a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build
new file mode 100644
index 0000000..a6616bf
--- /dev/null
+++ b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build
@@ -0,0 +1,51 @@
+<?xml version="1.0" ?>

+<project name="OpenGrid.Framework.Communications" default="build">

+    <target name="build">

+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />

+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />

+        <copy todir="${project::get-base-directory()}/${build.dir}">

+            <fileset basedir="${project::get-base-directory()}">

+            </fileset>

+        </copy>

+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">

+            <resources prefix="OpenGrid.Framework.Communications" dynamicprefix="true" >

+            </resources>

+            <sources failonempty="true">

+                <include name="RegionServerCommsLocal.cs" />

+                <include name="RegionServerCommsManager.cs" />

+                <include name="RegionServerCommsOGS.cs" />

+                <include name="GridServer/GridCommsManagerBase.cs" />

+                <include name="GridServer/GridCommsManagerLocal.cs" />

+                <include name="GridServer/GridCommsManagerOGS.cs" />

+                <include name="Properties/AssemblyInfo.cs" />

+                <include name="UserServer/UserCommsManagerBase.cs" />

+                <include name="UserServer/UserCommsManagerLocal.cs" />

+                <include name="UserServer/UserCommsManagerOGS.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" />

+                <include name="../../bin/OpenSim.Framework.dll" />

+                <include name="../../bin/libsecondlife.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.Console/ConsoleBase.cs b/Common/OpenSim.Framework.Console/ConsoleBase.cs
index 0377998..80a28e9 100644
--- a/Common/OpenSim.Framework.Console/ConsoleBase.cs
+++ b/Common/OpenSim.Framework.Console/ConsoleBase.cs
@@ -54,6 +54,12 @@ namespace OpenSim.Framework.Console
             this.cmdparser = cmdparser;

             this.m_silent = silent;

             System.Console.WriteLine("ServerConsole.cs - creating new local console");

+            

+            if( String.IsNullOrEmpty( LogFile ) )

+            {

+                LogFile = componentname + ".log";

+            }

+            

             System.Console.WriteLine("Logs will be saved to current directory in " + LogFile);

             Log = File.AppendText(LogFile);

             Log.WriteLine("========================================================================");

diff --git a/Common/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj.user b/Common/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/Common/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ReferencePath>C:\sugilite\bin\</ReferencePath>

-    <LastOpenVersion>8.0.50727</LastOpenVersion>

-    <ProjectView>ProjectFiles</ProjectView>

-    <ProjectTrust>0</ProjectTrust>

-  </PropertyGroup>

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />

-</Project>

diff --git a/Common/OpenSim.Framework/Interfaces/IClientAPI.cs b/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
index d5b2ae4..9d28dab 100644
--- a/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
+++ b/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
@@ -94,6 +94,7 @@ namespace OpenSim.Framework.Interfaces
         void OutPacket(Packet newPack);

         void SendWearables(AvatarWearable[] wearables);

         void SendRegionHandshake(RegionInfo regionInfo);

+        void SendChatMessage(string message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID);

         void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID);

         void SendLayerData(float[] map);

         void MoveAgentIntoRegion(RegionInfo regInfo);

diff --git a/Common/OpenSim.Framework/Interfaces/IWorld.cs b/Common/OpenSim.Framework/Interfaces/IWorld.cs
index ab2d63d..eee30b7 100644
--- a/Common/OpenSim.Framework/Interfaces/IWorld.cs
+++ b/Common/OpenSim.Framework/Interfaces/IWorld.cs
@@ -10,6 +10,9 @@ namespace OpenSim.Framework.Interfaces
     {

         void AddNewAvatar(IClientAPI remoteClient, LLUUID agentID, bool child);

         void RemoveAvatar(LLUUID agentID);

-        RegionInfo GetRegionInfo();

+        

+        RegionInfo RegionInfo { get; }

+        object SyncRoot { get; }

+        uint NextLocalId { get; }

     }

 }

diff --git a/Common/OpenSim.Framework/OpenSim.Framework.csproj b/Common/OpenSim.Framework/OpenSim.Framework.csproj
index 7e14e6a..f72c5f5 100644
--- a/Common/OpenSim.Framework/OpenSim.Framework.csproj
+++ b/Common/OpenSim.Framework/OpenSim.Framework.csproj
@@ -90,58 +90,49 @@
     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

-    <Compile Include="RegionCommsHostBase.cs">

-      <SubType>Code</SubType>

-    </Compile>

     <Compile Include="AgentInventory.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="AuthenticateSessionBase.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Util.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="Remoting.cs">

+    <Compile Include="BlockingQueue.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="UserProfileManagerBase.cs">

+    <Compile Include="IRegionCommsHost.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="LoginService.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="IRegionCommsHost.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="UserProfileManager.cs">

+    <Compile Include="RegionCommsHostBase.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="BlockingQueue.cs">

+    <Compile Include="Remoting.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="UserProfile.cs">

+    <Compile Include="SimProfile.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="SimProfileBase.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="SimProfile.cs">

+    <Compile Include="UserProfile.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Interfaces\LocalGridBase.cs">

+    <Compile Include="UserProfileManager.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Interfaces\RemoteGridBase.cs">

+    <Compile Include="UserProfileManagerBase.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Interfaces\IUserServer.cs">

+    <Compile Include="Util.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Interfaces\IAssetServer.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Interfaces\IWorld.cs">

+    <Compile Include="Interfaces\IClientAPI.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Interfaces\IGridServer.cs">

@@ -150,61 +141,64 @@
     <Compile Include="Interfaces\ILocalStorage.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Interfaces\IClientAPI.cs">

+    <Compile Include="Interfaces\IUserServer.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Interfaces\Scripting\IScriptEngine.cs">

+    <Compile Include="Interfaces\IWorld.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Interfaces\Scripting\IScriptAPI.cs">

+    <Compile Include="Interfaces\LocalGridBase.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Interfaces\Remoting\IProxyServerHost.cs">

+    <Compile Include="Interfaces\RemoteGridBase.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Interfaces\Remoting\IProxyServerClient.cs">

+    <Compile Include="Interfaces\Config\IGenericConfig.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Interfaces\Remoting\IRegionGridClient.cs">

+    <Compile Include="Interfaces\Config\IGridConfig.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Interfaces\Remoting\IGridServerHost.cs">

+    <Compile Include="Interfaces\Config\IUserConfig.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Interfaces\Remoting\IRegionSimHost.cs">

+    <Compile Include="Interfaces\Remoting\IGridServerHost.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Interfaces\Remoting\RegionGridClientBase.cs">

+    <Compile Include="Interfaces\Remoting\IProxyServerClient.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Interfaces\Config\IGenericConfig.cs">

+    <Compile Include="Interfaces\Remoting\IProxyServerHost.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Interfaces\Config\IUserConfig.cs">

+    <Compile Include="Interfaces\Remoting\IRegionGridClient.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Interfaces\Config\IGridConfig.cs">

+    <Compile Include="Interfaces\Remoting\IRegionSimHost.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Properties\AssemblyInfo.cs">

+    <Compile Include="Interfaces\Remoting\RegionGridClientBase.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Types\NeighbourInfo.cs">

+    <Compile Include="Interfaces\Scripting\IScriptAPI.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Types\NetworkServersInfo.cs">

+    <Compile Include="Interfaces\Scripting\IScriptEngine.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Types\RegionInfo.cs">

+    <Compile Include="Properties\AssemblyInfo.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Types\ParcelData.cs">

+    <Compile Include="Types\AgentCiruitData.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Types\AgentWearable.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Types\PrimData.cs">

+    <Compile Include="Types\AssetBase.cs">

+      <SubType>Code</SubType>

+    </Compile>

+    <Compile Include="Types\AssetLandmark.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Types\AssetStorage.cs">

@@ -213,19 +207,25 @@
     <Compile Include="Types\EstateSettings.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Types\OSVector3.cs">

+    <Compile Include="Types\Login.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Types\AgentCiruitData.cs">

+    <Compile Include="Types\NeighbourInfo.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Types\Login.cs">

+    <Compile Include="Types\NetworkServersInfo.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Types\AssetLandmark.cs">

+    <Compile Include="Types\OSVector3.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Types\AssetBase.cs">

+    <Compile Include="Types\ParcelData.cs">

+      <SubType>Code</SubType>

+    </Compile>

+    <Compile Include="Types\PrimData.cs">

+      <SubType>Code</SubType>

+    </Compile>

+    <Compile Include="Types\RegionInfo.cs">

       <SubType>Code</SubType>

     </Compile>

   </ItemGroup>

diff --git a/Common/OpenSim.Framework/OpenSim.Framework.csproj.user b/Common/OpenSim.Framework/OpenSim.Framework.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/Common/OpenSim.Framework/OpenSim.Framework.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ReferencePath>C:\sugilite\bin\</ReferencePath>

-    <LastOpenVersion>8.0.50727</LastOpenVersion>

-    <ProjectView>ProjectFiles</ProjectView>

-    <ProjectTrust>0</ProjectTrust>

-  </PropertyGroup>

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />

-</Project>

diff --git a/Common/OpenSim.Framework/OpenSim.Framework.dll.build b/Common/OpenSim.Framework/OpenSim.Framework.dll.build
index 2678e54..7ead9a8 100644
--- a/Common/OpenSim.Framework/OpenSim.Framework.dll.build
+++ b/Common/OpenSim.Framework/OpenSim.Framework.dll.build
@@ -11,52 +11,52 @@
             <resources prefix="OpenSim.Framework" dynamicprefix="true" >

             </resources>

             <sources failonempty="true">

-                <include name="RegionCommsHostBase.cs" />

                 <include name="AgentInventory.cs" />

                 <include name="AuthenticateSessionBase.cs" />

-                <include name="Util.cs" />

-                <include name="Remoting.cs" />

-                <include name="UserProfileManagerBase.cs" />

-                <include name="LoginService.cs" />

-                <include name="IRegionCommsHost.cs" />

-                <include name="UserProfileManager.cs" />

                 <include name="BlockingQueue.cs" />

-                <include name="UserProfile.cs" />

-                <include name="SimProfileBase.cs" />

+                <include name="IRegionCommsHost.cs" />

+                <include name="LoginService.cs" />

+                <include name="RegionCommsHostBase.cs" />

+                <include name="Remoting.cs" />

                 <include name="SimProfile.cs" />

-                <include name="Interfaces/LocalGridBase.cs" />

-                <include name="Interfaces/RemoteGridBase.cs" />

-                <include name="Interfaces/IUserServer.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/IWorld.cs" />

+                <include name="Interfaces/IClientAPI.cs" />

                 <include name="Interfaces/IGridServer.cs" />

                 <include name="Interfaces/ILocalStorage.cs" />

-                <include name="Interfaces/IClientAPI.cs" />

-                <include name="Interfaces/Scripting/IScriptEngine.cs" />

-                <include name="Interfaces/Scripting/IScriptAPI.cs" />

-                <include name="Interfaces/Remoting/IProxyServerHost.cs" />

+                <include name="Interfaces/IUserServer.cs" />

+                <include name="Interfaces/IWorld.cs" />

+                <include name="Interfaces/LocalGridBase.cs" />

+                <include name="Interfaces/RemoteGridBase.cs" />

+                <include name="Interfaces/Config/IGenericConfig.cs" />

+                <include name="Interfaces/Config/IGridConfig.cs" />

+                <include name="Interfaces/Config/IUserConfig.cs" />

+                <include name="Interfaces/Remoting/IGridServerHost.cs" />

                 <include name="Interfaces/Remoting/IProxyServerClient.cs" />

+                <include name="Interfaces/Remoting/IProxyServerHost.cs" />

                 <include name="Interfaces/Remoting/IRegionGridClient.cs" />

-                <include name="Interfaces/Remoting/IGridServerHost.cs" />

                 <include name="Interfaces/Remoting/IRegionSimHost.cs" />

                 <include name="Interfaces/Remoting/RegionGridClientBase.cs" />

-                <include name="Interfaces/Config/IGenericConfig.cs" />

-                <include name="Interfaces/Config/IUserConfig.cs" />

-                <include name="Interfaces/Config/IGridConfig.cs" />

+                <include name="Interfaces/Scripting/IScriptAPI.cs" />

+                <include name="Interfaces/Scripting/IScriptEngine.cs" />

                 <include name="Properties/AssemblyInfo.cs" />

-                <include name="Types/NeighbourInfo.cs" />

-                <include name="Types/NetworkServersInfo.cs" />

-                <include name="Types/RegionInfo.cs" />

-                <include name="Types/ParcelData.cs" />

+                <include name="Types/AgentCiruitData.cs" />

                 <include name="Types/AgentWearable.cs" />

-                <include name="Types/PrimData.cs" />

+                <include name="Types/AssetBase.cs" />

+                <include name="Types/AssetLandmark.cs" />

                 <include name="Types/AssetStorage.cs" />

                 <include name="Types/EstateSettings.cs" />

-                <include name="Types/OSVector3.cs" />

-                <include name="Types/AgentCiruitData.cs" />

                 <include name="Types/Login.cs" />

-                <include name="Types/AssetLandmark.cs" />

-                <include name="Types/AssetBase.cs" />

+                <include name="Types/NeighbourInfo.cs" />

+                <include name="Types/NetworkServersInfo.cs" />

+                <include name="Types/OSVector3.cs" />

+                <include name="Types/ParcelData.cs" />

+                <include name="Types/PrimData.cs" />

+                <include name="Types/RegionInfo.cs" />

             </sources>

             <references basedir="${project::get-base-directory()}">

                 <lib>

diff --git a/Common/OpenSim.Framework/Types/AgentWearable.cs b/Common/OpenSim.Framework/Types/AgentWearable.cs
index b7fbe3c..49c1292 100644
--- a/Common/OpenSim.Framework/Types/AgentWearable.cs
+++ b/Common/OpenSim.Framework/Types/AgentWearable.cs
@@ -14,5 +14,20 @@ namespace OpenSim.Framework.Types
         {

 

         }

+

+        public static AvatarWearable[] DefaultWearables

+        {

+            get

+            {

+                AvatarWearable[] defaultWearables =  new AvatarWearable[13]; //should be 13 of these

+                for (int i = 0; i < 13; i++)

+                {

+                    defaultWearables[i] = new AvatarWearable();

+                }

+                defaultWearables[0].AssetID = new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73");

+                defaultWearables[0].ItemID = LLUUID.Random();

+                return defaultWearables;

+            }

+        }

     }

 }

diff --git a/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj.user b/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ReferencePath>C:\sugilite\bin\</ReferencePath>

-    <LastOpenVersion>8.0.50727</LastOpenVersion>

-    <ProjectView>ProjectFiles</ProjectView>

-    <ProjectTrust>0</ProjectTrust>

-  </PropertyGroup>

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />

-</Project>

diff --git a/Common/OpenSim.Servers/BaseServer.cs b/Common/OpenSim.Servers/BaseServer.cs
deleted file mode 100644
index 0a4c498..0000000
--- a/Common/OpenSim.Servers/BaseServer.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System;

-using System.Collections.Generic;

-using System.Text;

-

-namespace OpenSim.Servers

-{

-    public class BaseServer

-    {

-    }

-}

diff --git a/Common/OpenSim.Servers/OpenSim.Servers.csproj b/Common/OpenSim.Servers/OpenSim.Servers.csproj
index 6768ce4..0c61f75 100644
--- a/Common/OpenSim.Servers/OpenSim.Servers.csproj
+++ b/Common/OpenSim.Servers/OpenSim.Servers.csproj
@@ -92,13 +92,10 @@
     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

-    <Compile Include="LoginServer.cs">

-      <SubType>Code</SubType>

-    </Compile>

     <Compile Include="BaseHttpServer.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="BaseServer.cs">

+    <Compile Include="CheckSumServer.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="IRestHandler.cs">

@@ -107,18 +104,18 @@
     <Compile Include="LocalUserProfileManager.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="XmlRpcMethod.cs">

-      <SubType>Code</SubType>

-    </Compile>

     <Compile Include="LoginResponse.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="CheckSumServer.cs">

+    <Compile Include="LoginServer.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>

diff --git a/Common/OpenSim.Servers/OpenSim.Servers.csproj.user b/Common/OpenSim.Servers/OpenSim.Servers.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/Common/OpenSim.Servers/OpenSim.Servers.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ReferencePath>C:\sugilite\bin\</ReferencePath>

-    <LastOpenVersion>8.0.50727</LastOpenVersion>

-    <ProjectView>ProjectFiles</ProjectView>

-    <ProjectTrust>0</ProjectTrust>

-  </PropertyGroup>

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />

-</Project>

diff --git a/Common/OpenSim.Servers/OpenSim.Servers.dll.build b/Common/OpenSim.Servers/OpenSim.Servers.dll.build
index a2af584..ec868f1 100644
--- a/Common/OpenSim.Servers/OpenSim.Servers.dll.build
+++ b/Common/OpenSim.Servers/OpenSim.Servers.dll.build
@@ -11,15 +11,14 @@
             <resources prefix="OpenSim.Servers" dynamicprefix="true" >

             </resources>

             <sources failonempty="true">

-                <include name="LoginServer.cs" />

                 <include name="BaseHttpServer.cs" />

-                <include name="BaseServer.cs" />

+                <include name="CheckSumServer.cs" />

                 <include name="IRestHandler.cs" />

                 <include name="LocalUserProfileManager.cs" />

-                <include name="XmlRpcMethod.cs" />

                 <include name="LoginResponse.cs" />

-                <include name="CheckSumServer.cs" />

+                <include name="LoginServer.cs" />

                 <include name="UDPServerBase.cs" />

+                <include name="XmlRpcMethod.cs" />

             </sources>

             <references basedir="${project::get-base-directory()}">

                 <lib>

diff --git a/Common/XmlRpcCS/XMLRPC.csproj b/Common/XmlRpcCS/XMLRPC.csproj
index 1ab494e..61f8be0 100644
--- a/Common/XmlRpcCS/XMLRPC.csproj
+++ b/Common/XmlRpcCS/XMLRPC.csproj
@@ -70,58 +70,58 @@
   <ItemGroup>

   </ItemGroup>

   <ItemGroup>

-    <Compile Include="XmlRpcBoxcarRequest.cs">

+    <Compile Include="Logger.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="XmlRpcRequest.cs">

+    <Compile Include="SimpleHttpRequest.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="XmlRpcResponseSerializer.cs">

+    <Compile Include="XmlRpcBoxcarRequest.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Logger.cs">

+    <Compile Include="XmlRpcClientProxy.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="XmlRpcRequestDeserializer.cs">

+    <Compile Include="XmlRpcDeserializer.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="XmlRpcExposedAttribute.cs">

+    <Compile Include="XmlRpcErrorCodes.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="XmlRpcResponse.cs">

+    <Compile Include="XmlRpcException.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="XmlRpcException.cs">

+    <Compile Include="XmlRpcExposedAttribute.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="XmlRpcResponder.cs">

+    <Compile Include="XmlRpcRequest.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="XmlRpcResponseDeserializer.cs">

+    <Compile Include="XmlRpcRequestDeserializer.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="XmlRpcServer.cs">

+    <Compile Include="XmlRpcRequestSerializer.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="XmlRpcErrorCodes.cs">

+    <Compile Include="XmlRpcResponder.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="XmlRpcSerializer.cs">

+    <Compile Include="XmlRpcResponse.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="XmlRpcSystemObject.cs">

+    <Compile Include="XmlRpcResponseDeserializer.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="SimpleHttpRequest.cs">

+    <Compile Include="XmlRpcResponseSerializer.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="XmlRpcClientProxy.cs">

+    <Compile Include="XmlRpcSerializer.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="XmlRpcRequestSerializer.cs">

+    <Compile Include="XmlRpcServer.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="XmlRpcDeserializer.cs">

+    <Compile Include="XmlRpcSystemObject.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="XmlRpcXmlTokens.cs">

diff --git a/Common/XmlRpcCS/XMLRPC.csproj.user b/Common/XmlRpcCS/XMLRPC.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/Common/XmlRpcCS/XMLRPC.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ReferencePath>C:\sugilite\bin\</ReferencePath>

-    <LastOpenVersion>8.0.50727</LastOpenVersion>

-    <ProjectView>ProjectFiles</ProjectView>

-    <ProjectTrust>0</ProjectTrust>

-  </PropertyGroup>

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />

-</Project>

diff --git a/Common/XmlRpcCS/XMLRPC.dll.build b/Common/XmlRpcCS/XMLRPC.dll.build
index e7936c3..2eabfcd 100644
--- a/Common/XmlRpcCS/XMLRPC.dll.build
+++ b/Common/XmlRpcCS/XMLRPC.dll.build
@@ -11,24 +11,24 @@
             <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="XmlRpcResponseSerializer.cs" />

-                <include name="Logger.cs" />

                 <include name="XmlRpcRequestDeserializer.cs" />

-                <include name="XmlRpcExposedAttribute.cs" />

-                <include name="XmlRpcResponse.cs" />

-                <include name="XmlRpcException.cs" />

+                <include name="XmlRpcRequestSerializer.cs" />

                 <include name="XmlRpcResponder.cs" />

+                <include name="XmlRpcResponse.cs" />

                 <include name="XmlRpcResponseDeserializer.cs" />

-                <include name="XmlRpcServer.cs" />

-                <include name="XmlRpcErrorCodes.cs" />

+                <include name="XmlRpcResponseSerializer.cs" />

                 <include name="XmlRpcSerializer.cs" />

+                <include name="XmlRpcServer.cs" />

                 <include name="XmlRpcSystemObject.cs" />

-                <include name="SimpleHttpRequest.cs" />

-                <include name="XmlRpcClientProxy.cs" />

-                <include name="XmlRpcRequestSerializer.cs" />

-                <include name="XmlRpcDeserializer.cs" />

                 <include name="XmlRpcXmlTokens.cs" />

             </sources>

             <references basedir="${project::get-base-directory()}">

diff --git a/OpenGridServices.suo b/OpenGridServices.suo
deleted file mode 100644
index 728df77..0000000
--- a/OpenGridServices.suo
+++ /dev/null
diff --git a/OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.csproj.user b/OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ReferencePath>C:\sugilite\bin\</ReferencePath>

-    <LastOpenVersion>8.0.50727</LastOpenVersion>

-    <ProjectView>ProjectFiles</ProjectView>

-    <ProjectTrust>0</ProjectTrust>

-  </PropertyGroup>

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />

-</Project>

diff --git a/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj b/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj
index 3b783ca..82d4f5f 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj
+++ b/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj
@@ -88,13 +88,13 @@
     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

-    <Compile Include="DB4oUserData.cs">

+    <Compile Include="DB4oGridData.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="DB4oManager.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="DB4oGridData.cs">

+    <Compile Include="DB4oUserData.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Properties\AssemblyInfo.cs">

diff --git a/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.user b/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ReferencePath>C:\sugilite\bin\</ReferencePath>

-    <LastOpenVersion>8.0.50727</LastOpenVersion>

-    <ProjectView>ProjectFiles</ProjectView>

-    <ProjectTrust>0</ProjectTrust>

-  </PropertyGroup>

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />

-</Project>

diff --git a/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build b/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build
index db8662d..8e0f53a 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build
+++ b/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build
@@ -11,9 +11,9 @@
             <resources prefix="OpenGrid.Framework.Data.DB4o" dynamicprefix="true" >

             </resources>

             <sources failonempty="true">

-                <include name="DB4oUserData.cs" />

-                <include name="DB4oManager.cs" />

                 <include name="DB4oGridData.cs" />

+                <include name="DB4oManager.cs" />

+                <include name="DB4oUserData.cs" />

                 <include name="Properties/AssemblyInfo.cs" />

             </sources>

             <references basedir="${project::get-base-directory()}">

diff --git a/OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj.user b/OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ReferencePath>C:\sugilite\bin\</ReferencePath>

-    <LastOpenVersion>8.0.50727</LastOpenVersion>

-    <ProjectView>ProjectFiles</ProjectView>

-    <ProjectTrust>0</ProjectTrust>

-  </PropertyGroup>

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />

-</Project>

diff --git a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj b/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj
index 5fe0cf7..75ef149 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj
+++ b/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj
@@ -88,19 +88,19 @@
     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

-    <Compile Include="MySQLInventoryData.cs">

+    <Compile Include="MySQLGridData.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="MySQLUserData.cs">

+    <Compile Include="MySQLInventoryData.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="MySQLManager.cs">

+    <Compile Include="MySQLLogData.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="MySQLLogData.cs">

+    <Compile Include="MySQLManager.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="MySQLGridData.cs">

+    <Compile Include="MySQLUserData.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Properties\AssemblyInfo.cs">

diff --git a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj.user b/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ReferencePath>C:\sugilite\bin\</ReferencePath>

-    <LastOpenVersion>8.0.50727</LastOpenVersion>

-    <ProjectView>ProjectFiles</ProjectView>

-    <ProjectTrust>0</ProjectTrust>

-  </PropertyGroup>

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />

-</Project>

diff --git a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build b/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build
index 84d3d56..78f4afe 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build
+++ b/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build
@@ -11,11 +11,11 @@
             <resources prefix="OpenGrid.Framework.Data.MySQL" dynamicprefix="true" >

             </resources>

             <sources failonempty="true">

+                <include name="MySQLGridData.cs" />

                 <include name="MySQLInventoryData.cs" />

-                <include name="MySQLUserData.cs" />

-                <include name="MySQLManager.cs" />

                 <include name="MySQLLogData.cs" />

-                <include name="MySQLGridData.cs" />

+                <include name="MySQLManager.cs" />

+                <include name="MySQLUserData.cs" />

                 <include name="Properties/AssemblyInfo.cs" />

             </sources>

             <references basedir="${project::get-base-directory()}">

diff --git a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj b/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj
index fa17367..463cf86 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj
+++ b/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj
@@ -88,10 +88,10 @@
     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

-    <Compile Include="SQLiteManager.cs">

+    <Compile Include="SQLiteGridData.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="SQLiteGridData.cs">

+    <Compile Include="SQLiteManager.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Properties\AssemblyInfo.cs">

diff --git a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj.user b/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ReferencePath>C:\sugilite\bin\</ReferencePath>

-    <LastOpenVersion>8.0.50727</LastOpenVersion>

-    <ProjectView>ProjectFiles</ProjectView>

-    <ProjectTrust>0</ProjectTrust>

-  </PropertyGroup>

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />

-</Project>

diff --git a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build b/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build
index 8c0f8fe..1be9b43 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build
+++ b/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build
@@ -11,8 +11,8 @@
             <resources prefix="OpenGrid.Framework.Data.SQLite" dynamicprefix="true" >

             </resources>

             <sources failonempty="true">

-                <include name="SQLiteManager.cs" />

                 <include name="SQLiteGridData.cs" />

+                <include name="SQLiteManager.cs" />

                 <include name="Properties/AssemblyInfo.cs" />

             </sources>

             <references basedir="${project::get-base-directory()}">

diff --git a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj b/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj
index 990cd16..a572204 100644
--- a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj
+++ b/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj
@@ -81,9 +81,6 @@
     <Compile Include="GridData.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="SimProfileData.cs">

-      <SubType>Code</SubType>

-    </Compile>

     <Compile Include="ILogData.cs">

       <SubType>Code</SubType>

     </Compile>

@@ -93,6 +90,9 @@
     <Compile Include="InventoryData.cs">

       <SubType>Code</SubType>

     </Compile>

+    <Compile Include="SimProfileData.cs">

+      <SubType>Code</SubType>

+    </Compile>

     <Compile Include="UserData.cs">

       <SubType>Code</SubType>

     </Compile>

diff --git a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.user b/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ReferencePath>C:\sugilite\bin\</ReferencePath>

-    <LastOpenVersion>8.0.50727</LastOpenVersion>

-    <ProjectView>ProjectFiles</ProjectView>

-    <ProjectTrust>0</ProjectTrust>

-  </PropertyGroup>

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />

-</Project>

diff --git a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build b/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build
index c993a8d..e6e0313 100644
--- a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build
+++ b/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build
@@ -12,10 +12,10 @@
             </resources>

             <sources failonempty="true">

                 <include name="GridData.cs" />

-                <include name="SimProfileData.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" />

diff --git a/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj.user b/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ReferencePath>C:\sugilite\bin\</ReferencePath>

-    <LastOpenVersion>8.0.50727</LastOpenVersion>

-    <ProjectView>ProjectFiles</ProjectView>

-    <ProjectTrust>0</ProjectTrust>

-  </PropertyGroup>

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />

-</Project>

diff --git a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj b/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj
index a281e4f..f170f42 100644
--- a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj
+++ b/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj
@@ -98,10 +98,10 @@
   <ItemGroup>

   </ItemGroup>

   <ItemGroup>

-    <Compile Include="Main.cs">

+    <Compile Include="AssetHttpServer.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="AssetHttpServer.cs">

+    <Compile Include="Main.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Properties\AssemblyInfo.cs">

diff --git a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj.user b/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ReferencePath>C:\sugilite\bin\</ReferencePath>

-    <LastOpenVersion>8.0.50727</LastOpenVersion>

-    <ProjectView>ProjectFiles</ProjectView>

-    <ProjectTrust>0</ProjectTrust>

-  </PropertyGroup>

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />

-</Project>

diff --git a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build b/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build
index 700e32b..72bfc74 100644
--- a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build
+++ b/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build
@@ -11,8 +11,8 @@
             <resources prefix="OpenGridServices.AssetServer" dynamicprefix="true" >

             </resources>

             <sources failonempty="true">

-                <include name="Main.cs" />

                 <include name="AssetHttpServer.cs" />

+                <include name="Main.cs" />

                 <include name="Properties/AssemblyInfo.cs" />

             </sources>

             <references basedir="${project::get-base-directory()}">

diff --git a/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj.user b/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ReferencePath>C:\sugilite\bin\</ReferencePath>

-    <LastOpenVersion>8.0.50727</LastOpenVersion>

-    <ProjectView>ProjectFiles</ProjectView>

-    <ProjectTrust>0</ProjectTrust>

-  </PropertyGroup>

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />

-</Project>

diff --git a/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj.user b/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ReferencePath>C:\sugilite\bin\</ReferencePath>

-    <LastOpenVersion>8.0.50727</LastOpenVersion>

-    <ProjectView>ProjectFiles</ProjectView>

-    <ProjectTrust>0</ProjectTrust>

-  </PropertyGroup>

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />

-</Project>

diff --git a/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj.user b/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ReferencePath>C:\sugilite\bin\</ReferencePath>

-    <LastOpenVersion>8.0.50727</LastOpenVersion>

-    <ProjectView>ProjectFiles</ProjectView>

-    <ProjectTrust>0</ProjectTrust>

-  </PropertyGroup>

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />

-</Project>

diff --git a/OpenSim.sln b/OpenSim.sln
index 33a7217..5b54b05 100644
--- a/OpenSim.sln
+++ b/OpenSim.sln
@@ -41,144 +41,93 @@ 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(ProjectDependencies) = postSolution

-    ({EE9E5D96-0000-0000-0000-000000000000}).6 = ({8ACA2445-0000-0000-0000-000000000000})

-    ({EE9E5D96-0000-0000-0000-000000000000}).7 = ({A7CD0630-0000-0000-0000-000000000000})

-    ({63A05FE9-0000-0000-0000-000000000000}).2 = ({8BE16150-0000-0000-0000-000000000000})

-    ({683344D5-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})

-    ({642A14A8-0000-0000-0000-000000000000}).5 = ({2270B8FE-0000-0000-0000-000000000000})

-    ({642A14A8-0000-0000-0000-000000000000}).6 = ({8ACA2445-0000-0000-0000-000000000000})

-    ({642A14A8-0000-0000-0000-000000000000}).7 = ({A7CD0630-0000-0000-0000-000000000000})

-    ({642A14A8-0000-0000-0000-000000000000}).8 = ({E88EF749-0000-0000-0000-000000000000})

-    ({642A14A8-0000-0000-0000-000000000000}).9 = ({8BE16150-0000-0000-0000-000000000000})

-    ({642A14A8-0000-0000-0000-000000000000}).10 = ({8BB20F0A-0000-0000-0000-000000000000})

-    ({642A14A8-0000-0000-0000-000000000000}).11 = ({8E81D43C-0000-0000-0000-000000000000})

-    ({642A14A8-0000-0000-0000-000000000000}).12 = ({683344D5-0000-0000-0000-000000000000})

-    ({438A9556-0000-0000-0000-000000000000}).5 = ({2270B8FE-0000-0000-0000-000000000000})

-    ({438A9556-0000-0000-0000-000000000000}).6 = ({8ACA2445-0000-0000-0000-000000000000})

-    ({438A9556-0000-0000-0000-000000000000}).7 = ({A7CD0630-0000-0000-0000-000000000000})

-    ({438A9556-0000-0000-0000-000000000000}).8 = ({8BE16150-0000-0000-0000-000000000000})

-    ({438A9556-0000-0000-0000-000000000000}).9 = ({8BB20F0A-0000-0000-0000-000000000000})

-    ({438A9556-0000-0000-0000-000000000000}).10 = ({642A14A8-0000-0000-0000-000000000000})

-    ({438A9556-0000-0000-0000-000000000000}).11 = ({632E1BFD-0000-0000-0000-000000000000})

-    ({438A9556-0000-0000-0000-000000000000}).12 = ({E88EF749-0000-0000-0000-000000000000})

-    ({438A9556-0000-0000-0000-000000000000}).13 = ({683344D5-0000-0000-0000-000000000000})

-    ({438A9556-0000-0000-0000-000000000000}).14 = ({8E81D43C-0000-0000-0000-000000000000})

-    ({632E1BFD-0000-0000-0000-000000000000}).5 = ({2270B8FE-0000-0000-0000-000000000000})

-    ({632E1BFD-0000-0000-0000-000000000000}).6 = ({8ACA2445-0000-0000-0000-000000000000})

-    ({632E1BFD-0000-0000-0000-000000000000}).7 = ({A7CD0630-0000-0000-0000-000000000000})

-    ({632E1BFD-0000-0000-0000-000000000000}).8 = ({E88EF749-0000-0000-0000-000000000000})

-    ({632E1BFD-0000-0000-0000-000000000000}).9 = ({8BE16150-0000-0000-0000-000000000000})

-    ({632E1BFD-0000-0000-0000-000000000000}).10 = ({8BB20F0A-0000-0000-0000-000000000000})

-    ({632E1BFD-0000-0000-0000-000000000000}).11 = ({8E81D43C-0000-0000-0000-000000000000})

-    ({E88EF749-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})

-    ({8BE16150-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})

-    ({8BE16150-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000})

-    ({4F874463-0000-0000-0000-000000000000}).2 = ({8BE16150-0000-0000-0000-000000000000})

-    ({988F0AC4-0000-0000-0000-000000000000}).3 = ({8BE16150-0000-0000-0000-000000000000})

-    ({B55C0B5D-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})

-    ({B55C0B5D-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000})

-    ({B55C0B5D-0000-0000-0000-000000000000}).5 = ({8E81D43C-0000-0000-0000-000000000000})

-    ({8ACA2445-0000-0000-0000-000000000000}).4 = ({8E81D43C-0000-0000-0000-000000000000})

-    ({8ACA2445-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000})

-    ({8BB20F0A-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})

-    ({8BB20F0A-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000})

-    ({8BB20F0A-0000-0000-0000-000000000000}).5 = ({8E81D43C-0000-0000-0000-000000000000})

-    ({E1B79ECF-0000-0000-0000-000000000000}).4 = ({8ACA2445-0000-0000-0000-000000000000})

-    ({E1B79ECF-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000})

-    ({6B20B603-0000-0000-0000-000000000000}).5 = ({8ACA2445-0000-0000-0000-000000000000})

-    ({6B20B603-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000})

-    ({97A82740-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})

-    ({546099CD-0000-0000-0000-000000000000}).4 = ({8ACA2445-0000-0000-0000-000000000000})

-    ({546099CD-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000})

-  EndGlobalSection

-  GlobalSection(ProjectConfigurationPlatforms) = postSolution

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

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

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

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

-    {683344D5-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-    {683344D5-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

-    {683344D5-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

-    {683344D5-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

-    {642A14A8-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-    {642A14A8-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

-    {642A14A8-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

-    {642A14A8-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

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

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

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

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

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

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

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

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

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

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

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

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

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

+        GlobalSection(SolutionConfigurationPlatforms) = preSolution

+                Debug|Any CPU = Debug|Any CPU

+                Release|Any CPU = Release|Any CPU

+        EndGlobalSection

+        GlobalSection(ProjectConfigurationPlatforms) = postSolution

+                {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

+                {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

+                {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

+                {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

+                {683344D5-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+                {683344D5-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

+                {683344D5-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

+                {683344D5-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

+                {642A14A8-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+                {642A14A8-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

+                {642A14A8-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

+                {642A14A8-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

+                {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

+                {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

+                {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

+                {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

+                {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

+                {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

+                {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

+                {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

+                {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

+                {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

+                {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

+                {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

+                {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/Examples/SimpleApp/MyWorld.cs b/OpenSim/Examples/SimpleApp/MyWorld.cs
new file mode 100644
index 0000000..27775f1
--- /dev/null
+++ b/OpenSim/Examples/SimpleApp/MyWorld.cs
@@ -0,0 +1,101 @@
+using System;

+using System.Collections.Generic;

+using System.Text;

+using OpenSim.Framework.Interfaces;

+using OpenSim.Framework.Types;

+using OpenSim.Framework.Console;

+using libsecondlife;

+

+namespace SimpleApp

+{

+    public class MyWorld : IWorld

+    {

+        private RegionInfo m_regionInfo;

+

+        public MyWorld(RegionInfo regionInfo)

+        {

+            m_regionInfo = regionInfo;

+        }

+

+        private void SendLayerData(IClientAPI remoteClient)

+        {

+            float[] map = new float[65536];

+

+            for (int i = 0; i < 65536; i++)

+            {

+                int x = i % 256;

+                int y = i / 256;

+

+                map[i] = (float)(x + y / 2);

+            }

+

+            remoteClient.SendLayerData(map);

+        }

+

+        #region IWorld Members

+

+        void IWorld.AddNewAvatar(IClientAPI client, LLUUID agentID, bool child)

+        {

+            LLVector3 pos = new LLVector3(128, 128, 128);

+            

+            client.OnRegionHandShakeReply += SendLayerData;

+            client.OnChatFromViewer +=

+                delegate(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID)

+                    {

+                        // Echo it (so you know what you typed)

+                        client.SendChatMessage(message, type, fromPos, fromName, fromAgentID);

+                        client.SendChatMessage("Ready.", 1, pos, "System", LLUUID.Zero );

+                    };

+            

+            client.OnRequestWearables += SendWearables;

+

+            client.OnCompleteMovementToRegion += delegate()

+                {

+                    client.MoveAgentIntoRegion(m_regionInfo);

+                };

+

+            client.OnCompleteMovementToRegion += delegate()

+                 {

+                     client.SendAvatarData(m_regionInfo, client.FirstName,

+                                           client.LastName, client.AgentId, 0,

+                                           pos);

+                                                         

+                     client.SendChatMessage("Welcome to My World.", 1, pos, "System", LLUUID.Zero );

+                 };

+

+            client.SendRegionHandshake(m_regionInfo);

+

+        }

+

+        private void SendWearables( IClientAPI client )

+        {

+            client.SendWearables( AvatarWearable.DefaultWearables );

+        }

+

+        void IWorld.RemoveAvatar(LLUUID agentID)

+        {

+

+        }

+

+        RegionInfo IWorld.RegionInfo

+        {

+            get { return m_regionInfo; }

+        }

+

+        object IWorld.SyncRoot

+        {

+            get { return this; }

+        }

+

+        private uint m_nextLocalId = 1;

+

+        uint IWorld.NextLocalId

+        {

+            get { return m_nextLocalId++; }

+        }

+

+        #endregion

+

+

+    }

+}

diff --git a/OpenSim/Examples/SimpleApp/Program.cs b/OpenSim/Examples/SimpleApp/Program.cs
new file mode 100644
index 0000000..e44bdba
--- /dev/null
+++ b/OpenSim/Examples/SimpleApp/Program.cs
@@ -0,0 +1,110 @@
+using System;

+using System.Collections.Generic;

+using System.Text;

+using OpenSim;

+using OpenSim.Servers;

+using OpenSim.GridInterfaces.Local;

+using OpenSim.Framework.Interfaces;

+using OpenSim.Framework.Types;

+using OpenSim.UserServer;

+using OpenSim.Framework.Console;

+using OpenSim.world;

+using OpenSim.Physics.Manager;

+using OpenSim.Assets;

+using libsecondlife;

+

+namespace SimpleApp

+{

+    class Program : IAssetReceiver, conscmd_callback

+    {

+        private ConsoleBase m_console;

+        

+        private void Run()

+        {

+            m_console = new ConsoleBase(null, "SimpleApp", this, false);

+            MainConsole.Instance = m_console;

+

+            CheckSumServer checksumServer = new CheckSumServer(12036);

+            checksumServer.ServerListener();

+

+            string simAddr = "127.0.0.1";

+            int simPort = 9000;

+            

+            LoginServer loginServer = new LoginServer( simAddr, simPort, 0, 0, false );

+            loginServer.Startup();

+            

+            AuthenticateSessionsLocal localSessions = new AuthenticateSessionsLocal();

+            loginServer.SetSessionHandler(localSessions.AddNewSessionHandler );

+

+            InventoryCache inventoryCache = new InventoryCache();

+

+            LocalAssetServer assetServer = new LocalAssetServer();

+            assetServer.SetServerInfo("http://127.0.0.1:8003/", "");

+            assetServer.SetReceiver(this);

+

+            AssetCache assetCache = new AssetCache(assetServer);

+            

+            UDPServer udpServer = new UDPServer(simPort, assetCache, inventoryCache, m_console, localSessions );

+            PacketServer packetServer = new PacketServer( udpServer, (uint) simPort );

+            udpServer.ServerListener();

+            

+            ClientView.TerrainManager = new TerrainManager(new SecondLife());

+

+            RegionInfo regionInfo = new RegionInfo();

+

+            udpServer.LocalWorld = new MyWorld( regionInfo );

+

+            // World world = new World(udpServer.PacketServer.ClientAPIs, regionInfo);            

+            // PhysicsScene physicsScene = new NullPhysicsScene();

+            // world.PhysicsScene = physicsScene;

+            // udpServer.LocalWorld = world;

+

+            BaseHttpServer httpServer = new BaseHttpServer( simPort );

+            httpServer.AddXmlRPCHandler( "login_to_simulator", loginServer.XmlRpcLoginMethod );

+            httpServer.Start();

+            

+            m_console.WriteLine( LogPriority.NORMAL, "Press enter to quit.");

+            m_console.ReadLine();

+        }

+

+        private void AddNewSessionHandler(Login loginData)

+        {

+            m_console.WriteLine( LogPriority.NORMAL, "Recieved Login from [{0}] [{1}]", loginData.First, loginData.Last );

+        }

+        

+        #region IAssetReceiver Members

+

+        public void AssetReceived( AssetBase asset, bool IsTexture)

+        {

+            throw new Exception("The method or operation is not implemented.");

+        }

+

+        public void AssetNotFound( AssetBase asset)

+        {

+            throw new Exception("The method or operation is not implemented.");

+        }

+

+        #endregion

+

+        #region conscmd_callback Members

+

+        public void RunCmd(string cmd, string[] cmdparams)

+        {

+            throw new Exception("The method or operation is not implemented.");

+        }

+

+        public void Show(string ShowWhat)

+        {

+            throw new Exception("The method or operation is not implemented.");

+        }

+

+        #endregion

+

+        static void Main(string[] args)

+        {

+            Program app = new Program();

+

+            app.Run();

+        }

+    }

+}

diff --git a/OpenSim/Examples/SimpleApp/Properties/AssemblyInfo.cs b/OpenSim/Examples/SimpleApp/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..0f9bf0f
--- /dev/null
+++ b/OpenSim/Examples/SimpleApp/Properties/AssemblyInfo.cs
@@ -0,0 +1,33 @@
+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("SimpleApp")]

+[assembly: AssemblyDescription("")]

+[assembly: AssemblyConfiguration("")]

+[assembly: AssemblyCompany("Playahead AB")]

+[assembly: AssemblyProduct("SimpleApp")]

+[assembly: AssemblyCopyright("Copyright © Playahead AB 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("a5cfa45f-5acf-4b2e-9c50-1dd1fd7608ee")]

+

+// 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/Examples/SimpleApp/SimpleApp.csproj b/OpenSim/Examples/SimpleApp/SimpleApp.csproj
new file mode 100644
index 0000000..51e14de
--- /dev/null
+++ b/OpenSim/Examples/SimpleApp/SimpleApp.csproj
@@ -0,0 +1,86 @@
+<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>{AD062D99-DD53-4D37-A4B8-2AF635377AEB}</ProjectGuid>

+    <OutputType>Exe</OutputType>

+    <AppDesignerFolder>Properties</AppDesignerFolder>

+    <RootNamespace>SimpleApp</RootNamespace>

+    <AssemblyName>SimpleApp</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="libsecondlife, Version=0.9.0.0, Culture=neutral, processorArchitecture=MSIL">

+      <SpecificVersion>False</SpecificVersion>

+      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>

+    </Reference>

+    <Reference Include="System" />

+    <Reference Include="System.Data" />

+    <Reference Include="System.Xml" />

+  </ItemGroup>

+  <ItemGroup>

+    <Compile Include="MyWorld.cs" />

+    <Compile Include="Program.cs" />

+    <Compile Include="Properties\AssemblyInfo.cs" />

+  </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\..\..\Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">

+      <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>

+      <Name>OpenSim.Framework.Console</Name>

+    </ProjectReference>

+    <ProjectReference Include="..\..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj">

+      <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>

+      <Name>OpenSim.Framework</Name>

+    </ProjectReference>

+    <ProjectReference Include="..\..\..\Common\OpenSim.Servers\OpenSim.Servers.csproj">

+      <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project>

+      <Name>OpenSim.Servers</Name>

+    </ProjectReference>

+    <ProjectReference Include="..\..\..\Common\XmlRpcCS\XMLRPC.csproj">

+      <Project>{8E81D43C-0000-0000-0000-000000000000}</Project>

+      <Name>XMLRPC</Name>

+    </ProjectReference>

+    <ProjectReference Include="..\..\OpenSim.GridInterfaces\Local\OpenSim.GridInterfaces.Local.csproj">

+      <Project>{546099CD-0000-0000-0000-000000000000}</Project>

+      <Name>OpenSim.GridInterfaces.Local</Name>

+    </ProjectReference>

+    <ProjectReference Include="..\..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj">

+      <Project>{8BE16150-0000-0000-0000-000000000000}</Project>

+      <Name>OpenSim.Physics.Manager</Name>

+    </ProjectReference>

+    <ProjectReference Include="..\..\OpenSim.RegionServer\OpenSim.RegionServer.csproj">

+      <Project>{632E1BFD-0000-0000-0000-000000000000}</Project>

+      <Name>OpenSim.RegionServer</Name>

+    </ProjectReference>

+    <ProjectReference Include="..\..\OpenSim.World\OpenSim.World.csproj">

+      <Project>{642A14A8-0000-0000-0000-000000000000}</Project>

+      <Name>OpenSim.World</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/OpenSim/Examples/SimpleApp2/MyClientView.cs b/OpenSim/Examples/SimpleApp2/MyClientView.cs
new file mode 100644
index 0000000..dd8869c
--- /dev/null
+++ b/OpenSim/Examples/SimpleApp2/MyClientView.cs
@@ -0,0 +1,69 @@
+using System;

+using System.Collections.Generic;

+using System.Text;

+using OpenSim;

+using libsecondlife;

+using OpenSim.Framework.Interfaces;

+using System.Net;

+using libsecondlife.Packets;

+using OpenSim.Assets;

+using OpenSim.Framework.Types;

+using OpenSim.Framework;

+

+namespace SimpleApp2

+{

+    public class MyClientView : ClientView

+    {

+        private float[] m_map;

+        private Dictionary<uint, IClientAPI> m_clientAPIs;

+

+        public MyClientView(float[] map, Dictionary<uint, IClientAPI> clientAPIs, EndPoint remoteEP, UseCircuitCodePacket initialcirpack, Dictionary<uint, ClientView> clientThreads, IWorld world, AssetCache assetCache, PacketServer packServer, InventoryCache inventoryCache, AuthenticateSessionsBase authenSessions)

+            : base(remoteEP, initialcirpack, clientThreads, world, assetCache, packServer, inventoryCache, authenSessions)

+        {

+            m_map = map;

+            m_clientAPIs = clientAPIs;

+            

+            OnRegionHandShakeReply += RegionHandShakeReplyHandler;

+            OnChatFromViewer += ChatHandler;

+            OnRequestWearables += RequestWearablesHandler;

+            OnCompleteMovementToRegion += CompleteMovementToRegionHandler;

+        }

+

+        private void ChatHandler(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID)

+        {            

+            // Echo it (so you know what you typed)

+            SendChatMessage(message, type, fromPos, fromName, fromAgentID);

+            SendChatMessage("Ready.", 1, fromPos, "System", LLUUID.Zero);

+        }

+        

+        private void CompleteMovementToRegionHandler()

+        {

+            LLVector3 pos = new LLVector3(128, 128, 128);

+

+            MoveAgentIntoRegion(m_world.RegionInfo);

+

+            SendAvatarData( m_world.RegionInfo, FirstName,

+                                           LastName, AgentId, 0,

+                                           pos);

+

+            SendChatMessage("Welcome to My World.", 1, pos, "System", LLUUID.Zero);

+

+            

+                

+            // OpenSim.world.Primitive prim = new OpenSim.world.Primitive( m_clientAPIs, m_world.RegionInfo.RegionHandle, m_world, AgentId );

+

+           // SendNewPrim( prim );

+            

+        }

+

+        private void RegionHandShakeReplyHandler(IClientAPI client)

+        {

+            client.SendLayerData(m_map);

+        }

+

+        private void RequestWearablesHandler(IClientAPI client)

+        {

+            SendWearables(AvatarWearable.DefaultWearables);

+        }

+    }

+}

diff --git a/OpenSim/Examples/SimpleApp2/MyPacketServer.cs b/OpenSim/Examples/SimpleApp2/MyPacketServer.cs
new file mode 100644
index 0000000..9c21016
--- /dev/null
+++ b/OpenSim/Examples/SimpleApp2/MyPacketServer.cs
@@ -0,0 +1,30 @@
+using System;

+using System.Collections.Generic;

+using System.Text;

+using OpenSim;

+using OpenSim.Assets;

+using System.Net;

+using libsecondlife.Packets;

+using OpenSim.Framework.Interfaces;

+using OpenSim.Framework;

+

+namespace SimpleApp2

+{

+    public class MyPacketServer : PacketServer

+    {

+        private float[] m_map;

+        

+        public MyPacketServer(float[] map, OpenSimNetworkHandler networkHandler, uint port ) : base( networkHandler, port )

+        {

+            m_map = map;

+        }

+        

+        protected override ClientView CreateNewClient(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, Dictionary<uint, ClientView> clientThreads, IWorld world, AssetCache assetCache, PacketServer packServer, InventoryCache inventoryCache, AuthenticateSessionsBase authenSessions)

+        {

+            // (EndPoint remoteEP, UseCircuitCodePacket initialcirpack, Dictionary<uint, ClientView> clientThreads, IWorld world, AssetCache assetCache, PacketServer packServer, InventoryCache inventoryCache, AuthenticateSessionsBase authenSessions)

+        

+            

+            return new MyClientView(m_map, ClientAPIs, remoteEP, initialcirpack, clientThreads, world, assetCache, packServer, inventoryCache, authenSessions);

+        }

+    }

+}

diff --git a/OpenSim/Examples/SimpleApp2/Program.cs b/OpenSim/Examples/SimpleApp2/Program.cs
new file mode 100644
index 0000000..9b977f6
--- /dev/null
+++ b/OpenSim/Examples/SimpleApp2/Program.cs
@@ -0,0 +1,160 @@
+using System;

+using System.Collections.Generic;

+using System.Text;

+using OpenSim;

+using OpenSim.Servers;

+using OpenSim.GridInterfaces.Local;

+using OpenSim.Framework.Interfaces;

+using OpenSim.Framework.Types;

+using OpenSim.UserServer;

+using OpenSim.Framework.Console;

+using OpenSim.world;

+using OpenSim.Physics.Manager;

+using OpenSim.Assets;

+using libsecondlife;

+

+namespace SimpleApp2

+{

+    class Program : IWorld, IAssetReceiver, conscmd_callback

+    {

+        private ConsoleBase m_console;

+        private RegionInfo m_regionInfo;

+        private float[] m_map;

+        

+        private void Run()

+        {

+            m_console = new ConsoleBase(null, "SimpleApp", this, false);

+            MainConsole.Instance = m_console;

+

+            m_map = CreateMap();

+            

+            CheckSumServer checksumServer = new CheckSumServer(12036);

+            checksumServer.ServerListener();

+

+            string simAddr = "127.0.0.1";

+            int simPort = 9000;

+

+            LoginServer loginServer = new LoginServer(simAddr, simPort, 0, 0, false);

+            loginServer.Startup();

+

+            AuthenticateSessionsLocal localSessions = new AuthenticateSessionsLocal();

+            loginServer.SetSessionHandler(localSessions.AddNewSessionHandler);

+

+            InventoryCache inventoryCache = new InventoryCache();

+

+            LocalAssetServer assetServer = new LocalAssetServer();

+            assetServer.SetServerInfo("http://127.0.0.1:8003/", "");

+            assetServer.SetReceiver(this);

+

+            AssetCache assetCache = new AssetCache(assetServer);

+

+            UDPServer udpServer = new UDPServer(simPort, assetCache, inventoryCache, m_console, localSessions);

+            PacketServer packetServer = new MyPacketServer(m_map, udpServer, (uint) simPort );

+            udpServer.ServerListener();

+

+            ClientView.TerrainManager = new TerrainManager(new SecondLife());

+

+            m_regionInfo = new RegionInfo();

+

+            udpServer.LocalWorld = this;

+

+            // World world = new World(udpServer.PacketServer.ClientAPIs, regionInfo);            

+            // PhysicsScene physicsScene = new NullPhysicsScene();

+            // world.PhysicsScene = physicsScene;

+            // udpServer.LocalWorld = world;

+

+            BaseHttpServer httpServer = new BaseHttpServer(simPort);

+            httpServer.AddXmlRPCHandler("login_to_simulator", loginServer.XmlRpcLoginMethod);

+            httpServer.Start();

+

+            m_console.WriteLine(LogPriority.NORMAL, "Press enter to quit.");

+            m_console.ReadLine();

+        }

+

+        private float[] CreateMap()

+        {

+            float[] map = new float[65536];

+

+            for (int i = 0; i < 65536; i++)

+            {

+                int x = i % 256;

+                int y = i / 256;

+

+                map[i] = (float)(x + y / 2);

+            }

+            

+            return map;

+        }

+

+        private void AddNewSessionHandler(Login loginData)

+        {

+            m_console.WriteLine(LogPriority.NORMAL, "Recieved Login from [{0}] [{1}]", loginData.First, loginData.Last);

+        }

+

+        static void Main(string[] args)

+        {

+            Program app = new Program();

+

+            app.Run();

+        }

+

+        #region IWorld Members

+

+        void IWorld.AddNewAvatar(IClientAPI remoteClient, LLUUID agentID, bool child)

+        {

+            remoteClient.SendRegionHandshake(m_regionInfo);

+        }

+

+        void IWorld.RemoveAvatar(LLUUID agentID)

+        {

+            throw new Exception("The method or operation is not implemented.");

+        }

+

+        RegionInfo IWorld.RegionInfo

+        {

+            get { return m_regionInfo; }

+        }

+

+        object IWorld.SyncRoot

+        {

+            get { return this; }

+        }

+

+        private uint m_nextLocalId = 1;

+

+        uint IWorld.NextLocalId

+        {

+            get { return m_nextLocalId++; }

+        }

+

+        #endregion

+

+        #region IAssetReceiver Members

+

+        public void AssetReceived(AssetBase asset, bool IsTexture)

+        {

+            throw new Exception("The method or operation is not implemented.");

+        }

+

+        public void AssetNotFound(AssetBase asset)

+        {

+            throw new Exception("The method or operation is not implemented.");

+        }

+

+        #endregion

+

+        #region conscmd_callback Members

+

+        public void RunCmd(string cmd, string[] cmdparams)

+        {

+            throw new Exception("The method or operation is not implemented.");

+        }

+

+        public void Show(string ShowWhat)

+        {

+            throw new Exception("The method or operation is not implemented.");

+        }

+

+        #endregion

+    }

+}

diff --git a/OpenSim/Examples/SimpleApp2/Properties/AssemblyInfo.cs b/OpenSim/Examples/SimpleApp2/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..f7d6aae
--- /dev/null
+++ b/OpenSim/Examples/SimpleApp2/Properties/AssemblyInfo.cs
@@ -0,0 +1,33 @@
+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("SimpleApp2")]

+[assembly: AssemblyDescription("")]

+[assembly: AssemblyConfiguration("")]

+[assembly: AssemblyCompany("Playahead AB")]

+[assembly: AssemblyProduct("SimpleApp2")]

+[assembly: AssemblyCopyright("Copyright © Playahead AB 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("bdda0707-02b4-46ca-87ce-ab3c12558a4a")]

+

+// 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/Examples/SimpleApp2/SimpleApp2.csproj b/OpenSim/Examples/SimpleApp2/SimpleApp2.csproj
new file mode 100644
index 0000000..92664e3
--- /dev/null
+++ b/OpenSim/Examples/SimpleApp2/SimpleApp2.csproj
@@ -0,0 +1,87 @@
+<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>{C84B2171-D386-4377-B490-9C5A56674B9E}</ProjectGuid>

+    <OutputType>Exe</OutputType>

+    <AppDesignerFolder>Properties</AppDesignerFolder>

+    <RootNamespace>SimpleApp2</RootNamespace>

+    <AssemblyName>SimpleApp2</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="libsecondlife, Version=0.9.0.0, Culture=neutral, processorArchitecture=MSIL">

+      <SpecificVersion>False</SpecificVersion>

+      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>

+    </Reference>

+    <Reference Include="System" />

+    <Reference Include="System.Data" />

+    <Reference Include="System.Xml" />

+  </ItemGroup>

+  <ItemGroup>

+    <Compile Include="MyClientView.cs" />

+    <Compile Include="MyPacketServer.cs" />

+    <Compile Include="Program.cs" />

+    <Compile Include="Properties\AssemblyInfo.cs" />

+  </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\..\..\Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">

+      <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>

+      <Name>OpenSim.Framework.Console</Name>

+    </ProjectReference>

+    <ProjectReference Include="..\..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj">

+      <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>

+      <Name>OpenSim.Framework</Name>

+    </ProjectReference>

+    <ProjectReference Include="..\..\..\Common\OpenSim.Servers\OpenSim.Servers.csproj">

+      <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project>

+      <Name>OpenSim.Servers</Name>

+    </ProjectReference>

+    <ProjectReference Include="..\..\..\Common\XmlRpcCS\XMLRPC.csproj">

+      <Project>{8E81D43C-0000-0000-0000-000000000000}</Project>

+      <Name>XMLRPC</Name>

+    </ProjectReference>

+    <ProjectReference Include="..\..\OpenSim.GridInterfaces\Local\OpenSim.GridInterfaces.Local.csproj">

+      <Project>{546099CD-0000-0000-0000-000000000000}</Project>

+      <Name>OpenSim.GridInterfaces.Local</Name>

+    </ProjectReference>

+    <ProjectReference Include="..\..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj">

+      <Project>{8BE16150-0000-0000-0000-000000000000}</Project>

+      <Name>OpenSim.Physics.Manager</Name>

+    </ProjectReference>

+    <ProjectReference Include="..\..\OpenSim.RegionServer\OpenSim.RegionServer.csproj">

+      <Project>{632E1BFD-0000-0000-0000-000000000000}</Project>

+      <Name>OpenSim.RegionServer</Name>

+    </ProjectReference>

+    <ProjectReference Include="..\..\OpenSim.World\OpenSim.World.csproj">

+      <Project>{642A14A8-0000-0000-0000-000000000000}</Project>

+      <Name>OpenSim.World</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/OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj.user b/OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ReferencePath>C:\sugilite\bin\</ReferencePath>

-    <LastOpenVersion>8.0.50727</LastOpenVersion>

-    <ProjectView>ProjectFiles</ProjectView>

-    <ProjectTrust>0</ProjectTrust>

-  </PropertyGroup>

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />

-</Project>

diff --git a/OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj.user b/OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ReferencePath>C:\sugilite\bin\</ReferencePath>

-    <LastOpenVersion>8.0.50727</LastOpenVersion>

-    <ProjectView>ProjectFiles</ProjectView>

-    <ProjectTrust>0</ProjectTrust>

-  </PropertyGroup>

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />

-</Project>

diff --git a/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj.user b/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ReferencePath>C:\sugilite\bin\</ReferencePath>

-    <LastOpenVersion>8.0.50727</LastOpenVersion>

-    <ProjectView>ProjectFiles</ProjectView>

-    <ProjectTrust>0</ProjectTrust>

-  </PropertyGroup>

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />

-</Project>

diff --git a/OpenSim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj.user b/OpenSim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/OpenSim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ReferencePath>C:\sugilite\bin\</ReferencePath>

-    <LastOpenVersion>8.0.50727</LastOpenVersion>

-    <ProjectView>ProjectFiles</ProjectView>

-    <ProjectTrust>0</ProjectTrust>

-  </PropertyGroup>

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />

-</Project>

diff --git a/OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj.user b/OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ReferencePath>C:\sugilite\bin\</ReferencePath>

-    <LastOpenVersion>8.0.50727</LastOpenVersion>

-    <ProjectView>ProjectFiles</ProjectView>

-    <ProjectTrust>0</ProjectTrust>

-  </PropertyGroup>

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />

-</Project>

diff --git a/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj.user b/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ReferencePath>C:\sugilite\bin\</ReferencePath>

-    <LastOpenVersion>8.0.50727</LastOpenVersion>

-    <ProjectView>ProjectFiles</ProjectView>

-    <ProjectTrust>0</ProjectTrust>

-  </PropertyGroup>

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />

-</Project>

diff --git a/OpenSim/OpenSim.RegionServer/AuthenticateSessionsLocal.cs b/OpenSim/OpenSim.RegionServer/AuthenticateSessionsLocal.cs
index 91772f8..4db7ccb 100644
--- a/OpenSim/OpenSim.RegionServer/AuthenticateSessionsLocal.cs
+++ b/OpenSim/OpenSim.RegionServer/AuthenticateSessionsLocal.cs
@@ -13,7 +13,13 @@ namespace OpenSim
         {

 

         }

-

+    

+        public bool AddNewSessionHandler(ulong regionHandle, Login loginData)

+        {

+            AddNewSession( loginData );

+            return true;

+        }

+        

         public void AddNewSession(Login loginData)

         {

             AgentCircuitData agent = new AgentCircuitData();

diff --git a/OpenSim/OpenSim.RegionServer/ClientView.API.cs b/OpenSim/OpenSim.RegionServer/ClientView.API.cs
index 9e0cd48..37e27f8 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.API.cs
+++ b/OpenSim/OpenSim.RegionServer/ClientView.API.cs
@@ -153,6 +153,11 @@ namespace OpenSim
             OutPacket(mov);

         }

 

+        public void SendChatMessage(string message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID)

+        {

+           SendChatMessage( Helpers.StringToField( message ), type, fromPos, fromName, fromAgentID); 

+        }

+        

         /// <summary>

         /// 

         /// </summary>

diff --git a/OpenSim/OpenSim.RegionServer/ClientView.cs b/OpenSim/OpenSim.RegionServer/ClientView.cs
index d970162..f9a7fe4 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.cs
+++ b/OpenSim/OpenSim.RegionServer/ClientView.cs
@@ -70,7 +70,7 @@ namespace OpenSim
         private AgentAssetUpload UploadAssets;

         private LLUUID newAssetFolder = LLUUID.Zero;

         private bool debug = false;

-        private IWorld m_world;

+        protected IWorld m_world;

         private Dictionary<uint, ClientView> m_clientThreads;

         private AssetCache m_assetCache;

         private IGridServer m_gridServer;

@@ -78,11 +78,9 @@ namespace OpenSim
         private int cachedtextureserial = 0;

         private RegionInfo m_regionData;

         protected AuthenticateSessionsBase m_authenticateSessionsHandler;

-        protected uint serverPort = 0;

 

-        public ClientView(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, Dictionary<uint, ClientView> clientThreads, IWorld world, AssetCache assetCache, PacketServer packServer, InventoryCache inventoryCache, AuthenticateSessionsBase authenSessions, uint port)

+        public ClientView(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, Dictionary<uint, ClientView> clientThreads, IWorld world, AssetCache assetCache, PacketServer packServer, InventoryCache inventoryCache, AuthenticateSessionsBase authenSessions )

         {

-            this.serverPort = port;

             m_world = world;

             m_clientThreads = clientThreads;

             m_assetCache = assetCache;

diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
index 2fc6516..990b5c3 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
+++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
@@ -124,10 +124,7 @@
     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

-    <Compile Include="NetworkServersInfo.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="UDPServer.cs">

+    <Compile Include="AgentAssetUpload.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="AuthenticateSessionsLocal.cs">

@@ -136,52 +133,55 @@
     <Compile Include="AuthenticateSessionsRemote.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="OpenSimNetworkHandler.cs">

+    <Compile Include="ClientView.API.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="UserConfigUtility.cs">

+    <Compile Include="ClientView.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="ClientView.Grid.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="PacketServer.cs">

+    <Compile Include="ClientView.PacketHandlers.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="ClientView.PacketHandlers.cs">

+    <Compile Include="ClientView.ProcessPackets.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="VersionInfo.cs">

+    <Compile Include="ClientViewBase.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="AgentAssetUpload.cs">

+    <Compile Include="CommsManager.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="ClientViewBase.cs">

+    <Compile Include="NetworkServersInfo.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="RegionServerBase.cs">

+    <Compile Include="OpenSimNetworkHandler.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="CommsManager.cs">

+    <Compile Include="PacketServer.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="ClientView.cs">

+    <Compile Include="RegionServerBase.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="ClientView.API.cs">

+    <Compile Include="UDPServer.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="ClientView.ProcessPackets.cs">

+    <Compile Include="UserConfigUtility.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="CAPS\AdminWebFront.cs">

+    <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="Assets\AssetCache.cs">

+    <Compile Include="CAPS\AdminWebFront.cs">

       <SubType>Code</SubType>

     </Compile>

   </ItemGroup>

diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj.user b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ReferencePath>C:\sugilite\bin\</ReferencePath>

-    <LastOpenVersion>8.0.50727</LastOpenVersion>

-    <ProjectView>ProjectFiles</ProjectView>

-    <ProjectTrust>0</ProjectTrust>

-  </PropertyGroup>

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />

-</Project>

diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
index c988025..8384407 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
+++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
@@ -11,26 +11,26 @@
             <resources prefix="OpenSim.RegionServer" dynamicprefix="true" >

             </resources>

             <sources failonempty="true">

-                <include name="NetworkServersInfo.cs" />

-                <include name="UDPServer.cs" />

+                <include name="AgentAssetUpload.cs" />

                 <include name="AuthenticateSessionsLocal.cs" />

                 <include name="AuthenticateSessionsRemote.cs" />

-                <include name="OpenSimNetworkHandler.cs" />

-                <include name="UserConfigUtility.cs" />

+                <include name="ClientView.API.cs" />

+                <include name="ClientView.cs" />

                 <include name="ClientView.Grid.cs" />

-                <include name="PacketServer.cs" />

                 <include name="ClientView.PacketHandlers.cs" />

-                <include name="VersionInfo.cs" />

-                <include name="AgentAssetUpload.cs" />

+                <include name="ClientView.ProcessPackets.cs" />

                 <include name="ClientViewBase.cs" />

-                <include name="RegionServerBase.cs" />

                 <include name="CommsManager.cs" />

-                <include name="ClientView.cs" />

-                <include name="ClientView.API.cs" />

-                <include name="ClientView.ProcessPackets.cs" />

-                <include name="CAPS/AdminWebFront.cs" />

-                <include name="Assets/InventoryCache.cs" />

+                <include name="NetworkServersInfo.cs" />

+                <include name="OpenSimNetworkHandler.cs" />

+                <include name="PacketServer.cs" />

+                <include name="RegionServerBase.cs" />

+                <include name="UDPServer.cs" />

+                <include name="UserConfigUtility.cs" />

+                <include name="VersionInfo.cs" />

                 <include name="Assets/AssetCache.cs" />

+                <include name="Assets/InventoryCache.cs" />

+                <include name="CAPS/AdminWebFront.cs" />

             </sources>

             <references basedir="${project::get-base-directory()}">

                 <lib>

diff --git a/OpenSim/OpenSim.RegionServer/PacketServer.cs b/OpenSim/OpenSim.RegionServer/PacketServer.cs
index ab77b5d..f1ca881 100644
--- a/OpenSim/OpenSim.RegionServer/PacketServer.cs
+++ b/OpenSim/OpenSim.RegionServer/PacketServer.cs
@@ -66,9 +66,17 @@ namespace OpenSim
             

         }

 

+        protected virtual ClientView CreateNewClient(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, Dictionary<uint, ClientView> clientThreads, IWorld world, AssetCache assetCache, PacketServer packServer, InventoryCache inventoryCache, AuthenticateSessionsBase authenSessions)

+        {

+            return new ClientView(remoteEP, initialcirpack, clientThreads, world, assetCache, packServer, inventoryCache, authenSessions );

+        }

+

         public virtual bool AddNewClient(EndPoint epSender, UseCircuitCodePacket useCircuit, AssetCache assetCache, InventoryCache inventoryCache, AuthenticateSessionsBase authenticateSessionsClass)

         {

-            ClientView newuser = new ClientView(epSender, useCircuit, this.ClientThreads, this._localWorld, assetCache, this, inventoryCache, authenticateSessionsClass, serverPort);

+            ClientView newuser =

+                CreateNewClient(epSender, useCircuit, ClientThreads, _localWorld, assetCache, this, inventoryCache,

+                                authenticateSessionsClass);

+            

             this.ClientThreads.Add(useCircuit.CircuitCode.Code, newuser);

             this.ClientAPIs.Add(useCircuit.CircuitCode.Code, (IClientAPI)newuser);

 

diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj
index 6ffcf9e..bd1a332 100644
--- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj
+++ b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj
@@ -76,64 +76,64 @@
     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

-    <Compile Include="MainMemory.cs">

+    <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="StackFrame.cs">

+    <Compile Include="Interpreter.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="InterpreterLogic.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="OpenSimJVM.cs">

+    <Compile Include="InterpreterMethods.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="InterpreterMethods.cs">

+    <Compile Include="InterpreterReturn.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="ClassInstance.cs">

+    <Compile Include="MainMemory.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="InterpreterReturn.cs">

+    <Compile Include="MethodMemory.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Interpreter.cs">

+    <Compile Include="Object.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="ClassRecord.cs">

+    <Compile Include="OpenSimJVM.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Stack.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Object.cs">

+    <Compile Include="StackFrame.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Thread.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="MethodMemory.cs">

-      <SubType>Code</SubType>

-    </Compile>

     <Compile Include="Properties\AssemblyInfo.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Types\BaseType.cs">

+    <Compile Include="Types\ArrayReference.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Types\ArrayReference.cs">

+    <Compile Include="Types\BaseType.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Types\ObjectReference.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Types\PrimitiveTypes\Char.cs">

+    <Compile Include="Types\PrimitiveTypes\Byte.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Types\PrimitiveTypes\Byte.cs">

+    <Compile Include="Types\PrimitiveTypes\Char.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Types\PrimitiveTypes\Float.cs">

diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj.user b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ReferencePath>C:\sugilite\bin\</ReferencePath>

-    <LastOpenVersion>8.0.50727</LastOpenVersion>

-    <ProjectView>ProjectFiles</ProjectView>

-    <ProjectTrust>0</ProjectTrust>

-  </PropertyGroup>

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />

-</Project>

diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build
index ac4d564..c5255db 100644
--- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build
+++ b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build
@@ -11,26 +11,26 @@
             <resources prefix="OpenSim.Scripting.EmbeddedJVM" dynamicprefix="true" >

             </resources>

             <sources failonempty="true">

-                <include name="MainMemory.cs" />

+                <include name="ClassInstance.cs" />

+                <include name="ClassRecord.cs" />

                 <include name="Heap.cs" />

-                <include name="StackFrame.cs" />

+                <include name="Interpreter.cs" />

                 <include name="InterpreterLogic.cs" />

-                <include name="OpenSimJVM.cs" />

                 <include name="InterpreterMethods.cs" />

-                <include name="ClassInstance.cs" />

                 <include name="InterpreterReturn.cs" />

-                <include name="Interpreter.cs" />

-                <include name="ClassRecord.cs" />

-                <include name="Stack.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="MethodMemory.cs" />

                 <include name="Properties/AssemblyInfo.cs" />

-                <include name="Types/BaseType.cs" />

                 <include name="Types/ArrayReference.cs" />

+                <include name="Types/BaseType.cs" />

                 <include name="Types/ObjectReference.cs" />

-                <include name="Types/PrimitiveTypes/Char.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>

diff --git a/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj.user b/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ReferencePath>C:\sugilite\bin\</ReferencePath>

-    <LastOpenVersion>8.0.50727</LastOpenVersion>

-    <ProjectView>ProjectFiles</ProjectView>

-    <ProjectTrust>0</ProjectTrust>

-  </PropertyGroup>

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />

-</Project>

diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
index af8285b..15ae5bf 100644
--- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
+++ b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
@@ -93,6 +93,9 @@
     <Compile Include="AssemblyInfo.cs">

       <SubType>Code</SubType>

     </Compile>

+    <Compile Include="Db4LocalStorage.cs">

+      <SubType>Code</SubType>

+    </Compile>

     <Compile Include="MapStorage.cs">

       <SubType>Code</SubType>

     </Compile>

@@ -102,9 +105,6 @@
     <Compile Include="UUIDPrimQuery.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Db4LocalStorage.cs">

-      <SubType>Code</SubType>

-    </Compile>

   </ItemGroup>

   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />

   <PropertyGroup>

diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj.user b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ReferencePath>C:\sugilite\bin\</ReferencePath>

-    <LastOpenVersion>8.0.50727</LastOpenVersion>

-    <ProjectView>ProjectFiles</ProjectView>

-    <ProjectTrust>0</ProjectTrust>

-  </PropertyGroup>

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />

-</Project>

diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
index 72aac2a..c2fd2bd 100644
--- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
+++ b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
@@ -12,10 +12,10 @@
             </resources>

             <sources failonempty="true">

                 <include name="AssemblyInfo.cs" />

+                <include name="Db4LocalStorage.cs" />

                 <include name="MapStorage.cs" />

                 <include name="UUIDParcelQuery.cs" />

                 <include name="UUIDPrimQuery.cs" />

-                <include name="Db4LocalStorage.cs" />

             </sources>

             <references basedir="${project::get-base-directory()}">

                 <lib>

diff --git a/OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj.user b/OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ReferencePath>C:\sugilite\bin\</ReferencePath>

-    <LastOpenVersion>8.0.50727</LastOpenVersion>

-    <ProjectView>ProjectFiles</ProjectView>

-    <ProjectTrust>0</ProjectTrust>

-  </PropertyGroup>

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />

-</Project>

diff --git a/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj.user b/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ReferencePath>C:\sugilite\bin\</ReferencePath>

-    <LastOpenVersion>8.0.50727</LastOpenVersion>

-    <ProjectView>ProjectFiles</ProjectView>

-    <ProjectTrust>0</ProjectTrust>

-  </PropertyGroup>

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />

-</Project>

diff --git a/OpenSim/OpenSim.World/Avatar.cs b/OpenSim/OpenSim.World/Avatar.cs
index c251d57..4ab576c 100644
--- a/OpenSim/OpenSim.World/Avatar.cs
+++ b/OpenSim/OpenSim.World/Avatar.cs
@@ -55,21 +55,16 @@ namespace OpenSim.world
             ControllingClient = theClient;

             this.firstname = ControllingClient.FirstName;

             this.lastname = ControllingClient.LastName;

-            localid = 8880000 + (this.m_world._localNumber++);

+            localid = this.m_world.NextLocalId;

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

 

+            Wearables = AvatarWearable.DefaultWearables;

+            

             this.avatarAppearanceTexture = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005"));

             Console.WriteLine("avatar point 4");

             

diff --git a/OpenSim/OpenSim.World/Entity.cs b/OpenSim/OpenSim.World/Entity.cs
index b14beed..dd5f9a6 100644
--- a/OpenSim/OpenSim.World/Entity.cs
+++ b/OpenSim/OpenSim.World/Entity.cs
@@ -51,7 +51,7 @@ namespace OpenSim.world
                 {

                     try

                     {

-                        lock (this.m_world.LockPhysicsEngine)

+                        lock (this.m_world.SyncRoot)

                         {

 

                             this._physActor.Position = new PhysicsVector(value.X, value.Y, value.Z);

diff --git a/OpenSim/OpenSim.World/OpenSim.World.csproj b/OpenSim/OpenSim.World/OpenSim.World.csproj
index f2fb596..46803d6 100644
--- a/OpenSim/OpenSim.World/OpenSim.World.csproj
+++ b/OpenSim/OpenSim.World/OpenSim.World.csproj
@@ -130,58 +130,58 @@
     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

-    <Compile Include="Entity.cs">

+    <Compile Include="Avatar.Client.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="World.PacketHandlers.cs">

+    <Compile Include="Avatar.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="WorldBase.cs">

+    <Compile Include="Avatar.Update.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="SceneObject.cs">

+    <Compile Include="AvatarAnimations.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="World.Scripting.cs">

+    <Compile Include="Entity.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Avatar.Client.cs">

+    <Compile Include="ParcelManager.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Avatar.Update.cs">

+    <Compile Include="Primitive.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="AvatarAnimations.cs">

+    <Compile Include="SceneObject.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Primitive.cs">

+    <Compile Include="World.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Avatar.cs">

+    <Compile Include="World.PacketHandlers.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="ParcelManager.cs">

+    <Compile Include="World.Scripting.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="World.cs">

+    <Compile Include="WorldBase.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Estate\EstateManager.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="scripting\IScriptHandler.cs">

+    <Compile Include="scripting\IScriptContext.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="scripting\ScriptFactory.cs">

+    <Compile Include="scripting\IScriptEntity.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="scripting\IScriptContext.cs">

+    <Compile Include="scripting\IScriptHandler.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="scripting\Script.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="scripting\IScriptEntity.cs">

+    <Compile Include="scripting\ScriptFactory.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="scripting\Scripts\FollowRandomAvatar.cs">

diff --git a/OpenSim/OpenSim.World/OpenSim.World.csproj.user b/OpenSim/OpenSim.World/OpenSim.World.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/OpenSim/OpenSim.World/OpenSim.World.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ReferencePath>C:\sugilite\bin\</ReferencePath>

-    <LastOpenVersion>8.0.50727</LastOpenVersion>

-    <ProjectView>ProjectFiles</ProjectView>

-    <ProjectTrust>0</ProjectTrust>

-  </PropertyGroup>

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />

-</Project>

diff --git a/OpenSim/OpenSim.World/OpenSim.World.dll.build b/OpenSim/OpenSim.World/OpenSim.World.dll.build
new file mode 100644
index 0000000..3fa534e
--- /dev/null
+++ b/OpenSim/OpenSim.World/OpenSim.World.dll.build
@@ -0,0 +1,71 @@
+<?xml version="1.0" ?>

+<project name="OpenSim.World" 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.World" dynamicprefix="true" >

+            </resources>

+            <sources failonempty="true">

+                <include name="Avatar.Client.cs" />

+                <include name="Avatar.cs" />

+                <include name="Avatar.Update.cs" />

+                <include name="AvatarAnimations.cs" />

+                <include name="Entity.cs" />

+                <include name="ParcelManager.cs" />

+                <include name="Primitive.cs" />

+                <include name="SceneObject.cs" />

+                <include name="World.cs" />

+                <include name="World.PacketHandlers.cs" />

+                <include name="World.Scripting.cs" />

+                <include name="WorldBase.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="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="System.dll" />

+                <include name="System.Xml.dll" />

+                <include name="../../bin/libsecondlife.dll" />

+                <include name="../../bin/Axiom.MathLib.dll" />

+                <include name="../../bin/Db4objects.Db4o.dll" />

+                <include name="../../bin/OpenSim.Terrain.BasicTerrain.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/XMLRPC.dll" />

+                <include name="../../bin/OpenGrid.Framework.Communications.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.World/World.cs b/OpenSim/OpenSim.World/World.cs
index 011e39a..7ef06e2 100644
--- a/OpenSim/OpenSim.World/World.cs
+++ b/OpenSim/OpenSim.World/World.cs
@@ -23,10 +23,8 @@ namespace OpenSim.world
     public partial class World : WorldBase, ILocalStorageReceiver, IScriptAPI

     {

         protected System.Timers.Timer m_heartbeatTimer = new System.Timers.Timer();

-        public object LockPhysicsEngine = new object();

         protected Dictionary<libsecondlife.LLUUID, Avatar> Avatars;

         protected Dictionary<libsecondlife.LLUUID, Primitive> Prims;

-        public uint _localNumber = 0;

         private PhysicsScene phyScene;

         private float timeStep = 0.1f;

         public ILocalStorage localStorage;

@@ -59,6 +57,7 @@ namespace OpenSim.world
                 return (this.phyScene);

             }

         }

+

         #endregion

 

         #region Constructors

@@ -155,7 +154,7 @@ namespace OpenSim.world
                     Entities[UUID].addForces();

                 }

 

-                lock (this.LockPhysicsEngine)

+                lock (this.m_syncRoot)

                 {

                     this.phyScene.Simulate(timeStep);

                 }

@@ -203,7 +202,7 @@ namespace OpenSim.world
                     OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs: Backup() - Terrain tainted, saving.");

                     localStorage.SaveMap(Terrain.getHeights1D());

                     OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs: Backup() - Terrain saved, informing Physics.");

-                    lock (this.LockPhysicsEngine)

+                    lock (this.m_syncRoot)

                     {

                         phyScene.SetTerrain(Terrain.getHeights1D());

                     }

@@ -297,7 +296,7 @@ namespace OpenSim.world
             {

                 Terrain.hills();

 

-                lock (this.LockPhysicsEngine)

+                lock (this.m_syncRoot)

                 {

                     this.phyScene.SetTerrain(Terrain.getHeights1D());

                 }

@@ -328,7 +327,7 @@ namespace OpenSim.world
             try

             {

                 this.Terrain.setHeights2D(newMap);

-                lock (this.LockPhysicsEngine)

+                lock (this.m_syncRoot)

                 {

                     this.phyScene.SetTerrain(this.Terrain.getHeights1D());

                 }

@@ -483,7 +482,7 @@ namespace OpenSim.world
                 this.estateManager.sendRegionHandshake(remoteClient);

 

                 PhysicsVector pVec = new PhysicsVector(newAvatar.Pos.X, newAvatar.Pos.Y, newAvatar.Pos.Z);

-                lock (this.LockPhysicsEngine)

+                lock (this.m_syncRoot)

                 {

                     newAvatar.PhysActor = this.phyScene.AddAvatar(pVec);

                 }

@@ -612,5 +611,10 @@ namespace OpenSim.world
         }

 

         #endregion

+

+        public override void SendLayerData(int px, int py, IClientAPI RemoteClient)

+        {

+            RemoteClient.SendLayerData( Terrain.getHeights1D() );

+        }

     }

 }

diff --git a/OpenSim/OpenSim.World/WorldBase.cs b/OpenSim/OpenSim.World/WorldBase.cs
index 19a8fb5..92bc6a3 100644
--- a/OpenSim/OpenSim.World/WorldBase.cs
+++ b/OpenSim/OpenSim.World/WorldBase.cs
@@ -15,61 +15,25 @@ using OpenSim.Terrain;
 

 namespace OpenSim.world

 {

-    public class WorldBase : IWorld

+    public abstract class WorldBase : IWorld

     {

         public Dictionary<libsecondlife.LLUUID, Entity> Entities;

         protected Dictionary<uint, IClientAPI> m_clientThreads;

         protected ulong m_regionHandle;

         protected string m_regionName;

-       // protected InventoryCache _inventoryCache;

-       // protected AssetCache _assetCache;

         protected 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

-        /// <summary>

-        /// 

-        /// </summary>

-        public WorldBase()

-        {

-

-        }

-        #endregion

-

-        #region Setup Methods

-       

-        #endregion

+        protected object m_syncRoot = new object();

+        private uint m_nextLocalId = 8880000;

 

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

-        {

+        public abstract void Update();

 

-        }

         #endregion

 

         #region Terrain Methods

@@ -77,11 +41,8 @@ namespace OpenSim.world
         /// <summary>

         /// Loads the World heightmap

         /// </summary>

-        public virtual void LoadWorldMap()

-        {

-

-        }

-

+        public abstract void LoadWorldMap();

+        

         /// <summary>

         /// Send the region heightmap to the client

         /// </summary>

@@ -97,10 +58,8 @@ namespace OpenSim.world
         /// <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, IClientAPI RemoteClient)

-        {

-           

-        }

+        public abstract void SendLayerData(int px, int py, IClientAPI RemoteClient);

+

         #endregion

 

         #region Add/Remove Agent/Avatar

@@ -110,39 +69,43 @@ namespace OpenSim.world
         /// <param name="remoteClient"></param>

         /// <param name="agentID"></param>

         /// <param name="child"></param>

-        public virtual void AddNewAvatar(IClientAPI remoteClient, LLUUID agentID, bool child)

-        {

-            return ;

-        }

-

+        public abstract void AddNewAvatar(IClientAPI remoteClient, LLUUID agentID, bool child);

+        

         /// <summary>

         /// 

         /// </summary>

         /// <param name="agentID"></param>

-        public virtual void RemoveAvatar(LLUUID agentID)

-        {

-            return ;

-        }

-

+        public abstract void RemoveAvatar(LLUUID agentID);

+       

         #endregion

 

         /// <summary>

         /// 

         /// </summary>

         /// <returns></returns>

-        public virtual RegionInfo GetRegionInfo()

+        public virtual RegionInfo RegionInfo

+        {

+            get { return null; }

+        }

+

+        public object SyncRoot

+        {

+            get { return m_syncRoot; }

+        }

+

+        public uint NextLocalId

         {

-            return null;

+            get { return m_nextLocalId++; }

         }

 

         #region Shutdown

         /// <summary>

         /// Tidy before shutdown

         /// </summary>

-        public virtual void Close()

-        {

+        public abstract void Close();

 

-        }

         #endregion

+

+ 

     }

 }

diff --git a/OpenSim/OpenSim/OpenSim.csproj.user b/OpenSim/OpenSim/OpenSim.csproj.user
deleted file mode 100644
index 66e2cb4..0000000
--- a/OpenSim/OpenSim/OpenSim.csproj.user
+++ /dev/null
@@ -1,13 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <StartArguments>-loginserver -sandbox -accounts</StartArguments>

-    <ReferencePath>C:\sugilite\bin\</ReferencePath>

-    <LastOpenVersion>8.0.50727</LastOpenVersion>

-    <ProjectView>ProjectFiles</ProjectView>

-    <ProjectTrust>0</ProjectTrust>

-  </PropertyGroup>

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />

-</Project>

diff --git a/Prebuild/src/Prebuild.csproj b/Prebuild/src/Prebuild.csproj
index df6b4f4..55efffa 100644
--- a/Prebuild/src/Prebuild.csproj
+++ b/Prebuild/src/Prebuild.csproj
@@ -83,6 +83,9 @@
     <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>

@@ -92,25 +95,19 @@
     <Compile Include="Core\WarningException.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Core\FatalException.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="Core\Interfaces\ITarget.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="Core\Interfaces\IDataNode.cs">

+    <Compile Include="Core\Attributes\DataNodeAttribute.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Core\Attributes\OptionNodeAttribute.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Core\Attributes\DataNodeAttribute.cs">

+    <Compile Include="Core\Attributes\TargetAttribute.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Core\Attributes\TargetAttribute.cs">

+    <Compile Include="Core\Interfaces\IDataNode.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Core\Nodes\ProjectNode.cs">

+    <Compile Include="Core\Interfaces\ITarget.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Core\Nodes\ConfigurationNode.cs">

@@ -122,73 +119,76 @@
     <Compile Include="Core\Nodes\ExcludeNode.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Core\Nodes\OptionsNode.cs">

+    <Compile Include="Core\Nodes\FileNode.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Core\Nodes\ReferencePathNode.cs">

+    <Compile Include="Core\Nodes\FilesNode.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Core\Nodes\MatchNode.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Core\Nodes\SolutionNode.cs">

+    <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\FileNode.cs">

+    <Compile Include="Core\Nodes\ReferencePathNode.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Core\Nodes\FilesNode.cs">

+    <Compile Include="Core\Nodes\SolutionNode.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Core\Targets\DebugTarget.cs">

+    <Compile Include="Core\Parse\IfContext.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Core\Targets\MonoDevelopTarget.cs">

+    <Compile Include="Core\Parse\Preprocessor.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Core\Targets\AutotoolsTarget.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Core\Targets\SharpDevelopTarget.cs">

+    <Compile Include="Core\Targets\DebugTarget.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Core\Targets\VS2002Target.cs">

+    <Compile Include="Core\Targets\MonoDevelopTarget.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Core\Targets\VS2003Target.cs">

+    <Compile Include="Core\Targets\NAntTarget.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Core\Targets\SharpDevelop2Target.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Core\Targets\VS2005Target.cs">

+    <Compile Include="Core\Targets\SharpDevelopTarget.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Core\Targets\NAntTarget.cs">

+    <Compile Include="Core\Targets\VS2002Target.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Core\Parse\IfContext.cs">

+    <Compile Include="Core\Targets\VS2003Target.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Core\Parse\Preprocessor.cs">

+    <Compile Include="Core\Targets\VS2005Target.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Core\Utilities\Helper.cs">

+    <Compile Include="Core\Utilities\CommandLineCollection.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Core\Utilities\Log.cs">

+    <Compile Include="Core\Utilities\CurrentDirectory.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Core\Utilities\CommandLineCollection.cs">

+    <Compile Include="Core\Utilities\Helper.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Core\Utilities\CurrentDirectory.cs">

+    <Compile Include="Core\Utilities\Log.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Properties\AssemblyInfo.cs">

diff --git a/Prebuild/src/Prebuild.csproj.user b/Prebuild/src/Prebuild.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/Prebuild/src/Prebuild.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ReferencePath>C:\sugilite\bin\</ReferencePath>

-    <LastOpenVersion>8.0.50727</LastOpenVersion>

-    <ProjectView>ProjectFiles</ProjectView>

-    <ProjectTrust>0</ProjectTrust>

-  </PropertyGroup>

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />

-</Project>

diff --git a/Prebuild/src/Prebuild.exe.build b/Prebuild/src/Prebuild.exe.build
index f2c8cab..43f5516 100644
--- a/Prebuild/src/Prebuild.exe.build
+++ b/Prebuild/src/Prebuild.exe.build
@@ -14,42 +14,42 @@
             </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/FatalException.cs" />

-                <include name="Core/Interfaces/ITarget.cs" />

-                <include name="Core/Interfaces/IDataNode.cs" />

-                <include name="Core/Attributes/OptionNodeAttribute.cs" />

                 <include name="Core/Attributes/DataNodeAttribute.cs" />

+                <include name="Core/Attributes/OptionNodeAttribute.cs" />

                 <include name="Core/Attributes/TargetAttribute.cs" />

-                <include name="Core/Nodes/ProjectNode.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/OptionsNode.cs" />

-                <include name="Core/Nodes/ReferencePathNode.cs" />

+                <include name="Core/Nodes/FileNode.cs" />

+                <include name="Core/Nodes/FilesNode.cs" />

                 <include name="Core/Nodes/MatchNode.cs" />

-                <include name="Core/Nodes/SolutionNode.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/FileNode.cs" />

-                <include name="Core/Nodes/FilesNode.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/AutotoolsTarget.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/SharpDevelop2Target.cs" />

                 <include name="Core/Targets/VS2005Target.cs" />

-                <include name="Core/Targets/NAntTarget.cs" />

-                <include name="Core/Parse/IfContext.cs" />

-                <include name="Core/Parse/Preprocessor.cs" />

-                <include name="Core/Utilities/Helper.cs" />

-                <include name="Core/Utilities/Log.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()}">