*Moved VersionInfo.cs to its correct place in OpenSim.csproj

*Added OpenSim.Region.Caps
*Updated prebuild.xml and ran prebuild

OpenSim/Region/Application/OpenSim.csproj

@@ -164,10 +164,13 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="OpenSimMain.cs">
+    <Compile Include="Application.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Application.cs">
+    <Compile Include="VersionInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="OpenSimMain.cs">
       <SubType>Code</SubType>
     </Compile>
   </ItemGroup>

OpenSim/Region/Application/OpenSimMain.cs

@@ -40,7 +40,7 @@ using libsecondlife;
 using libsecondlife.Packets;
 using OpenSim.Region.Environment;
 using OpenSim.Region.Environment.Scenes;
-using OpenSim.Terrain;
+using OpenSim.Region.Terrain;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
 using OpenSim.Framework;

OpenSim/Region/Application/VersionInfo.cs

@@ -27,7 +27,7 @@
 */
 using System;
 
-namespace OpenSim.Region.ClientStack
+namespace OpenSim
 {
     /// <summary>
     /// </summary>

OpenSim/Region/Caps/Caps.cs

@@ -4,11 +4,11 @@ using System.Collections.Generic;
 using System.Text;
 using System.IO;
 using System.Xml;
-using OpenSim.Servers;
+using OpenSim.Framework.Servers;
 using OpenSim.Framework;
 using OpenSim.Framework.Utilities;
 using OpenSim.Framework.Types;
-using OpenSim.Caches;
+using OpenSim.Region.Caches;
 using libsecondlife;
 
 namespace OpenSim.Region

OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj

@@ -135,9 +135,6 @@
     <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>
@@ -147,16 +144,16 @@
     <Compile Include="ClientView.ProcessPackets.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="VersionInfo.cs">
+    <Compile Include="ClientViewBase.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ClientView.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="RegionApplicationBase.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="ClientViewBase.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ClientView.cs">
+    <Compile Include="UDPServer.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Assets\InventoryCache.cs">

OpenSim/Region/ClientStack/RegionApplicationBase.cs

@@ -37,7 +37,7 @@ using System.Collections;
 using System.Collections.Generic;
 using libsecondlife;
 using libsecondlife.Packets;
-using OpenSim.Terrain;
+using OpenSim.Region.Terrain;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
 using OpenSim.Framework;

OpenSim/Region/ClientStack/UDPServer.cs

@@ -37,7 +37,7 @@ using System.Collections;
 using System.Collections.Generic;
 using libsecondlife;
 using libsecondlife.Packets;
-using OpenSim.Terrain;
+using OpenSim.Region.Terrain;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
 using OpenSim.Assets;

OpenSim/Region/Simulation/OpenSim.Region.Environment.csproj

@@ -149,9 +149,6 @@
     <Compile Include="Scenes\Entity.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\Scene.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Scenes\Scene.Scripting.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -176,10 +173,13 @@
     <Compile Include="Scenes\Primitive.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\SceneBase.cs">
+    <Compile Include="Scenes\IScenePresenceBody.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\IScenePresenceBody.cs">
+    <Compile Include="Scenes\Scene.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Scenes\SceneBase.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Scenes\scripting\IScriptHandler.cs">

OpenSim/Region/Simulation/Scenes/Scene.cs

@@ -40,7 +40,7 @@ using OpenSim.Framework.Types;
 using OpenSim.Framework.Inventory;
 using OpenSim.Framework;
 using OpenSim.Region.Environment.Scripting;
-using OpenSim.Terrain;
+using OpenSim.Region.Terrain;
 using OpenSim.Framework.Communications;
 using OpenSim.Region.Caches;
 using OpenSim.Region.Environment;

OpenSim/Region/Simulation/Scenes/SceneBase.cs

@@ -38,7 +38,7 @@ using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
 using OpenSim.Framework.Inventory;
 using OpenSim.Region.Environment.Scripting;
-using OpenSim.Terrain;
+using OpenSim.Region.Terrain;
 using OpenSim.Region.Caches;
 
 namespace OpenSim.Region.Environment.Scenes

OpenSim/Region/Terrain.BasicTerrain/OpenSim.Region.Terrain.BasicTerrain.csproj

@@ -90,10 +90,10 @@
   <ItemGroup>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="TerrainEngine.cs">
+    <Compile Include="TerrainFilter.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="TerrainFilter.cs">
+    <Compile Include="TerrainEngine.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">

OpenSim/Region/Terrain.BasicTerrain/Properties/AssemblyInfo.cs

@@ -32,11 +32,11 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("OpenSim.Terrain.BasicTerrain")]
+[assembly: AssemblyTitle("OpenSim.Region.Terrain.BasicTerrain")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("OpenSim.Terrain.BasicTerrain")]
+[assembly: AssemblyProduct("OpenSim.Region.Terrain.BasicTerrain")]
 [assembly: AssemblyCopyright("Copyright ©  2007")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs

@@ -32,7 +32,7 @@ using System.Drawing;
 using libTerrain;
 using OpenJPEGNet;
 
-namespace OpenSim.Terrain
+namespace OpenSim.Region.Terrain
 {
     public class TerrainCommand
     {

OpenSim/Region/Terrain.BasicTerrain/TerrainFilter.cs

@@ -9,7 +9,7 @@ using Microsoft.JScript;
 
 using libTerrain;
 
-namespace OpenSim.Terrain
+namespace OpenSim.Region.Terrain
 {
     public interface ITerrainFilter
     {
@@ -48,7 +48,7 @@ namespace OpenSim.Terrain
             compilerParams.GenerateInMemory = true;
             compilerParams.IncludeDebugInformation = false;
             compilerParams.ReferencedAssemblies.Add("libTerrain-BSD.dll");
-            compilerParams.ReferencedAssemblies.Add("OpenSim.Terrain.BasicTerrain.dll");
+            compilerParams.ReferencedAssemblies.Add("OpenSim.Region.Terrain.BasicTerrain.dll");
             compilerParams.ReferencedAssemblies.Add("System.dll");
 
             compilerResults = compiler.CompileAssemblyFromFile(compilerParams, filename);