From fa50dce1b68be238da2494031769dc347899675a Mon Sep 17 00:00:00 2001
From: mingchen
Date: Wed, 6 Jun 2007 21:59:05 +0000
Subject: If this is what it takes, then fine *Adding every .build and .csproj
 to get ccnet working (hopefully)

---
 .../OpenSim.RegionServer.csproj                    | 76 +++++++++++-----------
 .../OpenSim.RegionServer.dll.build                 | 46 ++++++-------
 .../OpenSim.Scripting.EmbeddedJVM.csproj           | 32 ++++-----
 .../OpenSim.Scripting.EmbeddedJVM.dll.build        | 20 +++---
 .../OpenSim.Storage.LocalStorageDb4o.csproj        | 45 ++++++-------
 .../OpenSim.Storage.LocalStorageDb4o.dll.build     |  5 +-
 OpenSim/OpenSim/OpenSim.csproj                     |  4 +-
 OpenSim/OpenSim/OpenSim.exe.build                  |  2 +-
 8 files changed, 113 insertions(+), 117 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
index 256d3e1..9161a4e 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
+++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
@@ -124,10 +124,10 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AgentAssetUpload.cs">
+    <Compile Include="OpenSimMain.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="AuthenticateSessionsBase.cs">
+    <Compile Include="UDPServer.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="AuthenticateSessionsLocal.cs">
@@ -136,28 +136,16 @@
     <Compile Include="AuthenticateSessionsRemote.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="ClientView.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ClientView.Grid.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="OpenSimNetworkHandler.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Grid.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="OpenSimMain.cs">
+    <Compile Include="RegionInfoBase.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="OpenSimNetworkHandler.cs">
+    <Compile Include="ClientView.Grid.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="PacketServer.cs">
@@ -166,55 +154,55 @@
     <Compile Include="RegionInfo.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="RegionInfoBase.cs">
+    <Compile Include="ClientView.PacketHandlers.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="RegionServerBase.cs">
+    <Compile Include="AuthenticateSessionsBase.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="UDPServer.cs">
+    <Compile Include="ClientView.ProcessPackets.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="VersionInfo.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Assets\AssetCache.cs">
+    <Compile Include="AgentAssetUpload.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Assets\InventoryCache.cs">
+    <Compile Include="ClientViewBase.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="CAPS\AdminWebFront.cs">
+    <Compile Include="RegionServerBase.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="types\Mesh.cs">
+    <Compile Include="ClientView.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="types\Triangle.cs">
+    <Compile Include="CAPS\AdminWebFront.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="world\Avatar.Client.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="world\Avatar.cs">
+    <Compile Include="world\Entity.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="world\Avatar.Update.cs">
+    <Compile Include="world\Avatar.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="world\AvatarAnimations.cs">
+    <Compile Include="world\World.PacketHandlers.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="world\Entity.cs">
+    <Compile Include="world\Avatar.Update.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="world\ParcelManager.cs">
+    <Compile Include="world\AvatarAnimations.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="world\Primitive.cs">
+    <Compile Include="world\ParcelManager.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="world\Primitive2.cs">
+    <Compile Include="world\WorldBase.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="world\SceneObject.cs">
@@ -223,33 +211,45 @@
     <Compile Include="world\World.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="world\World.PacketHandlers.cs">
+    <Compile Include="world\Primitive.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="world\World.Scripting.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="world\WorldBase.cs">
+    <Compile Include="world\Primitive2.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="world\scripting\IScriptContext.cs">
+    <Compile Include="world\scripting\IScriptHandler.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="world\scripting\IScriptEntity.cs">
+    <Compile Include="world\scripting\ScriptFactory.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="world\scripting\IScriptHandler.cs">
+    <Compile Include="world\scripting\IScriptContext.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="world\scripting\Script.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="world\scripting\ScriptFactory.cs">
+    <Compile Include="world\scripting\IScriptEntity.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="world\scripting\Scripts\FollowRandomAvatar.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Assets\InventoryCache.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Assets\AssetCache.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="types\Mesh.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="types\Triangle.cs">
+      <SubType>Code</SubType>
+    </Compile>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
index 25bbf07..bbd63f1 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
+++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
@@ -11,48 +11,48 @@
             <resources prefix="OpenSim.RegionServer" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
-                <include name="AgentAssetUpload.cs" />
-                <include name="AuthenticateSessionsBase.cs" />
+                <include name="OpenSimMain.cs" />
+                <include name="UDPServer.cs" />
                 <include name="AuthenticateSessionsLocal.cs" />
                 <include name="AuthenticateSessionsRemote.cs" />
-                <include name="ClientView.cs" />
+                <include name="OpenSimNetworkHandler.cs" />
+                <include name="Grid.cs" />
+                <include name="RegionInfoBase.cs" />
                 <include name="ClientView.Grid.cs" />
+                <include name="PacketServer.cs" />
+                <include name="RegionInfo.cs" />
                 <include name="ClientView.PacketHandlers.cs" />
+                <include name="AuthenticateSessionsBase.cs" />
                 <include name="ClientView.ProcessPackets.cs" />
+                <include name="VersionInfo.cs" />
+                <include name="AgentAssetUpload.cs" />
                 <include name="ClientViewBase.cs" />
-                <include name="Grid.cs" />
-                <include name="OpenSimMain.cs" />
-                <include name="OpenSimNetworkHandler.cs" />
-                <include name="PacketServer.cs" />
-                <include name="RegionInfo.cs" />
-                <include name="RegionInfoBase.cs" />
                 <include name="RegionServerBase.cs" />
-                <include name="UDPServer.cs" />
-                <include name="VersionInfo.cs" />
-                <include name="Assets/AssetCache.cs" />
-                <include name="Assets/InventoryCache.cs" />
+                <include name="ClientView.cs" />
                 <include name="CAPS/AdminWebFront.cs" />
-                <include name="types/Mesh.cs" />
-                <include name="types/Triangle.cs" />
                 <include name="world/Avatar.Client.cs" />
+                <include name="world/Entity.cs" />
                 <include name="world/Avatar.cs" />
+                <include name="world/World.PacketHandlers.cs" />
                 <include name="world/Avatar.Update.cs" />
                 <include name="world/AvatarAnimations.cs" />
-                <include name="world/Entity.cs" />
                 <include name="world/ParcelManager.cs" />
-                <include name="world/Primitive.cs" />
-                <include name="world/Primitive2.cs" />
+                <include name="world/WorldBase.cs" />
                 <include name="world/SceneObject.cs" />
                 <include name="world/World.cs" />
-                <include name="world/World.PacketHandlers.cs" />
+                <include name="world/Primitive.cs" />
                 <include name="world/World.Scripting.cs" />
-                <include name="world/WorldBase.cs" />
-                <include name="world/scripting/IScriptContext.cs" />
-                <include name="world/scripting/IScriptEntity.cs" />
+                <include name="world/Primitive2.cs" />
                 <include name="world/scripting/IScriptHandler.cs" />
-                <include name="world/scripting/Script.cs" />
                 <include name="world/scripting/ScriptFactory.cs" />
+                <include name="world/scripting/IScriptContext.cs" />
+                <include name="world/scripting/Script.cs" />
+                <include name="world/scripting/IScriptEntity.cs" />
                 <include name="world/scripting/Scripts/FollowRandomAvatar.cs" />
+                <include name="Assets/InventoryCache.cs" />
+                <include name="Assets/AssetCache.cs" />
+                <include name="types/Mesh.cs" />
+                <include name="types/Triangle.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
                 <lib>
diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj
index bd1a332..6ffcf9e 100644
--- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj
+++ b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj
@@ -76,66 +76,66 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ClassInstance.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ClassRecord.cs">
+    <Compile Include="MainMemory.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Heap.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Interpreter.cs">
+    <Compile Include="StackFrame.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="InterpreterLogic.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="InterpreterMethods.cs">
+    <Compile Include="OpenSimJVM.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="InterpreterReturn.cs">
+    <Compile Include="InterpreterMethods.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="MainMemory.cs">
+    <Compile Include="ClassInstance.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="MethodMemory.cs">
+    <Compile Include="InterpreterReturn.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Object.cs">
+    <Compile Include="Interpreter.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="OpenSimJVM.cs">
+    <Compile Include="ClassRecord.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Stack.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="StackFrame.cs">
+    <Compile Include="Object.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Thread.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs">
+    <Compile Include="MethodMemory.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\ArrayReference.cs">
+    <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Types\BaseType.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\ObjectReference.cs">
+    <Compile Include="Types\ArrayReference.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\PrimitiveTypes\Byte.cs">
+    <Compile Include="Types\ObjectReference.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Types\PrimitiveTypes\Char.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Types\PrimitiveTypes\Byte.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Types\PrimitiveTypes\Float.cs">
       <SubType>Code</SubType>
     </Compile>
diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build
index c5255db..ac4d564 100644
--- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build
+++ b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build
@@ -11,26 +11,26 @@
             <resources prefix="OpenSim.Scripting.EmbeddedJVM" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
-                <include name="ClassInstance.cs" />
-                <include name="ClassRecord.cs" />
+                <include name="MainMemory.cs" />
                 <include name="Heap.cs" />
-                <include name="Interpreter.cs" />
+                <include name="StackFrame.cs" />
                 <include name="InterpreterLogic.cs" />
+                <include name="OpenSimJVM.cs" />
                 <include name="InterpreterMethods.cs" />
+                <include name="ClassInstance.cs" />
                 <include name="InterpreterReturn.cs" />
-                <include name="MainMemory.cs" />
-                <include name="MethodMemory.cs" />
-                <include name="Object.cs" />
-                <include name="OpenSimJVM.cs" />
+                <include name="Interpreter.cs" />
+                <include name="ClassRecord.cs" />
                 <include name="Stack.cs" />
-                <include name="StackFrame.cs" />
+                <include name="Object.cs" />
                 <include name="Thread.cs" />
+                <include name="MethodMemory.cs" />
                 <include name="Properties/AssemblyInfo.cs" />
-                <include name="Types/ArrayReference.cs" />
                 <include name="Types/BaseType.cs" />
+                <include name="Types/ArrayReference.cs" />
                 <include name="Types/ObjectReference.cs" />
-                <include name="Types/PrimitiveTypes/Byte.cs" />
                 <include name="Types/PrimitiveTypes/Char.cs" />
+                <include name="Types/PrimitiveTypes/Byte.cs" />
                 <include name="Types/PrimitiveTypes/Float.cs" />
                 <include name="Types/PrimitiveTypes/Int.cs" />
             </sources>
diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
index 231ba1d..7bb5d6e 100644
--- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
+++ b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.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>{E1B79ECF-0000-0000-0000-000000000000}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>
-    </ApplicationIcon>
+    <ApplicationIcon></ApplicationIcon>
     <AssemblyKeyContainerName>
     </AssemblyKeyContainerName>
     <AssemblyName>OpenSim.Storage.LocalStorageDb4o</AssemblyName>
@@ -16,11 +15,9 @@
     <DefaultTargetSchema>IE50</DefaultTargetSchema>
     <DelaySign>false</DelaySign>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>
-    </AppDesignerFolder>
+    <AppDesignerFolder></AppDesignerFolder>
     <RootNamespace>OpenSim.Storage.LocalStorageDb4o</RootNamespace>
-    <StartupObject>
-    </StartupObject>
+    <StartupObject></StartupObject>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
   </PropertyGroup>
@@ -31,8 +28,7 @@
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
     <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
+    <DocumentationFile></DocumentationFile>
     <DebugSymbols>True</DebugSymbols>
     <FileAlignment>4096</FileAlignment>
     <Optimize>False</Optimize>
@@ -41,8 +37,7 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>
     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
     <WarningLevel>4</WarningLevel>
-    <NoWarn>
-    </NoWarn>
+    <NoWarn></NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -51,8 +46,7 @@
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
     <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
+    <DocumentationFile></DocumentationFile>
     <DebugSymbols>False</DebugSymbols>
     <FileAlignment>4096</FileAlignment>
     <Optimize>True</Optimize>
@@ -61,23 +55,22 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>
     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
     <WarningLevel>4</WarningLevel>
-    <NoWarn>
-    </NoWarn>
+    <NoWarn></NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System">
+    <Reference Include="System" >
       <HintPath>System.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="System.Xml">
+    <Reference Include="System.Xml" >
       <HintPath>System.Xml.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="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>
@@ -87,29 +80,31 @@
       <Name>OpenSim.Framework</Name>
       <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
+			<Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
       <Name>OpenSim.Framework.Console</Name>
       <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
+			<Private>False</Private>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="UUIDParcelQuery.cs" />
-    <Compile Include="UUIDPrimQuery.cs">
+    <Compile Include="MapStorage.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="MapStorage.cs">
+    <Compile Include="UUIDPrimQuery.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Db4LocalStorage.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="UUIDParcelQuery.cs">
+      <SubType>Code</SubType>
+    </Compile>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
@@ -118,4 +113,4 @@
     <PostBuildEvent>
     </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
index da2db14..e18478a 100644
--- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
+++ b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
@@ -12,9 +12,10 @@
             </resources>
             <sources failonempty="true">
                 <include name="AssemblyInfo.cs" />
-                <include name="Db4LocalStorage.cs" />
                 <include name="MapStorage.cs" />
-                <include name="UUIDQuery.cs" />
+                <include name="UUIDPrimQuery.cs" />
+                <include name="Db4LocalStorage.cs" />
+                <include name="UUIDParcelQuery.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
                 <lib>
diff --git a/OpenSim/OpenSim/OpenSim.csproj b/OpenSim/OpenSim/OpenSim.csproj
index 069c5c6..a3f6ec0 100644
--- a/OpenSim/OpenSim/OpenSim.csproj
+++ b/OpenSim/OpenSim/OpenSim.csproj
@@ -130,10 +130,10 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Application.cs">
+    <Compile Include="OpenSimMain.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="OpenSimMain.cs">
+    <Compile Include="Application.cs">
       <SubType>Code</SubType>
     </Compile>
   </ItemGroup>
diff --git a/OpenSim/OpenSim/OpenSim.exe.build b/OpenSim/OpenSim/OpenSim.exe.build
index 4f8ca8a..670b77c 100644
--- a/OpenSim/OpenSim/OpenSim.exe.build
+++ b/OpenSim/OpenSim/OpenSim.exe.build
@@ -11,8 +11,8 @@
             <resources prefix="OpenSim" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
-                <include name="Application.cs" />
                 <include name="OpenSimMain.cs" />
+                <include name="Application.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
                 <lib>
-- 
cgit v1.1