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

author: MW 2007-06-28 13:13:17 +0000
committer: MW 2007-06-28 13:13:17 +0000
commit: 3456d951d89fbc83f742d40ca8ca2a1a79d414eb (patch)
tree: cc5a53b8edd4ac4cc99e6178fb70c98672f3c168 /OpenSim/Region/Communications
parent: should now work. (diff)
download: opensim-SC_OLD-3456d951d89fbc83f742d40ca8ca2a1a79d414eb.zip
opensim-SC_OLD-3456d951d89fbc83f742d40ca8ca2a1a79d414eb.tar.gz
opensim-SC_OLD-3456d951d89fbc83f742d40ca8ca2a1a79d414eb.tar.bz2
opensim-SC_OLD-3456d951d89fbc83f742d40ca8ca2a1a79d414eb.tar.xz
5 files changed, 107 insertions, 7 deletions
diff --git a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
index 8837bdb..f5aa8ae 100644
--- a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
+++ b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
@@ -35,7 +35,6 @@ using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
 using OpenSim.Framework.Communications;
 namespace OpenSim.Region.Communications.Local
 {
    public class CommunicationsLocal : CommunicationsManager
diff --git a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj
index f9f6b7d..0a15a49 100644
--- a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj
+++ b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj
@@ -98,15 +98,15 @@
    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
-    <Compile Include="LocalUserServices.cs">
-      <SubType>Code</SubType>
-    </Compile>
    <Compile Include="CommunicationsLocal.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="LocalBackEndServices.cs">
      <SubType>Code</SubType>
    </Compile>
+    <Compile Include="LocalUserServices.cs">
+      <SubType>Code</SubType>
+    </Compile>
    <Compile Include="Properties\AssemblyInfo.cs">
      <SubType>Code</SubType>
    </Compile>
diff --git a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build
new file mode 100644
index 0000000..3cac9d3
--- /dev/null
+++ b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build
@@ -0,0 +1,48 @@
+<?xml version="1.0" ?>
+<project name="OpenSim.Region.Communications.Local" 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.Communications.Local" dynamicprefix="true" >
+            </resources>
+            <sources failonempty="true">
+                <include name="CommunicationsLocal.cs" />
+                <include name="LocalBackEndServices.cs" />
+                <include name="LocalUserServices.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/libsecondlife.dll" />
+                <include name="../../../../bin/OpenSim.Framework.dll" />
+                <include name="../../../../bin/OpenSim.Framework.Communications.dll" />
+                <include name="../../../../bin/OpenSim.Framework.Data.dll" />
+                <include name="../../../../bin/OpenSim.Framework.UserManagement.dll" />
+                <include name="System.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/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
index 1aa7019..8cc5641 100644
--- a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
+++ b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
@@ -116,16 +116,16 @@
    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
-    <Compile Include="OGSUserServices.cs">
+    <Compile Include="GridCommsManager.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="GridCommsManager.cs">
+    <Compile Include="OGS1GridServices.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="OGSInterSimComms.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="OGS1GridServices.cs">
+    <Compile Include="OGSUserServices.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build
new file mode 100644
index 0000000..21bb15c
--- /dev/null
+++ b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build
@@ -0,0 +1,53 @@
+<?xml version="1.0" ?>
+<project name="OpenSim.Region.Communications.OGS1" 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.Communications.OGS1" dynamicprefix="true" >
+            </resources>
+            <sources failonempty="true">
+                <include name="GridCommsManager.cs" />
+                <include name="OGS1GridServices.cs" />
+                <include name="OGSInterSimComms.cs" />
+                <include name="OGSUserServices.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/libsecondlife.dll" />
+                <include name="../../../../bin/OpenSim.Framework.dll" />
+                <include name="../../../../bin/OpenSim.Framework.Communications.dll" />
+                <include name="../../../../bin/OpenSim.Framework.Console.dll" />
+                <include name="../../../../bin/OpenSim.Framework.Data.dll" />
+                <include name="../../../../bin/OpenSim.Framework.Servers.dll" />
+                <include name="System.dll" />
+                <include name="System.Data.dll" />
+                <include name="System.Runtime.Remoting.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>
author	MW	2007-06-28 13:13:17 +0000
committer	MW	2007-06-28 13:13:17 +0000
commit	3456d951d89fbc83f742d40ca8ca2a1a79d414eb (patch)
tree	cc5a53b8edd4ac4cc99e6178fb70c98672f3c168 /OpenSim/Region/Communications
parent	should now work. (diff)
download	opensim-SC_OLD-3456d951d89fbc83f742d40ca8ca2a1a79d414eb.zip opensim-SC_OLD-3456d951d89fbc83f742d40ca8ca2a1a79d414eb.tar.gz opensim-SC_OLD-3456d951d89fbc83f742d40ca8ca2a1a79d414eb.tar.bz2 opensim-SC_OLD-3456d951d89fbc83f742d40ca8ca2a1a79d414eb.tar.xz

diff --git a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs index 8837bdb..f5aa8ae 100644 --- a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs +++ b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
@@ -35,7 +35,6 @@ using OpenSim.Framework.Interfaces;
35	using OpenSim.Framework.Types;	35	using OpenSim.Framework.Types;
36	using OpenSim.Framework.Communications;	36	using OpenSim.Framework.Communications;
37		37
38
39	namespace OpenSim.Region.Communications.Local	38	namespace OpenSim.Region.Communications.Local
40	{	39	{
41	public class CommunicationsLocal : CommunicationsManager	40	public class CommunicationsLocal : CommunicationsManager


diff --git a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj index f9f6b7d..0a15a49 100644 --- a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj +++ b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj
@@ -98,15 +98,15 @@
98	</ProjectReference>	98	</ProjectReference>
99	</ItemGroup>	99	</ItemGroup>
100	<ItemGroup>	100	<ItemGroup>
101	<Compile Include="LocalUserServices.cs">
102	<SubType>Code</SubType>
103	</Compile>
104	<Compile Include="CommunicationsLocal.cs">	101	<Compile Include="CommunicationsLocal.cs">
105	<SubType>Code</SubType>	102	<SubType>Code</SubType>
106	</Compile>	103	</Compile>
107	<Compile Include="LocalBackEndServices.cs">	104	<Compile Include="LocalBackEndServices.cs">
108	<SubType>Code</SubType>	105	<SubType>Code</SubType>
109	</Compile>	106	</Compile>
		107	<Compile Include="LocalUserServices.cs">
		108	<SubType>Code</SubType>
		109	</Compile>
110	<Compile Include="Properties\AssemblyInfo.cs">	110	<Compile Include="Properties\AssemblyInfo.cs">
111	<SubType>Code</SubType>	111	<SubType>Code</SubType>
112	</Compile>	112	</Compile>


diff --git a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build new file mode 100644 index 0000000..3cac9d3 --- /dev/null +++ b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build
@@ -0,0 +1,48 @@
		1	<?xml version="1.0" ?>
		2	<project name="OpenSim.Region.Communications.Local" default="build">
		3	<target name="build">
		4	<echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
		5	<mkdir dir="${project::get-base-directory()}/${build.dir}" />
		6	<copy todir="${project::get-base-directory()}/${build.dir}">
		7	<fileset basedir="${project::get-base-directory()}">
		8	</fileset>
		9	</copy>
		10	<csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
		11	<resources prefix="OpenSim.Region.Communications.Local" dynamicprefix="true" >
		12	</resources>
		13	<sources failonempty="true">
		14	<include name="CommunicationsLocal.cs" />
		15	<include name="LocalBackEndServices.cs" />
		16	<include name="LocalUserServices.cs" />
		17	<include name="Properties/AssemblyInfo.cs" />
		18	</sources>
		19	<references basedir="${project::get-base-directory()}">
		20	<lib>
		21	<include name="${project::get-base-directory()}" />
		22	<include name="${project::get-base-directory()}/${build.dir}" />
		23	</lib>
		24	<include name="../../../../bin/libsecondlife.dll" />
		25	<include name="../../../../bin/OpenSim.Framework.dll" />
		26	<include name="../../../../bin/OpenSim.Framework.Communications.dll" />
		27	<include name="../../../../bin/OpenSim.Framework.Data.dll" />
		28	<include name="../../../../bin/OpenSim.Framework.UserManagement.dll" />
		29	<include name="System.dll" />
		30	<include name="System.Xml.dll" />
		31	</references>
		32	</csc>
		33	<echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../../bin/" />
		34	<mkdir dir="${project::get-base-directory()}/../../../../bin/"/>
		35	<copy todir="${project::get-base-directory()}/../../../../bin/">
		36	<fileset basedir="${project::get-base-directory()}/${build.dir}/" >
		37	<include name="*.dll"/>
		38	<include name="*.exe"/>
		39	</fileset>
		40	</copy>
		41	</target>
		42	<target name="clean">
		43	<delete dir="${bin.dir}" failonerror="false" />
		44	<delete dir="${obj.dir}" failonerror="false" />
		45	</target>
		46	<target name="doc" description="Creates documentation.">
		47	</target>
		48	</project>


diff --git a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj index 1aa7019..8cc5641 100644 --- a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj +++ b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
@@ -116,16 +116,16 @@
116	</ProjectReference>	116	</ProjectReference>
117	</ItemGroup>	117	</ItemGroup>
118	<ItemGroup>	118	<ItemGroup>
119	<Compile Include="OGSUserServices.cs">	119	<Compile Include="GridCommsManager.cs">
120	<SubType>Code</SubType>	120	<SubType>Code</SubType>
121	</Compile>	121	</Compile>
122	<Compile Include="GridCommsManager.cs">	122	<Compile Include="OGS1GridServices.cs">
123	<SubType>Code</SubType>	123	<SubType>Code</SubType>
124	</Compile>	124	</Compile>
125	<Compile Include="OGSInterSimComms.cs">	125	<Compile Include="OGSInterSimComms.cs">
126	<SubType>Code</SubType>	126	<SubType>Code</SubType>
127	</Compile>	127	</Compile>
128	<Compile Include="OGS1GridServices.cs">	128	<Compile Include="OGSUserServices.cs">
129	<SubType>Code</SubType>	129	<SubType>Code</SubType>
130	</Compile>	130	</Compile>
131	<Compile Include="Properties\AssemblyInfo.cs">	131	<Compile Include="Properties\AssemblyInfo.cs">


diff --git a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build new file mode 100644 index 0000000..21bb15c --- /dev/null +++ b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build
@@ -0,0 +1,53 @@
		1	<?xml version="1.0" ?>
		2	<project name="OpenSim.Region.Communications.OGS1" default="build">
		3	<target name="build">
		4	<echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
		5	<mkdir dir="${project::get-base-directory()}/${build.dir}" />
		6	<copy todir="${project::get-base-directory()}/${build.dir}">
		7	<fileset basedir="${project::get-base-directory()}">
		8	</fileset>
		9	</copy>
		10	<csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
		11	<resources prefix="OpenSim.Region.Communications.OGS1" dynamicprefix="true" >
		12	</resources>
		13	<sources failonempty="true">
		14	<include name="GridCommsManager.cs" />
		15	<include name="OGS1GridServices.cs" />
		16	<include name="OGSInterSimComms.cs" />
		17	<include name="OGSUserServices.cs" />
		18	<include name="Properties/AssemblyInfo.cs" />
		19	</sources>
		20	<references basedir="${project::get-base-directory()}">
		21	<lib>
		22	<include name="${project::get-base-directory()}" />
		23	<include name="${project::get-base-directory()}/${build.dir}" />
		24	</lib>
		25	<include name="../../../../bin/libsecondlife.dll" />
		26	<include name="../../../../bin/OpenSim.Framework.dll" />
		27	<include name="../../../../bin/OpenSim.Framework.Communications.dll" />
		28	<include name="../../../../bin/OpenSim.Framework.Console.dll" />
		29	<include name="../../../../bin/OpenSim.Framework.Data.dll" />
		30	<include name="../../../../bin/OpenSim.Framework.Servers.dll" />
		31	<include name="System.dll" />
		32	<include name="System.Data.dll" />
		33	<include name="System.Runtime.Remoting.dll" />
		34	<include name="System.Xml.dll" />
		35	<include name="../../../../bin/XMLRPC.dll" />
		36	</references>
		37	</csc>
		38	<echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../../bin/" />
		39	<mkdir dir="${project::get-base-directory()}/../../../../bin/"/>
		40	<copy todir="${project::get-base-directory()}/../../../../bin/">
		41	<fileset basedir="${project::get-base-directory()}/${build.dir}/" >
		42	<include name="*.dll"/>
		43	<include name="*.exe"/>
		44	</fileset>
		45	</copy>
		46	</target>
		47	<target name="clean">
		48	<delete dir="${bin.dir}" failonerror="false" />
		49	<delete dir="${obj.dir}" failonerror="false" />
		50	</target>
		51	<target name="doc" description="Creates documentation.">
		52	</target>
		53	</project>