58 files changed, 440 insertions, 383 deletions
diff --git a/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj
index 0ee62e9..31ab172 100644
--- a/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj
+++ b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj
@@ -86,16 +86,16 @@
    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
-    <Compile Include="IUserServices.cs">
+    <Compile Include="CommunicationsManager.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="IGridServices.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="CommunicationsManager.cs">
+    <Compile Include="IInterRegionCommunications.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="IInterRegionCommunications.cs">
+    <Compile Include="IUserServices.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build
index 8b0e0f6..52d29f6 100644
--- a/OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build
+++ b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build
@@ -11,10 +11,10 @@
            <resources prefix="OpenSim.Framework.Communications" dynamicprefix="true" >
            </resources>
            <sources failonempty="true">
-                <include name="IUserServices.cs" />
-                <include name="IGridServices.cs" />
                <include name="CommunicationsManager.cs" />
+                <include name="IGridServices.cs" />
                <include name="IInterRegionCommunications.cs" />
+                <include name="IUserServices.cs" />
                <include name="Properties/AssemblyInfo.cs" />
            </sources>
            <references basedir="${project::get-base-directory()}">
diff --git a/OpenSim/Framework/Console/OpenSim.Framework.Console.csproj b/OpenSim/Framework/Console/OpenSim.Framework.Console.csproj
index c02a506..f3dcec5 100644
--- a/OpenSim/Framework/Console/OpenSim.Framework.Console.csproj
+++ b/OpenSim/Framework/Console/OpenSim.Framework.Console.csproj
@@ -69,10 +69,10 @@
    <Compile Include="AssemblyInfo.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="LogBase.cs">
+    <Compile Include="ConsoleCallbacksBase.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="ConsoleCallbacksBase.cs">
+    <Compile Include="LogBase.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="MainLog.cs">
diff --git a/OpenSim/Framework/Console/OpenSim.Framework.Console.dll.build b/OpenSim/Framework/Console/OpenSim.Framework.Console.dll.build
index 10e72a1..eb40c0d 100644
--- a/OpenSim/Framework/Console/OpenSim.Framework.Console.dll.build
+++ b/OpenSim/Framework/Console/OpenSim.Framework.Console.dll.build
@@ -12,8 +12,8 @@
            </resources>
            <sources failonempty="true">
                <include name="AssemblyInfo.cs" />
-                <include name="LogBase.cs" />
                <include name="ConsoleCallbacksBase.cs" />
+                <include name="LogBase.cs" />
                <include name="MainLog.cs" />
            </sources>
            <references basedir="${project::get-base-directory()}">
diff --git a/OpenSim/Framework/Data.DB4o/DB4oManager.cs b/OpenSim/Framework/Data.DB4o/DB4oManager.cs
index 3870a8c..bd4cea8 100644
--- a/OpenSim/Framework/Data.DB4o/DB4oManager.cs
+++ b/OpenSim/Framework/Data.DB4o/DB4oManager.cs
@@ -89,7 +89,7 @@ namespace OpenSim.Framework.Data.DB4o
                database.Close();
                return true;
            }
-            catch (Exception e)
+            catch (Exception)
            {
                return false;
            }
@@ -154,7 +154,7 @@ namespace OpenSim.Framework.Data.DB4o
                database.Close();
                return true;
            }
-            catch (Exception e)
+            catch (Exception)
            {
                return false;
            }
diff --git a/OpenSim/Framework/Data.DB4o/DB4oUserData.cs b/OpenSim/Framework/Data.DB4o/DB4oUserData.cs
index 8caa75d..3ab0073 100644
--- a/OpenSim/Framework/Data.DB4o/DB4oUserData.cs
+++ b/OpenSim/Framework/Data.DB4o/DB4oUserData.cs
@@ -100,7 +100,7 @@ namespace OpenSim.Framework.Data.DB4o
            {
                return getUserByUUID(uuid).currentAgent;
            }
-            catch (Exception e)
+            catch (Exception)
            {
                return null;
            }
@@ -128,7 +128,7 @@ namespace OpenSim.Framework.Data.DB4o
            {
                return getUserByName(fname,lname).currentAgent;
            }
-            catch (Exception e)
+            catch (Exception)
            {
                return null;
            }
diff --git a/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj b/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj
index f6e8311..b09cecf 100644
--- a/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj
+++ b/OpenSim/Framework/Data.DB4o/OpenSim.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/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build b/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build
index 2c5e31b..f124eb5 100644
--- a/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build
+++ b/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build
@@ -11,9 +11,9 @@
            <resources prefix="OpenSim.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/OpenSim/Framework/Data.MSSQL/MSSQLManager.cs b/OpenSim/Framework/Data.MSSQL/MSSQLManager.cs
index 7cf1a56..3c83c1f 100644
--- a/OpenSim/Framework/Data.MSSQL/MSSQLManager.cs
+++ b/OpenSim/Framework/Data.MSSQL/MSSQLManager.cs
@@ -203,7 +203,7 @@ namespace OpenSim.Framework.Data.MSSQL
                result.Dispose();
            }
-            catch (Exception e)
+            catch (Exception)
            {
                return false;
            }
diff --git a/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj
index 09a32b5..62e3887 100644
--- a/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj
+++ b/OpenSim/Framework/Data.MySQL/OpenSim.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/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build
index 3aeebbc..594ec52 100644
--- a/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build
+++ b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build
@@ -11,11 +11,11 @@
            <resources prefix="OpenSim.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/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj
index dab22ea..4ba24f1 100644
--- a/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj
+++ b/OpenSim/Framework/Data.SQLite/OpenSim.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/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.dll.build b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.dll.build
index 719fbc6..e28d0a6 100644
--- a/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.dll.build
+++ b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.dll.build
@@ -11,8 +11,8 @@
            <resources prefix="OpenSim.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/OpenSim/Framework/Data.SQLite/SQLiteManager.cs b/OpenSim/Framework/Data.SQLite/SQLiteManager.cs
index b67b79c..3397e0d 100644
--- a/OpenSim/Framework/Data.SQLite/SQLiteManager.cs
+++ b/OpenSim/Framework/Data.SQLite/SQLiteManager.cs
@@ -198,7 +198,7 @@ namespace OpenSim.Framework.Data.SQLite
                result.Dispose();
            }
-            catch (Exception e)
+            catch (Exception)
            {
                return false;
            }
diff --git a/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj b/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj
index 47b9ba3..dcafbcd 100644
--- a/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj
+++ b/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj
@@ -78,15 +78,9 @@
  <ItemGroup>
  </ItemGroup>
  <ItemGroup>
-    <Compile Include="ReservationData.cs">
-      <SubType>Code</SubType>
-    </Compile>
    <Compile Include="GridData.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="SimProfileData.cs">
-      <SubType>Code</SubType>
-    </Compile>
    <Compile Include="ILogData.cs">
      <SubType>Code</SubType>
    </Compile>
@@ -96,6 +90,12 @@
    <Compile Include="InventoryData.cs">
      <SubType>Code</SubType>
    </Compile>
+    <Compile Include="ReservationData.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="SimProfileData.cs">
+      <SubType>Code</SubType>
+    </Compile>
    <Compile Include="UserData.cs">
      <SubType>Code</SubType>
    </Compile>
diff --git a/OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build b/OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build
index 881bb3a..aefb02b 100644
--- a/OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build
+++ b/OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build
@@ -11,12 +11,12 @@
            <resources prefix="OpenSim.Framework.Data" dynamicprefix="true" >
            </resources>
            <sources failonempty="true">
-                <include name="ReservationData.cs" />
                <include name="GridData.cs" />
-                <include name="SimProfileData.cs" />
                <include name="ILogData.cs" />
                <include name="IniConfig.cs" />
                <include name="InventoryData.cs" />
+                <include name="ReservationData.cs" />
+                <include name="SimProfileData.cs" />
                <include name="UserData.cs" />
                <include name="UserProfileData.cs" />
                <include name="Properties/AssemblyInfo.cs" />
diff --git a/OpenSim/Framework/Data/UserProfileData.cs b/OpenSim/Framework/Data/UserProfileData.cs
index 00d422d..ac168e0 100644
--- a/OpenSim/Framework/Data/UserProfileData.cs
+++ b/OpenSim/Framework/Data/UserProfileData.cs
@@ -136,7 +136,7 @@ namespace OpenSim.Framework.Data
        /// <summary>
        /// The IP address of the user
        /// </summary>
-        public string agentIP;
+        public string agentIP = String.Empty;
        /// <summary>
        /// The port of the user
        /// </summary>
diff --git a/OpenSim/Framework/General/Interfaces/IWorld.cs b/OpenSim/Framework/General/Interfaces/IWorld.cs
index 4857417..2edc0b4 100644
--- a/OpenSim/Framework/General/Interfaces/IWorld.cs
+++ b/OpenSim/Framework/General/Interfaces/IWorld.cs
@@ -35,7 +35,7 @@ namespace OpenSim.Framework.Interfaces
 {
    public interface IWorld
    {
-        void AddNewClient(IClientAPI remoteClient, LLUUID agentID, bool child);
+        void AddNewClient(IClientAPI client, bool child);
        void RemoveClient(LLUUID agentID);
        
        RegionInfo RegionInfo { get; }
diff --git a/OpenSim/Framework/General/OpenSim.Framework.csproj b/OpenSim/Framework/General/OpenSim.Framework.csproj
index 57076a1..7d3d53a 100644
--- a/OpenSim/Framework/General/OpenSim.Framework.csproj
+++ b/OpenSim/Framework/General/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,28 +55,26 @@
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
    <WarningLevel>4</WarningLevel>
-    <NoWarn>
+    <NoWarn></NoWarn>
-    </NoWarn>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="Db4objects.Db4o.dll">
+    <Reference Include="Db4objects.Db4o.dll" >
      <HintPath>..\..\..\bin\Db4objects.Db4o.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="System">
+    <Reference Include="System" >
      <HintPath>System.dll</HintPath>
      <Private>False</Private>
    </Reference>
-    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" >
-    <Reference Include="System.Xml">
      <HintPath>System.Xml.dll</HintPath>
      <Private>False</Private>
    </Reference>
-    <Reference Include="XMLRPC.dll">
+    <Reference Include="XMLRPC.dll" >
      <HintPath>..\..\..\bin\XMLRPC.dll</HintPath>
      <Private>False</Private>
    </Reference>
@@ -92,17 +84,14 @@
      <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>
-    <Compile Include="AuthenticateSessionBase.cs">
+    <Compile Include="AgentInventory.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Remoting.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="RegionCommsListener.cs">
+    <Compile Include="AuthenticateSessionBase.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="BlockingQueue.cs">
@@ -111,92 +100,97 @@
    <Compile Include="IRegionCommsListener.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Types\UUID.cs" />
+    <Compile Include="LoginService.cs">
-    <Compile Include="Util.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="UserProfile.cs">
+    <Compile Include="RegionCommsListener.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Remoting.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="SimProfile.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="LoginService.cs">
+    <Compile Include="UserProfile.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="AgentInventory.cs">
+    <Compile Include="Util.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="Interfaces\AuthenticateResponse.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Interfaces\IUserServer.cs">
+    <Compile Include="Interfaces\IAssetServer.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Interfaces\IAssetServer.cs">
+    <Compile Include="Interfaces\IClientAPI.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Interfaces\IWorld.cs">
+    <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\ILocalStorage.cs">
+    <Compile Include="Interfaces\IWorld.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="Interfaces\Config\IGenericConfig.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Interfaces\Config\IUserConfig.cs">
+    <Compile Include="Interfaces\Config\IGridConfig.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Interfaces\Config\IGridConfig.cs">
+    <Compile Include="Interfaces\Config\IUserConfig.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="Properties\AssemblyInfo.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Types\NeighbourInfo.cs">
+    <Compile Include="Types\AgentCiruitData.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Types\NetworkServersInfo.cs">
+    <Compile Include="Types\AgentWearable.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Types\RegionHandle.cs">
+    <Compile Include="Types\AssetBase.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Types\RegionInfo.cs">
+    <Compile Include="Types\AssetLandmark.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Types\ParcelData.cs">
+    <Compile Include="Types\AssetStorage.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Types\AgentWearable.cs">
+    <Compile Include="Types\EstateSettings.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Types\PrimData.cs">
+    <Compile Include="Types\Login.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="Types\MapBlockData.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Types\AssetStorage.cs">
+    <Compile Include="Types\NeighbourInfo.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Types\EstateSettings.cs">
+    <Compile Include="Types\NetworkServersInfo.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Types\AgentCiruitData.cs">
+    <Compile Include="Types\ParcelData.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Types\Login.cs">
+    <Compile Include="Types\PrimData.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Types\AssetLandmark.cs">
+    <Compile Include="Types\RegionHandle.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Types\AssetBase.cs">
+    <Compile Include="Types\RegionInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Types\UUID.cs">
      <SubType>Code</SubType>
    </Compile>
  </ItemGroup>
@@ -207,4 +201,4 @@
    <PostBuildEvent>
    </PostBuildEvent>
  </PropertyGroup>
-</Project>
-\ No newline at end of file
+</Project>
diff --git a/OpenSim/Framework/General/OpenSim.Framework.dll.build b/OpenSim/Framework/General/OpenSim.Framework.dll.build
index 0d8077b..239e3e5 100644
--- a/OpenSim/Framework/General/OpenSim.Framework.dll.build
+++ b/OpenSim/Framework/General/OpenSim.Framework.dll.build
@@ -11,40 +11,41 @@
            <resources prefix="OpenSim.Framework" dynamicprefix="true" >
            </resources>
            <sources failonempty="true">
+                <include name="AgentInventory.cs" />
                <include name="AuthenticateSessionBase.cs" />
-                <include name="Remoting.cs" />
-                <include name="RegionCommsListener.cs" />
                <include name="BlockingQueue.cs" />
                <include name="IRegionCommsListener.cs" />
-                <include name="Util.cs" />
-                <include name="UserProfile.cs" />
-                <include name="SimProfile.cs" />
                <include name="LoginService.cs" />
-                <include name="AgentInventory.cs" />
+                <include name="RegionCommsListener.cs" />
+                <include name="Remoting.cs" />
+                <include name="SimProfile.cs" />
+                <include name="UserProfile.cs" />
+                <include name="Util.cs" />
                <include name="Interfaces/AuthenticateResponse.cs" />
-                <include name="Interfaces/IUserServer.cs" />
                <include name="Interfaces/IAssetServer.cs" />
-                <include name="Interfaces/IWorld.cs" />
                <include name="Interfaces/IClientAPI.cs" />
                <include name="Interfaces/ILocalStorage.cs" />
+                <include name="Interfaces/IUserServer.cs" />
+                <include name="Interfaces/IWorld.cs" />
                <include name="Interfaces/Config/IGenericConfig.cs" />
-                <include name="Interfaces/Config/IUserConfig.cs" />
                <include name="Interfaces/Config/IGridConfig.cs" />
+                <include name="Interfaces/Config/IUserConfig.cs" />
                <include name="Properties/AssemblyInfo.cs" />
-                <include name="Types/NeighbourInfo.cs" />
+                <include name="Types/AgentCiruitData.cs" />
-                <include name="Types/NetworkServersInfo.cs" />
-                <include name="Types/RegionHandle.cs" />
-                <include name="Types/RegionInfo.cs" />
-                <include name="Types/ParcelData.cs" />
                <include name="Types/AgentWearable.cs" />
-                <include name="Types/PrimData.cs" />
+                <include name="Types/AssetBase.cs" />
-                <include name="Types/MapBlockData.cs" />
+                <include name="Types/AssetLandmark.cs" />
                <include name="Types/AssetStorage.cs" />
                <include name="Types/EstateSettings.cs" />
-                <include name="Types/AgentCiruitData.cs" />
                <include name="Types/Login.cs" />
-                <include name="Types/AssetLandmark.cs" />
+                <include name="Types/MapBlockData.cs" />
-                <include name="Types/AssetBase.cs" />
+                <include name="Types/NeighbourInfo.cs" />
+                <include name="Types/NetworkServersInfo.cs" />
+                <include name="Types/ParcelData.cs" />
+                <include name="Types/PrimData.cs" />
+                <include name="Types/RegionHandle.cs" />
+                <include name="Types/RegionInfo.cs" />
+                <include name="Types/UUID.cs" />
            </sources>
            <references basedir="${project::get-base-directory()}">
                <lib>
diff --git a/OpenSim/Framework/General/Types/RegionInfo.cs b/OpenSim/Framework/General/Types/RegionInfo.cs
index 0fba6ca..1ead3c4 100644
--- a/OpenSim/Framework/General/Types/RegionInfo.cs
+++ b/OpenSim/Framework/General/Types/RegionInfo.cs
@@ -40,9 +40,38 @@ namespace OpenSim.Framework.Types
    {
        public LLUUID SimUUID = new LLUUID();
        public string RegionName = "";
-        public uint RegionLocX = 0;
-        public uint RegionLocY = 0;
+        private uint? m_regionLocX;
-        public ulong RegionHandle = 0;
+        public uint RegionLocX
+        {
+            get
+            {
+                return m_regionLocX.Value;
+            }
+        }
+        private uint? m_regionLocY;
+        public uint RegionLocY
+        {
+            get
+            {
+                return m_regionLocY.Value;
+            }
+        }
+        private ulong? m_regionHandle;
+        public ulong RegionHandle
+        {
+            get
+            {
+                if (!m_regionHandle.HasValue)
+                {
+                    m_regionHandle = Util.UIntsToLong((RegionLocX * 256), (RegionLocY * 256));
+                }
+                return m_regionHandle.Value;
+            }
+        }
        public string DataStore = "";
        public bool isSandbox = false;
@@ -52,19 +81,43 @@ namespace OpenSim.Framework.Types
        public string MasterAvatarLastName = "";
        public string MasterAvatarSandboxPassword = "";
+        private int? m_commsIPListenPort;
        /// <summary>
        /// Port used for listening (TCP and UDP)
        /// </summary>
        /// <remarks>Seperate TCP and UDP</remarks>
-        public int CommsIPListenPort = 0;
+        public int CommsIPListenPort
+        {
+            get
+            {
+                return m_commsIPListenPort.Value;
+            }
+        }
+        
+        private string m_commsIPListenAddr;
        /// <summary>
        /// Address used for internal listening (default: 0.0.0.0?)
        /// </summary>
-        public string CommsIPListenAddr = "";
+        public string CommsIPListenAddr        
+        {
+            get
+            {
+                return m_commsIPListenAddr;
+            }            
+        }
+        
+        private string m_commsExternalAddress;
        /// <summary>
        /// Address used for external addressing (DNS or IP)
        /// </summary>
-        public string CommsExternalAddress = "";
+        public string CommsExternalAddress
+        {
+            get
+            {
+                return m_commsExternalAddress;
+            }
+        }
        public EstateSettings estateSettings;
@@ -73,7 +126,16 @@ namespace OpenSim.Framework.Types
        {
            estateSettings = new EstateSettings();
        }
+        
+        public RegionInfo( uint regionLocX, uint regionLocY, string simIp, int simPort, string simUri ) : this()
+        {
+            m_regionLocX = regionLocX;
+            m_regionLocY = regionLocY;            
+            
+            m_commsIPListenAddr = simIp;
+            m_commsIPListenPort = simPort;
+            m_commsExternalAddress = simUri;
+        }
        public void InitConfig(bool sandboxMode, IGenericConfig configData)
        {
@@ -112,11 +174,11 @@ namespace OpenSim.Framework.Types
                {
                    string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid Location X", "1000");
                    configData.SetAttribute("SimLocationX", location);
-                    this.RegionLocX = (uint)Convert.ToUInt32(location);
+                    m_regionLocX = (uint)Convert.ToUInt32(location);
                }
                else
                {
-                    this.RegionLocX = (uint)Convert.ToUInt32(attri);
+                    m_regionLocX = (uint)Convert.ToUInt32(attri);
                }
                // Sim/Grid location Y
                attri = "";
@@ -125,13 +187,15 @@ namespace OpenSim.Framework.Types
                {
                    string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid Location Y", "1000");
                    configData.SetAttribute("SimLocationY", location);
-                    this.RegionLocY = (uint)Convert.ToUInt32(location);
+                    m_regionLocY = (uint)Convert.ToUInt32(location);
                }
                else
                {
-                    this.RegionLocY = (uint)Convert.ToUInt32(attri);
+                    m_regionLocY = (uint)Convert.ToUInt32(attri);
                }
+                m_regionHandle = null;
+                
                // Local storage datastore
                attri = "";
                attri = configData.GetAttribute("Datastore");
@@ -153,11 +217,11 @@ namespace OpenSim.Framework.Types
                {
                    string port = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("UDP port for client connections", "9000");
                    configData.SetAttribute("SimListenPort", port);
-                    this.CommsIPListenPort = Convert.ToInt32(port);
+                    m_commsIPListenPort = Convert.ToInt32(port);
                }
                else
                {
-                    this.CommsIPListenPort = Convert.ToInt32(attri);
+                    m_commsIPListenPort = Convert.ToInt32(attri);
                }
                //Sim Listen Address
@@ -165,8 +229,8 @@ namespace OpenSim.Framework.Types
                attri = configData.GetAttribute("SimListenAddress");
                if (attri == "")
                {
-                    this.CommsIPListenAddr = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("IP Address to listen on for client connections", "0.0.0.0");
+                    m_commsIPListenAddr = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("IP Address to listen on for client connections", "0.0.0.0");
-                    configData.SetAttribute("SimListenAddress", this.CommsIPListenAddr);
+                    configData.SetAttribute("SimListenAddress", CommsIPListenAddr );
                }
                else
                {
@@ -177,26 +241,25 @@ namespace OpenSim.Framework.Types
                        System.Net.IPAddress[] ips = System.Net.Dns.GetHostAddresses(localhostname);
                        try
                        {
-                            this.CommsIPListenAddr = "0.0.0.0"; // Incase a IPv4 address isnt found
+                            m_commsIPListenAddr = "0.0.0.0"; // Incase a IPv4 address isnt found
                            foreach (System.Net.IPAddress ip in ips)
                            {
                                if (ip.AddressFamily.ToString() == System.Net.Sockets.ProtocolFamily.InterNetwork.ToString())
                                {
-                                    this.CommsIPListenAddr = ip.ToString();
+                                    m_commsIPListenAddr = ip.ToString();
                                    break;
                                }
                            }
                        }
-                        catch (Exception e)
+                        catch (Exception)
                        {
-                            e.ToString();
+                            m_commsIPListenAddr = "0.0.0.0"; // Use the default if we fail
-                            this.CommsIPListenAddr = "0.0.0.0"; // Use the default if we fail
                        }
                    }
                    else
                    {
-                        this.CommsIPListenAddr = attri;
+                        m_commsIPListenAddr = attri;
                    }
                }
@@ -205,12 +268,12 @@ namespace OpenSim.Framework.Types
                attri = configData.GetAttribute("SimExternalAddress");
                if (attri == "")
                {
-                    this.CommsExternalAddress = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("IP or DNS address to send external clients to", "localhost");
+                    m_commsExternalAddress = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("IP or DNS address to send external clients to", "localhost");
-                    configData.SetAttribute("SimExternalAddress", this.CommsExternalAddress);
+                    configData.SetAttribute("SimExternalAddress", CommsExternalAddress);
                }
                else
                {
-                    this.CommsExternalAddress = attri;
+                    m_commsExternalAddress = attri;
                }
                attri = "";
@@ -281,8 +344,6 @@ namespace OpenSim.Framework.Types
                    }
                }
-                this.RegionHandle = Util.UIntsToLong((RegionLocX * 256), (RegionLocY * 256));
-               
                configData.Commit();
            }
            catch (Exception e)
@@ -292,13 +353,13 @@ namespace OpenSim.Framework.Types
            }
            OpenSim.Framework.Console.MainLog.Instance.Verbose("Sim settings loaded:");
-            OpenSim.Framework.Console.MainLog.Instance.Verbose( "UUID: " + this.SimUUID.ToStringHyphenated());
+            OpenSim.Framework.Console.MainLog.Instance.Verbose("UUID: " + this.SimUUID.ToStringHyphenated());
-            OpenSim.Framework.Console.MainLog.Instance.Verbose( "Name: " + this.RegionName);
+            OpenSim.Framework.Console.MainLog.Instance.Verbose("Name: " + this.RegionName);
-            OpenSim.Framework.Console.MainLog.Instance.Verbose( "Region Location: [" + this.RegionLocX.ToString() + "," + this.RegionLocY + "]");
+            OpenSim.Framework.Console.MainLog.Instance.Verbose("Region Location: [" + this.RegionLocX.ToString() + "," + this.RegionLocY + "]");
-            OpenSim.Framework.Console.MainLog.Instance.Verbose( "Region Handle: " + this.RegionHandle.ToString());
+            OpenSim.Framework.Console.MainLog.Instance.Verbose("Region Handle: " + this.RegionHandle.ToString());
-            OpenSim.Framework.Console.MainLog.Instance.Verbose( "Listening on IP: " + this.CommsIPListenAddr + ":" + this.CommsIPListenPort);
+            OpenSim.Framework.Console.MainLog.Instance.Verbose("Listening on IP: " + this.CommsIPListenAddr + ":" + this.CommsIPListenPort);
-            OpenSim.Framework.Console.MainLog.Instance.Verbose( "Sandbox Mode? " + isSandbox.ToString());
+            OpenSim.Framework.Console.MainLog.Instance.Verbose("Sandbox Mode? " + isSandbox.ToString());
-  
        }
    }
 }
diff --git a/OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj b/OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj
index 5262224..399f456 100644
--- a/OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj
+++ b/OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj
@@ -93,16 +93,16 @@
    <Compile Include="BaseHttpServer.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="IRestHandler.cs">
+    <Compile Include="CheckSumServer.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="XmlRpcMethod.cs">
+    <Compile Include="IRestHandler.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="CheckSumServer.cs">
+    <Compile Include="UDPServerBase.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="UDPServerBase.cs">
+    <Compile Include="XmlRpcMethod.cs">
      <SubType>Code</SubType>
    </Compile>
  </ItemGroup>
diff --git a/OpenSim/Framework/Servers/OpenSim.Framework.Servers.dll.build b/OpenSim/Framework/Servers/OpenSim.Framework.Servers.dll.build
index 96b937c..7401b07 100644
--- a/OpenSim/Framework/Servers/OpenSim.Framework.Servers.dll.build
+++ b/OpenSim/Framework/Servers/OpenSim.Framework.Servers.dll.build
@@ -12,10 +12,10 @@
            </resources>
            <sources failonempty="true">
                <include name="BaseHttpServer.cs" />
-                <include name="IRestHandler.cs" />
-                <include name="XmlRpcMethod.cs" />
                <include name="CheckSumServer.cs" />
+                <include name="IRestHandler.cs" />
                <include name="UDPServerBase.cs" />
+                <include name="XmlRpcMethod.cs" />
            </sources>
            <references basedir="${project::get-base-directory()}">
                <lib>
diff --git a/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.csproj b/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.csproj
index 60c4b2f..02aa3f3 100644
--- a/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.csproj
+++ b/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.csproj
@@ -108,10 +108,10 @@
    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
-    <Compile Include="UserManagerBase.cs">
+    <Compile Include="LoginResponse.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="LoginResponse.cs">
+    <Compile Include="UserManagerBase.cs">
      <SubType>Code</SubType>
    </Compile>
  </ItemGroup>
diff --git a/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.dll.build b/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.dll.build
index ced9276..3ea339b 100644
--- a/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.dll.build
+++ b/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.dll.build
@@ -11,8 +11,8 @@
            <resources prefix="OpenSim.Framework.UserManagement" dynamicprefix="true" >
            </resources>
            <sources failonempty="true">
-                <include name="UserManagerBase.cs" />
                <include name="LoginResponse.cs" />
+                <include name="UserManagerBase.cs" />
            </sources>
            <references basedir="${project::get-base-directory()}">
                <lib>
diff --git a/OpenSim/Framework/UserManager/UserManagerBase.cs b/OpenSim/Framework/UserManager/UserManagerBase.cs
index d06059e..560752e 100644
--- a/OpenSim/Framework/UserManager/UserManagerBase.cs
+++ b/OpenSim/Framework/UserManager/UserManagerBase.cs
@@ -43,7 +43,7 @@ using System.Security.Cryptography;
 namespace OpenSim.Framework.UserManagement
 {
-    public class UserManagerBase
+    public abstract class UserManagerBase
    {
        public OpenSim.Framework.Interfaces.UserConfig _config;
        Dictionary<string, IUserData> _plugins = new Dictionary<string, IUserData>();
@@ -142,14 +142,9 @@ namespace OpenSim.Framework.UserManagement
                try
                {
                    UserProfileData profile = plugin.Value.getUserByName(fname,lname);
-                    try
-                    {
+                    profile.currentAgent = getUserAgent(profile.UUID);
-                        profile.currentAgent = getUserAgent(profile.UUID);
-                    }
-                    catch (Exception e)
-                    {
-                        // Ignore
-                    }
                    return profile;
                }
                catch (Exception e)
@@ -238,16 +233,14 @@ namespace OpenSim.Framework.UserManagement
        /// </summary>
        /// <param name="profile">The users profile</param>
        /// <param name="request">The users loginrequest</param>
-        public void CreateAgent(ref UserProfileData profile, XmlRpcRequest request)
+        public void CreateAgent(UserProfileData profile, XmlRpcRequest request)
        {
            Hashtable requestData = (Hashtable)request.Params[0];
            UserAgentData agent = new UserAgentData();
            // User connection
-            agent.agentIP = "";
            agent.agentOnline = true;
-            agent.agentPort = 0;
            // Generate sessions
            RNGCryptoServiceProvider rand = new RNGCryptoServiceProvider();
@@ -282,7 +275,7 @@ namespace OpenSim.Framework.UserManagement
                        //SimProfile SimInfo = new SimProfile();
                        //SimInfo = SimInfo.LoadFromGrid(theUser.currentAgent.currentHandle, _config.GridServerURL, _config.GridSendKey, _config.GridRecvKey);
                    }
-                    catch (Exception e)
+                    catch (Exception)
                    {
                    }
@@ -319,7 +312,7 @@ namespace OpenSim.Framework.UserManagement
        /// <param name="profile">The users profile</param>
        /// <param name="password">The supplied password</param>
        /// <returns>Authenticated?</returns>
-        public virtual bool AuthenticateUser(ref UserProfileData profile, string password)
+        public virtual bool AuthenticateUser(UserProfileData profile, string password)
        {
            OpenSim.Framework.Console.MainLog.Instance.Verbose(
                "Authenticating " + profile.username + " " + profile.surname);
@@ -358,10 +351,7 @@ namespace OpenSim.Framework.UserManagement
        /// </summary>
        /// <param name="response">The existing response</param>
        /// <param name="theUser">The user profile</param>
-        public virtual void CustomiseResponse(ref LoginResponse response, ref UserProfileData theUser)
+        public abstract void CustomiseResponse( LoginResponse response, UserProfileData theUser);
-        {
-       
-        }
        /// <summary>
        /// Main user login function
@@ -379,7 +369,7 @@ namespace OpenSim.Framework.UserManagement
            string lastname = "";
            string passwd = "";
-            UserProfileData TheUser;
+            UserProfileData userProfile;
            LoginResponse logResponse = new LoginResponse();
            if (GoodXML)
@@ -388,11 +378,11 @@ namespace OpenSim.Framework.UserManagement
                lastname = (string)requestData["last"];
                passwd = (string)requestData["passwd"];
-                TheUser = GetTheUser(firstname, lastname);
+                userProfile = GetTheUser(firstname, lastname);
-                if (TheUser == null)
+                if (userProfile == null)
                    return logResponse.CreateLoginFailedResponse();
-                GoodLogin = AuthenticateUser(ref TheUser, passwd);
+                GoodLogin = AuthenticateUser(userProfile, passwd);
            }
            else
            {
@@ -406,19 +396,19 @@ namespace OpenSim.Framework.UserManagement
            else
            {
                // If we already have a session...
-                if (TheUser.currentAgent != null && TheUser.currentAgent.agentOnline)
+                if (userProfile.currentAgent != null && userProfile.currentAgent.agentOnline)
                {
                    // Reject the login
                    return logResponse.CreateAlreadyLoggedInResponse();
                }
                // Otherwise...
                // Create a new agent session
-                CreateAgent(ref TheUser, request);
+                CreateAgent( userProfile, request);
                try
                {
-                    LLUUID AgentID = TheUser.UUID;
+                    LLUUID AgentID = userProfile.UUID;
                    // Inventory Library Section
                    ArrayList AgentInventoryArray = new ArrayList();
@@ -446,32 +436,32 @@ namespace OpenSim.Framework.UserManagement
                    // Circuit Code
                    uint circode = (uint)(Util.RandomClass.Next());
-                    logResponse.Lastname = TheUser.surname;
+                    logResponse.Lastname = userProfile.surname;
-                    logResponse.Firstname = TheUser.username;
+                    logResponse.Firstname = userProfile.username;
                    logResponse.AgentID = AgentID.ToStringHyphenated();
-                    logResponse.SessionID = TheUser.currentAgent.sessionID.ToStringHyphenated();
+                    logResponse.SessionID = userProfile.currentAgent.sessionID.ToStringHyphenated();
-                    logResponse.SecureSessionID = TheUser.currentAgent.secureSessionID.ToStringHyphenated();
+                    logResponse.SecureSessionID = userProfile.currentAgent.secureSessionID.ToStringHyphenated();
                    logResponse.InventoryRoot = InventoryRoot;
                    logResponse.InventorySkeleton = AgentInventoryArray;
                    logResponse.CircuitCode = (Int32)circode;
-                    logResponse.RegionX = 0; //overwritten
+                    //logResponse.RegionX = 0; //overwritten
-                    logResponse.RegionY = 0; //overwritten
+                    //logResponse.RegionY = 0; //overwritten
                    logResponse.Home = "!!null temporary value {home}!!";   // Overwritten
                    //logResponse.LookAt = "\n[r" + TheUser.homeLookAt.X.ToString() + ",r" + TheUser.homeLookAt.Y.ToString() + ",r" + TheUser.homeLookAt.Z.ToString() + "]\n";
-                    logResponse.SimAddress = "127.0.0.1"; //overwritten
+                    //logResponse.SimAddress = "127.0.0.1"; //overwritten
-                    logResponse.SimPort = 0; //overwritten
+                    //logResponse.SimPort = 0; //overwritten
                    logResponse.Message = this.GetMessage();
                    
                    try
                    {
-                        this.CustomiseResponse(ref logResponse, ref TheUser);
+                        this.CustomiseResponse(  logResponse,   userProfile);
                    }
                    catch (Exception e)
                    {
                        System.Console.WriteLine(e.ToString());
                        return logResponse.CreateDeadRegionResponse();
                    }
-                    CommitAgent(ref TheUser);
+                    CommitAgent(ref userProfile);
                    return logResponse.ToXmlRpcResponse();
                }
diff --git a/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj b/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj
index 945b7a5..caebca3 100644
--- a/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj
+++ b/OpenSim/Grid/AssetServer/OpenSim.Grid.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/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.exe.build b/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.exe.build
index 0a1b533..88724f6 100644
--- a/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.exe.build
+++ b/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.exe.build
@@ -11,8 +11,8 @@
            <resources prefix="OpenSim.Grid.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/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
index c78d14a..47f7d00 100644
--- a/OpenSim/Grid/GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -108,7 +108,7 @@ namespace OpenSim.Grid.GridServer
                {
                    kvp.Value.saveLog("Gridserver", target, method, args, priority, message);
                }
-                catch (Exception e)
+                catch (Exception)
                {
                    OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: unable to write log via " + kvp.Key);
                }
@@ -127,7 +127,7 @@ namespace OpenSim.Grid.GridServer
                {
                    return kvp.Value.GetProfileByLLUUID(uuid);
                }
-                catch (Exception e)
+                catch (Exception)
                {
                    OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: Unable to find region " + uuid.ToStringHyphenated() + " via " + kvp.Key);
                }
@@ -148,7 +148,7 @@ namespace OpenSim.Grid.GridServer
                {
                    return kvp.Value.GetProfileByHandle(handle);
                }
-                catch (Exception e)
+                catch
                {
                    OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: Unable to find region " + handle.ToString() + " via " + kvp.Key);
                }
@@ -172,7 +172,7 @@ namespace OpenSim.Grid.GridServer
                        regions[neighbour.regionHandle] = neighbour;
                    }
                }
-                catch (Exception e)
+                catch
                {
                    OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: Unable to query regionblock via " + kvp.Key);
                }
diff --git a/OpenSim/Grid/GridServer/Main.cs b/OpenSim/Grid/GridServer/Main.cs
index b225214..5ac64b2 100644
--- a/OpenSim/Grid/GridServer/Main.cs
+++ b/OpenSim/Grid/GridServer/Main.cs
@@ -262,7 +262,7 @@ namespace OpenSim.Grid.GridServer
                }
                configData.Commit();
            }
-            catch (Exception e)
+            catch
            {
            }
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index 640f91a..c65bb97 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -178,7 +178,7 @@ namespace OpenSim.Grid.UserServer
                }
                configData.Commit();
            }
-            catch (Exception e)
+            catch
            {
            }
diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs
index c99cf87..a3e3322 100644
--- a/OpenSim/Grid/UserServer/UserManager.cs
+++ b/OpenSim/Grid/UserServer/UserManager.cs
@@ -56,7 +56,7 @@ namespace OpenSim.Grid.UserServer
        /// </summary>
        /// <param name="response">The existing response</param>
        /// <param name="theUser">The user profile</param>
-        public override void CustomiseResponse(ref LoginResponse response, ref UserProfileData theUser)
+        public override void CustomiseResponse(  LoginResponse response,   UserProfileData theUser)
        {
            // Load information from the gridserver
            SimProfile SimInfo = new SimProfile();
diff --git a/OpenSim/Region/Application/OpenSim.csproj b/OpenSim/Region/Application/OpenSim.csproj
index 13619eb..bec85cc 100644
--- a/OpenSim/Region/Application/OpenSim.csproj
+++ b/OpenSim/Region/Application/OpenSim.csproj
@@ -170,13 +170,13 @@
    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
-    <Compile Include="OpenSimMain.cs">
+    <Compile Include="Application.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="VersionInfo.cs">
+    <Compile Include="OpenSimMain.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Application.cs">
+    <Compile Include="VersionInfo.cs">
      <SubType>Code</SubType>
    </Compile>
  </ItemGroup>
diff --git a/OpenSim/Region/Application/OpenSim.exe.build b/OpenSim/Region/Application/OpenSim.exe.build
index 355092b..6c7d7ac 100644
--- a/OpenSim/Region/Application/OpenSim.exe.build
+++ b/OpenSim/Region/Application/OpenSim.exe.build
@@ -11,9 +11,9 @@
            <resources prefix="OpenSim" dynamicprefix="true" >
            </resources>
            <sources failonempty="true">
+                <include name="Application.cs" />
                <include name="OpenSimMain.cs" />
                <include name="VersionInfo.cs" />
-                <include name="Application.cs" />
            </sources>
            <references basedir="${project::get-base-directory()}">
                <lib>
diff --git a/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj
index 1ed28d2..4667d52 100644
--- a/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj
+++ b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj
@@ -96,40 +96,40 @@
    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
-    <Compile Include="LLSDCapsDetails.cs">
+    <Compile Include="Caps.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="LLSDArray.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="LLSDEmpty.cs">
+    <Compile Include="LLSDCapEvent.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="LLSDTest.cs">
+    <Compile Include="LLSDCapsDetails.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="LLSDUploadReply.cs">
+    <Compile Include="LLSDEmpty.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="LLSDType.cs">
+    <Compile Include="LLSDHelpers.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="LLSDHelpers.cs">
+    <Compile Include="LLSDMapLayer.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="LLSDCapEvent.cs">
+    <Compile Include="LLSDMapLayerResponse.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="LLSDMapRequest.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Caps.cs">
+    <Compile Include="LLSDTest.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="LLSDMapLayerResponse.cs">
+    <Compile Include="LLSDType.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="LLSDMapLayer.cs">
+    <Compile Include="LLSDUploadReply.cs">
      <SubType>Code</SubType>
    </Compile>
  </ItemGroup>
diff --git a/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build
index dd853e7..a091b5c 100644
--- a/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build
+++ b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build
@@ -11,18 +11,18 @@
            <resources prefix="OpenSim.Region.Capabilities" dynamicprefix="true" >
            </resources>
            <sources failonempty="true">
-                <include name="LLSDCapsDetails.cs" />
+                <include name="Caps.cs" />
                <include name="LLSDArray.cs" />
+                <include name="LLSDCapEvent.cs" />
+                <include name="LLSDCapsDetails.cs" />
                <include name="LLSDEmpty.cs" />
-                <include name="LLSDTest.cs" />
-                <include name="LLSDUploadReply.cs" />
-                <include name="LLSDType.cs" />
                <include name="LLSDHelpers.cs" />
-                <include name="LLSDCapEvent.cs" />
-                <include name="LLSDMapRequest.cs" />
-                <include name="Caps.cs" />
-                <include name="LLSDMapLayerResponse.cs" />
                <include name="LLSDMapLayer.cs" />
+                <include name="LLSDMapLayerResponse.cs" />
+                <include name="LLSDMapRequest.cs" />
+                <include name="LLSDTest.cs" />
+                <include name="LLSDType.cs" />
+                <include name="LLSDUploadReply.cs" />
            </sources>
            <references basedir="${project::get-base-directory()}">
                <lib>
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index 9c4462d..402a3ca 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -211,7 +211,7 @@ namespace OpenSim.Region.ClientStack
        protected virtual void InitNewClient()
        {
            OpenSim.Framework.Console.MainLog.Instance.Verbose( "OpenSimClient.cs:InitNewClient() - Adding viewer agent to world");
-            this.m_world.AddNewClient(this, this.AgentID, false);
+            this.m_world.AddNewClient(this, false);
        }
        protected virtual void AuthUser()
diff --git a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
index 2e1d8e2..3093eb0 100644
--- a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
+++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
@@ -122,34 +122,34 @@
    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
-    <Compile Include="ClientView.AgentAssetUpload.cs">
+    <Compile Include="ClientStackNetworkHandler.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="ClientStackNetworkHandler.cs">
+    <Compile Include="ClientView.AgentAssetUpload.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="PacketServer.cs">
+    <Compile Include="ClientView.API.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="UDPServer.cs">
+    <Compile Include="ClientView.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="ClientView.PacketHandlers.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="ClientView.API.cs">
+    <Compile Include="ClientView.ProcessPackets.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="ClientView.ProcessPackets.cs">
+    <Compile Include="ClientViewBase.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="RegionApplicationBase.cs">
+    <Compile Include="PacketServer.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="ClientViewBase.cs">
+    <Compile Include="RegionApplicationBase.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="ClientView.cs">
+    <Compile Include="UDPServer.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="Assets\InventoryCache.cs">
diff --git a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
index 1c791d3..f76a4c8 100644
--- a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
+++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
@@ -11,16 +11,16 @@
            <resources prefix="OpenSim.Region.ClientStack" dynamicprefix="true" >
            </resources>
            <sources failonempty="true">
-                <include name="ClientView.AgentAssetUpload.cs" />
                <include name="ClientStackNetworkHandler.cs" />
-                <include name="PacketServer.cs" />
+                <include name="ClientView.AgentAssetUpload.cs" />
-                <include name="UDPServer.cs" />
-                <include name="ClientView.PacketHandlers.cs" />
                <include name="ClientView.API.cs" />
+                <include name="ClientView.cs" />
+                <include name="ClientView.PacketHandlers.cs" />
                <include name="ClientView.ProcessPackets.cs" />
-                <include name="RegionApplicationBase.cs" />
                <include name="ClientViewBase.cs" />
-                <include name="ClientView.cs" />
+                <include name="PacketServer.cs" />
+                <include name="RegionApplicationBase.cs" />
+                <include name="UDPServer.cs" />
                <include name="Assets/InventoryCache.cs" />
            </sources>
            <references basedir="${project::get-base-directory()}">
diff --git a/OpenSim/Region/Communications/Local/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs
index 6cf254b..5a2a5c8 100644
--- a/OpenSim/Region/Communications/Local/LocalUserServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs
@@ -69,14 +69,14 @@ namespace OpenSim.Region.Communications.Local
            return profile;
        }
-        public override bool AuthenticateUser(ref UserProfileData profile, string password)
+        public override bool AuthenticateUser(UserProfileData profile, string password)
        {
            //for now we will accept any password in sandbox mode
            Console.WriteLine("authorising user");
            return true;
        }
-        public override void CustomiseResponse(ref LoginResponse response, ref UserProfileData theUser)
+        public override void CustomiseResponse(LoginResponse response, UserProfileData theUser)
        {
            ulong currentRegion = theUser.currentAgent.currentHandle;
            RegionInfo reg = m_Parent.GridServer.RequestNeighbourInfo(currentRegion);
diff --git a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj
index f9f6b7d..0a15a49 100644
--- a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj
+++ b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj
@@ -98,15 +98,15 @@
    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
-    <Compile Include="LocalUserServices.cs">
-      <SubType>Code</SubType>
-    </Compile>
    <Compile Include="CommunicationsLocal.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="LocalBackEndServices.cs">
      <SubType>Code</SubType>
    </Compile>
+    <Compile Include="LocalUserServices.cs">
+      <SubType>Code</SubType>
+    </Compile>
    <Compile Include="Properties\AssemblyInfo.cs">
      <SubType>Code</SubType>
    </Compile>
diff --git a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build
index bfefabf..3cac9d3 100644
--- a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build
+++ b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build
@@ -11,9 +11,9 @@
            <resources prefix="OpenSim.Region.Communications.Local" dynamicprefix="true" >
            </resources>
            <sources failonempty="true">
-                <include name="LocalUserServices.cs" />
                <include name="CommunicationsLocal.cs" />
                <include name="LocalBackEndServices.cs" />
+                <include name="LocalUserServices.cs" />
                <include name="Properties/AssemblyInfo.cs" />
            </sources>
            <references basedir="${project::get-base-directory()}">
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index 5f0c80c..2ac7297 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -75,18 +75,14 @@ namespace OpenSim.Region.Communications.OGS1
            foreach (Hashtable n in (Hashtable)respData.Values)
            {
-                RegionInfo neighbour = new RegionInfo();
+                RegionInfo neighbour = new RegionInfo( (uint)n["x"], (uint)n["y"], (string)n["sim_ip"], (int)n["sim_port"], (string)n["sim_uri"] );
                //OGS1
-                neighbour.RegionHandle = (ulong)n["regionhandle"];
+                //neighbour.RegionHandle = (ulong)n["regionhandle"]; is now calculated locally
-                neighbour.RegionLocX = (uint)n["x"];
-                neighbour.RegionLocY = (uint)n["y"];
                neighbour.RegionName = (string)n["name"];
                //OGS1+
-                neighbour.CommsIPListenAddr = (string)n["sim_ip"];
-                neighbour.CommsIPListenPort = (int)n["sim_port"];
-                neighbour.CommsExternalAddress = (string)n["sim_uri"];
                neighbour.SimUUID = (string)n["uuid"];
                neighbours.Add(neighbour);
diff --git a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
index 90a01b6..d6abd13 100644
--- a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
+++ b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
@@ -116,9 +116,6 @@
    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
-    <Compile Include="OGS1UserServices.cs">
-      <SubType>Code</SubType>
-    </Compile>
    <Compile Include="CommunicationsOGS1.cs">
      <SubType>Code</SubType>
    </Compile>
@@ -128,6 +125,9 @@
    <Compile Include="OGS1InterSimComms.cs">
      <SubType>Code</SubType>
    </Compile>
+    <Compile Include="OGS1UserServices.cs">
+      <SubType>Code</SubType>
+    </Compile>
    <Compile Include="Properties\AssemblyInfo.cs">
      <SubType>Code</SubType>
    </Compile>
diff --git a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build
index 960a84a..04d61b9 100644
--- a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build
+++ b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build
@@ -11,10 +11,10 @@
            <resources prefix="OpenSim.Region.Communications.OGS1" dynamicprefix="true" >
            </resources>
            <sources failonempty="true">
-                <include name="OGS1UserServices.cs" />
                <include name="CommunicationsOGS1.cs" />
                <include name="OGS1GridServices.cs" />
                <include name="OGS1InterSimComms.cs" />
+                <include name="OGS1UserServices.cs" />
                <include name="Properties/AssemblyInfo.cs" />
            </sources>
            <references basedir="${project::get-base-directory()}">
diff --git a/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj b/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj
index 6dabd05..428f381 100644
--- a/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj
+++ b/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj
@@ -144,55 +144,55 @@
    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
-    <Compile Include="RegionManager.cs">
-      <SubType>Code</SubType>
-    </Compile>
    <Compile Include="EstateManager.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="ParcelManager.cs">
      <SubType>Code</SubType>
    </Compile>
+    <Compile Include="RegionManager.cs">
+      <SubType>Code</SubType>
+    </Compile>
    <Compile Include="Scenes\Entity.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Scenes\Scene.cs">
+    <Compile Include="Scenes\IScenePresenceBody.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Scenes\ScenePresence.Body.cs">
+    <Compile Include="Scenes\Primitive.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Scenes\SceneEvents.cs">
+    <Compile Include="Scenes\Scene.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Scenes\ScenePresence.cs">
+    <Compile Include="Scenes\Scene.PacketHandlers.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Scenes\ScenePresence.Animations.cs">
+    <Compile Include="Scenes\SceneBase.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Scenes\Scene.PacketHandlers.cs">
+    <Compile Include="Scenes\SceneEvents.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="Scenes\SceneObject.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Scenes\Primitive.cs">
+    <Compile Include="Scenes\ScenePresence.Animations.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Scenes\SceneBase.cs">
+    <Compile Include="Scenes\ScenePresence.Body.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Scenes\IScenePresenceBody.cs">
+    <Compile Include="Scenes\ScenePresence.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Scenes\scripting\ScriptManager.cs">
+    <Compile Include="Scenes\scripting\Script.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="Scenes\scripting\ScriptInfo.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Scenes\scripting\Script.cs">
+    <Compile Include="Scenes\scripting\ScriptManager.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="Scenes\scripting\Engines\CSharpScriptEngine.cs">
diff --git a/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build b/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build
index eb26ea0..2fa5e76 100644
--- a/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build
+++ b/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build
@@ -11,23 +11,23 @@
            <resources prefix="OpenSim.Region.Environment" dynamicprefix="true" >
            </resources>
            <sources failonempty="true">
-                <include name="RegionManager.cs" />
                <include name="EstateManager.cs" />
                <include name="ParcelManager.cs" />
+                <include name="RegionManager.cs" />
                <include name="Scenes/Entity.cs" />
+                <include name="Scenes/IScenePresenceBody.cs" />
+                <include name="Scenes/Primitive.cs" />
                <include name="Scenes/Scene.cs" />
-                <include name="Scenes/ScenePresence.Body.cs" />
-                <include name="Scenes/SceneEvents.cs" />
-                <include name="Scenes/ScenePresence.cs" />
-                <include name="Scenes/ScenePresence.Animations.cs" />
                <include name="Scenes/Scene.PacketHandlers.cs" />
-                <include name="Scenes/SceneObject.cs" />
-                <include name="Scenes/Primitive.cs" />
                <include name="Scenes/SceneBase.cs" />
-                <include name="Scenes/IScenePresenceBody.cs" />
+                <include name="Scenes/SceneEvents.cs" />
-                <include name="Scenes/scripting/ScriptManager.cs" />
+                <include name="Scenes/SceneObject.cs" />
-                <include name="Scenes/scripting/ScriptInfo.cs" />
+                <include name="Scenes/ScenePresence.Animations.cs" />
+                <include name="Scenes/ScenePresence.Body.cs" />
+                <include name="Scenes/ScenePresence.cs" />
                <include name="Scenes/scripting/Script.cs" />
+                <include name="Scenes/scripting/ScriptInfo.cs" />
+                <include name="Scenes/scripting/ScriptManager.cs" />
                <include name="Scenes/scripting/Engines/CSharpScriptEngine.cs" />
                <include name="Scenes/scripting/Engines/JScriptEngine.cs" />
            </sources>
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 8c912d0..d5406b6 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -493,19 +493,19 @@ namespace OpenSim.Region.Environment.Scenes
        /// <param name="remoteClient"></param          
        /// <param name="agentID"></param>
        /// <param name="child"></param>
-        public override void AddNewClient(IClientAPI remoteClient, LLUUID agentID, bool child)
+        public override void AddNewClient(IClientAPI client, bool child)
        {
-            remoteClient.OnRegionHandShakeReply += this.SendLayerData;
+            client.OnRegionHandShakeReply += this.SendLayerData;
            //remoteClient.OnRequestWearables += new GenericCall(this.GetInitialPrims);
-            remoteClient.OnChatFromViewer += this.SimChat;
+            client.OnChatFromViewer += this.SimChat;
-            remoteClient.OnRequestWearables += this.InformClientOfNeighbours;
+            client.OnRequestWearables += this.InformClientOfNeighbours;
-            remoteClient.OnAddPrim += this.AddNewPrim;
+            client.OnAddPrim += this.AddNewPrim;
-            remoteClient.OnUpdatePrimPosition += this.UpdatePrimPosition;
+            client.OnUpdatePrimPosition += this.UpdatePrimPosition;
-            remoteClient.OnRequestMapBlocks += this.RequestMapBlocks;
+            client.OnRequestMapBlocks += this.RequestMapBlocks;
-            remoteClient.OnTeleportLocationRequest += this.RequestTeleportLocation;
+            client.OnTeleportLocationRequest += this.RequestTeleportLocation;
           //remoteClient.OnObjectSelect += this.SelectPrim;
-            remoteClient.OnGrapUpdate += this.MoveObject;
+            client.OnGrapUpdate += this.MoveObject;
-            remoteClient.OnNameFromUUIDRequest += this.commsManager.HandleUUIDNameRequest;
+            client.OnNameFromUUIDRequest += this.commsManager.HandleUUIDNameRequest;
            /* remoteClient.OnParcelPropertiesRequest += new ParcelPropertiesRequest(parcelManager.handleParcelPropertiesRequest);
            remoteClient.OnParcelDivideRequest += new ParcelDivideRequest(parcelManager.handleParcelDivideRequest);
@@ -513,19 +513,21 @@ namespace OpenSim.Region.Environment.Scenes
            remoteClient.OnParcelPropertiesUpdateRequest += new ParcelPropertiesUpdateRequest(parcelManager.handleParcelPropertiesUpdateRequest);
            remoteClient.OnEstateOwnerMessage += new EstateOwnerMessageRequest(estateManager.handleEstateOwnerMessage);
            */
-            
+            this.estateManager.sendRegionHandshake(client);
+            CreateAndAddScenePresence(client);
+            return;
+        }
+        protected void CreateAndAddScenePresence(IClientAPI client)
+        {
            ScenePresence newAvatar = null;
-            try
-            {
-                OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs:AddViewerAgent() - Creating new avatar for remote viewer agent");
+            OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs:AddViewerAgent() - Creating new avatar for remote viewer agent");
-                newAvatar = new ScenePresence(remoteClient, this, this.m_regInfo);
+                newAvatar = new ScenePresence(client, this, this.m_regInfo);
                OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs:AddViewerAgent() - Adding new avatar to world");
                OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs:AddViewerAgent() - Starting RegionHandshake ");
-                //newAvatar.SendRegionHandshake();
-                this.estateManager.sendRegionHandshake(remoteClient);
                PhysicsVector pVec = new PhysicsVector(newAvatar.Pos.X, newAvatar.Pos.Y, newAvatar.Pos.Z);
                lock (this.m_syncRoot)
                {
@@ -534,36 +536,29 @@ namespace OpenSim.Region.Environment.Scenes
                lock (Entities)
                {
-                    if (!Entities.ContainsKey(agentID))
+                    if (!Entities.ContainsKey(client.AgentId))
                    {
-                        this.Entities.Add(agentID, newAvatar);
+                        this.Entities.Add(client.AgentId, newAvatar);
                    }
                    else
                    {
-                        Entities[agentID] = newAvatar;
+                        Entities[client.AgentId] = newAvatar;
                    }
                }
                lock (Avatars)
                {
-                    if (Avatars.ContainsKey(agentID))
+                    if (Avatars.ContainsKey(client.AgentId))
                    {
-                        Avatars[agentID] = newAvatar;
+                        Avatars[client.AgentId] = newAvatar;
                    }
                    else
                    {
-                        this.Avatars.Add(agentID, newAvatar);
+                        this.Avatars.Add(client.AgentId, newAvatar);
                    }
                }
-            }
-            catch (Exception e)
-            {
-                OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: AddViewerAgent() - Failed with exception " + e.ToString());
-            }
-            return;
        }
        /// <summary>
        /// 
        /// </summary>
@@ -642,8 +637,8 @@ namespace OpenSim.Region.Environment.Scenes
            this.regionCommsHost = this.commsManager.GridServer.RegisterRegion(this.m_regInfo,gridSettings);
            if (this.regionCommsHost != null)
            {
-                this.regionCommsHost.OnExpectUser += new ExpectUserDelegate(this.NewUserConnection);
+                this.regionCommsHost.OnExpectUser += this.NewUserConnection;
-                this.regionCommsHost.OnAvatarCrossingIntoRegion += new AgentCrossing(this.AgentCrossing);
+                this.regionCommsHost.OnAvatarCrossingIntoRegion += this.AgentCrossing;
            }
        }
diff --git a/OpenSim/Region/Environment/Scenes/SceneBase.cs b/OpenSim/Region/Environment/Scenes/SceneBase.cs
index 50d3b82..e06acbd 100644
--- a/OpenSim/Region/Environment/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneBase.cs
@@ -148,7 +148,7 @@ namespace OpenSim.Region.Environment.Scenes
        /// <param name="remoteClient"></param>
        /// <param name="agentID"></param>
        /// <param name="child"></param>
-        public abstract void AddNewClient(IClientAPI remoteClient, LLUUID agentID, bool child);
+        public abstract void AddNewClient(IClientAPI client, bool child);
        
        /// <summary>
        /// 
diff --git a/OpenSim/Region/Examples/SimpleApp/MyWorld.cs b/OpenSim/Region/Examples/SimpleApp/MyWorld.cs
index 89f39d3..fe1fc16 100644
--- a/OpenSim/Region/Examples/SimpleApp/MyWorld.cs
+++ b/OpenSim/Region/Examples/SimpleApp/MyWorld.cs
@@ -44,7 +44,7 @@ namespace SimpleApp
        #region IWorld Members
-        override public void AddNewClient(IClientAPI client, LLUUID agentID, bool child)
+        override public void AddNewClient(IClientAPI client, bool child)
        {
            LLVector3 pos = new LLVector3(128, 128, 128);
@@ -59,7 +59,13 @@ namespace SimpleApp
                    };
            
            client.OnRequestWearables += SendWearables;
+            client.OnAddPrim += AddNewPrim;
+            client.OnUpdatePrimPosition += this.UpdatePrimPosition;
+            client.OnRequestMapBlocks += this.RequestMapBlocks;
+            client.OnTeleportLocationRequest += this.RequestTeleportLocation;
+            client.OnGrapUpdate += this.MoveObject;
+            client.OnNameFromUUIDRequest += this.commsManager.HandleUUIDNameRequest;
+            
            client.OnCompleteMovementToRegion += delegate()
                {
                    client.MoveAgentIntoRegion(m_regionInfo, pos, LLVector3.Zero );
@@ -76,7 +82,7 @@ namespace SimpleApp
            client.SendRegionHandshake(m_regionInfo);
-            OpenSim.Region.Environment.Scenes.ScenePresence avatar = new Avatar( client, this, m_regionInfo );
+            CreateAndAddScenePresence(client);
            
        }
@@ -85,12 +91,6 @@ namespace SimpleApp
            client.SendWearables( AvatarWearable.DefaultWearables );
        }
-       override public void RemoveClient(LLUUID agentID)
-        {
-        }
        public RegionInfo RegionInfo
        {
            get { return m_regionInfo; }
diff --git a/OpenSim/Region/Examples/SimpleApp/Program.cs b/OpenSim/Region/Examples/SimpleApp/Program.cs
index 4060d68..0d5b4b3 100644
--- a/OpenSim/Region/Examples/SimpleApp/Program.cs
+++ b/OpenSim/Region/Examples/SimpleApp/Program.cs
@@ -14,6 +14,7 @@ using OpenSim.Region.Caches;
 using OpenSim.Framework.Communications;
 using OpenSim.Region.Communications.Local;
 using OpenSim.Region.ClientStack;
+using OpenSim.Region.Physics.BasicPhysicsPlugin;
 namespace SimpleApp
 {
@@ -32,11 +33,7 @@ namespace SimpleApp
            string simAddr = "127.0.0.1";
            int simPort = 9000;
-            /*
+            
-            LoginServer loginServer = new LoginServer( simAddr, simPort, 0, 0, false );
-            loginServer.Startup();
-            loginServer.SetSessionHandler( AddNewSessionHandler );*/
            m_circuitManager = new AuthenticateSessionsBase();
            InventoryCache inventoryCache = new InventoryCache();
@@ -53,18 +50,17 @@ namespace SimpleApp
            
            ClientView.TerrainManager = new TerrainManager(new SecondLife());
-            CommunicationsManager communicationsManager = new CommunicationsLocal(null);
+            NetworkServersInfo serverInfo = new NetworkServersInfo();
+            CommunicationsLocal communicationsManager = new CommunicationsLocal(serverInfo);
+            RegionInfo regionInfo = new RegionInfo( 1000, 1000, simAddr, simPort, simAddr );
            
-            RegionInfo regionInfo = new RegionInfo( );
            BaseHttpServer httpServer = new BaseHttpServer(simPort);
-            udpServer.LocalWorld = new MyWorld( packetServer.ClientAPIs, regionInfo, m_circuitManager, communicationsManager, assetCache, httpServer );
+            MyWorld world = new MyWorld(packetServer.ClientAPIs, regionInfo, m_circuitManager, communicationsManager, assetCache, httpServer);
+            world.PhysScene = new BasicScene();
-            // World world = new World(udpServer.PacketServer.ClientAPIs, regionInfo);            
+            udpServer.LocalWorld = world;
-            // PhysicsScene physicsScene = new NullPhysicsScene();
-            // world.PhysicsScene = physicsScene;
-            // udpServer.LocalWorld = world;
-          //  httpServer.AddXmlRPCHandler( "login_to_simulator", loginServer.XmlRpcLoginMethod );
+            httpServer.AddXmlRPCHandler("login_to_simulator", communicationsManager.UserServices.XmlRpcLoginMethod );
            httpServer.Start();
            
            m_log.WriteLine( LogPriority.NORMAL, "Press enter to quit.");
diff --git a/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj b/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj
index 0a82172..d39d091 100644
--- a/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj
+++ b/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj
@@ -104,6 +104,12 @@
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
+    <ProjectReference Include="..\..\..\Framework\UserManager\OpenSim.Framework.UserManagement.csproj">
+      <Name>OpenSim.Framework.UserManagement</Name>
+      <Project>{586E2916-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+                        <Private>False</Private>
+    </ProjectReference>
    <ProjectReference Include="..\..\Caches\OpenSim.Region.Caches.csproj">
      <Name>OpenSim.Region.Caches</Name>
      <Project>{61FCCDB3-0000-0000-0000-000000000000}</Project>
@@ -134,6 +140,18 @@
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
+    <ProjectReference Include="..\..\Physics\BasicPhysicsPlugin\OpenSim.Region.Physics.BasicPhysicsPlugin.csproj">
+      <Name>OpenSim.Region.Physics.BasicPhysicsPlugin</Name>
+      <Project>{15B4FEF3-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+                        <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Physics\Manager\OpenSim.Region.Physics.Manager.csproj">
+      <Name>OpenSim.Region.Physics.Manager</Name>
+      <Project>{F4FF31EB-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+                        <Private>False</Private>
+    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
    <Compile Include="MyWorld.cs">
diff --git a/OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build b/OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build
index f8896fa..db44992 100644
--- a/OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build
+++ b/OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build
@@ -25,11 +25,14 @@
                <include name="../../../../bin/OpenSim.Framework.Communications.dll" />
                <include name="../../../../bin/OpenSim.Framework.Console.dll" />
                <include name="../../../../bin/OpenSim.Framework.Servers.dll" />
+                <include name="../../../../bin/OpenSim.Framework.UserManagement.dll" />
                <include name="../../../../bin/OpenSim.Region.Caches.dll" />
                <include name="../../../../bin/OpenSim.Region.ClientStack.dll" />
                <include name="../../../../bin/OpenSim.Region.Communications.Local.dll" />
                <include name="../../../../bin/OpenSim.Region.Environment.dll" />
                <include name="../../../../bin/OpenSim.Region.GridInterfaces.Local.dll" />
+                <include name="../../../../bin/OpenSim.Region.Physics.BasicPhysicsPlugin.dll" />
+                <include name="../../../../bin/OpenSim.Region.Physics.Manager.dll" />
                <include name="System.dll" />
                <include name="System.Data.dll.dll" />
                <include name="System.Xml.dll" />
diff --git a/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj
index 716fd57..147158c 100644
--- a/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj
+++ b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.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/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build
index 112ff1c..fc9f055 100644
--- a/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build
+++ b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.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/Prebuild/src/Prebuild.csproj b/Prebuild/src/Prebuild.csproj
index f332827..c8b859c 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">
+    <Compile Include="Core\Attributes\DataNodeAttribute.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\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.exe.build b/Prebuild/src/Prebuild.exe.build
index 52dd1a7..2851125 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/FileNode.cs" />
-                <include name="Core/Nodes/ReferencePathNode.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/ReferencePathNode.cs" />
-                <include name="Core/Nodes/FilesNode.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()}">
diff --git a/prebuild.xml b/prebuild.xml
index 6cf8bd8..feab3ee 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -707,6 +707,9 @@
      <Reference name="OpenSim.Framework.Console"/>
      <Reference name="OpenSim.Framework"/>
+      <Reference name="OpenSim.Framework.UserManagement"/>
+      <Reference name="OpenSim.Region.Physics.Manager"/>
+      <Reference name="OpenSim.Region.Physics.BasicPhysicsPlugin"/>
      <Reference name="XMLRPC.dll"/>
      <Reference name="OpenSim.Region.GridInterfaces.Local"/>
      <Reference name="OpenSim.Framework.Servers"/>