14 files changed, 92 insertions, 100 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/OpenSim.Framework.Data.DB4o.csproj b/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj
index c7b4870..b09cecf 100644
--- a/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj
+++ b/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj
@@ -88,15 +88,15 @@
     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

-    <Compile Include="DB4oUserData.cs">

-      <SubType>Code</SubType>

-    </Compile>

     <Compile Include="DB4oGridData.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="DB4oManager.cs">

       <SubType>Code</SubType>

     </Compile>

+    <Compile Include="DB4oUserData.cs">

+      <SubType>Code</SubType>

+    </Compile>

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

       <SubType>Code</SubType>

     </Compile>

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 efccdc1..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="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.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/OpenSim.Framework.Data.csproj b/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj
index 6077266..dcafbcd 100644
--- a/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj
+++ b/OpenSim/Framework/Data/OpenSim.Framework.Data.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>{36B72A9B-0000-0000-0000-000000000000}</ProjectGuid>

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

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

-    <ApplicationIcon>

-    </ApplicationIcon>

+    <ApplicationIcon></ApplicationIcon>

     <AssemblyKeyContainerName>

     </AssemblyKeyContainerName>

     <AssemblyName>OpenSim.Framework.Data</AssemblyName>

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

     <DelaySign>false</DelaySign>

     <OutputType>Library</OutputType>

-    <AppDesignerFolder>

-    </AppDesignerFolder>

+    <AppDesignerFolder></AppDesignerFolder>

     <RootNamespace>OpenSim.Framework.Data</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,34 +55,29 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn>

-    </NoWarn>

+    <NoWarn></NoWarn>

   </PropertyGroup>

   <ItemGroup>

-    <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.Data" >

       <HintPath>System.Data.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="System.Xml">

+    <Reference Include="System.Xml" >

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

       <Private>False</Private>

     </Reference>

-    <Reference Include="XMLRPC, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL" />

   </ItemGroup>

   <ItemGroup>

   </ItemGroup>

   <ItemGroup>

-    <Compile Include="ReservationData.cs">

-      <SubType>Code</SubType>

-    </Compile>

     <Compile Include="GridData.cs">

       <SubType>Code</SubType>

     </Compile>

@@ -101,13 +90,16 @@
     <Compile Include="InventoryData.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="UserData.cs">

+    <Compile Include="ReservationData.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="UserProfileData.cs">

+    <Compile Include="SimProfileData.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="SimProfileData.cs">

+    <Compile Include="UserData.cs">

+      <SubType>Code</SubType>

+    </Compile>

+    <Compile Include="UserProfileData.cs">

       <SubType>Code</SubType>

     </Compile>

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

@@ -121,4 +113,4 @@
     <PostBuildEvent>

     </PostBuildEvent>

   </PropertyGroup>

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

diff --git a/OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build b/OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build
index 6b489f2..aefb02b 100644
--- a/OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build
+++ b/OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build
@@ -11,14 +11,14 @@
             <resources prefix="OpenSim.Framework.Data" dynamicprefix="true" >

             </resources>

             <sources failonempty="true">

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

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

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

             </sources>

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

diff --git a/OpenSim/Framework/General/OpenSim.Framework.csproj b/OpenSim/Framework/General/OpenSim.Framework.csproj
index 4a72db0..c5124cd 100644
--- a/OpenSim/Framework/General/OpenSim.Framework.csproj
+++ b/OpenSim/Framework/General/OpenSim.Framework.csproj
@@ -97,100 +97,100 @@
     <Compile Include="BlockingQueue.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Util.cs">

+    <Compile Include="IRegionCommsListener.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="UserProfile.cs">

+    <Compile Include="LoginService.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="IRegionCommsListener.cs">

+    <Compile Include="RegionCommsListener.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Remoting.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="RegionCommsListener.cs">

+    <Compile Include="UserProfile.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="LoginService.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="Types\MapBlockData.cs">

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

       <SubType>Code</SubType>

     </Compile>

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

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

       <SubType>Code</SubType>

     </Compile>

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

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

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Types\NeighbourInfo.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\RegionHandle.cs">

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

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Types\ParcelData.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\AgentWearable.cs">

+    <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\UUID.cs">

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

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Types\EstateSettings.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\AgentCiruitData.cs">

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

       <SubType>Code</SubType>

     </Compile>

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

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

       <SubType>Code</SubType>

     </Compile>

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

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

       <SubType>Code</SubType>

     </Compile>

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

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

       <SubType>Code</SubType>

     </Compile>

   </ItemGroup>

diff --git a/OpenSim/Framework/General/OpenSim.Framework.dll.build b/OpenSim/Framework/General/OpenSim.Framework.dll.build
index 9fb35bc..a44f0fc 100644
--- a/OpenSim/Framework/General/OpenSim.Framework.dll.build
+++ b/OpenSim/Framework/General/OpenSim.Framework.dll.build
@@ -14,38 +14,38 @@
                 <include name="AgentInventory.cs" />

                 <include name="AuthenticateSessionBase.cs" />

                 <include name="BlockingQueue.cs" />

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

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

                 <include name="IRegionCommsListener.cs" />

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

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

                 <include name="LoginService.cs" />

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

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

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

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

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

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

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

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

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

+                <include name="Interfaces/Config/IUserConfig.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/UUID.cs" />

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

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

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

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

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

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

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

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

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

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

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

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

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

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

             </sources>

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

                 <lib>