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

2 files changed, 15 insertions, 10 deletions

diff --git a/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj b/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj
index 1cdfaf6..65a158c 100644
--- a/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj
+++ b/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.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>

@@ -58,14 +58,14 @@
     <NoWarn></NoWarn>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="libTerrain-BSD.dll" >

-      <HintPath>..\bin\libTerrain-BSD.dll</HintPath>

-      <Private>False</Private>

-    </Reference>

     <Reference Include="System" >

       <HintPath>System.dll</HintPath>

       <Private>False</Private>

     </Reference>

+    <Reference Include="System.Drawing" >

+      <HintPath>System.Drawing.dll</HintPath>

+      <Private>False</Private>

+    </Reference>

     <Reference Include="System.Data" >

       <HintPath>System.Data.dll</HintPath>

       <Private>False</Private>

@@ -74,6 +74,10 @@
       <HintPath>System.Xml.dll</HintPath>

       <Private>False</Private>

     </Reference>

+    <Reference Include="libTerrain-BSD.dll" >

+      <HintPath>..\..\bin\libTerrain-BSD.dll</HintPath>

+      <Private>False</Private>

+    </Reference>

   </ItemGroup>

   <ItemGroup>

   </ItemGroup>

diff --git a/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build b/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build
index e1a3d2d..9c80ac7 100644
--- a/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build
+++ b/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build
@@ -20,14 +20,15 @@
                     <include name="${project::get-base-directory()}/${build.dir}" />

                 </lib>

                 <include name="System.dll" />

+                <include name="System.Drawing.dll" />

                 <include name="System.Data.dll" />

                 <include name="System.Xml.dll" />

-                <include name="../bin/libTerrain-BSD.dll" />

+                <include name="../../bin/libTerrain-BSD.dll" />

             </references>

         </csc>

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

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

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

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

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

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

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

                 <include name="*.dll"/>

                 <include name="*.exe"/>