Imported the scripting changes, so now should be up to date with sugilite.

3 files changed, 77 insertions, 3 deletions

diff --git a/OpenSim/Region/Terrain.BasicTerrain/OpenSim.Region.Terrain.BasicTerrain.csproj b/OpenSim/Region/Terrain.BasicTerrain/OpenSim.Region.Terrain.BasicTerrain.csproj
index 60a2d2b..24667e5 100644
--- a/OpenSim/Region/Terrain.BasicTerrain/OpenSim.Region.Terrain.BasicTerrain.csproj
+++ b/OpenSim/Region/Terrain.BasicTerrain/OpenSim.Region.Terrain.BasicTerrain.csproj
@@ -90,10 +90,10 @@
   <ItemGroup>

   </ItemGroup>

   <ItemGroup>

-    <Compile Include="TerrainFilter.cs">

+    <Compile Include="TerrainEngine.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="TerrainEngine.cs">

+    <Compile Include="TerrainFilter.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Properties\AssemblyInfo.cs">

diff --git a/OpenSim/Region/Terrain.BasicTerrain/OpenSim.Region.Terrain.BasicTerrain.dll.build b/OpenSim/Region/Terrain.BasicTerrain/OpenSim.Region.Terrain.BasicTerrain.dll.build
new file mode 100644
index 0000000..dc7203a
--- /dev/null
+++ b/OpenSim/Region/Terrain.BasicTerrain/OpenSim.Region.Terrain.BasicTerrain.dll.build
@@ -0,0 +1,47 @@
+<?xml version="1.0" ?>

+<project name="OpenSim.Region.Terrain.BasicTerrain" default="build">

+    <target name="build">

+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />

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

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

+            <fileset basedir="${project::get-base-directory()}">

+            </fileset>

+        </copy>

+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">

+            <resources prefix="OpenSim.Region.Terrain.BasicTerrain" dynamicprefix="true" >

+            </resources>

+            <sources failonempty="true">

+                <include name="TerrainEngine.cs" />

+                <include name="TerrainFilter.cs" />

+                <include name="Properties/AssemblyInfo.cs" />

+            </sources>

+            <references basedir="${project::get-base-directory()}">

+                <lib>

+                    <include name="${project::get-base-directory()}" />

+                    <include name="${project::get-base-directory()}/${build.dir}" />

+                </lib>

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

+                <include name="Microsoft.JScript.dll" />

+                <include name="../../../bin/openjpegnet.dll" />

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

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

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

+                <include name="System.Xml.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/">

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

+                <include name="*.dll"/>

+                <include name="*.exe"/>

+            </fileset>

+        </copy>

+    </target>

+    <target name="clean">

+        <delete dir="${bin.dir}" failonerror="false" />

+        <delete dir="${obj.dir}" failonerror="false" />

+    </target>

+    <target name="doc" description="Creates documentation.">

+    </target>

+</project>

diff --git a/OpenSim/Region/Terrain.BasicTerrain/TerrainFilter.cs b/OpenSim/Region/Terrain.BasicTerrain/TerrainFilter.cs
index f04ac56..e0ae586 100644
--- a/OpenSim/Region/Terrain.BasicTerrain/TerrainFilter.cs
+++ b/OpenSim/Region/Terrain.BasicTerrain/TerrainFilter.cs
@@ -1,3 +1,30 @@
+/*

+* Copyright (c) Contributors, http://www.openmetaverse.org/

+* See CONTRIBUTORS.TXT for a full list of copyright holders.

+*

+* Redistribution and use in source and binary forms, with or without

+* modification, are permitted provided that the following conditions are met:

+*     * Redistributions of source code must retain the above copyright

+*       notice, this list of conditions and the following disclaimer.

+*     * Redistributions in binary form must reproduce the above copyright

+*       notice, this list of conditions and the following disclaimer in the

+*       documentation and/or other materials provided with the distribution.

+*     * Neither the name of the OpenSim Project nor the

+*       names of its contributors may be used to endorse or promote products

+*       derived from this software without specific prior written permission.

+*

+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY

+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+* 

+*/

 using System;

 using System.Collections.Generic;

 using System.Text;

@@ -48,7 +75,7 @@ namespace OpenSim.Region.Terrain
             compilerParams.GenerateInMemory = true;

             compilerParams.IncludeDebugInformation = false;

             compilerParams.ReferencedAssemblies.Add("libTerrain-BSD.dll");

-            compilerParams.ReferencedAssemblies.Add("OpenSim.Region.Terrain.BasicTerrain.dll");

+            compilerParams.ReferencedAssemblies.Add("OpenSim.Terrain.BasicTerrain.dll");

             compilerParams.ReferencedAssemblies.Add("System.dll");

 

             compilerResults = compiler.CompileAssemblyFromFile(compilerParams, filename);