From 108d89f89436556c8f4662197903c374db943f7d Mon Sep 17 00:00:00 2001
From: mingchen <mingchen>
Date: Thu, 28 Jun 2007 16:17:20 +0000
Subject: [PATCH] *Master User is now set up *Added support for getting user
 profile information from remote grid server (untested) *Updated prebuild.xml

---
 .../Communications/CommunicationsManager.cs   |  3 +-
 .../OpenSim.Framework.Communications.csproj   |  6 +-
 ...OpenSim.Framework.Communications.dll.build |  2 +-
 .../Console/OpenSim.Framework.Console.csproj  |  4 +-
 .../OpenSim.Framework.Console.dll.build       |  2 +-
 .../OpenSim.Framework.Data.DB4o.csproj        |  4 +-
 .../OpenSim.Framework.Data.DB4o.dll.build     |  4 +-
 .../OpenSim.Framework.Data.MySQL.csproj       | 10 +--
 .../OpenSim.Framework.Data.MySQL.dll.build    |  6 +-
 .../OpenSim.Framework.Data.SQLite.csproj      |  4 +-
 .../OpenSim.Framework.Data.SQLite.dll.build   |  2 +-
 .../Data/OpenSim.Framework.Data.csproj        | 12 ++--
 .../Data/OpenSim.Framework.Data.dll.build     |  4 +-
 .../General/OpenSim.Framework.csproj          | 72 +++++++++----------
 .../General/OpenSim.Framework.dll.build       | 46 ++++++------
 .../General/Types/NetworkServersInfo.cs       | 39 ++++++++++
 .../Servers/OpenSim.Framework.Servers.csproj  | 10 +--
 .../OpenSim.Framework.Servers.dll.build       |  6 +-
 .../OpenSim.Grid.AssetServer.csproj           |  4 +-
 .../OpenSim.Grid.AssetServer.exe.build        |  2 +-
 .../UserServer/OpenSim.Grid.UserServer.csproj |  4 +-
 .../OpenSim.Grid.UserServer.exe.build         |  2 +-
 OpenSim/Region/Application/OpenSim.csproj     | 12 +++-
 OpenSim/Region/Application/OpenSim.exe.build  |  3 +-
 OpenSim/Region/Application/OpenSimMain.cs     | 11 ++-
 .../OpenSim.Region.Capabilities.csproj        | 40 +++++------
 .../OpenSim.Region.Capabilities.dll.build     | 16 ++---
 .../OpenSim.Region.ClientStack.csproj         | 34 ++++-----
 .../OpenSim.Region.ClientStack.dll.build      | 14 ++--
 .../Local/CommunicationsLocal.cs              |  2 +-
 ...OpenSim.Region.Communications.Local.csproj |  6 +-
 ...nSim.Region.Communications.Local.dll.build |  2 +-
 .../Communications/OGS1/GridCommsManager.cs   |  2 +-
 .../Communications/OGS1/OGSUserServices.cs    | 63 ++++++++++++++++
 .../OpenSim.Region.Communications.OGS1.csproj |  4 +-
 ...enSim.Region.Communications.OGS1.dll.build |  4 +-
 .../OpenSim.Region.Environment.csproj         | 52 +++++++-------
 .../OpenSim.Region.Environment.dll.build      | 26 +++----
 ...Sim.Region.Storage.LocalStorageDb4o.csproj |  6 +-
 ....Region.Storage.LocalStorageDb4o.dll.build |  2 +-
 Prebuild/src/Prebuild.csproj                  | 72 +++++++++----------
 Prebuild/src/Prebuild.exe.build               | 38 +++++-----
 prebuild.xml                                  |  1 +
 43 files changed, 389 insertions(+), 269 deletions(-)

diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs
index 74d12d2000..69b5da65a6 100644
--- a/OpenSim/Framework/Communications/CommunicationsManager.cs
+++ b/OpenSim/Framework/Communications/CommunicationsManager.cs
@@ -43,9 +43,10 @@ namespace OpenSim.Framework.Communications
         public IGridServices GridServer;
         public IInterRegionCommunications InterRegion;
 
+        public NetworkServersInfo ServersInfo;
         public CommunicationsManager(NetworkServersInfo serversInfo)
         {
-            
+            ServersInfo = serversInfo;
         }
     }
 }
diff --git a/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj
index 31ab172cec..66507a8eab 100644
--- a/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj
+++ b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj
@@ -86,9 +86,6 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="CommunicationsManager.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="IGridServices.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -98,6 +95,9 @@
     <Compile Include="IUserServices.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="CommunicationsManager.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
diff --git a/OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build
index 52d29f6065..1c55d8c23a 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="CommunicationsManager.cs" />
                 <include name="IGridServices.cs" />
                 <include name="IInterRegionCommunications.cs" />
                 <include name="IUserServices.cs" />
+                <include name="CommunicationsManager.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 f3dcec59e7..c02a5066dc 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="ConsoleCallbacksBase.cs">
+    <Compile Include="LogBase.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="LogBase.cs">
+    <Compile Include="ConsoleCallbacksBase.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 eb40c0db4c..10e72a10d8 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="ConsoleCallbacksBase.cs" />
                 <include name="LogBase.cs" />
+                <include name="ConsoleCallbacksBase.cs" />
                 <include name="MainLog.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
diff --git a/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj b/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj
index b09cecf756..f6e831117a 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="DB4oGridData.cs">
+    <Compile Include="DB4oUserData.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="DB4oManager.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="DB4oUserData.cs">
+    <Compile Include="DB4oGridData.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build b/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build
index f124eb5e2b..2c5e31ba9a 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="DB4oGridData.cs" />
-                <include name="DB4oManager.cs" />
                 <include name="DB4oUserData.cs" />
+                <include name="DB4oManager.cs" />
+                <include name="DB4oGridData.cs" />
                 <include name="Properties/AssemblyInfo.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
diff --git a/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj
index 62e3887249..09a32b54fa 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="MySQLGridData.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="MySQLInventoryData.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="MySQLLogData.cs">
+    <Compile Include="MySQLUserData.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="MySQLManager.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="MySQLUserData.cs">
+    <Compile Include="MySQLLogData.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="MySQLGridData.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build
index 594ec5266c..3aeebbcec1 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="MySQLLogData.cs" />
-                <include name="MySQLManager.cs" />
                 <include name="MySQLUserData.cs" />
+                <include name="MySQLManager.cs" />
+                <include name="MySQLLogData.cs" />
+                <include name="MySQLGridData.cs" />
                 <include name="Properties/AssemblyInfo.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
diff --git a/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj
index 4ba24f11f8..dab22eaab3 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="SQLiteGridData.cs">
+    <Compile Include="SQLiteManager.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="SQLiteManager.cs">
+    <Compile Include="SQLiteGridData.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.dll.build b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.dll.build
index e28d0a6109..719fbc69f2 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="SQLiteGridData.cs" />
                 <include name="SQLiteManager.cs" />
+                <include name="SQLiteGridData.cs" />
                 <include name="Properties/AssemblyInfo.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
diff --git a/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj b/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj
index dcafbcdb84..47b9ba32fa 100644
--- a/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj
+++ b/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj
@@ -78,9 +78,15 @@
   <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>
@@ -90,12 +96,6 @@
     <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 aefb02b032..881bb3ada6 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/General/OpenSim.Framework.csproj b/OpenSim/Framework/General/OpenSim.Framework.csproj
index 48db634cd2..261b96b442 100644
--- a/OpenSim/Framework/General/OpenSim.Framework.csproj
+++ b/OpenSim/Framework/General/OpenSim.Framework.csproj
@@ -91,76 +91,85 @@
     <Compile Include="AgentInventory.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Util.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="AuthenticateSessionBase.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="BlockingQueue.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="IRegionCommsListener.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Logger.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="LoginService.cs">
+    <Compile Include="Remoting.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="RegionCommsListener.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Remoting.cs">
+    <Compile Include="LoginService.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="SimProfile.cs">
+    <Compile Include="BlockingQueue.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="UserProfile.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Util.cs">
+    <Compile Include="IRegionCommsListener.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="SimProfile.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Interfaces\AuthenticateResponse.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Interfaces\IUserServer.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Interfaces\IAssetServer.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Interfaces\IWorld.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Interfaces\IClientAPI.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Interfaces\ILocalStorage.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Interfaces\IUserServer.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Interfaces\IWorld.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Interfaces\Config\IGenericConfig.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Interfaces\Config\IGridConfig.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Interfaces\Config\IUserConfig.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Interfaces\Config\IGridConfig.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\AgentCiruitData.cs">
+    <Compile Include="Types\NeighbourInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Types\RegionHandle.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Types\RegionInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Types\ParcelData.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Types\AgentWearable.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\AssetBase.cs">
+    <Compile Include="Types\PrimData.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\AssetLandmark.cs">
+    <Compile Include="Types\MapBlockData.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Types\AssetStorage.cs">
@@ -169,30 +178,21 @@
     <Compile Include="Types\EstateSettings.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Types\AgentCiruitData.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Types\Login.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\MapBlockData.cs">
+    <Compile Include="Types\AssetLandmark.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\NeighbourInfo.cs">
+    <Compile Include="Types\AssetBase.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Types\NetworkServersInfo.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\ParcelData.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Types\PrimData.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Types\RegionHandle.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Types\RegionInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
diff --git a/OpenSim/Framework/General/OpenSim.Framework.dll.build b/OpenSim/Framework/General/OpenSim.Framework.dll.build
index a18838bace..f05217fb69 100644
--- a/OpenSim/Framework/General/OpenSim.Framework.dll.build
+++ b/OpenSim/Framework/General/OpenSim.Framework.dll.build
@@ -12,40 +12,40 @@
             </resources>
             <sources failonempty="true">
                 <include name="AgentInventory.cs" />
-                <include name="AuthenticateSessionBase.cs" />
-                <include name="BlockingQueue.cs" />
-                <include name="IRegionCommsListener.cs" />
-                <include name="Logger.cs" />
-                <include name="LoginService.cs" />
-                <include name="RegionCommsListener.cs" />
-                <include name="Remoting.cs" />
-                <include name="SimProfile.cs" />
-                <include name="UserProfile.cs" />
                 <include name="Util.cs" />
+                <include name="AuthenticateSessionBase.cs" />
+                <include name="Logger.cs" />
+                <include name="Remoting.cs" />
+                <include name="RegionCommsListener.cs" />
+                <include name="LoginService.cs" />
+                <include name="BlockingQueue.cs" />
+                <include name="UserProfile.cs" />
+                <include name="IRegionCommsListener.cs" />
+                <include name="SimProfile.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/IGridConfig.cs" />
                 <include name="Interfaces/Config/IUserConfig.cs" />
+                <include name="Interfaces/Config/IGridConfig.cs" />
                 <include name="Properties/AssemblyInfo.cs" />
-                <include name="Types/AgentCiruitData.cs" />
-                <include name="Types/AgentWearable.cs" />
-                <include name="Types/AssetBase.cs" />
-                <include name="Types/AssetLandmark.cs" />
-                <include name="Types/AssetStorage.cs" />
-                <include name="Types/EstateSettings.cs" />
-                <include name="Types/Login.cs" />
-                <include name="Types/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/ParcelData.cs" />
+                <include name="Types/AgentWearable.cs" />
+                <include name="Types/PrimData.cs" />
+                <include name="Types/MapBlockData.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/NetworkServersInfo.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
                 <lib>
diff --git a/OpenSim/Framework/General/Types/NetworkServersInfo.cs b/OpenSim/Framework/General/Types/NetworkServersInfo.cs
index 73d781169d..c6b81a7945 100644
--- a/OpenSim/Framework/General/Types/NetworkServersInfo.cs
+++ b/OpenSim/Framework/General/Types/NetworkServersInfo.cs
@@ -156,6 +156,45 @@ namespace OpenSim.Framework.Types
                         this.GridRecvKey = attri;
                     }
 
+                    //Grid Server 
+                    attri = "";
+                    attri = configData.GetAttribute("UserServerURL");
+                    if (attri == "")
+                    {
+                        this.UserURL= OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("User server URL", "http://127.0.0.1:8002/");
+                        configData.SetAttribute("UserServerURL", this.UserURL);
+                    }
+                    else
+                    {
+                        this.UserURL = attri;
+                    }
+
+                    //Grid Send Key
+                    attri = "";
+                    attri = configData.GetAttribute("UserSendKey");
+                    if (attri == "")
+                    {
+                        this.UserSendKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to send to user server", "null");
+                        configData.SetAttribute("UserSendKey", this.UserSendKey);
+                    }
+                    else
+                    {
+                        this.UserSendKey = attri;
+                    }
+
+                    //Grid Receive Key
+                    attri = "";
+                    attri = configData.GetAttribute("UserRecvKey");
+                    if (attri == "")
+                    {
+                        this.UserRecvKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to expect from user server", "null");
+                        configData.SetAttribute("GridRecvKey", this.UserRecvKey);
+                    }
+                    else
+                    {
+                        this.UserRecvKey = attri;
+                    }
+
                     attri = "";
                     attri = configData.GetAttribute("AssetServerURL");
                     if (attri == "")
diff --git a/OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj b/OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj
index 399f45634c..2301fa6a27 100644
--- a/OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj
+++ b/OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj
@@ -90,19 +90,19 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="BaseHttpServer.cs">
+    <Compile Include="IRestHandler.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="XmlRpcMethod.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="CheckSumServer.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="IRestHandler.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="UDPServerBase.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="XmlRpcMethod.cs">
+    <Compile Include="BaseHttpServer.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 7401b07d73..bb20780d44 100644
--- a/OpenSim/Framework/Servers/OpenSim.Framework.Servers.dll.build
+++ b/OpenSim/Framework/Servers/OpenSim.Framework.Servers.dll.build
@@ -11,11 +11,11 @@
             <resources prefix="OpenSim.Framework.Servers" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
-                <include name="BaseHttpServer.cs" />
-                <include name="CheckSumServer.cs" />
                 <include name="IRestHandler.cs" />
-                <include name="UDPServerBase.cs" />
                 <include name="XmlRpcMethod.cs" />
+                <include name="CheckSumServer.cs" />
+                <include name="UDPServerBase.cs" />
+                <include name="BaseHttpServer.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
                 <lib>
diff --git a/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj b/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj
index caebca32ea..945b7a598c 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="AssetHttpServer.cs">
+    <Compile Include="Main.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Main.cs">
+    <Compile Include="AssetHttpServer.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 88724f6b69..0a1b533832 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="AssetHttpServer.cs" />
                 <include name="Main.cs" />
+                <include name="AssetHttpServer.cs" />
                 <include name="Properties/AssemblyInfo.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
diff --git a/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj b/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj
index 1146b1714a..e822c18896 100644
--- a/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj
+++ b/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj
@@ -114,10 +114,10 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Main.cs">
+    <Compile Include="UserManager.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="UserManager.cs">
+    <Compile Include="Main.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.exe.build b/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.exe.build
index 50c9788910..b0333f1784 100644
--- a/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.exe.build
+++ b/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.exe.build
@@ -11,8 +11,8 @@
             <resources prefix="OpenSim.Grid.UserServer" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
-                <include name="Main.cs" />
                 <include name="UserManager.cs" />
+                <include name="Main.cs" />
                 <include name="Properties/AssemblyInfo.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
diff --git a/OpenSim/Region/Application/OpenSim.csproj b/OpenSim/Region/Application/OpenSim.csproj
index 5cefa9611e..f5da23d887 100644
--- a/OpenSim/Region/Application/OpenSim.csproj
+++ b/OpenSim/Region/Application/OpenSim.csproj
@@ -102,6 +102,12 @@
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
 			<Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\Framework\Data\OpenSim.Framework.Data.csproj">
+      <Name>OpenSim.Framework.Data</Name>
+      <Project>{36B72A9B-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
     <ProjectReference Include="..\..\Framework\GenericConfig\Xml\OpenSim.Framework.GenericConfig.Xml.csproj">
       <Name>OpenSim.Framework.GenericConfig.Xml</Name>
       <Project>{C74E4A30-0000-0000-0000-000000000000}</Project>
@@ -164,15 +170,15 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="VersionInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Application.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="OpenSimMain.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="VersionInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
diff --git a/OpenSim/Region/Application/OpenSim.exe.build b/OpenSim/Region/Application/OpenSim.exe.build
index 74eee5b875..9890cfa8a8 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="VersionInfo.cs" />
                 <include name="Application.cs" />
                 <include name="OpenSimMain.cs" />
-                <include name="VersionInfo.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
                 <lib>
@@ -26,6 +26,7 @@
                 <include name="../../../bin/OpenSim.Framework.dll" />
                 <include name="../../../bin/OpenSim.Framework.Communications.dll" />
                 <include name="../../../bin/OpenSim.Framework.Console.dll" />
+                <include name="../../../bin/OpenSim.Framework.Data.dll" />
                 <include name="../../../bin/OpenSim.Framework.GenericConfig.Xml.dll" />
                 <include name="../../../bin/OpenSim.Framework.Servers.dll" />
                 <include name="../../../bin/OpenSim.Framework.UserManagement.dll" />
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 7bf6b8dc46..6e600b857a 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -42,6 +42,8 @@ using OpenSim.Region.Environment;
 using OpenSim.Region.Environment.Scenes;
 using OpenSim.Region.Terrain;
 using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Data;
+
 using OpenSim.Framework.Types;
 using OpenSim.Framework;
 using OpenSim.Assets;
@@ -250,7 +252,14 @@ namespace OpenSim
                 LocalWorld.PhysScene = this.physManager.GetPhysicsScene(this.m_physicsEngine);
                 LocalWorld.PhysScene.SetTerrain(LocalWorld.Terrain.getHeights1D());
                 LocalWorld.LoadPrimsFromStorage();
-                LocalWorld.localStorage.LoadParcels((ILocalStorageParcelReceiver)LocalWorld.parcelManager);
+
+                //Master Avatar Setup
+                UserProfileData masterAvatar = commsManager.UserServer.SetupMasterUser(LocalWorld.RegionInfo.MasterAvatarFirstName, LocalWorld.RegionInfo.MasterAvatarLastName, LocalWorld.RegionInfo.MasterAvatarSandboxPassword);
+                if (masterAvatar != null)
+                {
+                    LocalWorld.RegionInfo.MasterAvatarAssignedUUID = masterAvatar.UUID;
+                    LocalWorld.localStorage.LoadParcels((ILocalStorageParcelReceiver)LocalWorld.parcelManager);
+                }
 
 
                 LocalWorld.StartTimer();
diff --git a/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj
index 4667d525d0..1ed28d2630 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="Caps.cs">
+    <Compile Include="LLSDCapsDetails.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="LLSDArray.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="LLSDCapEvent.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LLSDCapsDetails.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="LLSDEmpty.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="LLSDHelpers.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LLSDMapLayer.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LLSDMapLayerResponse.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LLSDMapRequest.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="LLSDTest.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="LLSDUploadReply.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="LLSDType.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="LLSDUploadReply.cs">
+    <Compile Include="LLSDHelpers.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="LLSDCapEvent.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="LLSDMapRequest.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Caps.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="LLSDMapLayerResponse.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="LLSDMapLayer.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 a091b5c043..dd853e7f1e 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="Caps.cs" />
-                <include name="LLSDArray.cs" />
-                <include name="LLSDCapEvent.cs" />
                 <include name="LLSDCapsDetails.cs" />
+                <include name="LLSDArray.cs" />
                 <include name="LLSDEmpty.cs" />
-                <include name="LLSDHelpers.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" />
+                <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" />
             </sources>
             <references basedir="${project::get-base-directory()}">
                 <lib>
diff --git a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
index 3093eb0ef4..2e1d8e2642 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="ClientStackNetworkHandler.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="ClientView.AgentAssetUpload.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="ClientView.API.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ClientView.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ClientView.PacketHandlers.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ClientView.ProcessPackets.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ClientViewBase.cs">
+    <Compile Include="ClientStackNetworkHandler.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="PacketServer.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="UDPServer.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ClientView.PacketHandlers.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ClientView.API.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ClientView.ProcessPackets.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="RegionApplicationBase.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="UDPServer.cs">
+    <Compile Include="ClientViewBase.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ClientView.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 f76a4c8871..1c791d3e2b 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="ClientStackNetworkHandler.cs" />
                 <include name="ClientView.AgentAssetUpload.cs" />
-                <include name="ClientView.API.cs" />
-                <include name="ClientView.cs" />
-                <include name="ClientView.PacketHandlers.cs" />
-                <include name="ClientView.ProcessPackets.cs" />
-                <include name="ClientViewBase.cs" />
+                <include name="ClientStackNetworkHandler.cs" />
                 <include name="PacketServer.cs" />
-                <include name="RegionApplicationBase.cs" />
                 <include name="UDPServer.cs" />
+                <include name="ClientView.PacketHandlers.cs" />
+                <include name="ClientView.API.cs" />
+                <include name="ClientView.ProcessPackets.cs" />
+                <include name="RegionApplicationBase.cs" />
+                <include name="ClientViewBase.cs" />
+                <include name="ClientView.cs" />
                 <include name="Assets/InventoryCache.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
diff --git a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
index f5aa8aef28..bacaa3e634 100644
--- a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
+++ b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
@@ -45,7 +45,7 @@ namespace OpenSim.Region.Communications.Local
         public CommunicationsLocal(NetworkServersInfo serversInfo)
             : base(serversInfo)
         {
-            UserServices = new LocalUserServices(this , serversInfo.DefaultHomeLocX, serversInfo.DefaultHomeLocY);
+            UserServices = new LocalUserServices(this,this.ServersInfo.DefaultHomeLocX,this.ServersInfo.DefaultHomeLocY);
             UserServices.AddPlugin("OpenSim.Framework.Data.DB4o.dll");
             UserServer = UserServices;
             GridServer = SandBoxServices;
diff --git a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj
index 0a15a49104..200fa3a7fd 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="CommunicationsLocal.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="LocalBackEndServices.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="LocalUserServices.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="CommunicationsLocal.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 3cac9d3d50..60a90bdd88 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="CommunicationsLocal.cs" />
                 <include name="LocalBackEndServices.cs" />
                 <include name="LocalUserServices.cs" />
+                <include name="CommunicationsLocal.cs" />
                 <include name="Properties/AssemblyInfo.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
diff --git a/OpenSim/Region/Communications/OGS1/GridCommsManager.cs b/OpenSim/Region/Communications/OGS1/GridCommsManager.cs
index 77848fa7d1..2bf95361c7 100644
--- a/OpenSim/Region/Communications/OGS1/GridCommsManager.cs
+++ b/OpenSim/Region/Communications/OGS1/GridCommsManager.cs
@@ -12,7 +12,7 @@ namespace OpenSim.Region.Communications.OGS1
         {
             GridServer = gridInterComms;
             InterRegion = gridInterComms;
-            UserServer = new OGSUserServices();
+            UserServer = new OGSUserServices(this);
         }
     }
 }
diff --git a/OpenSim/Region/Communications/OGS1/OGSUserServices.cs b/OpenSim/Region/Communications/OGS1/OGSUserServices.cs
index 48d3018e54..d41bdafe04 100644
--- a/OpenSim/Region/Communications/OGS1/OGSUserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGSUserServices.cs
@@ -1,24 +1,87 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Text;
+using OpenSim.Framework.Types;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Data;
 using libsecondlife;
 
+using Nwc.XmlRpc;
+
 namespace OpenSim.Region.Communications.OGS1
 {
     public class OGSUserServices :IUserServices
     {
+        GridCommsManager m_parent;
+        public OGSUserServices(GridCommsManager parent)
+        {
+            m_parent = parent;
+        }
+
+        public UserProfileData ConvertXMLRPCDataToUserProfile(Hashtable data)
+        {
+            UserProfileData userData = new UserProfileData();
+            userData.username = (string)data["firstname"];
+            userData.surname = (string)data["lastname"];
+            userData.UUID = new LLUUID((string)data["uuid"]);
+            userData.userInventoryURI = (string)data["server_inventory"];
+            userData.userAssetURI = (string)data["server_asset"];
+            userData.profileFirstText = (string)data["profile_firstlife_about"];
+            userData.profileFirstImage = new LLUUID((string)data["profile_firstlife_image"]);
+            userData.profileCanDoMask = (uint)data["profile_can_do"];
+            userData.profileWantDoMask = (uint)data["profile_want_do"];
+            userData.profileImage = new LLUUID((string)data["profile_image"]);
+            userData.lastLogin = (int)data["profile_lastlogin"];
+            userData.homeLocation = new LLVector3();
+            userData.homeLookAt = new LLVector3();
+
+            return userData;
+        }
         public UserProfileData GetUserProfile(string firstName, string lastName)
         {
             return GetUserProfile(firstName + " " + lastName);
         }
         public UserProfileData GetUserProfile(string name)
         {
+
+            try
+            {
+                Hashtable param = new Hashtable();
+                param["avatar_name"] = name;
+                IList parameters = new ArrayList();
+                parameters.Add(param);
+                XmlRpcRequest req = new XmlRpcRequest("get_user_by_name", parameters);
+                XmlRpcResponse resp = req.Send(m_parent.ServersInfo.UserURL, 3000);
+                Hashtable respData = (Hashtable)resp.Value;
+
+                return ConvertXMLRPCDataToUserProfile(respData);
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine("Error when trying to fetch profile data by name from remote user server: " + e.Message);
+            }
             return null;
         }
         public UserProfileData GetUserProfile(LLUUID avatarID)
         {
+            try
+            {
+
+                Hashtable param = new Hashtable();
+                param["avatar_uuid"] = avatarID.ToString();
+                IList parameters = new ArrayList();
+                parameters.Add(param);
+                XmlRpcRequest req = new XmlRpcRequest("get_user_by_uuid", parameters);
+                XmlRpcResponse resp = req.Send(m_parent.ServersInfo.UserURL, 3000);
+                Hashtable respData = (Hashtable)resp.Value;
+
+                return ConvertXMLRPCDataToUserProfile(respData);
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine("Error when trying to fetch profile data by uuid from remote user server: " + e.Message);
+            }
             return null;
         }
 
diff --git a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
index 8cc5641831..2124bd9963 100644
--- a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
+++ b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
@@ -116,13 +116,13 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="GridCommsManager.cs">
+    <Compile Include="OGSInterSimComms.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="OGS1GridServices.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="OGSInterSimComms.cs">
+    <Compile Include="GridCommsManager.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="OGSUserServices.cs">
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 21bb15c203..1a7cf696c4 100644
--- a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build
+++ b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build
@@ -11,9 +11,9 @@
             <resources prefix="OpenSim.Region.Communications.OGS1" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
-                <include name="GridCommsManager.cs" />
-                <include name="OGS1GridServices.cs" />
                 <include name="OGSInterSimComms.cs" />
+                <include name="OGS1GridServices.cs" />
+                <include name="GridCommsManager.cs" />
                 <include name="OGSUserServices.cs" />
                 <include name="Properties/AssemblyInfo.cs" />
             </sources>
diff --git a/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj b/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj
index 4069454fef..9f8d2c3ddb 100644
--- a/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj
+++ b/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj
@@ -148,64 +148,64 @@
     </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\IScenePresenceBody.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Scenes\Primitive.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Scenes\Scene.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Scenes\Scene.PacketHandlers.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Scenes\SceneBase.cs">
+    <Compile Include="Scenes\ScenePresence.Body.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Scenes\SceneEvents.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\SceneObject.cs">
+    <Compile Include="Scenes\ScenePresence.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Scenes\ScenePresence.Animations.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\ScenePresence.Body.cs">
+    <Compile Include="Scenes\Scene.PacketHandlers.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\ScenePresence.cs">
+    <Compile Include="Scenes\SceneObject.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\scripting\Script.cs">
+    <Compile Include="Scenes\Primitive.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\scripting\ScriptInfo.cs">
+    <Compile Include="Scenes\IScenePresenceBody.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Scenes\Entity.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Scenes\SceneBase.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Scenes\Scene.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Scenes\scripting\ScriptManager.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Scenes\scripting\ScriptInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Scenes\scripting\Script.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Scenes\scripting\Engines\CSharpScriptEngine.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\scripting\Engines\JScriptEngine.cs">
+    <Compile Include="Scenes\scripting\Engines\JSharpScriptEngine.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\scripting\Engines\JSharpScriptEngine.cs">
+    <Compile Include="Scenes\scripting\Engines\JScriptEngine.cs">
       <SubType>Code</SubType>
     </Compile>
   </ItemGroup>
diff --git a/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build b/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build
index 51924d5c12..667f1d7e67 100644
--- a/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build
+++ b/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build
@@ -11,26 +11,26 @@
             <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/Scene.PacketHandlers.cs" />
-                <include name="Scenes/SceneBase.cs" />
-                <include name="Scenes/SceneEvents.cs" />
-                <include name="Scenes/SceneObject.cs" />
-                <include name="Scenes/ScenePresence.Animations.cs" />
                 <include name="Scenes/ScenePresence.Body.cs" />
+                <include name="Scenes/SceneEvents.cs" />
                 <include name="Scenes/ScenePresence.cs" />
-                <include name="Scenes/scripting/Script.cs" />
-                <include name="Scenes/scripting/ScriptInfo.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/IScenePresenceBody.cs" />
+                <include name="Scenes/Entity.cs" />
+                <include name="Scenes/SceneBase.cs" />
+                <include name="Scenes/Scene.cs" />
                 <include name="Scenes/scripting/ScriptManager.cs" />
+                <include name="Scenes/scripting/ScriptInfo.cs" />
+                <include name="Scenes/scripting/Script.cs" />
                 <include name="Scenes/scripting/Engines/CSharpScriptEngine.cs" />
-                <include name="Scenes/scripting/Engines/JScriptEngine.cs" />
                 <include name="Scenes/scripting/Engines/JSharpScriptEngine.cs" />
+                <include name="Scenes/scripting/Engines/JScriptEngine.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
                 <lib>
diff --git a/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj
index 147158c6b8..716fd5761b 100644
--- a/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj
+++ b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj
@@ -93,9 +93,6 @@
     <Compile Include="AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Db4LocalStorage.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="MapStorage.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -105,6 +102,9 @@
     <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 fc9f055b47..112ff1c309 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 c8b859c41d..f332827196 100644
--- a/Prebuild/src/Prebuild.csproj
+++ b/Prebuild/src/Prebuild.csproj
@@ -83,9 +83,6 @@
     <Compile Include="Prebuild.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\FatalException.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Core\Kernel.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -95,19 +92,25 @@
     <Compile Include="Core\WarningException.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Attributes\DataNodeAttribute.cs">
+    <Compile Include="Core\FatalException.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Attributes\OptionNodeAttribute.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Core\Attributes\TargetAttribute.cs">
+    <Compile Include="Core\Interfaces\ITarget.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Core\Interfaces\IDataNode.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Interfaces\ITarget.cs">
+    <Compile Include="Core\Attributes\OptionNodeAttribute.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\Attributes\DataNodeAttribute.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\Attributes\TargetAttribute.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\Nodes\ProjectNode.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Core\Nodes\ConfigurationNode.cs">
@@ -119,40 +122,28 @@
     <Compile Include="Core\Nodes\ExcludeNode.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Nodes\FileNode.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Core\Nodes\FilesNode.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Core\Nodes\MatchNode.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <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\ReferencePathNode.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Core\Nodes\MatchNode.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Core\Nodes\SolutionNode.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Parse\IfContext.cs">
+    <Compile Include="Core\Nodes\ProcessNode.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Parse\Preprocessor.cs">
+    <Compile Include="Core\Nodes\ReferenceNode.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Targets\AutotoolsTarget.cs">
+    <Compile Include="Core\Nodes\FileNode.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\Nodes\FilesNode.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Core\Targets\DebugTarget.cs">
@@ -161,10 +152,7 @@
     <Compile Include="Core\Targets\MonoDevelopTarget.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Targets\NAntTarget.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Core\Targets\SharpDevelop2Target.cs">
+    <Compile Include="Core\Targets\AutotoolsTarget.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Core\Targets\SharpDevelopTarget.cs">
@@ -176,13 +164,19 @@
     <Compile Include="Core\Targets\VS2003Target.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Core\Targets\SharpDevelop2Target.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Core\Targets\VS2005Target.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Utilities\CommandLineCollection.cs">
+    <Compile Include="Core\Targets\NAntTarget.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Utilities\CurrentDirectory.cs">
+    <Compile Include="Core\Parse\IfContext.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\Parse\Preprocessor.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Core\Utilities\Helper.cs">
@@ -191,6 +185,12 @@
     <Compile Include="Core\Utilities\Log.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Core\Utilities\CommandLineCollection.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\Utilities\CurrentDirectory.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
diff --git a/Prebuild/src/Prebuild.exe.build b/Prebuild/src/Prebuild.exe.build
index 2851125232..52dd1a7778 100644
--- a/Prebuild/src/Prebuild.exe.build
+++ b/Prebuild/src/Prebuild.exe.build
@@ -14,42 +14,42 @@
             </resources>
             <sources failonempty="true">
                 <include name="Prebuild.cs" />
-                <include name="Core/FatalException.cs" />
                 <include name="Core/Kernel.cs" />
                 <include name="Core/UnknownLanguageException.cs" />
                 <include name="Core/WarningException.cs" />
-                <include name="Core/Attributes/DataNodeAttribute.cs" />
-                <include name="Core/Attributes/OptionNodeAttribute.cs" />
-                <include name="Core/Attributes/TargetAttribute.cs" />
-                <include name="Core/Interfaces/IDataNode.cs" />
+                <include name="Core/FatalException.cs" />
                 <include name="Core/Interfaces/ITarget.cs" />
+                <include name="Core/Interfaces/IDataNode.cs" />
+                <include name="Core/Attributes/OptionNodeAttribute.cs" />
+                <include name="Core/Attributes/DataNodeAttribute.cs" />
+                <include name="Core/Attributes/TargetAttribute.cs" />
+                <include name="Core/Nodes/ProjectNode.cs" />
                 <include name="Core/Nodes/ConfigurationNode.cs" />
                 <include name="Core/Nodes/DataNode.cs" />
                 <include name="Core/Nodes/ExcludeNode.cs" />
+                <include name="Core/Nodes/OptionsNode.cs" />
+                <include name="Core/Nodes/ReferencePathNode.cs" />
+                <include name="Core/Nodes/MatchNode.cs" />
+                <include name="Core/Nodes/SolutionNode.cs" />
+                <include name="Core/Nodes/ProcessNode.cs" />
+                <include name="Core/Nodes/ReferenceNode.cs" />
                 <include name="Core/Nodes/FileNode.cs" />
                 <include name="Core/Nodes/FilesNode.cs" />
-                <include name="Core/Nodes/MatchNode.cs" />
-                <include name="Core/Nodes/OptionsNode.cs" />
-                <include name="Core/Nodes/ProcessNode.cs" />
-                <include name="Core/Nodes/ProjectNode.cs" />
-                <include name="Core/Nodes/ReferenceNode.cs" />
-                <include name="Core/Nodes/ReferencePathNode.cs" />
-                <include name="Core/Nodes/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/NAntTarget.cs" />
-                <include name="Core/Targets/SharpDevelop2Target.cs" />
+                <include name="Core/Targets/AutotoolsTarget.cs" />
                 <include name="Core/Targets/SharpDevelopTarget.cs" />
                 <include name="Core/Targets/VS2002Target.cs" />
                 <include name="Core/Targets/VS2003Target.cs" />
+                <include name="Core/Targets/SharpDevelop2Target.cs" />
                 <include name="Core/Targets/VS2005Target.cs" />
-                <include name="Core/Utilities/CommandLineCollection.cs" />
-                <include name="Core/Utilities/CurrentDirectory.cs" />
+                <include name="Core/Targets/NAntTarget.cs" />
+                <include name="Core/Parse/IfContext.cs" />
+                <include name="Core/Parse/Preprocessor.cs" />
                 <include name="Core/Utilities/Helper.cs" />
                 <include name="Core/Utilities/Log.cs" />
+                <include name="Core/Utilities/CommandLineCollection.cs" />
+                <include name="Core/Utilities/CurrentDirectory.cs" />
                 <include name="Properties/AssemblyInfo.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
diff --git a/prebuild.xml b/prebuild.xml
index 1e51bd49d8..f9e4361585 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -667,6 +667,7 @@
       <Reference name="Db4objects.Db4o.dll"/>
       <Reference name="OpenSim.Region.Terrain.BasicTerrain"/>
       <Reference name="OpenSim.Framework"/>
+      <Reference name="OpenSim.Framework.Data"/>
       <Reference name="OpenSim.Framework.Console"/>
       <Reference name="OpenSim.Region.Physics.Manager"/>
       <Reference name="OpenSim.Framework.Servers"/>