1 files changed, 54 insertions, 47 deletions

diff --git a/OpenSim/OpenSim/OpenSim.csproj b/OpenSim/Region/Application/OpenSim.csproj
index 222e2f7..bec85cc 100644
--- a/OpenSim/OpenSim/OpenSim.csproj
+++ b/OpenSim/Region/Application/OpenSim.csproj
@@ -32,7 +32,7 @@
     <DebugSymbols>True</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>False</Optimize>

-    <OutputPath>..\..\bin\</OutputPath>

+    <OutputPath>..\..\..\bin\</OutputPath>

     <RegisterForComInterop>False</RegisterForComInterop>

     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

@@ -50,7 +50,7 @@
     <DebugSymbols>False</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>True</Optimize>

-    <OutputPath>..\..\bin\</OutputPath>

+    <OutputPath>..\..\..\bin\</OutputPath>

     <RegisterForComInterop>False</RegisterForComInterop>

     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

@@ -59,15 +59,15 @@
   </PropertyGroup>

   <ItemGroup>

     <Reference Include="Axiom.MathLib.dll" >

-      <HintPath>..\..\bin\Axiom.MathLib.dll</HintPath>

+      <HintPath>..\..\..\bin\Axiom.MathLib.dll</HintPath>

       <Private>False</Private>

     </Reference>

     <Reference Include="Db4objects.Db4o.dll" >

-      <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath>

+      <HintPath>..\..\..\bin\Db4objects.Db4o.dll</HintPath>

       <Private>False</Private>

     </Reference>

     <Reference Include="libsecondlife.dll" >

-      <HintPath>..\..\bin\libsecondlife.dll</HintPath>

+      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>

       <Private>False</Private>

     </Reference>

     <Reference Include="System" >

@@ -78,89 +78,93 @@
       <HintPath>System.Xml.dll</HintPath>

       <Private>False</Private>

     </Reference>

+    <Reference Include="XMLRPC.dll" >

+      <HintPath>..\..\..\bin\XMLRPC.dll</HintPath>

+      <Private>False</Private>

+    </Reference>

   </ItemGroup>

   <ItemGroup>

-    <ProjectReference Include="..\..\Common\OpenGrid.Framework.Communications\OpenGrid.Framework.Communications.csproj">

-      <Name>OpenGrid.Framework.Communications</Name>

-      <Project>{683344D5-0000-0000-0000-000000000000}</Project>

+    <ProjectReference Include="..\..\Framework\General\OpenSim.Framework.csproj">

+      <Name>OpenSim.Framework</Name>

+      <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

                         <Private>False</Private>

     </ProjectReference>

-    <ProjectReference Include="..\..\Common\OpenGrid.Framework.Communications.OGS1\OpenGrid.Framework.Communications.OGS1.csproj">

-      <Name>OpenGrid.Framework.Communications.OGS1</Name>

-      <Project>{17442AF1-0000-0000-0000-000000000000}</Project>

+    <ProjectReference Include="..\..\Framework\Communications\OpenSim.Framework.Communications.csproj">

+      <Name>OpenSim.Framework.Communications</Name>

+      <Project>{CB52B7E7-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

                         <Private>False</Private>

     </ProjectReference>

-    <ProjectReference Include="..\..\Common\OpenGrid.Framework.UserManager\OpenGrid.Framework.UserManagement.csproj">

-      <Name>OpenGrid.Framework.UserManagement</Name>

-      <Project>{DA9A7391-0000-0000-0000-000000000000}</Project>

+    <ProjectReference Include="..\..\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>

     </ProjectReference>

-    <ProjectReference Include="..\OpenSim.Caches\OpenSim.Caches.csproj">

-      <Name>OpenSim.Caches</Name>

-      <Project>{1938EB12-0000-0000-0000-000000000000}</Project>

+    <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="..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj">

-      <Name>OpenSim.Framework</Name>

-      <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>

+    <ProjectReference Include="..\..\Framework\GenericConfig\Xml\OpenSim.Framework.GenericConfig.Xml.csproj">

+      <Name>OpenSim.Framework.GenericConfig.Xml</Name>

+      <Project>{C74E4A30-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

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

+    <ProjectReference Include="..\..\Framework\Servers\OpenSim.Framework.Servers.csproj">

+      <Name>OpenSim.Framework.Servers</Name>

+      <Project>{2CC71860-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

                         <Private>False</Private>

     </ProjectReference>

-    <ProjectReference Include="..\..\Common\OpenSim.GenericConfig\Xml\OpenSim.GenericConfig.Xml.csproj">

-      <Name>OpenSim.GenericConfig.Xml</Name>

-      <Project>{E88EF749-0000-0000-0000-000000000000}</Project>

+    <ProjectReference Include="..\..\Framework\UserManager\OpenSim.Framework.UserManagement.csproj">

+      <Name>OpenSim.Framework.UserManagement</Name>

+      <Project>{586E2916-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

                         <Private>False</Private>

     </ProjectReference>

-    <ProjectReference Include="..\OpenSim.LocalCommunications\OpenSim.LocalCommunications.csproj">

-      <Name>OpenSim.LocalCommunications</Name>

-      <Project>{79CED992-0000-0000-0000-000000000000}</Project>

+    <ProjectReference Include="..\Caches\OpenSim.Region.Caches.csproj">

+      <Name>OpenSim.Region.Caches</Name>

+      <Project>{61FCCDB3-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

                         <Private>False</Private>

     </ProjectReference>

-    <ProjectReference Include="..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj">

-      <Name>OpenSim.Physics.Manager</Name>

-      <Project>{8BE16150-0000-0000-0000-000000000000}</Project>

+    <ProjectReference Include="..\ClientStack\OpenSim.Region.ClientStack.csproj">

+      <Name>OpenSim.Region.ClientStack</Name>

+      <Project>{DC3698B2-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

                         <Private>False</Private>

     </ProjectReference>

-    <ProjectReference Include="..\OpenSim.Region\OpenSim.Region.csproj">

-      <Name>OpenSim.Region</Name>

-      <Project>{196916AF-0000-0000-0000-000000000000}</Project>

+    <ProjectReference Include="..\Communications\Local\OpenSim.Region.Communications.Local.csproj">

+      <Name>OpenSim.Region.Communications.Local</Name>

+      <Project>{BFB5D807-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

                         <Private>False</Private>

     </ProjectReference>

-    <ProjectReference Include="..\OpenSim.RegionServer\OpenSim.RegionServer.csproj">

-      <Name>OpenSim.RegionServer</Name>

-      <Project>{632E1BFD-0000-0000-0000-000000000000}</Project>

+    <ProjectReference Include="..\Communications\OGS1\OpenSim.Region.Communications.OGS1.csproj">

+      <Name>OpenSim.Region.Communications.OGS1</Name>

+      <Project>{4806E378-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

                         <Private>False</Private>

     </ProjectReference>

-    <ProjectReference Include="..\..\Common\OpenSim.Servers\OpenSim.Servers.csproj">

-      <Name>OpenSim.Servers</Name>

-      <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project>

+    <ProjectReference Include="..\Environment\OpenSim.Region.Environment.csproj">

+      <Name>OpenSim.Region.Environment</Name>

+      <Project>{DCBA491C-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

                         <Private>False</Private>

     </ProjectReference>

-    <ProjectReference Include="..\OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj">

-      <Name>OpenSim.Terrain.BasicTerrain</Name>

-      <Project>{2270B8FE-0000-0000-0000-000000000000}</Project>

+    <ProjectReference Include="..\Physics\Manager\OpenSim.Region.Physics.Manager.csproj">

+      <Name>OpenSim.Region.Physics.Manager</Name>

+      <Project>{F4FF31EB-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

                         <Private>False</Private>

     </ProjectReference>

-    <ProjectReference Include="..\..\Common\XmlRpcCS\XMLRPC.csproj">

-      <Name>XMLRPC</Name>

-      <Project>{8E81D43C-0000-0000-0000-000000000000}</Project>

+    <ProjectReference Include="..\Terrain.BasicTerrain\OpenSim.Region.Terrain.BasicTerrain.csproj">

+      <Name>OpenSim.Region.Terrain.BasicTerrain</Name>

+      <Project>{C9E0F891-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

                         <Private>False</Private>

     </ProjectReference>

@@ -172,6 +176,9 @@
     <Compile Include="OpenSimMain.cs">

       <SubType>Code</SubType>

     </Compile>

+    <Compile Include="VersionInfo.cs">

+      <SubType>Code</SubType>

+    </Compile>

   </ItemGroup>

   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />

   <PropertyGroup>