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

2 files changed, 65 insertions, 17 deletions

diff --git a/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj
index 0d8fac5..4667d52 100644
--- a/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj
+++ b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj
@@ -62,14 +62,6 @@
       <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="OpenSim.Framework.Types" >

-      <HintPath>OpenSim.Framework.Types.dll</HintPath>

-      <Private>False</Private>

-    </Reference>

-    <Reference Include="OpenSim.Framework.Utilities" >

-      <HintPath>OpenSim.Framework.Utilities.dll</HintPath>

-      <Private>False</Private>

-    </Reference>

     <Reference Include="System" >

       <HintPath>System.dll</HintPath>

       <Private>False</Private>

@@ -104,15 +96,6 @@
     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

-    <Compile Include="LLSDCapsDetails.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="LLSDMapRequest.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="LLSDMapLayerResponse.cs">

-      <SubType>Code</SubType>

-    </Compile>

     <Compile Include="Caps.cs">

       <SubType>Code</SubType>

     </Compile>

@@ -122,6 +105,9 @@
     <Compile Include="LLSDCapEvent.cs">

       <SubType>Code</SubType>

     </Compile>

+    <Compile Include="LLSDCapsDetails.cs">

+      <SubType>Code</SubType>

+    </Compile>

     <Compile Include="LLSDEmpty.cs">

       <SubType>Code</SubType>

     </Compile>

@@ -131,6 +117,12 @@
     <Compile Include="LLSDMapLayer.cs">

       <SubType>Code</SubType>

     </Compile>

+    <Compile Include="LLSDMapLayerResponse.cs">

+      <SubType>Code</SubType>

+    </Compile>

+    <Compile Include="LLSDMapRequest.cs">

+      <SubType>Code</SubType>

+    </Compile>

     <Compile Include="LLSDTest.cs">

       <SubType>Code</SubType>

     </Compile>

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

+<project name="OpenSim.Region.Capabilities" 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.Capabilities" dynamicprefix="true" >

+            </resources>

+            <sources failonempty="true">

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

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

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

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

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

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

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

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

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

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

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

+                <include name="LLSDUploadReply.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/libsecondlife.dll" />

+                <include name="../../../bin/OpenSim.Framework.dll" />

+                <include name="../../../bin/OpenSim.Framework.Servers.dll" />

+                <include name="../../../bin/OpenSim.Region.Caches.dll" />

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

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

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