32 files changed, 338 insertions, 386 deletions

diff --git a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj
index dcf09d9..b3fd574 100644
--- a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj
+++ b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <PropertyGroup>

     <ProjectType>Local</ProjectType>

     <ProductVersion>8.0.50727</ProductVersion>

@@ -6,8 +6,7 @@
     <ProjectGuid>{683344D5-0000-0000-0000-000000000000}</ProjectGuid>

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

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

-    <ApplicationIcon>

-    </ApplicationIcon>

+    <ApplicationIcon></ApplicationIcon>

     <AssemblyKeyContainerName>

     </AssemblyKeyContainerName>

     <AssemblyName>OpenGrid.Framework.Communications</AssemblyName>

@@ -16,11 +15,9 @@
     <DefaultTargetSchema>IE50</DefaultTargetSchema>

     <DelaySign>false</DelaySign>

     <OutputType>Library</OutputType>

-    <AppDesignerFolder>

-    </AppDesignerFolder>

+    <AppDesignerFolder></AppDesignerFolder>

     <RootNamespace>OpenGrid.Framework.Communications</RootNamespace>

-    <StartupObject>

-    </StartupObject>

+    <StartupObject></StartupObject>

     <FileUpgradeFlags>

     </FileUpgradeFlags>

   </PropertyGroup>

@@ -31,8 +28,7 @@
     <ConfigurationOverrideFile>

     </ConfigurationOverrideFile>

     <DefineConstants>TRACE;DEBUG</DefineConstants>

-    <DocumentationFile>

-    </DocumentationFile>

+    <DocumentationFile></DocumentationFile>

     <DebugSymbols>True</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>False</Optimize>

@@ -41,8 +37,7 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn>

-    </NoWarn>

+    <NoWarn></NoWarn>

   </PropertyGroup>

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

     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>

@@ -51,8 +46,7 @@
     <ConfigurationOverrideFile>

     </ConfigurationOverrideFile>

     <DefineConstants>TRACE</DefineConstants>

-    <DocumentationFile>

-    </DocumentationFile>

+    <DocumentationFile></DocumentationFile>

     <DebugSymbols>False</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>True</Optimize>

@@ -61,19 +55,18 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn>

-    </NoWarn>

+    <NoWarn></NoWarn>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="System">

+    <Reference Include="System" >

       <HintPath>System.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="System.Xml">

+    <Reference Include="System.Xml" >

       <HintPath>System.Xml.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="libsecondlife.dll">

+    <Reference Include="libsecondlife.dll" >

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

       <Private>False</Private>

     </Reference>

@@ -83,50 +76,50 @@
       <Name>OpenSim.Framework</Name>

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

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-      <Private>False</Private>

+                        <Private>False</Private>

     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

-    <Compile Include="RegionServerCommsLocal.cs">

+    <Compile Include="RegionServerCommsOGS.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="RegionServerCommsManager.cs">

+    <Compile Include="RegionServerCommsLocal.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="RegionServerCommsOGS.cs">

+    <Compile Include="RegionServerCommsManager.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="LocalBackEndServices.cs">

       <SubType>Code</SubType>

     </Compile>

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

+    <Compile Include="UserServer\UserCommsManagerOGS.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="InterSimComms\InterSimsCommsBase.cs">

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

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="InterSimComms\InterSimsCommsLocal.cs">

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

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="InterSimComms\InterSimsCommsOGS.cs">

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

       <SubType>Code</SubType>

     </Compile>

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

       <SubType>Code</SubType>

     </Compile>

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

+    <Compile Include="InterSimComms\InterSimsCommsOGS.cs">

       <SubType>Code</SubType>

     </Compile>

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

+    <Compile Include="InterSimComms\InterSimsCommsBase.cs">

       <SubType>Code</SubType>

     </Compile>

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

+    <Compile Include="InterSimComms\InterSimsCommsLocal.cs">

       <SubType>Code</SubType>

     </Compile>

   </ItemGroup>

@@ -137,4 +130,4 @@
     <PostBuildEvent>

     </PostBuildEvent>

   </PropertyGroup>

-</Project>
\ No newline at end of file
+</Project>

diff --git a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build
index 4036747..c46174c 100644
--- a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build
+++ b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build
@@ -11,20 +11,20 @@
             <resources prefix="OpenGrid.Framework.Communications" dynamicprefix="true" >

             </resources>

             <sources failonempty="true">

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

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

                 <include name="RegionServerCommsLocal.cs" />

                 <include name="RegionServerCommsManager.cs" />

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

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

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

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

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

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

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

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

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

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

+                <include name="InterSimComms/InterSimsCommsOGS.cs" />

                 <include name="InterSimComms/InterSimsCommsBase.cs" />

                 <include name="InterSimComms/InterSimsCommsLocal.cs" />

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

diff --git a/Common/OpenSim.Framework/OpenSim.Framework.csproj b/Common/OpenSim.Framework/OpenSim.Framework.csproj
index 0da0982..9407a4f 100644
--- a/Common/OpenSim.Framework/OpenSim.Framework.csproj
+++ b/Common/OpenSim.Framework/OpenSim.Framework.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <PropertyGroup>

     <ProjectType>Local</ProjectType>

     <ProductVersion>8.0.50727</ProductVersion>

@@ -6,8 +6,7 @@
     <ProjectGuid>{8ACA2445-0000-0000-0000-000000000000}</ProjectGuid>

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

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

-    <ApplicationIcon>

-    </ApplicationIcon>

+    <ApplicationIcon></ApplicationIcon>

     <AssemblyKeyContainerName>

     </AssemblyKeyContainerName>

     <AssemblyName>OpenSim.Framework</AssemblyName>

@@ -16,11 +15,9 @@
     <DefaultTargetSchema>IE50</DefaultTargetSchema>

     <DelaySign>false</DelaySign>

     <OutputType>Library</OutputType>

-    <AppDesignerFolder>

-    </AppDesignerFolder>

+    <AppDesignerFolder></AppDesignerFolder>

     <RootNamespace>OpenSim.Framework</RootNamespace>

-    <StartupObject>

-    </StartupObject>

+    <StartupObject></StartupObject>

     <FileUpgradeFlags>

     </FileUpgradeFlags>

   </PropertyGroup>

@@ -31,8 +28,7 @@
     <ConfigurationOverrideFile>

     </ConfigurationOverrideFile>

     <DefineConstants>TRACE;DEBUG</DefineConstants>

-    <DocumentationFile>

-    </DocumentationFile>

+    <DocumentationFile></DocumentationFile>

     <DebugSymbols>True</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>False</Optimize>

@@ -41,8 +37,7 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn>

-    </NoWarn>

+    <NoWarn></NoWarn>

   </PropertyGroup>

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

     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>

@@ -51,8 +46,7 @@
     <ConfigurationOverrideFile>

     </ConfigurationOverrideFile>

     <DefineConstants>TRACE</DefineConstants>

-    <DocumentationFile>

-    </DocumentationFile>

+    <DocumentationFile></DocumentationFile>

     <DebugSymbols>False</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>True</Optimize>

@@ -61,23 +55,22 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn>

-    </NoWarn>

+    <NoWarn></NoWarn>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="System">

+    <Reference Include="System" >

       <HintPath>System.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="System.Xml">

+    <Reference Include="System.Xml" >

       <HintPath>System.Xml.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="libsecondlife.dll">

+    <Reference Include="libsecondlife.dll" >

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

       <Private>False</Private>

     </Reference>

-    <Reference Include="Db4objects.Db4o.dll">

+    <Reference Include="Db4objects.Db4o.dll" >

       <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath>

       <Private>False</Private>

     </Reference>

@@ -87,13 +80,13 @@
       <Name>XMLRPC</Name>

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

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-      <Private>False</Private>

+                        <Private>False</Private>

     </ProjectReference>

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

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

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

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-      <Private>False</Private>

+                        <Private>False</Private>

     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

@@ -118,12 +111,6 @@
     <Compile Include="Remoting.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="SimProfile.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="SimProfileBase.cs">

-      <SubType>Code</SubType>

-    </Compile>

     <Compile Include="UserProfile.cs">

       <SubType>Code</SubType>

     </Compile>

@@ -136,49 +123,55 @@
     <Compile Include="Util.cs">

       <SubType>Code</SubType>

     </Compile>

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

+    <Compile Include="SimProfile.cs">

       <SubType>Code</SubType>

     </Compile>

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

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

       <SubType>Code</SubType>

     </Compile>

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

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

       <SubType>Code</SubType>

     </Compile>

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

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

+      <SubType>Code</SubType>

+    </Compile>

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

       <SubType>Code</SubType>

     </Compile>

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

       <SubType>Code</SubType>

     </Compile>

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

+      <SubType>Code</SubType>

+    </Compile>

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

       <SubType>Code</SubType>

     </Compile>

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

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

       <SubType>Code</SubType>

     </Compile>

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

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

       <SubType>Code</SubType>

     </Compile>

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

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

       <SubType>Code</SubType>

     </Compile>

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

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

       <SubType>Code</SubType>

     </Compile>

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

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

       <SubType>Code</SubType>

     </Compile>

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

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

       <SubType>Code</SubType>

     </Compile>

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

       <SubType>Code</SubType>

     </Compile>

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

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

       <SubType>Code</SubType>

     </Compile>

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

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

       <SubType>Code</SubType>

     </Compile>

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

@@ -187,15 +180,24 @@
     <Compile Include="Interfaces\Remoting\RegionGridClientBase.cs">

       <SubType>Code</SubType>

     </Compile>

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

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

       <SubType>Code</SubType>

     </Compile>

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

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

+      <SubType>Code</SubType>

+    </Compile>

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

       <SubType>Code</SubType>

     </Compile>

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

       <SubType>Code</SubType>

     </Compile>

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

+      <SubType>Code</SubType>

+    </Compile>

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

+      <SubType>Code</SubType>

+    </Compile>

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

       <SubType>Code</SubType>

     </Compile>

@@ -211,9 +213,6 @@
     <Compile Include="Types\AssetStorage.cs">

       <SubType>Code</SubType>

     </Compile>

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

-      <SubType>Code</SubType>

-    </Compile>

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

       <SubType>Code</SubType>

     </Compile>

@@ -223,9 +222,6 @@
     <Compile Include="Types\NetworkServersInfo.cs">

       <SubType>Code</SubType>

     </Compile>

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

-      <SubType>Code</SubType>

-    </Compile>

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

       <SubType>Code</SubType>

     </Compile>

@@ -240,4 +236,4 @@
     <PostBuildEvent>

     </PostBuildEvent>

   </PropertyGroup>

-</Project>
\ No newline at end of file
+</Project>

diff --git a/Common/OpenSim.Framework/OpenSim.Framework.dll.build b/Common/OpenSim.Framework/OpenSim.Framework.dll.build
index 7ead9a8..dcbff12 100644
--- a/Common/OpenSim.Framework/OpenSim.Framework.dll.build
+++ b/Common/OpenSim.Framework/OpenSim.Framework.dll.build
@@ -18,43 +18,43 @@
                 <include name="LoginService.cs" />

                 <include name="RegionCommsHostBase.cs" />

                 <include name="Remoting.cs" />

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

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

                 <include name="UserProfile.cs" />

                 <include name="UserProfileManager.cs" />

                 <include name="UserProfileManagerBase.cs" />

                 <include name="Util.cs" />

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

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

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

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

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

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

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

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

+                <include name="Interfaces/Remoting/IProxyServerClient.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/Scripting/IScriptAPI.cs" />

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/Common/OpenSim.Framework/SimProfile.cs b/Common/OpenSim.Framework/SimProfile.cs
index 2e37e02..cfa5e50 100644
--- a/Common/OpenSim.Framework/SimProfile.cs
+++ b/Common/OpenSim.Framework/SimProfile.cs
@@ -35,8 +35,20 @@ using Nwc.XmlRpc;
 

 namespace OpenSim.Framework.Sims

 {

-    public class SimProfile : SimProfileBase

+    public class SimProfile

     {

+        public LLUUID UUID;

+        public ulong regionhandle;

+        public string regionname;

+        public string sim_ip;

+        public uint sim_port;

+        public string caps_url;

+        public uint RegionLocX;

+        public uint RegionLocY;

+        public string sendkey;

+        public string recvkey;

+        public bool online;

+

         public SimProfile LoadFromGrid(ulong region_handle, string GridURL, string SendKey, string RecvKey)

         {

             try

diff --git a/Common/OpenSim.Framework/SimProfileBase.cs b/Common/OpenSim.Framework/SimProfileBase.cs
deleted file mode 100644
index bab18be..0000000
--- a/Common/OpenSim.Framework/SimProfileBase.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-/*

-* Copyright (c) Contributors, http://www.openmetaverse.org/

-* See CONTRIBUTORS.TXT for a full list of copyright holders.

-*

-* Redistribution and use in source and binary forms, with or without

-* modification, are permitted provided that the following conditions are met:

-*     * Redistributions of source code must retain the above copyright

-*       notice, this list of conditions and the following disclaimer.

-*     * Redistributions in binary form must reproduce the above copyright

-*       notice, this list of conditions and the following disclaimer in the

-*       documentation and/or other materials provided with the distribution.

-*     * Neither the name of the OpenSim Project nor the

-*       names of its contributors may be used to endorse or promote products

-*       derived from this software without specific prior written permission.

-*

-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY

-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-* 

-*/

-using System;

-using System.Collections.Generic;

-using System.Text;

-using libsecondlife;

-

-namespace OpenSim.Framework.Sims

-{

-    [System.Obsolete("Depreciated, use SimProfileData instead")]

-    public class SimProfileBase

-    {

-        public LLUUID UUID;

-        public ulong regionhandle;

-        public string regionname;

-        public string sim_ip;

-        public uint sim_port;

-        public string caps_url;

-        public uint RegionLocX;

-        public uint RegionLocY;

-        public string sendkey;

-        public string recvkey;

-            public bool online;

-

-        public SimProfileBase()

-        {

-        }

-    }

-}

diff --git a/Common/OpenSim.Servers/OpenSim.Servers.csproj b/Common/OpenSim.Servers/OpenSim.Servers.csproj
index 0c61f75..f0a6eee 100644
--- a/Common/OpenSim.Servers/OpenSim.Servers.csproj
+++ b/Common/OpenSim.Servers/OpenSim.Servers.csproj
@@ -92,6 +92,12 @@
     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

+    <Compile Include="LoginServer2.cs">

+      <SubType>Code</SubType>

+    </Compile>

+    <Compile Include="LocalLoginServer.cs">

+      <SubType>Code</SubType>

+    </Compile>

     <Compile Include="BaseHttpServer.cs">

       <SubType>Code</SubType>

     </Compile>

diff --git a/Common/OpenSim.Servers/OpenSim.Servers.dll.build b/Common/OpenSim.Servers/OpenSim.Servers.dll.build
index ec868f1..059829f 100644
--- a/Common/OpenSim.Servers/OpenSim.Servers.dll.build
+++ b/Common/OpenSim.Servers/OpenSim.Servers.dll.build
@@ -11,6 +11,8 @@
             <resources prefix="OpenSim.Servers" dynamicprefix="true" >

             </resources>

             <sources failonempty="true">

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

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

                 <include name="BaseHttpServer.cs" />

                 <include name="CheckSumServer.cs" />

                 <include name="IRestHandler.cs" />

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

   </ItemGroup>

   <ItemGroup>

-    <Compile Include="Logger.cs">

+    <Compile Include="XmlRpcBoxcarRequest.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="SimpleHttpRequest.cs">

+    <Compile Include="XmlRpcRequest.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="XmlRpcBoxcarRequest.cs">

+    <Compile Include="XmlRpcResponseSerializer.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="XmlRpcClientProxy.cs">

+    <Compile Include="Logger.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="XmlRpcDeserializer.cs">

+    <Compile Include="XmlRpcRequestDeserializer.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="XmlRpcErrorCodes.cs">

+    <Compile Include="XmlRpcExposedAttribute.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="XmlRpcException.cs">

+    <Compile Include="XmlRpcResponse.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="XmlRpcExposedAttribute.cs">

+    <Compile Include="XmlRpcException.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="XmlRpcRequest.cs">

+    <Compile Include="XmlRpcResponseDeserializer.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="XmlRpcRequestDeserializer.cs">

+    <Compile Include="XmlRpcResponder.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="XmlRpcRequestSerializer.cs">

+    <Compile Include="XmlRpcServer.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="XmlRpcResponder.cs">

+    <Compile Include="XmlRpcErrorCodes.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="XmlRpcResponse.cs">

+    <Compile Include="XmlRpcSerializer.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="XmlRpcResponseDeserializer.cs">

+    <Compile Include="XmlRpcSystemObject.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="XmlRpcResponseSerializer.cs">

+    <Compile Include="SimpleHttpRequest.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="XmlRpcSerializer.cs">

+    <Compile Include="XmlRpcClientProxy.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="XmlRpcServer.cs">

+    <Compile Include="XmlRpcRequestSerializer.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="XmlRpcSystemObject.cs">

+    <Compile Include="XmlRpcDeserializer.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="XmlRpcXmlTokens.cs">

diff --git a/Common/XmlRpcCS/XMLRPC.dll.build b/Common/XmlRpcCS/XMLRPC.dll.build
index 2eabfcd..8d5efd1 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="XmlRpcRequestSerializer.cs" />

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

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

                 <include name="XmlRpcResponse.cs" />

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

                 <include name="XmlRpcResponseDeserializer.cs" />

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

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

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

                 <include name="XmlRpcServer.cs" />

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

+                <include name="XmlRpcSerializer.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.sln b/OpenGridServices.sln
index 9ed513f..86cb4ad 100644
--- a/OpenGridServices.sln
+++ b/OpenGridServices.sln
@@ -1,5 +1,5 @@
 Microsoft Visual Studio Solution File, Format Version 9.00

-# Visual C# Express 2005

+# Visual Studio 2005

 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenUser.Config.UserConfigDb4o", "OpenGridServices\OpenUser.Config\UserConfigDb4o\OpenUser.Config.UserConfigDb4o.csproj", "{7E494328-0000-0000-0000-000000000000}"

 EndProject

 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.AssetServer", "OpenGridServices\OpenGridServices.AssetServer\OpenGridServices.AssetServer.csproj", "{0021261B-0000-0000-0000-000000000000}"

@@ -23,57 +23,66 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Data.MySQL", "OpenGridServices\OpenGrid.Framework.Data.MySQL\OpenGrid.Framework.Data.MySQL.csproj", "{0F3C3AC1-0000-0000-0000-000000000000}"

 EndProject

 Global

-        GlobalSection(SolutionConfigurationPlatforms) = preSolution

-                Debug|Any CPU = Debug|Any CPU

-                Release|Any CPU = Release|Any CPU

-        EndGlobalSection

-        GlobalSection(ProjectConfigurationPlatforms) = postSolution

-                {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-                {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

-                {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

-                {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

-                {0021261B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-                {0021261B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

-                {0021261B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

-                {0021261B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

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

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

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

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

-                {1E3F341A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-                {1E3F341A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

-                {1E3F341A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

-                {1E3F341A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

-                {39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-                {39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

-                {39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

-                {39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

-                {7924FD35-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-                {7924FD35-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

-                {7924FD35-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

-                {7924FD35-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

-                {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-                {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

-                {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

-                {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

-                {0A563AC1-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

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

-                {0A563AC1-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

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

-                {62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-                {62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

-                {62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

-                {62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

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

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

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

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

-                {0F3C3AC1-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

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

-                {0F3C3AC1-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

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

-        EndGlobalSection

-        GlobalSection(SolutionProperties) = preSolution

-                HideSolutionNode = FALSE

-        EndGlobalSection

+  GlobalSection(SolutionConfigurationPlatforms) = preSolution

+    Debug|Any CPU = Debug|Any CPU

+    Release|Any CPU = Release|Any CPU

+  EndGlobalSection

+  GlobalSection(ProjectDependencies) = postSolution

+    ({1E3F341A-0000-0000-0000-000000000000}).4 = ({62CDF671-0000-0000-0000-000000000000})

+    ({39BD9497-0000-0000-0000-000000000000}).3 = ({62CDF671-0000-0000-0000-000000000000})

+    ({21BFC8E2-0000-0000-0000-000000000000}).6 = ({62CDF671-0000-0000-0000-000000000000})

+    ({21BFC8E2-0000-0000-0000-000000000000}).7 = ({7924FD35-0000-0000-0000-000000000000})

+    ({0A563AC1-0000-0000-0000-000000000000}).3 = ({62CDF671-0000-0000-0000-000000000000})

+    ({66591469-0000-0000-0000-000000000000}).5 = ({62CDF671-0000-0000-0000-000000000000})

+    ({0F3C3AC1-0000-0000-0000-000000000000}).3 = ({62CDF671-0000-0000-0000-000000000000})

+  EndGlobalSection

+  GlobalSection(ProjectConfigurationPlatforms) = postSolution

+    {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+    {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

+    {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

+    {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

+    {0021261B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+    {0021261B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

+    {0021261B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

+    {0021261B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

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

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

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

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

+    {1E3F341A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+    {1E3F341A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

+    {1E3F341A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

+    {1E3F341A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

+    {39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+    {39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

+    {39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

+    {39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

+    {7924FD35-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+    {7924FD35-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

+    {7924FD35-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

+    {7924FD35-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

+    {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+    {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

+    {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

+    {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

+    {0A563AC1-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

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

+    {0A563AC1-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

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

+    {62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+    {62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

+    {62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

+    {62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

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

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

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

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

+    {0F3C3AC1-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

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

+    {0F3C3AC1-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

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

+  EndGlobalSection

+  GlobalSection(SolutionProperties) = preSolution

+    HideSolutionNode = FALSE

+  EndGlobalSection

 EndGlobal

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 82d4f5f..3b783ca 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="DB4oGridData.cs">

+    <Compile Include="DB4oUserData.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="DB4oManager.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="DB4oUserData.cs">

+    <Compile Include="DB4oGridData.cs">

       <SubType>Code</SubType>

     </Compile>

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

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 8e0f53a..db8662d 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="DB4oGridData.cs" />

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

                 <include name="DB4oUserData.cs" />

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

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

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

             </sources>

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

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 75ef149..5fe0cf7 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="MySQLGridData.cs">

-      <SubType>Code</SubType>

-    </Compile>

     <Compile Include="MySQLInventoryData.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="MySQLLogData.cs">

+    <Compile Include="MySQLUserData.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="MySQLManager.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="MySQLUserData.cs">

+    <Compile Include="MySQLLogData.cs">

+      <SubType>Code</SubType>

+    </Compile>

+    <Compile Include="MySQLGridData.cs">

       <SubType>Code</SubType>

     </Compile>

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

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 78f4afe..84d3d56 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="MySQLLogData.cs" />

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

                 <include name="MySQLUserData.cs" />

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

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

+                <include name="MySQLGridData.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 463cf86..fa17367 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="SQLiteGridData.cs">

+    <Compile Include="SQLiteManager.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="SQLiteManager.cs">

+    <Compile Include="SQLiteGridData.cs">

       <SubType>Code</SubType>

     </Compile>

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

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 1be9b43..8c0f8fe 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="SQLiteGridData.cs" />

                 <include name="SQLiteManager.cs" />

+                <include name="SQLiteGridData.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 a572204..990cd16 100644
--- a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj
+++ b/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj
@@ -81,6 +81,9 @@
     <Compile Include="GridData.cs">

       <SubType>Code</SubType>

     </Compile>

+    <Compile Include="SimProfileData.cs">

+      <SubType>Code</SubType>

+    </Compile>

     <Compile Include="ILogData.cs">

       <SubType>Code</SubType>

     </Compile>

@@ -90,9 +93,6 @@
     <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.dll.build b/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build
index e6e0313..c993a8d 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/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj b/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj
index 1bd07fb..8c0f513 100644
--- a/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj
+++ b/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj
@@ -108,10 +108,10 @@
     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

-    <Compile Include="Main.cs">

+    <Compile Include="UserManager.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="UserManager.cs">

+    <Compile Include="Main.cs">

       <SubType>Code</SubType>

     </Compile>

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

diff --git a/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build b/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build
index 5275ef4..1183d65 100644
--- a/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build
+++ b/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build
@@ -11,8 +11,8 @@
             <resources prefix="OpenGridServices.UserServer" dynamicprefix="true" >

             </resources>

             <sources failonempty="true">

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

                 <include name="UserManager.cs" />

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

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

             </sources>

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

diff --git a/OpenSim/OpenSim.Region/OpenSim.Region.csproj b/OpenSim/OpenSim.Region/OpenSim.Region.csproj
index 5c30810..365af66 100644
--- a/OpenSim/OpenSim.Region/OpenSim.Region.csproj
+++ b/OpenSim/OpenSim.Region/OpenSim.Region.csproj
@@ -136,6 +136,9 @@
     <Compile Include="Estate\EstateManager.cs">

       <SubType>Code</SubType>

     </Compile>

+    <Compile Include="World\AvatarAnimations.cs">

+      <SubType>Code</SubType>

+    </Compile>

     <Compile Include="World\Avatar.Client.cs">

       <SubType>Code</SubType>

     </Compile>

@@ -145,9 +148,6 @@
     <Compile Include="World\Avatar.Update.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="World\AvatarAnimations.cs">

-      <SubType>Code</SubType>

-    </Compile>

     <Compile Include="World\Entity.cs">

       <SubType>Code</SubType>

     </Compile>

@@ -163,10 +163,10 @@
     <Compile Include="World\World.PacketHandlers.cs">

       <SubType>Code</SubType>

     </Compile>

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

+    <Compile Include="World\WorldBase.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="World\WorldBase.cs">

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

       <SubType>Code</SubType>

     </Compile>

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

diff --git a/OpenSim/OpenSim.Region/OpenSim.Region.dll.build b/OpenSim/OpenSim.Region/OpenSim.Region.dll.build
index ae46c6b..a33d214 100644
--- a/OpenSim/OpenSim.Region/OpenSim.Region.dll.build
+++ b/OpenSim/OpenSim.Region/OpenSim.Region.dll.build
@@ -13,17 +13,17 @@
             <sources failonempty="true">

                 <include name="ParcelManager.cs" />

                 <include name="Estate/EstateManager.cs" />

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

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

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

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

-                <include name="World/AvatarAnimations.cs" />

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

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

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

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

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

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

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

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

                 <include name="World/scripting/IScriptContext.cs" />

                 <include name="World/scripting/IScriptEntity.cs" />

                 <include name="World/scripting/IScriptHandler.cs" />

diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
index 75b70b4..259d839 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
+++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <PropertyGroup>

     <ProjectType>Local</ProjectType>

     <ProductVersion>8.0.50727</ProductVersion>

@@ -6,8 +6,7 @@
     <ProjectGuid>{632E1BFD-0000-0000-0000-000000000000}</ProjectGuid>

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

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

-    <ApplicationIcon>

-    </ApplicationIcon>

+    <ApplicationIcon></ApplicationIcon>

     <AssemblyKeyContainerName>

     </AssemblyKeyContainerName>

     <AssemblyName>OpenSim.RegionServer</AssemblyName>

@@ -16,11 +15,9 @@
     <DefaultTargetSchema>IE50</DefaultTargetSchema>

     <DelaySign>false</DelaySign>

     <OutputType>Library</OutputType>

-    <AppDesignerFolder>

-    </AppDesignerFolder>

+    <AppDesignerFolder></AppDesignerFolder>

     <RootNamespace>OpenSim.RegionServer</RootNamespace>

-    <StartupObject>

-    </StartupObject>

+    <StartupObject></StartupObject>

     <FileUpgradeFlags>

     </FileUpgradeFlags>

   </PropertyGroup>

@@ -31,8 +28,7 @@
     <ConfigurationOverrideFile>

     </ConfigurationOverrideFile>

     <DefineConstants>TRACE;DEBUG</DefineConstants>

-    <DocumentationFile>

-    </DocumentationFile>

+    <DocumentationFile></DocumentationFile>

     <DebugSymbols>True</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>False</Optimize>

@@ -41,8 +37,7 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn>

-    </NoWarn>

+    <NoWarn></NoWarn>

   </PropertyGroup>

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

     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>

@@ -51,8 +46,7 @@
     <ConfigurationOverrideFile>

     </ConfigurationOverrideFile>

     <DefineConstants>TRACE</DefineConstants>

-    <DocumentationFile>

-    </DocumentationFile>

+    <DocumentationFile></DocumentationFile>

     <DebugSymbols>False</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>True</Optimize>

@@ -61,27 +55,26 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn>

-    </NoWarn>

+    <NoWarn></NoWarn>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="System">

+    <Reference Include="System" >

       <HintPath>System.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="System.Xml">

+    <Reference Include="System.Xml" >

       <HintPath>System.Xml.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="libsecondlife.dll">

+    <Reference Include="libsecondlife.dll" >

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

       <Private>False</Private>

     </Reference>

-    <Reference Include="Axiom.MathLib.dll">

+    <Reference Include="Axiom.MathLib.dll" >

       <HintPath>..\..\bin\Axiom.MathLib.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="Db4objects.Db4o.dll">

+    <Reference Include="Db4objects.Db4o.dll" >

       <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath>

       <Private>False</Private>

     </Reference>

@@ -91,43 +84,43 @@
       <Name>OpenSim.Terrain.BasicTerrain</Name>

       <Project>{2270B8FE-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-      <Private>False</Private>

+                        <Private>False</Private>

     </ProjectReference>

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

       <Name>OpenSim.Framework</Name>

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

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-      <Private>False</Private>

+                        <Private>False</Private>

     </ProjectReference>

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

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

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

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-      <Private>False</Private>

+                        <Private>False</Private>

     </ProjectReference>

     <ProjectReference Include="..\..\Common\OpenSim.GenericConfig\Xml\OpenSim.GenericConfig.Xml.csproj">

       <Name>OpenSim.GenericConfig.Xml</Name>

       <Project>{E88EF749-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-      <Private>False</Private>

+                        <Private>False</Private>

     </ProjectReference>

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

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

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

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-      <Private>False</Private>

+                        <Private>False</Private>

     </ProjectReference>

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

       <Name>OpenSim.Servers</Name>

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

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-      <Private>False</Private>

+                        <Private>False</Private>

     </ProjectReference>

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

       <Name>XMLRPC</Name>

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

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-      <Private>False</Private>

+                        <Private>False</Private>

     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

@@ -161,16 +154,16 @@
     <Compile Include="PacketServer.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="RegionServerBase.cs">

+    <Compile Include="UserConfigUtility.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="UDPServer.cs">

+    <Compile Include="VersionInfo.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="UserConfigUtility.cs">

+    <Compile Include="RegionServerBase.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="VersionInfo.cs">

+    <Compile Include="UDPServer.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Assets\AssetCache.cs">

@@ -187,4 +180,4 @@
     <PostBuildEvent>

     </PostBuildEvent>

   </PropertyGroup>

-</Project>
\ No newline at end of file
+</Project>

diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
index 5b3e60b..32c1699 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
+++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
@@ -21,13 +21,12 @@
                 <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="RegionServerBase.cs" />

+                <include name="UDPServer.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.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj
index 0750742..6bcf38a 100644
--- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj
+++ b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <PropertyGroup>

     <ProjectType>Local</ProjectType>

     <ProductVersion>8.0.50727</ProductVersion>

@@ -6,8 +6,7 @@
     <ProjectGuid>{97A82740-0000-0000-0000-000000000000}</ProjectGuid>

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

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

-    <ApplicationIcon>

-    </ApplicationIcon>

+    <ApplicationIcon></ApplicationIcon>

     <AssemblyKeyContainerName>

     </AssemblyKeyContainerName>

     <AssemblyName>OpenSim.Scripting.EmbeddedJVM</AssemblyName>

@@ -16,11 +15,9 @@
     <DefaultTargetSchema>IE50</DefaultTargetSchema>

     <DelaySign>false</DelaySign>

     <OutputType>Library</OutputType>

-    <AppDesignerFolder>

-    </AppDesignerFolder>

+    <AppDesignerFolder></AppDesignerFolder>

     <RootNamespace>OpenSim.Scripting.EmbeddedJVM</RootNamespace>

-    <StartupObject>

-    </StartupObject>

+    <StartupObject></StartupObject>

     <FileUpgradeFlags>

     </FileUpgradeFlags>

   </PropertyGroup>

@@ -31,8 +28,7 @@
     <ConfigurationOverrideFile>

     </ConfigurationOverrideFile>

     <DefineConstants>TRACE;DEBUG</DefineConstants>

-    <DocumentationFile>

-    </DocumentationFile>

+    <DocumentationFile></DocumentationFile>

     <DebugSymbols>True</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>False</Optimize>

@@ -41,8 +37,7 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn>

-    </NoWarn>

+    <NoWarn></NoWarn>

   </PropertyGroup>

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

     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>

@@ -51,8 +46,7 @@
     <ConfigurationOverrideFile>

     </ConfigurationOverrideFile>

     <DefineConstants>TRACE</DefineConstants>

-    <DocumentationFile>

-    </DocumentationFile>

+    <DocumentationFile></DocumentationFile>

     <DebugSymbols>False</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>True</Optimize>

@@ -61,29 +55,28 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn>

-    </NoWarn>

+    <NoWarn></NoWarn>

   </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" >

       <HintPath>System.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="System.Xml">

+    <Reference Include="System.Xml" >

       <HintPath>System.Xml.dll</HintPath>

       <Private>False</Private>

     </Reference>

+    <Reference Include="libsecondlife.dll" >

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

+      <Private>False</Private>

+    </Reference>

   </ItemGroup>

   <ItemGroup>

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

       <Name>OpenSim.Framework</Name>

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

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-      <Private>False</Private>

+                        <Private>False</Private>

     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

@@ -102,9 +95,6 @@
     <Compile Include="InterpreterLogic.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="InterpreterMethods.cs">

-      <SubType>Code</SubType>

-    </Compile>

     <Compile Include="InterpreterReturn.cs">

       <SubType>Code</SubType>

     </Compile>

@@ -129,6 +119,9 @@
     <Compile Include="Thread.cs">

       <SubType>Code</SubType>

     </Compile>

+    <Compile Include="InterpreterMethods.cs">

+      <SubType>Code</SubType>

+    </Compile>

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

       <SubType>Code</SubType>

     </Compile>

@@ -161,4 +154,4 @@
     <PostBuildEvent>

     </PostBuildEvent>

   </PropertyGroup>

-</Project>
\ No newline at end of file
+</Project>

diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build
index c5255db..2ff51ef 100644
--- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build
+++ b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build
@@ -16,7 +16,6 @@
                 <include name="Heap.cs" />

                 <include name="Interpreter.cs" />

                 <include name="InterpreterLogic.cs" />

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

                 <include name="InterpreterReturn.cs" />

                 <include name="MainMemory.cs" />

                 <include name="MethodMemory.cs" />

@@ -25,6 +24,7 @@
                 <include name="Stack.cs" />

                 <include name="StackFrame.cs" />

                 <include name="Thread.cs" />

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

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

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

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

@@ -41,6 +41,7 @@
                 </lib>

                 <include name="System.dll" />

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

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

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

             </references>

         </csc>

diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
index 15ae5bf..6f92e76 100644
--- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
+++ b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
@@ -90,19 +90,19 @@
     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

-    <Compile Include="AssemblyInfo.cs">

+    <Compile Include="UUIDParcelQuery.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Db4LocalStorage.cs">

+    <Compile Include="UUIDPrimQuery.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="MapStorage.cs">

+    <Compile Include="Db4LocalStorage.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="UUIDParcelQuery.cs">

+    <Compile Include="AssemblyInfo.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="UUIDPrimQuery.cs">

+    <Compile Include="MapStorage.cs">

       <SubType>Code</SubType>

     </Compile>

   </ItemGroup>

diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
index c2fd2bd..7fb50c8 100644
--- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
+++ b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
@@ -11,11 +11,11 @@
             <resources prefix="OpenSim.Storage.LocalStorageDb4o" dynamicprefix="true" >

             </resources>

             <sources failonempty="true">

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

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

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

                 <include name="UUIDParcelQuery.cs" />

                 <include name="UUIDPrimQuery.cs" />

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

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

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

             </sources>

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

                 <lib>

diff --git a/Prebuild/src/Prebuild.csproj b/Prebuild/src/Prebuild.csproj
index 55efffa..df6b4f4 100644
--- a/Prebuild/src/Prebuild.csproj
+++ b/Prebuild/src/Prebuild.csproj
@@ -83,9 +83,6 @@
     <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>

@@ -95,19 +92,25 @@
     <Compile Include="Core\WarningException.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Core\Attributes\DataNodeAttribute.cs">

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

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Core\Attributes\OptionNodeAttribute.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Core\Attributes\TargetAttribute.cs">

+    <Compile Include="Core\Attributes\DataNodeAttribute.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Core\Interfaces\IDataNode.cs">

+    <Compile Include="Core\Attributes\TargetAttribute.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Core\Interfaces\ITarget.cs">

+    <Compile Include="Core\Nodes\ProjectNode.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Core\Nodes\ConfigurationNode.cs">

@@ -119,76 +122,73 @@
     <Compile Include="Core\Nodes\ExcludeNode.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Core\Nodes\FileNode.cs">

+    <Compile Include="Core\Nodes\OptionsNode.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Core\Nodes\FilesNode.cs">

+    <Compile Include="Core\Nodes\ReferencePathNode.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Core\Nodes\MatchNode.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Core\Nodes\OptionsNode.cs">

+    <Compile Include="Core\Nodes\SolutionNode.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Core\Nodes\ProcessNode.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Core\Nodes\ProjectNode.cs">

-      <SubType>Code</SubType>

-    </Compile>

     <Compile Include="Core\Nodes\ReferenceNode.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Core\Nodes\ReferencePathNode.cs">

+    <Compile Include="Core\Nodes\FileNode.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Core\Nodes\SolutionNode.cs">

+    <Compile Include="Core\Nodes\FilesNode.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Core\Parse\IfContext.cs">

+    <Compile Include="Core\Targets\DebugTarget.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Core\Parse\Preprocessor.cs">

+    <Compile Include="Core\Targets\MonoDevelopTarget.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Core\Targets\AutotoolsTarget.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Core\Targets\DebugTarget.cs">

+    <Compile Include="Core\Targets\SharpDevelopTarget.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Core\Targets\MonoDevelopTarget.cs">

+    <Compile Include="Core\Targets\VS2002Target.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Core\Targets\NAntTarget.cs">

+    <Compile Include="Core\Targets\VS2003Target.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Core\Targets\SharpDevelop2Target.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Core\Targets\SharpDevelopTarget.cs">

+    <Compile Include="Core\Targets\VS2005Target.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Core\Targets\VS2002Target.cs">

+    <Compile Include="Core\Targets\NAntTarget.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Core\Targets\VS2003Target.cs">

+    <Compile Include="Core\Parse\IfContext.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Core\Targets\VS2005Target.cs">

+    <Compile Include="Core\Parse\Preprocessor.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="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="Properties\AssemblyInfo.cs">

diff --git a/Prebuild/src/Prebuild.exe.build b/Prebuild/src/Prebuild.exe.build
index 43f5516..f2c8cab 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/Attributes/DataNodeAttribute.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/TargetAttribute.cs" />

-                <include name="Core/Interfaces/IDataNode.cs" />

-                <include name="Core/Interfaces/ITarget.cs" />

+                <include name="Core/Nodes/ProjectNode.cs" />

                 <include name="Core/Nodes/ConfigurationNode.cs" />

                 <include name="Core/Nodes/DataNode.cs" />

                 <include name="Core/Nodes/ExcludeNode.cs" />

-                <include name="Core/Nodes/FileNode.cs" />

-                <include name="Core/Nodes/FilesNode.cs" />

-                <include name="Core/Nodes/MatchNode.cs" />

                 <include name="Core/Nodes/OptionsNode.cs" />

-                <include name="Core/Nodes/ProcessNode.cs" />

-                <include name="Core/Nodes/ProjectNode.cs" />

-                <include name="Core/Nodes/ReferenceNode.cs" />

                 <include name="Core/Nodes/ReferencePathNode.cs" />

+                <include name="Core/Nodes/MatchNode.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/Nodes/ProcessNode.cs" />

+                <include name="Core/Nodes/ReferenceNode.cs" />

+                <include name="Core/Nodes/FileNode.cs" />

+                <include name="Core/Nodes/FilesNode.cs" />

                 <include name="Core/Targets/DebugTarget.cs" />

                 <include name="Core/Targets/MonoDevelopTarget.cs" />

-                <include name="Core/Targets/NAntTarget.cs" />

-                <include name="Core/Targets/SharpDevelop2Target.cs" />

+                <include name="Core/Targets/AutotoolsTarget.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/Utilities/CommandLineCollection.cs" />

-                <include name="Core/Utilities/CurrentDirectory.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="Properties/AssemblyInfo.cs" />

             </sources>

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

diff --git a/prebuild.xml b/prebuild.xml
index 2aa8a37..3aadd9b 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -406,6 +406,8 @@
       <ReferencePath>../../../bin/</ReferencePath>

       <Reference name="System"/>

       <Reference name="System.Xml"/>

+

+      <Reference name="libsecondlife.dll"/>

      <Reference name="OpenSim.Framework"/>

 

       <Files>