Fixed SimpleApp - aka thankgoditssundaycommit

* Updated SimpleApp with various introduced dependencies
* Extracted ScenePrescence creation in Scene
* removed try-catchall from UserManagerBase (that actually hid a bug)
* Refactored RegionInfo
  * handle is calculated
  * it will explode upon accessing x,y,ip,port,externalip if not explicitly initialized
* Removed superfluous 'ref' keywords
* Removed a shitload of 'catch Exception e' that causes build warnings
* Lots of small refactorings, renames et c
* Ignored some bins

26 files changed, 234 insertions, 188 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">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="Remoting.cs">

+    <Compile Include="AgentInventory.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="Util.cs">

+    <Compile Include="LoginService.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/NetworkServersInfo.cs" />

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

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

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

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

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

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

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

+                <include name="Types/AssetBase.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/AssetBase.cs" />

+                <include name="Types/MapBlockData.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;

-        public ulong RegionHandle = 0;

+

+        private uint? m_regionLocX;

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

-                    configData.SetAttribute("SimListenAddress", this.CommsIPListenAddr);

+                    m_commsIPListenAddr = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("IP Address to listen on for client connections", "0.0.0.0");

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

-                            this.CommsIPListenAddr = "0.0.0.0"; // Use the default if we fail

+                            m_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");

-                    configData.SetAttribute("SimExternalAddress", this.CommsExternalAddress);

+                    m_commsExternalAddress = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("IP or DNS address to send external clients to", "localhost");

+                    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( "Name: " + this.RegionName);

-            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( "Listening on IP: " + this.CommsIPListenAddr + ":" + this.CommsIPListenPort);

-            OpenSim.Framework.Console.MainLog.Instance.Verbose( "Sandbox Mode? " + isSandbox.ToString());

-  

+            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("Region Location: [" + this.RegionLocX.ToString() + "," + this.RegionLocY + "]");

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

-                    }

-                    catch (Exception e)

-                    {

-                        // Ignore

-                    }

+

+                    profile.currentAgent = getUserAgent(profile.UUID);

+

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

-                if (TheUser == null)

+                userProfile = GetTheUser(firstname, lastname);

+                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.Firstname = TheUser.username;

+                    logResponse.Lastname = userProfile.surname;

+                    logResponse.Firstname = userProfile.username;

                     logResponse.AgentID = AgentID.ToStringHyphenated();

-                    logResponse.SessionID = TheUser.currentAgent.sessionID.ToStringHyphenated();

-                    logResponse.SecureSessionID = TheUser.currentAgent.secureSessionID.ToStringHyphenated();

+                    logResponse.SessionID = userProfile.currentAgent.sessionID.ToStringHyphenated();

+                    logResponse.SecureSessionID = userProfile.currentAgent.secureSessionID.ToStringHyphenated();

                     logResponse.InventoryRoot = InventoryRoot;

                     logResponse.InventorySkeleton = AgentInventoryArray;

                     logResponse.CircuitCode = (Int32)circode;

-                    logResponse.RegionX = 0; //overwritten

-                    logResponse.RegionY = 0; //overwritten

+                    //logResponse.RegionX = 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.SimPort = 0; //overwritten

+                    //logResponse.SimAddress = "127.0.0.1"; //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();

 

                 }