Stage 1 of repairing the build files, those ofr the OpenSim regionserver should now be okay. Now onto the Grid servers...

2 files changed, 10 insertions, 10 deletions

diff --git a/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj b/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj
index efe9c79..b72bb0f 100644
--- a/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj
+++ b/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj
@@ -32,7 +32,7 @@
     <DebugSymbols>True</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>False</Optimize>

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

+    <OutputPath>..\..\..\bin\Physics\</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\Physics\</OutputPath>

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

     <RegisterForComInterop>False</RegisterForComInterop>

     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

@@ -63,11 +63,11 @@
       <Private>False</Private>

     </Reference>

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

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

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

       <Private>False</Private>

     </Reference>

     <Reference Include="PhysX_Wrapper_Dotnet.dll" >

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

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

       <Private>False</Private>

     </Reference>

   </ItemGroup>

diff --git a/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build b/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build
index 5ab70bb..2ea5534 100644
--- a/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build
+++ b/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build
@@ -20,14 +20,14 @@
                     <include name="${project::get-base-directory()}/${build.dir}" />

                 </lib>

                 <include name="System.dll" />

-                <include name="../../bin/Axiom.MathLib.dll" />

-                <include name="../../bin/PhysX_Wrapper_Dotnet.dll" />

-                <include name="../../bin/OpenSim.Physics.Manager.dll" />

+                <include name="../../../bin/Axiom.MathLib.dll" />

+                <include name="../../../bin/PhysX_Wrapper_Dotnet.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/" />

-        <mkdir dir="${project::get-base-directory()}/../../bin/Physics/"/>

-        <copy todir="${project::get-base-directory()}/../../bin/Physics/">

+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/Physics/" />

+        <mkdir dir="${project::get-base-directory()}/../../../bin/Physics/"/>

+        <copy todir="${project::get-base-directory()}/../../../bin/Physics/">

             <fileset basedir="${project::get-base-directory()}/${build.dir}/" >

                 <include name="*.dll"/>

                 <include name="*.exe"/>