From f42d1fc825b7b9d22ae05836992531d9abd2a26d Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Tue, 27 Mar 2007 21:42:14 +0000
Subject: * revert the revert - begin the beguine

---
 .../OpenSim.Physics.BasicPhysicsPlugin.csproj                  |  4 ++--
 .../OpenSim.Physics.BasicPhysicsPlugin.dll.build               |  2 +-
 OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj         | 10 ++++++++--
 OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build      |  3 ++-
 OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj     |  4 ++--
 OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build  |  2 +-
 OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj |  4 ++--
 .../PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build          |  2 +-
 8 files changed, 19 insertions(+), 12 deletions(-)

(limited to 'OpenSim.Physics')

diff --git a/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj b/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj
index 23985fd..ec632b1 100644
--- a/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj
+++ b/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj
@@ -3,7 +3,7 @@
     <ProjectType>Local</ProjectType>
     <ProductVersion>8.0.50727</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{1F6E0D7F-D82D-4A21-B61D-970294EC1CAD}</ProjectGuid>
+    <ProjectGuid>{E168B13F-8D18-43E7-8546-C0EC1899579F}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ApplicationIcon></ApplicationIcon>
@@ -70,7 +70,7 @@
   <ItemGroup>
     <ProjectReference Include="..\Manager\OpenSim.Physics.Manager.csproj">
       <Name>OpenSim.Physics.Manager</Name>
-      <Project>{0AAA0EEB-1F2C-4B4B-9BFA-7C3E45BCD348}</Project>
+      <Project>{2EAB18A1-8187-4C79-9947-A671F9C007D9}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
 			<Private>False</Private>
     </ProjectReference>
diff --git a/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build b/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build
index f146733..3497a55 100644
--- a/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build
+++ b/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build
@@ -21,7 +21,7 @@
                 </lib>
                 <include name="System.dll" />
                 <include name="../../bin/Axiom.MathLib.dll" />
-                <include name="../Manager/${build.dir}/OpenSim.Physics.Manager.dll" />
+                <include name="../../bin/OpenSim.Physics.Manager.dll" />
             </references>
         </csc>
         <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/Physics/" />
diff --git a/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj b/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj
index 0055c9c..b4679a9 100644
--- a/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj
+++ b/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj
@@ -3,7 +3,7 @@
     <ProjectType>Local</ProjectType>
     <ProductVersion>8.0.50727</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{0AAA0EEB-1F2C-4B4B-9BFA-7C3E45BCD348}</ProjectGuid>
+    <ProjectGuid>{2EAB18A1-8187-4C79-9947-A671F9C007D9}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ApplicationIcon></ApplicationIcon>
@@ -72,9 +72,15 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\OpenSim.Framework\OpenSim.Framework.csproj">
+      <Name>OpenSim.Framework</Name>
+      <Project>{BD7866A4-04BA-47F0-905F-B2359118F5B2}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
     <ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
       <Name>OpenSim.Framework.Console</Name>
-      <Project>{7AED7536-7D6B-4E28-8016-B5A554C663B4}</Project>
+      <Project>{4B0A7290-36C2-4C74-B9B4-07775B031CF2}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
 			<Private>False</Private>
     </ProjectReference>
diff --git a/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build b/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build
index 47e5534..4b5ee51 100644
--- a/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build
+++ b/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build
@@ -25,7 +25,8 @@
                 <include name="System.dll" />
                 <include name="System.Xml.dll" />
                 <include name="../../bin/Axiom.MathLib.dll" />
-                <include name="../../OpenSim.Framework.Console/${build.dir}/OpenSim.Framework.Console.dll" />
+                <include name="../../bin/OpenSim.Framework.dll" />
+                <include name="../../bin/OpenSim.Framework.Console.dll" />
             </references>
         </csc>
         <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
diff --git a/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj b/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj
index 7e83efd..6fd3e8c 100644
--- a/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj
+++ b/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj
@@ -3,7 +3,7 @@
     <ProjectType>Local</ProjectType>
     <ProductVersion>8.0.50727</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{C81B7E61-943D-4190-87C3-CB02BF67A2B3}</ProjectGuid>
+    <ProjectGuid>{F23A90E8-FDED-4D8C-A1B9-2ABE0A8C8EB2}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ApplicationIcon></ApplicationIcon>
@@ -74,7 +74,7 @@
   <ItemGroup>
     <ProjectReference Include="..\Manager\OpenSim.Physics.Manager.csproj">
       <Name>OpenSim.Physics.Manager</Name>
-      <Project>{0AAA0EEB-1F2C-4B4B-9BFA-7C3E45BCD348}</Project>
+      <Project>{2EAB18A1-8187-4C79-9947-A671F9C007D9}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
 			<Private>False</Private>
     </ProjectReference>
diff --git a/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build b/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build
index 8e49f8f..f25361a 100644
--- a/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build
+++ b/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build
@@ -21,7 +21,7 @@
                 </lib>
                 <include name="System.dll" />
                 <include name="../../bin/Axiom.MathLib.dll" />
-                <include name="../Manager/${build.dir}/OpenSim.Physics.Manager.dll" />
+                <include name="../../bin/OpenSim.Physics.Manager.dll" />
                 <include name="../../bin/Ode.NET.dll" />
             </references>
         </csc>
diff --git a/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj b/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj
index d2039a1..8d36b00 100644
--- a/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj
+++ b/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj
@@ -3,7 +3,7 @@
     <ProjectType>Local</ProjectType>
     <ProductVersion>8.0.50727</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{E1510E0F-EFCB-4702-BCB6-96A084454B55}</ProjectGuid>
+    <ProjectGuid>{0EF13F92-86F1-403D-882A-AA9DD4421B32}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ApplicationIcon></ApplicationIcon>
@@ -74,7 +74,7 @@
   <ItemGroup>
     <ProjectReference Include="..\Manager\OpenSim.Physics.Manager.csproj">
       <Name>OpenSim.Physics.Manager</Name>
-      <Project>{0AAA0EEB-1F2C-4B4B-9BFA-7C3E45BCD348}</Project>
+      <Project>{2EAB18A1-8187-4C79-9947-A671F9C007D9}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
 			<Private>False</Private>
     </ProjectReference>
diff --git a/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build b/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build
index 8f9e7dc..5ab70bb 100644
--- a/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build
+++ b/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build
@@ -22,7 +22,7 @@
                 <include name="System.dll" />
                 <include name="../../bin/Axiom.MathLib.dll" />
                 <include name="../../bin/PhysX_Wrapper_Dotnet.dll" />
-                <include name="../Manager/${build.dir}/OpenSim.Physics.Manager.dll" />
+                <include name="../../bin/OpenSim.Physics.Manager.dll" />
             </references>
         </csc>
         <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/Physics/" />
-- 
cgit v1.1