diff options
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 | |
parent | should now work. (diff) | |
download | opensim-SC-3456d951d89fbc83f742d40ca8ca2a1a79d414eb.zip opensim-SC-3456d951d89fbc83f742d40ca8ca2a1a79d414eb.tar.gz opensim-SC-3456d951d89fbc83f742d40ca8ca2a1a79d414eb.tar.bz2 opensim-SC-3456d951d89fbc83f742d40ca8ca2a1a79d414eb.tar.xz |
Imported the scripting changes, so now should be up to date with sugilite.
Diffstat (limited to 'OpenSim/Region')
41 files changed, 1422 insertions, 405 deletions
diff --git a/OpenSim/Region/Application/OpenSim.csproj b/OpenSim/Region/Application/OpenSim.csproj index 3801067..5cefa96 100644 --- a/OpenSim/Region/Application/OpenSim.csproj +++ b/OpenSim/Region/Application/OpenSim.csproj | |||
@@ -167,10 +167,10 @@ | |||
167 | <Compile Include="Application.cs"> | 167 | <Compile Include="Application.cs"> |
168 | <SubType>Code</SubType> | 168 | <SubType>Code</SubType> |
169 | </Compile> | 169 | </Compile> |
170 | <Compile Include="VersionInfo.cs"> | 170 | <Compile Include="OpenSimMain.cs"> |
171 | <SubType>Code</SubType> | 171 | <SubType>Code</SubType> |
172 | </Compile> | 172 | </Compile> |
173 | <Compile Include="OpenSimMain.cs"> | 173 | <Compile Include="VersionInfo.cs"> |
174 | <SubType>Code</SubType> | 174 | <SubType>Code</SubType> |
175 | </Compile> | 175 | </Compile> |
176 | </ItemGroup> | 176 | </ItemGroup> |
diff --git a/OpenSim/Region/Application/OpenSim.exe.build b/OpenSim/Region/Application/OpenSim.exe.build new file mode 100644 index 0000000..74eee5b --- /dev/null +++ b/OpenSim/Region/Application/OpenSim.exe.build | |||
@@ -0,0 +1,59 @@ | |||
1 | <?xml version="1.0" ?> | ||
2 | <project name="OpenSim" 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="exe" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe"> | ||
11 | <resources prefix="OpenSim" dynamicprefix="true" > | ||
12 | </resources> | ||
13 | <sources failonempty="true"> | ||
14 | <include name="Application.cs" /> | ||
15 | <include name="OpenSimMain.cs" /> | ||
16 | <include name="VersionInfo.cs" /> | ||
17 | </sources> | ||
18 | <references basedir="${project::get-base-directory()}"> | ||
19 | <lib> | ||
20 | <include name="${project::get-base-directory()}" /> | ||
21 | <include name="${project::get-base-directory()}/${build.dir}" /> | ||
22 | </lib> | ||
23 | <include name="../../../bin/Axiom.MathLib.dll" /> | ||
24 | <include name="../../../bin/Db4objects.Db4o.dll" /> | ||
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.GenericConfig.Xml.dll" /> | ||
30 | <include name="../../../bin/OpenSim.Framework.Servers.dll" /> | ||
31 | <include name="../../../bin/OpenSim.Framework.UserManagement.dll" /> | ||
32 | <include name="../../../bin/OpenSim.Region.Caches.dll" /> | ||
33 | <include name="../../../bin/OpenSim.Region.ClientStack.dll" /> | ||
34 | <include name="../../../bin/OpenSim.Region.Communications.Local.dll" /> | ||
35 | <include name="../../../bin/OpenSim.Region.Communications.OGS1.dll" /> | ||
36 | <include name="../../../bin/OpenSim.Region.Environment.dll" /> | ||
37 | <include name="../../../bin/OpenSim.Region.Physics.Manager.dll" /> | ||
38 | <include name="../../../bin/OpenSim.Region.Terrain.BasicTerrain.dll" /> | ||
39 | <include name="System.dll" /> | ||
40 | <include name="System.Xml.dll" /> | ||
41 | <include name="../../../bin/XMLRPC.dll" /> | ||
42 | </references> | ||
43 | </csc> | ||
44 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" /> | ||
45 | <mkdir dir="${project::get-base-directory()}/../../../bin/"/> | ||
46 | <copy todir="${project::get-base-directory()}/../../../bin/"> | ||
47 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | ||
48 | <include name="*.dll"/> | ||
49 | <include name="*.exe"/> | ||
50 | </fileset> | ||
51 | </copy> | ||
52 | </target> | ||
53 | <target name="clean"> | ||
54 | <delete dir="${bin.dir}" failonerror="false" /> | ||
55 | <delete dir="${obj.dir}" failonerror="false" /> | ||
56 | </target> | ||
57 | <target name="doc" description="Creates documentation."> | ||
58 | </target> | ||
59 | </project> | ||
diff --git a/OpenSim/Region/Caches/OpenSim.Region.Caches.dll.build b/OpenSim/Region/Caches/OpenSim.Region.Caches.dll.build new file mode 100644 index 0000000..3ca89e8 --- /dev/null +++ b/OpenSim/Region/Caches/OpenSim.Region.Caches.dll.build | |||
@@ -0,0 +1,43 @@ | |||
1 | <?xml version="1.0" ?> | ||
2 | <project name="OpenSim.Region.Caches" 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.Caches" dynamicprefix="true" > | ||
12 | </resources> | ||
13 | <sources failonempty="true"> | ||
14 | <include name="AssetCache.cs" /> | ||
15 | <include name="Properties/AssemblyInfo.cs" /> | ||
16 | </sources> | ||
17 | <references basedir="${project::get-base-directory()}"> | ||
18 | <lib> | ||
19 | <include name="${project::get-base-directory()}" /> | ||
20 | <include name="${project::get-base-directory()}/${build.dir}" /> | ||
21 | </lib> | ||
22 | <include name="../../../bin/libsecondlife.dll" /> | ||
23 | <include name="../../../bin/OpenSim.Framework.dll" /> | ||
24 | <include name="System.dll" /> | ||
25 | <include name="System.Xml.dll" /> | ||
26 | </references> | ||
27 | </csc> | ||
28 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" /> | ||
29 | <mkdir dir="${project::get-base-directory()}/../../../bin/"/> | ||
30 | <copy todir="${project::get-base-directory()}/../../../bin/"> | ||
31 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | ||
32 | <include name="*.dll"/> | ||
33 | <include name="*.exe"/> | ||
34 | </fileset> | ||
35 | </copy> | ||
36 | </target> | ||
37 | <target name="clean"> | ||
38 | <delete dir="${bin.dir}" failonerror="false" /> | ||
39 | <delete dir="${obj.dir}" failonerror="false" /> | ||
40 | </target> | ||
41 | <target name="doc" description="Creates documentation."> | ||
42 | </target> | ||
43 | </project> | ||
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 @@ | |||
62 | <HintPath>..\..\..\bin\libsecondlife.dll</HintPath> | 62 | <HintPath>..\..\..\bin\libsecondlife.dll</HintPath> |
63 | <Private>False</Private> | 63 | <Private>False</Private> |
64 | </Reference> | 64 | </Reference> |
65 | <Reference Include="OpenSim.Framework.Types" > | ||
66 | <HintPath>OpenSim.Framework.Types.dll</HintPath> | ||
67 | <Private>False</Private> | ||
68 | </Reference> | ||
69 | <Reference Include="OpenSim.Framework.Utilities" > | ||
70 | <HintPath>OpenSim.Framework.Utilities.dll</HintPath> | ||
71 | <Private>False</Private> | ||
72 | </Reference> | ||
73 | <Reference Include="System" > | 65 | <Reference Include="System" > |
74 | <HintPath>System.dll</HintPath> | 66 | <HintPath>System.dll</HintPath> |
75 | <Private>False</Private> | 67 | <Private>False</Private> |
@@ -104,15 +96,6 @@ | |||
104 | </ProjectReference> | 96 | </ProjectReference> |
105 | </ItemGroup> | 97 | </ItemGroup> |
106 | <ItemGroup> | 98 | <ItemGroup> |
107 | <Compile Include="LLSDCapsDetails.cs"> | ||
108 | <SubType>Code</SubType> | ||
109 | </Compile> | ||
110 | <Compile Include="LLSDMapRequest.cs"> | ||
111 | <SubType>Code</SubType> | ||
112 | </Compile> | ||
113 | <Compile Include="LLSDMapLayerResponse.cs"> | ||
114 | <SubType>Code</SubType> | ||
115 | </Compile> | ||
116 | <Compile Include="Caps.cs"> | 99 | <Compile Include="Caps.cs"> |
117 | <SubType>Code</SubType> | 100 | <SubType>Code</SubType> |
118 | </Compile> | 101 | </Compile> |
@@ -122,6 +105,9 @@ | |||
122 | <Compile Include="LLSDCapEvent.cs"> | 105 | <Compile Include="LLSDCapEvent.cs"> |
123 | <SubType>Code</SubType> | 106 | <SubType>Code</SubType> |
124 | </Compile> | 107 | </Compile> |
108 | <Compile Include="LLSDCapsDetails.cs"> | ||
109 | <SubType>Code</SubType> | ||
110 | </Compile> | ||
125 | <Compile Include="LLSDEmpty.cs"> | 111 | <Compile Include="LLSDEmpty.cs"> |
126 | <SubType>Code</SubType> | 112 | <SubType>Code</SubType> |
127 | </Compile> | 113 | </Compile> |
@@ -131,6 +117,12 @@ | |||
131 | <Compile Include="LLSDMapLayer.cs"> | 117 | <Compile Include="LLSDMapLayer.cs"> |
132 | <SubType>Code</SubType> | 118 | <SubType>Code</SubType> |
133 | </Compile> | 119 | </Compile> |
120 | <Compile Include="LLSDMapLayerResponse.cs"> | ||
121 | <SubType>Code</SubType> | ||
122 | </Compile> | ||
123 | <Compile Include="LLSDMapRequest.cs"> | ||
124 | <SubType>Code</SubType> | ||
125 | </Compile> | ||
134 | <Compile Include="LLSDTest.cs"> | 126 | <Compile Include="LLSDTest.cs"> |
135 | <SubType>Code</SubType> | 127 | <SubType>Code</SubType> |
136 | </Compile> | 128 | </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 @@ | |||
1 | <?xml version="1.0" ?> | ||
2 | <project name="OpenSim.Region.Capabilities" 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.Capabilities" dynamicprefix="true" > | ||
12 | </resources> | ||
13 | <sources failonempty="true"> | ||
14 | <include name="Caps.cs" /> | ||
15 | <include name="LLSDArray.cs" /> | ||
16 | <include name="LLSDCapEvent.cs" /> | ||
17 | <include name="LLSDCapsDetails.cs" /> | ||
18 | <include name="LLSDEmpty.cs" /> | ||
19 | <include name="LLSDHelpers.cs" /> | ||
20 | <include name="LLSDMapLayer.cs" /> | ||
21 | <include name="LLSDMapLayerResponse.cs" /> | ||
22 | <include name="LLSDMapRequest.cs" /> | ||
23 | <include name="LLSDTest.cs" /> | ||
24 | <include name="LLSDType.cs" /> | ||
25 | <include name="LLSDUploadReply.cs" /> | ||
26 | </sources> | ||
27 | <references basedir="${project::get-base-directory()}"> | ||
28 | <lib> | ||
29 | <include name="${project::get-base-directory()}" /> | ||
30 | <include name="${project::get-base-directory()}/${build.dir}" /> | ||
31 | </lib> | ||
32 | <include name="../../../bin/libsecondlife.dll" /> | ||
33 | <include name="../../../bin/OpenSim.Framework.dll" /> | ||
34 | <include name="../../../bin/OpenSim.Framework.Servers.dll" /> | ||
35 | <include name="../../../bin/OpenSim.Region.Caches.dll" /> | ||
36 | <include name="System.dll" /> | ||
37 | <include name="System.Xml.dll" /> | ||
38 | <include name="../../../bin/XMLRPC.dll" /> | ||
39 | </references> | ||
40 | </csc> | ||
41 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" /> | ||
42 | <mkdir dir="${project::get-base-directory()}/../../../bin/"/> | ||
43 | <copy todir="${project::get-base-directory()}/../../../bin/"> | ||
44 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | ||
45 | <include name="*.dll"/> | ||
46 | <include name="*.exe"/> | ||
47 | </fileset> | ||
48 | </copy> | ||
49 | </target> | ||
50 | <target name="clean"> | ||
51 | <delete dir="${bin.dir}" failonerror="false" /> | ||
52 | <delete dir="${obj.dir}" failonerror="false" /> | ||
53 | </target> | ||
54 | <target name="doc" description="Creates documentation."> | ||
55 | </target> | ||
56 | </project> | ||
diff --git a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj index 40cd4f0..3093eb0 100644 --- a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj +++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj | |||
@@ -122,19 +122,19 @@ | |||
122 | </ProjectReference> | 122 | </ProjectReference> |
123 | </ItemGroup> | 123 | </ItemGroup> |
124 | <ItemGroup> | 124 | <ItemGroup> |
125 | <Compile Include="ClientView.AgentAssetUpload.cs"> | 125 | <Compile Include="ClientStackNetworkHandler.cs"> |
126 | <SubType>Code</SubType> | 126 | <SubType>Code</SubType> |
127 | </Compile> | 127 | </Compile> |
128 | <Compile Include="ClientStackNetworkHandler.cs"> | 128 | <Compile Include="ClientView.AgentAssetUpload.cs"> |
129 | <SubType>Code</SubType> | 129 | <SubType>Code</SubType> |
130 | </Compile> | 130 | </Compile> |
131 | <Compile Include="PacketServer.cs"> | 131 | <Compile Include="ClientView.API.cs"> |
132 | <SubType>Code</SubType> | 132 | <SubType>Code</SubType> |
133 | </Compile> | 133 | </Compile> |
134 | <Compile Include="ClientView.PacketHandlers.cs"> | 134 | <Compile Include="ClientView.cs"> |
135 | <SubType>Code</SubType> | 135 | <SubType>Code</SubType> |
136 | </Compile> | 136 | </Compile> |
137 | <Compile Include="ClientView.API.cs"> | 137 | <Compile Include="ClientView.PacketHandlers.cs"> |
138 | <SubType>Code</SubType> | 138 | <SubType>Code</SubType> |
139 | </Compile> | 139 | </Compile> |
140 | <Compile Include="ClientView.ProcessPackets.cs"> | 140 | <Compile Include="ClientView.ProcessPackets.cs"> |
@@ -143,7 +143,7 @@ | |||
143 | <Compile Include="ClientViewBase.cs"> | 143 | <Compile Include="ClientViewBase.cs"> |
144 | <SubType>Code</SubType> | 144 | <SubType>Code</SubType> |
145 | </Compile> | 145 | </Compile> |
146 | <Compile Include="ClientView.cs"> | 146 | <Compile Include="PacketServer.cs"> |
147 | <SubType>Code</SubType> | 147 | <SubType>Code</SubType> |
148 | </Compile> | 148 | </Compile> |
149 | <Compile Include="RegionApplicationBase.cs"> | 149 | <Compile Include="RegionApplicationBase.cs"> |
diff --git a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build new file mode 100644 index 0000000..f76a4c8 --- /dev/null +++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build | |||
@@ -0,0 +1,60 @@ | |||
1 | <?xml version="1.0" ?> | ||
2 | <project name="OpenSim.Region.ClientStack" 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.ClientStack" dynamicprefix="true" > | ||
12 | </resources> | ||
13 | <sources failonempty="true"> | ||
14 | <include name="ClientStackNetworkHandler.cs" /> | ||
15 | <include name="ClientView.AgentAssetUpload.cs" /> | ||
16 | <include name="ClientView.API.cs" /> | ||
17 | <include name="ClientView.cs" /> | ||
18 | <include name="ClientView.PacketHandlers.cs" /> | ||
19 | <include name="ClientView.ProcessPackets.cs" /> | ||
20 | <include name="ClientViewBase.cs" /> | ||
21 | <include name="PacketServer.cs" /> | ||
22 | <include name="RegionApplicationBase.cs" /> | ||
23 | <include name="UDPServer.cs" /> | ||
24 | <include name="Assets/InventoryCache.cs" /> | ||
25 | </sources> | ||
26 | <references basedir="${project::get-base-directory()}"> | ||
27 | <lib> | ||
28 | <include name="${project::get-base-directory()}" /> | ||
29 | <include name="${project::get-base-directory()}/${build.dir}" /> | ||
30 | </lib> | ||
31 | <include name="../../../bin/Axiom.MathLib.dll" /> | ||
32 | <include name="../../../bin/Db4objects.Db4o.dll" /> | ||
33 | <include name="../../../bin/libsecondlife.dll" /> | ||
34 | <include name="../../../bin/OpenSim.Framework.dll" /> | ||
35 | <include name="../../../bin/OpenSim.Framework.Console.dll" /> | ||
36 | <include name="../../../bin/OpenSim.Framework.Servers.dll" /> | ||
37 | <include name="../../../bin/OpenSim.Region.Caches.dll" /> | ||
38 | <include name="../../../bin/OpenSim.Region.Physics.Manager.dll" /> | ||
39 | <include name="../../../bin/OpenSim.Region.Terrain.BasicTerrain.dll" /> | ||
40 | <include name="System.dll" /> | ||
41 | <include name="System.Xml.dll" /> | ||
42 | <include name="../../../bin/XMLRPC.dll" /> | ||
43 | </references> | ||
44 | </csc> | ||
45 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" /> | ||
46 | <mkdir dir="${project::get-base-directory()}/../../../bin/"/> | ||
47 | <copy todir="${project::get-base-directory()}/../../../bin/"> | ||
48 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | ||
49 | <include name="*.dll"/> | ||
50 | <include name="*.exe"/> | ||
51 | </fileset> | ||
52 | </copy> | ||
53 | </target> | ||
54 | <target name="clean"> | ||
55 | <delete dir="${bin.dir}" failonerror="false" /> | ||
56 | <delete dir="${obj.dir}" failonerror="false" /> | ||
57 | </target> | ||
58 | <target name="doc" description="Creates documentation."> | ||
59 | </target> | ||
60 | </project> | ||
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> | ||
diff --git a/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj b/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj index 6f07969..efde96c 100644 --- a/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj +++ b/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj | |||
@@ -70,6 +70,10 @@ | |||
70 | <HintPath>..\..\..\bin\libsecondlife.dll</HintPath> | 70 | <HintPath>..\..\..\bin\libsecondlife.dll</HintPath> |
71 | <Private>False</Private> | 71 | <Private>False</Private> |
72 | </Reference> | 72 | </Reference> |
73 | <Reference Include="Microsoft.JScript" > | ||
74 | <HintPath>Microsoft.JScript.dll</HintPath> | ||
75 | <Private>False</Private> | ||
76 | </Reference> | ||
73 | <Reference Include="System" > | 77 | <Reference Include="System" > |
74 | <HintPath>System.dll</HintPath> | 78 | <HintPath>System.dll</HintPath> |
75 | <Private>False</Private> | 79 | <Private>False</Private> |
@@ -78,6 +82,10 @@ | |||
78 | <HintPath>System.Xml.dll</HintPath> | 82 | <HintPath>System.Xml.dll</HintPath> |
79 | <Private>False</Private> | 83 | <Private>False</Private> |
80 | </Reference> | 84 | </Reference> |
85 | <Reference Include="VJSharpCodeProvider" > | ||
86 | <HintPath>VJSharpCodeProvider.dll</HintPath> | ||
87 | <Private>False</Private> | ||
88 | </Reference> | ||
81 | <Reference Include="XMLRPC.dll" > | 89 | <Reference Include="XMLRPC.dll" > |
82 | <HintPath>..\..\..\bin\XMLRPC.dll</HintPath> | 90 | <HintPath>..\..\..\bin\XMLRPC.dll</HintPath> |
83 | <Private>False</Private> | 91 | <Private>False</Private> |
@@ -152,55 +160,55 @@ | |||
152 | <Compile Include="Scenes\Entity.cs"> | 160 | <Compile Include="Scenes\Entity.cs"> |
153 | <SubType>Code</SubType> | 161 | <SubType>Code</SubType> |
154 | </Compile> | 162 | </Compile> |
155 | <Compile Include="Scenes\Scene.Scripting.cs"> | 163 | <Compile Include="Scenes\IScenePresenceBody.cs"> |
156 | <SubType>Code</SubType> | 164 | <SubType>Code</SubType> |
157 | </Compile> | 165 | </Compile> |
158 | <Compile Include="Scenes\ScenePresence.Body.cs"> | 166 | <Compile Include="Scenes\Primitive.cs"> |
159 | <SubType>Code</SubType> | 167 | <SubType>Code</SubType> |
160 | </Compile> | 168 | </Compile> |
161 | <Compile Include="Scenes\SceneEvents.cs"> | 169 | <Compile Include="Scenes\Scene.cs"> |
162 | <SubType>Code</SubType> | 170 | <SubType>Code</SubType> |
163 | </Compile> | 171 | </Compile> |
164 | <Compile Include="Scenes\ScenePresence.cs"> | 172 | <Compile Include="Scenes\Scene.PacketHandlers.cs"> |
165 | <SubType>Code</SubType> | 173 | <SubType>Code</SubType> |
166 | </Compile> | 174 | </Compile> |
167 | <Compile Include="Scenes\ScenePresence.Animations.cs"> | 175 | <Compile Include="Scenes\Scene.Scripting.cs"> |
168 | <SubType>Code</SubType> | 176 | <SubType>Code</SubType> |
169 | </Compile> | 177 | </Compile> |
170 | <Compile Include="Scenes\Scene.PacketHandlers.cs"> | 178 | <Compile Include="Scenes\SceneBase.cs"> |
171 | <SubType>Code</SubType> | 179 | <SubType>Code</SubType> |
172 | </Compile> | 180 | </Compile> |
173 | <Compile Include="Scenes\SceneObject.cs"> | 181 | <Compile Include="Scenes\SceneEvents.cs"> |
174 | <SubType>Code</SubType> | 182 | <SubType>Code</SubType> |
175 | </Compile> | 183 | </Compile> |
176 | <Compile Include="Scenes\Primitive.cs"> | 184 | <Compile Include="Scenes\SceneObject.cs"> |
177 | <SubType>Code</SubType> | 185 | <SubType>Code</SubType> |
178 | </Compile> | 186 | </Compile> |
179 | <Compile Include="Scenes\IScenePresenceBody.cs"> | 187 | <Compile Include="Scenes\ScenePresence.Animations.cs"> |
180 | <SubType>Code</SubType> | 188 | <SubType>Code</SubType> |
181 | </Compile> | 189 | </Compile> |
182 | <Compile Include="Scenes\SceneBase.cs"> | 190 | <Compile Include="Scenes\ScenePresence.Body.cs"> |
183 | <SubType>Code</SubType> | 191 | <SubType>Code</SubType> |
184 | </Compile> | 192 | </Compile> |
185 | <Compile Include="Scenes\Scene.cs"> | 193 | <Compile Include="Scenes\ScenePresence.cs"> |
186 | <SubType>Code</SubType> | 194 | <SubType>Code</SubType> |
187 | </Compile> | 195 | </Compile> |
188 | <Compile Include="Scenes\scripting\IScriptHandler.cs"> | 196 | <Compile Include="Scenes\scripting\Script.cs"> |
189 | <SubType>Code</SubType> | 197 | <SubType>Code</SubType> |
190 | </Compile> | 198 | </Compile> |
191 | <Compile Include="Scenes\scripting\ScriptFactory.cs"> | 199 | <Compile Include="Scenes\scripting\ScriptInfo.cs"> |
192 | <SubType>Code</SubType> | 200 | <SubType>Code</SubType> |
193 | </Compile> | 201 | </Compile> |
194 | <Compile Include="Scenes\scripting\IScriptContext.cs"> | 202 | <Compile Include="Scenes\scripting\ScriptManager.cs"> |
195 | <SubType>Code</SubType> | 203 | <SubType>Code</SubType> |
196 | </Compile> | 204 | </Compile> |
197 | <Compile Include="Scenes\scripting\Script.cs"> | 205 | <Compile Include="Scenes\scripting\Engines\CSharpScriptEngine.cs"> |
198 | <SubType>Code</SubType> | 206 | <SubType>Code</SubType> |
199 | </Compile> | 207 | </Compile> |
200 | <Compile Include="Scenes\scripting\IScriptEntity.cs"> | 208 | <Compile Include="Scenes\scripting\Engines\JScriptEngine.cs"> |
201 | <SubType>Code</SubType> | 209 | <SubType>Code</SubType> |
202 | </Compile> | 210 | </Compile> |
203 | <Compile Include="Scenes\scripting\Scripts\FollowRandomAvatar.cs"> | 211 | <Compile Include="Scenes\scripting\Engines\JSharpScriptEngine.cs"> |
204 | <SubType>Code</SubType> | 212 | <SubType>Code</SubType> |
205 | </Compile> | 213 | </Compile> |
206 | </ItemGroup> | 214 | </ItemGroup> |
diff --git a/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build b/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build new file mode 100644 index 0000000..da73c8c --- /dev/null +++ b/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build | |||
@@ -0,0 +1,75 @@ | |||
1 | <?xml version="1.0" ?> | ||
2 | <project name="OpenSim.Region.Environment" 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.Environment" dynamicprefix="true" > | ||
12 | </resources> | ||
13 | <sources failonempty="true"> | ||
14 | <include name="EstateManager.cs" /> | ||
15 | <include name="ParcelManager.cs" /> | ||
16 | <include name="RegionManager.cs" /> | ||
17 | <include name="Scenes/Entity.cs" /> | ||
18 | <include name="Scenes/IScenePresenceBody.cs" /> | ||
19 | <include name="Scenes/Primitive.cs" /> | ||
20 | <include name="Scenes/Scene.cs" /> | ||
21 | <include name="Scenes/Scene.PacketHandlers.cs" /> | ||
22 | <include name="Scenes/Scene.Scripting.cs" /> | ||
23 | <include name="Scenes/SceneBase.cs" /> | ||
24 | <include name="Scenes/SceneEvents.cs" /> | ||
25 | <include name="Scenes/SceneObject.cs" /> | ||
26 | <include name="Scenes/ScenePresence.Animations.cs" /> | ||
27 | <include name="Scenes/ScenePresence.Body.cs" /> | ||
28 | <include name="Scenes/ScenePresence.cs" /> | ||
29 | <include name="Scenes/scripting/Script.cs" /> | ||
30 | <include name="Scenes/scripting/ScriptInfo.cs" /> | ||
31 | <include name="Scenes/scripting/ScriptManager.cs" /> | ||
32 | <include name="Scenes/scripting/Engines/CSharpScriptEngine.cs" /> | ||
33 | <include name="Scenes/scripting/Engines/JScriptEngine.cs" /> | ||
34 | <include name="Scenes/scripting/Engines/JSharpScriptEngine.cs" /> | ||
35 | </sources> | ||
36 | <references basedir="${project::get-base-directory()}"> | ||
37 | <lib> | ||
38 | <include name="${project::get-base-directory()}" /> | ||
39 | <include name="${project::get-base-directory()}/${build.dir}" /> | ||
40 | </lib> | ||
41 | <include name="../../../bin/Axiom.MathLib.dll" /> | ||
42 | <include name="../../../bin/Db4objects.Db4o.dll" /> | ||
43 | <include name="../../../bin/libsecondlife.dll" /> | ||
44 | <include name="Microsoft.JScript.dll" /> | ||
45 | <include name="../../../bin/OpenSim.Framework.dll" /> | ||
46 | <include name="../../../bin/OpenSim.Framework.Communications.dll" /> | ||
47 | <include name="../../../bin/OpenSim.Framework.Console.dll" /> | ||
48 | <include name="../../../bin/OpenSim.Framework.GenericConfig.Xml.dll" /> | ||
49 | <include name="../../../bin/OpenSim.Framework.Servers.dll" /> | ||
50 | <include name="../../../bin/OpenSim.Region.Caches.dll" /> | ||
51 | <include name="../../../bin/OpenSim.Region.Capabilities.dll" /> | ||
52 | <include name="../../../bin/OpenSim.Region.Physics.Manager.dll" /> | ||
53 | <include name="../../../bin/OpenSim.Region.Terrain.BasicTerrain.dll" /> | ||
54 | <include name="System.dll" /> | ||
55 | <include name="System.Xml.dll" /> | ||
56 | <include name="VJSharpCodeProvider.dll" /> | ||
57 | <include name="../../../bin/XMLRPC.dll" /> | ||
58 | </references> | ||
59 | </csc> | ||
60 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" /> | ||
61 | <mkdir dir="${project::get-base-directory()}/../../../bin/"/> | ||
62 | <copy todir="${project::get-base-directory()}/../../../bin/"> | ||
63 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | ||
64 | <include name="*.dll"/> | ||
65 | <include name="*.exe"/> | ||
66 | </fileset> | ||
67 | </copy> | ||
68 | </target> | ||
69 | <target name="clean"> | ||
70 | <delete dir="${bin.dir}" failonerror="false" /> | ||
71 | <delete dir="${obj.dir}" failonerror="false" /> | ||
72 | </target> | ||
73 | <target name="doc" description="Creates documentation."> | ||
74 | </target> | ||
75 | </project> | ||
diff --git a/OpenSim/Region/Environment/Scenes/Entity.cs b/OpenSim/Region/Environment/Scenes/Entity.cs index bbba34d..db5070d 100644 --- a/OpenSim/Region/Environment/Scenes/Entity.cs +++ b/OpenSim/Region/Environment/Scenes/Entity.cs | |||
@@ -31,11 +31,10 @@ using System.Text; | |||
31 | using Axiom.MathLib; | 31 | using Axiom.MathLib; |
32 | using OpenSim.Physics.Manager; | 32 | using OpenSim.Physics.Manager; |
33 | using libsecondlife; | 33 | using libsecondlife; |
34 | using OpenSim.Region.Environment.Scripting; | ||
35 | 34 | ||
36 | namespace OpenSim.Region.Environment.Scenes | 35 | namespace OpenSim.Region.Environment.Scenes |
37 | { | 36 | { |
38 | public abstract class Entity : IScriptReadonlyEntity | 37 | public abstract class Entity |
39 | { | 38 | { |
40 | public libsecondlife.LLUUID uuid; | 39 | public libsecondlife.LLUUID uuid; |
41 | public Quaternion rotation; | 40 | public Quaternion rotation; |
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index ff54efa..b345c0c 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -39,12 +39,14 @@ using OpenSim.Framework.Interfaces; | |||
39 | using OpenSim.Framework.Types; | 39 | using OpenSim.Framework.Types; |
40 | using OpenSim.Framework.Inventory; | 40 | using OpenSim.Framework.Inventory; |
41 | using OpenSim.Framework; | 41 | using OpenSim.Framework; |
42 | using OpenSim.Region.Environment.Scripting; | ||
43 | using OpenSim.Region.Terrain; | 42 | using OpenSim.Region.Terrain; |
44 | using OpenSim.Framework.Communications; | 43 | using OpenSim.Framework.Communications; |
45 | using OpenSim.Region.Caches; | 44 | using OpenSim.Region.Caches; |
46 | using OpenSim.Region.Environment; | 45 | using OpenSim.Region.Environment; |
47 | using OpenSim.Framework.Servers; | 46 | using OpenSim.Framework.Servers; |
47 | using OpenSim.Scripting; | ||
48 | using OpenSim.Region.Capabilities; | ||
49 | using Caps = OpenSim.Region.Capabilities.Caps; | ||
48 | 50 | ||
49 | namespace OpenSim.Region.Environment.Scenes | 51 | namespace OpenSim.Region.Environment.Scenes |
50 | { | 52 | { |
@@ -60,20 +62,19 @@ namespace OpenSim.Region.Environment.Scenes | |||
60 | private Random Rand = new Random(); | 62 | private Random Rand = new Random(); |
61 | private uint _primCount = 702000; | 63 | private uint _primCount = 702000; |
62 | private int storageCount; | 64 | private int storageCount; |
63 | private Dictionary<LLUUID, ScriptHandler> m_scriptHandlers; | ||
64 | private Dictionary<string, ScriptFactory> m_scripts; | ||
65 | private Mutex updateLock; | 65 | private Mutex updateLock; |
66 | 66 | ||
67 | protected AuthenticateSessionsBase authenticateHandler; | 67 | protected AuthenticateSessionsBase authenticateHandler; |
68 | protected RegionCommsListener regionCommsHost; | 68 | protected RegionCommsListener regionCommsHost; |
69 | protected CommunicationsManager commsManager; | 69 | protected CommunicationsManager commsManager; |
70 | 70 | ||
71 | protected Dictionary<LLUUID, Capabilities.Caps> capsHandlers = new Dictionary<LLUUID, Capabilities.Caps>(); | 71 | protected Dictionary<LLUUID,Caps> capsHandlers = new Dictionary<LLUUID, Caps>(); |
72 | protected BaseHttpServer httpListener; | 72 | protected BaseHttpServer httpListener; |
73 | 73 | ||
74 | public ParcelManager parcelManager; | 74 | public ParcelManager parcelManager; |
75 | public EstateManager estateManager; | 75 | public EstateManager estateManager; |
76 | public EventManager eventManager; | 76 | public EventManager eventManager; |
77 | public ScriptManager scriptManager; | ||
77 | 78 | ||
78 | #region Properties | 79 | #region Properties |
79 | /// <summary> | 80 | /// <summary> |
@@ -117,12 +118,9 @@ namespace OpenSim.Region.Environment.Scenes | |||
117 | 118 | ||
118 | parcelManager = new ParcelManager(this, this.m_regInfo); | 119 | parcelManager = new ParcelManager(this, this.m_regInfo); |
119 | estateManager = new EstateManager(this, this.m_regInfo); | 120 | estateManager = new EstateManager(this, this.m_regInfo); |
120 | 121 | scriptManager = new ScriptManager(this); | |
121 | eventManager = new EventManager(); | 122 | eventManager = new EventManager(); |
122 | 123 | ||
123 | m_scriptHandlers = new Dictionary<LLUUID, ScriptHandler>(); | ||
124 | m_scripts = new Dictionary<string, ScriptFactory>(); | ||
125 | |||
126 | OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs - creating new entitities instance"); | 124 | OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs - creating new entitities instance"); |
127 | Entities = new Dictionary<libsecondlife.LLUUID, Entity>(); | 125 | Entities = new Dictionary<libsecondlife.LLUUID, Entity>(); |
128 | Avatars = new Dictionary<LLUUID, ScenePresence>(); | 126 | Avatars = new Dictionary<LLUUID, ScenePresence>(); |
@@ -195,19 +193,9 @@ namespace OpenSim.Region.Environment.Scenes | |||
195 | Entities[UUID].update(); | 193 | Entities[UUID].update(); |
196 | } | 194 | } |
197 | 195 | ||
198 | // New | 196 | // General purpose event manager |
199 | eventManager.TriggerOnFrame(); | 197 | eventManager.TriggerOnFrame(); |
200 | 198 | ||
201 | // TODO: Obsolete - Phase out | ||
202 | foreach (ScriptHandler scriptHandler in m_scriptHandlers.Values) | ||
203 | { | ||
204 | scriptHandler.OnFrame(); | ||
205 | } | ||
206 | foreach (IScriptEngine scripteng in this.scriptEngines.Values) | ||
207 | { | ||
208 | scripteng.OnFrame(); | ||
209 | } | ||
210 | |||
211 | //backup world data | 199 | //backup world data |
212 | this.storageCount++; | 200 | this.storageCount++; |
213 | if (storageCount > 1200) //set to how often you want to backup | 201 | if (storageCount > 1200) //set to how often you want to backup |
@@ -256,7 +244,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
256 | //Parcel backup routines | 244 | //Parcel backup routines |
257 | ParcelData[] parcels = new ParcelData[parcelManager.parcelList.Count]; | 245 | ParcelData[] parcels = new ParcelData[parcelManager.parcelList.Count]; |
258 | int i = 0; | 246 | int i = 0; |
259 | foreach (OpenSim.Region.Environment.Parcel parcel in parcelManager.parcelList.Values) | 247 | foreach (OpenSim.Region.Parcel parcel in parcelManager.parcelList.Values) |
260 | { | 248 | { |
261 | parcels[i] = parcel.parcelData; | 249 | parcels[i] = parcel.parcelData; |
262 | i++; | 250 | i++; |
@@ -672,7 +660,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
672 | if (agent.CapsPath != "") | 660 | if (agent.CapsPath != "") |
673 | { | 661 | { |
674 | //Console.WriteLine("new user, so creating caps handler for it"); | 662 | //Console.WriteLine("new user, so creating caps handler for it"); |
675 | Capabilities.Caps cap = new Capabilities.Caps(this.assetCache, httpListener, this.m_regInfo.CommsIPListenAddr, 9000, agent.CapsPath, agent.AgentID); | 663 | Caps cap = new Caps(this.assetCache, httpListener, this.m_regInfo.CommsIPListenAddr, 9000, agent.CapsPath, agent.AgentID); |
676 | cap.RegisterHandlers(); | 664 | cap.RegisterHandlers(); |
677 | this.capsHandlers.Add(agent.AgentID, cap); | 665 | this.capsHandlers.Add(agent.AgentID, cap); |
678 | } | 666 | } |
diff --git a/OpenSim/Region/Environment/Scenes/SceneBase.cs b/OpenSim/Region/Environment/Scenes/SceneBase.cs index 3d8f522..50d3b82 100644 --- a/OpenSim/Region/Environment/Scenes/SceneBase.cs +++ b/OpenSim/Region/Environment/Scenes/SceneBase.cs | |||
@@ -37,7 +37,6 @@ using OpenSim.Physics.Manager; | |||
37 | using OpenSim.Framework.Interfaces; | 37 | using OpenSim.Framework.Interfaces; |
38 | using OpenSim.Framework.Types; | 38 | using OpenSim.Framework.Types; |
39 | using OpenSim.Framework.Inventory; | 39 | using OpenSim.Framework.Inventory; |
40 | using OpenSim.Region.Environment.Scripting; | ||
41 | using OpenSim.Region.Terrain; | 40 | using OpenSim.Region.Terrain; |
42 | using OpenSim.Region.Caches; | 41 | using OpenSim.Region.Caches; |
43 | 42 | ||
diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/CSharpScriptEngine.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/CSharpScriptEngine.cs new file mode 100644 index 0000000..870303f --- /dev/null +++ b/OpenSim/Region/Environment/Scenes/scripting/Engines/CSharpScriptEngine.cs | |||
@@ -0,0 +1,104 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://www.openmetaverse.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | * | ||
27 | */ | ||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | |||
32 | // Compilation stuff | ||
33 | using System.CodeDom; | ||
34 | using System.CodeDom.Compiler; | ||
35 | using Microsoft.CSharp; | ||
36 | |||
37 | namespace OpenSim.Scripting | ||
38 | { | ||
39 | public class CSharpScriptEngine : IScriptCompiler | ||
40 | { | ||
41 | public string FileExt() | ||
42 | { | ||
43 | return ".cs"; | ||
44 | } | ||
45 | |||
46 | private Dictionary<string,IScript> LoadDotNetScript(ICodeCompiler compiler, string filename) | ||
47 | { | ||
48 | CompilerParameters compilerParams = new CompilerParameters(); | ||
49 | CompilerResults compilerResults; | ||
50 | compilerParams.GenerateExecutable = false; | ||
51 | compilerParams.GenerateInMemory = true; | ||
52 | compilerParams.IncludeDebugInformation = false; | ||
53 | compilerParams.ReferencedAssemblies.Add("OpenSim.Region.dll"); | ||
54 | compilerParams.ReferencedAssemblies.Add("OpenSim.Framework.dll"); | ||
55 | compilerParams.ReferencedAssemblies.Add("libsecondlife.dll"); | ||
56 | compilerParams.ReferencedAssemblies.Add("System.dll"); | ||
57 | |||
58 | compilerResults = compiler.CompileAssemblyFromFile(compilerParams, filename); | ||
59 | |||
60 | if (compilerResults.Errors.Count > 0) | ||
61 | { | ||
62 | OpenSim.Framework.Console.MainLog.Instance.Error("Compile errors"); | ||
63 | foreach (CompilerError error in compilerResults.Errors) | ||
64 | { | ||
65 | OpenSim.Framework.Console.MainLog.Instance.Error(error.Line.ToString() + ": " + error.ErrorText.ToString()); | ||
66 | } | ||
67 | } | ||
68 | else | ||
69 | { | ||
70 | Dictionary<string,IScript> scripts = new Dictionary<string,IScript>(); | ||
71 | |||
72 | foreach (Type pluginType in compilerResults.CompiledAssembly.GetExportedTypes()) | ||
73 | { | ||
74 | Type testInterface = pluginType.GetInterface("IScript", true); | ||
75 | |||
76 | if (testInterface != null) | ||
77 | { | ||
78 | IScript script = (IScript)compilerResults.CompiledAssembly.CreateInstance(pluginType.ToString()); | ||
79 | |||
80 | string scriptName = "C#/" + script.getName(); | ||
81 | Console.WriteLine("Script: " + scriptName + " loaded."); | ||
82 | |||
83 | if (!scripts.ContainsKey(scriptName)) | ||
84 | { | ||
85 | scripts.Add(scriptName, script); | ||
86 | } | ||
87 | else | ||
88 | { | ||
89 | scripts[scriptName] = script; | ||
90 | } | ||
91 | } | ||
92 | } | ||
93 | return scripts; | ||
94 | } | ||
95 | return null; | ||
96 | } | ||
97 | |||
98 | public Dictionary<string,IScript> compile(string filename) | ||
99 | { | ||
100 | CSharpCodeProvider csharpProvider = new CSharpCodeProvider(); | ||
101 | return LoadDotNetScript(csharpProvider.CreateCompiler(), filename); | ||
102 | } | ||
103 | } | ||
104 | } | ||
diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/JScriptEngine.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/JScriptEngine.cs new file mode 100644 index 0000000..ffae1d7 --- /dev/null +++ b/OpenSim/Region/Environment/Scenes/scripting/Engines/JScriptEngine.cs | |||
@@ -0,0 +1,104 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://www.openmetaverse.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | * | ||
27 | */ | ||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | |||
32 | // Compilation stuff | ||
33 | using System.CodeDom; | ||
34 | using System.CodeDom.Compiler; | ||
35 | using Microsoft.JScript; | ||
36 | |||
37 | namespace OpenSim.Scripting | ||
38 | { | ||
39 | public class JScriptEngine : IScriptCompiler | ||
40 | { | ||
41 | public string FileExt() | ||
42 | { | ||
43 | return ".js"; | ||
44 | } | ||
45 | |||
46 | private Dictionary<string, IScript> LoadDotNetScript(ICodeCompiler compiler, string filename) | ||
47 | { | ||
48 | CompilerParameters compilerParams = new CompilerParameters(); | ||
49 | CompilerResults compilerResults; | ||
50 | compilerParams.GenerateExecutable = false; | ||
51 | compilerParams.GenerateInMemory = true; | ||
52 | compilerParams.IncludeDebugInformation = false; | ||
53 | compilerParams.ReferencedAssemblies.Add("OpenSim.Region.dll"); | ||
54 | compilerParams.ReferencedAssemblies.Add("OpenSim.Framework.dll"); | ||
55 | compilerParams.ReferencedAssemblies.Add("libsecondlife.dll"); | ||
56 | compilerParams.ReferencedAssemblies.Add("System.dll"); | ||
57 | |||
58 | compilerResults = compiler.CompileAssemblyFromFile(compilerParams, filename); | ||
59 | |||
60 | if (compilerResults.Errors.Count > 0) | ||
61 | { | ||
62 | OpenSim.Framework.Console.MainLog.Instance.Error("Compile errors"); | ||
63 | foreach (CompilerError error in compilerResults.Errors) | ||
64 | { | ||
65 | OpenSim.Framework.Console.MainLog.Instance.Error(error.Line.ToString() + ": " + error.ErrorText.ToString()); | ||
66 | } | ||
67 | } | ||
68 | else | ||
69 | { | ||
70 | Dictionary<string, IScript> scripts = new Dictionary<string, IScript>(); | ||
71 | |||
72 | foreach (Type pluginType in compilerResults.CompiledAssembly.GetExportedTypes()) | ||
73 | { | ||
74 | Type testInterface = pluginType.GetInterface("IScript", true); | ||
75 | |||
76 | if (testInterface != null) | ||
77 | { | ||
78 | IScript script = (IScript)compilerResults.CompiledAssembly.CreateInstance(pluginType.ToString()); | ||
79 | |||
80 | string scriptName = "JS.NET/" + script.getName(); | ||
81 | Console.WriteLine("Script: " + scriptName + " loaded."); | ||
82 | |||
83 | if (!scripts.ContainsKey(scriptName)) | ||
84 | { | ||
85 | scripts.Add(scriptName, script); | ||
86 | } | ||
87 | else | ||
88 | { | ||
89 | scripts[scriptName] = script; | ||
90 | } | ||
91 | } | ||
92 | } | ||
93 | return scripts; | ||
94 | } | ||
95 | return null; | ||
96 | } | ||
97 | |||
98 | public Dictionary<string, IScript> compile(string filename) | ||
99 | { | ||
100 | JScriptCodeProvider jscriptProvider = new JScriptCodeProvider(); | ||
101 | return LoadDotNetScript(jscriptProvider.CreateCompiler(), filename); | ||
102 | } | ||
103 | } | ||
104 | } | ||
diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/JSharpScriptEngine.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/JSharpScriptEngine.cs new file mode 100644 index 0000000..b33b55d --- /dev/null +++ b/OpenSim/Region/Environment/Scenes/scripting/Engines/JSharpScriptEngine.cs | |||
@@ -0,0 +1,104 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://www.openmetaverse.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | * | ||
27 | */ | ||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | |||
32 | // Compilation stuff | ||
33 | using System.CodeDom; | ||
34 | using System.CodeDom.Compiler; | ||
35 | using Microsoft.VJSharp; | ||
36 | |||
37 | namespace OpenSim.Scripting | ||
38 | { | ||
39 | public class JSharpScriptEngine : IScriptCompiler | ||
40 | { | ||
41 | public string FileExt() | ||
42 | { | ||
43 | return ".jsl"; | ||
44 | } | ||
45 | |||
46 | private Dictionary<string, IScript> LoadDotNetScript(ICodeCompiler compiler, string filename) | ||
47 | { | ||
48 | CompilerParameters compilerParams = new CompilerParameters(); | ||
49 | CompilerResults compilerResults; | ||
50 | compilerParams.GenerateExecutable = false; | ||
51 | compilerParams.GenerateInMemory = true; | ||
52 | compilerParams.IncludeDebugInformation = false; | ||
53 | compilerParams.ReferencedAssemblies.Add("OpenSim.Region.dll"); | ||
54 | compilerParams.ReferencedAssemblies.Add("OpenSim.Framework.dll"); | ||
55 | compilerParams.ReferencedAssemblies.Add("libsecondlife.dll"); | ||
56 | compilerParams.ReferencedAssemblies.Add("System.dll"); | ||
57 | |||
58 | compilerResults = compiler.CompileAssemblyFromFile(compilerParams, filename); | ||
59 | |||
60 | if (compilerResults.Errors.Count > 0) | ||
61 | { | ||
62 | OpenSim.Framework.Console.MainLog.Instance.Error("Compile errors"); | ||
63 | foreach (CompilerError error in compilerResults.Errors) | ||
64 | { | ||
65 | OpenSim.Framework.Console.MainLog.Instance.Error(error.Line.ToString() + ": " + error.ErrorText.ToString()); | ||
66 | } | ||
67 | } | ||
68 | else | ||
69 | { | ||
70 | Dictionary<string, IScript> scripts = new Dictionary<string, IScript>(); | ||
71 | |||
72 | foreach (Type pluginType in compilerResults.CompiledAssembly.GetExportedTypes()) | ||
73 | { | ||
74 | Type testInterface = pluginType.GetInterface("IScript", true); | ||
75 | |||
76 | if (testInterface != null) | ||
77 | { | ||
78 | IScript script = (IScript)compilerResults.CompiledAssembly.CreateInstance(pluginType.ToString()); | ||
79 | |||
80 | string scriptName = "J#/" + script.getName(); | ||
81 | Console.WriteLine("Script: " + scriptName + " loaded."); | ||
82 | |||
83 | if (!scripts.ContainsKey(scriptName)) | ||
84 | { | ||
85 | scripts.Add(scriptName, script); | ||
86 | } | ||
87 | else | ||
88 | { | ||
89 | scripts[scriptName] = script; | ||
90 | } | ||
91 | } | ||
92 | } | ||
93 | return scripts; | ||
94 | } | ||
95 | return null; | ||
96 | } | ||
97 | |||
98 | public Dictionary<string, IScript> compile(string filename) | ||
99 | { | ||
100 | VJSharpCodeProvider jsharpProvider = new VJSharpCodeProvider(); | ||
101 | return LoadDotNetScript(jsharpProvider.CreateCompiler(), filename); | ||
102 | } | ||
103 | } | ||
104 | } | ||
diff --git a/OpenSim/Region/Environment/Scenes/scripting/IScriptContext.cs b/OpenSim/Region/Environment/Scenes/scripting/IScriptContext.cs deleted file mode 100644 index eb8a117..0000000 --- a/OpenSim/Region/Environment/Scenes/scripting/IScriptContext.cs +++ /dev/null | |||
@@ -1,40 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://www.openmetaverse.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | * | ||
27 | */ | ||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | using libsecondlife; | ||
32 | |||
33 | namespace OpenSim.Region.Environment.Scripting | ||
34 | { | ||
35 | public interface IScriptContext | ||
36 | { | ||
37 | IScriptEntity Entity { get; } | ||
38 | bool TryGetRandomAvatar(out IScriptReadonlyEntity avatar); | ||
39 | } | ||
40 | } | ||
diff --git a/OpenSim/Region/Environment/Scenes/scripting/IScriptEntity.cs b/OpenSim/Region/Environment/Scenes/scripting/IScriptEntity.cs deleted file mode 100644 index e813626..0000000 --- a/OpenSim/Region/Environment/Scenes/scripting/IScriptEntity.cs +++ /dev/null | |||
@@ -1,46 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://www.openmetaverse.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | * | ||
27 | */ | ||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | using libsecondlife; | ||
32 | |||
33 | namespace OpenSim.Region.Environment.Scripting | ||
34 | { | ||
35 | public interface IScriptReadonlyEntity | ||
36 | { | ||
37 | LLVector3 Pos { get; } | ||
38 | string Name { get; } | ||
39 | } | ||
40 | |||
41 | public interface IScriptEntity | ||
42 | { | ||
43 | LLVector3 Pos { get; set; } | ||
44 | string Name { get; } | ||
45 | } | ||
46 | } | ||
diff --git a/OpenSim/Region/Environment/Scenes/scripting/IScriptHandler.cs b/OpenSim/Region/Environment/Scenes/scripting/IScriptHandler.cs deleted file mode 100644 index 115b4f4..0000000 --- a/OpenSim/Region/Environment/Scenes/scripting/IScriptHandler.cs +++ /dev/null | |||
@@ -1,126 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://www.openmetaverse.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | * | ||
27 | */ | ||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | using libsecondlife; | ||
32 | using OpenSim.Physics.Manager; | ||
33 | using OpenSim.Region.Environment; | ||
34 | using OpenSim.Region.Environment.Scenes; | ||
35 | using Avatar=OpenSim.Region.Environment.Scenes.ScenePresence; | ||
36 | using Primitive = OpenSim.Region.Environment.Scenes.Primitive; | ||
37 | |||
38 | namespace OpenSim.Region.Environment.Scripting | ||
39 | { | ||
40 | public delegate void ScriptEventHandler(IScriptContext context); | ||
41 | |||
42 | public class ScriptHandler : IScriptContext, IScriptEntity, IScriptReadonlyEntity | ||
43 | { | ||
44 | private Scene m_world; | ||
45 | private Script m_script; | ||
46 | private Entity m_entity; | ||
47 | |||
48 | public LLUUID ScriptId | ||
49 | { | ||
50 | get | ||
51 | { | ||
52 | return m_script.ScriptId; | ||
53 | } | ||
54 | } | ||
55 | |||
56 | public void OnFrame() | ||
57 | { | ||
58 | m_script.OnFrame(this); | ||
59 | } | ||
60 | |||
61 | public ScriptHandler(Script script, Entity entity, Scene world) | ||
62 | { | ||
63 | m_script = script; | ||
64 | m_entity = entity; | ||
65 | m_world = world; | ||
66 | } | ||
67 | |||
68 | #region IScriptContext Members | ||
69 | |||
70 | IScriptEntity IScriptContext.Entity | ||
71 | { | ||
72 | get | ||
73 | { | ||
74 | return this; | ||
75 | } | ||
76 | } | ||
77 | |||
78 | bool IScriptContext.TryGetRandomAvatar(out IScriptReadonlyEntity avatar) | ||
79 | { | ||
80 | foreach (Entity entity in m_world.Entities.Values ) | ||
81 | { | ||
82 | if( entity is Avatar ) | ||
83 | { | ||
84 | avatar = entity; | ||
85 | return true; | ||
86 | } | ||
87 | } | ||
88 | |||
89 | avatar = null; | ||
90 | return false; | ||
91 | } | ||
92 | |||
93 | #endregion | ||
94 | |||
95 | #region IScriptEntity and IScriptReadonlyEntity Members | ||
96 | |||
97 | public string Name | ||
98 | { | ||
99 | get | ||
100 | { | ||
101 | return m_entity.Name; | ||
102 | } | ||
103 | } | ||
104 | |||
105 | public LLVector3 Pos | ||
106 | { | ||
107 | get | ||
108 | { | ||
109 | return m_entity.Pos; | ||
110 | } | ||
111 | |||
112 | set | ||
113 | { | ||
114 | if (m_entity is Primitive) | ||
115 | { | ||
116 | Primitive prim = m_entity as Primitive; | ||
117 | // Of course, we really should have asked the physEngine if this is possible, and if not, returned false. | ||
118 | // prim.UpdatePosition( value ); | ||
119 | } | ||
120 | } | ||
121 | } | ||
122 | |||
123 | #endregion | ||
124 | } | ||
125 | |||
126 | } | ||
diff --git a/OpenSim/Region/Environment/Scenes/scripting/ScriptFactory.cs b/OpenSim/Region/Environment/Scenes/scripting/ScriptFactory.cs deleted file mode 100644 index 0ce65ea..0000000 --- a/OpenSim/Region/Environment/Scenes/scripting/ScriptFactory.cs +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://www.openmetaverse.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | * | ||
27 | */ | ||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | |||
32 | namespace OpenSim.Region.Environment.Scripting | ||
33 | { | ||
34 | public delegate Script ScriptFactory(); | ||
35 | } | ||
diff --git a/OpenSim/Region/Environment/Scenes/scripting/Script.cs b/OpenSim/Region/Environment/Scenes/scripting/ScriptInfo.cs index 5d398b0..57df4c4 100644 --- a/OpenSim/Region/Environment/Scenes/scripting/Script.cs +++ b/OpenSim/Region/Environment/Scenes/scripting/ScriptInfo.cs | |||
@@ -28,26 +28,31 @@ | |||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Text; | 30 | using System.Text; |
31 | using libsecondlife; | ||
32 | 31 | ||
33 | namespace OpenSim.Region.Environment.Scripting | 32 | using OpenSim.Region.Environment.Scenes; |
33 | using OpenSim.Framework.Console; | ||
34 | |||
35 | namespace OpenSim.Scripting | ||
34 | { | 36 | { |
35 | public class Script | 37 | /// <summary> |
38 | /// Class which provides access to the world | ||
39 | /// </summary> | ||
40 | public class ScriptInfo | ||
36 | { | 41 | { |
37 | private LLUUID m_scriptId; | 42 | // Reference to world.eventsManager provided for convenience |
38 | public virtual LLUUID ScriptId | 43 | public EventManager events; |
39 | { | 44 | |
40 | get | 45 | // The main world |
41 | { | 46 | public Scene world; |
42 | return m_scriptId; | 47 | |
43 | } | 48 | // The console |
44 | } | 49 | public LogBase logger; |
45 | 50 | ||
46 | public Script( LLUUID scriptId ) | 51 | public ScriptInfo(Scene scene) |
47 | { | 52 | { |
48 | m_scriptId = scriptId; | 53 | world = scene; |
54 | events = world.eventManager; | ||
55 | logger = OpenSim.Framework.Console.MainLog.Instance; | ||
49 | } | 56 | } |
50 | |||
51 | public ScriptEventHandler OnFrame; | ||
52 | } | 57 | } |
53 | } | 58 | } |
diff --git a/OpenSim/Region/Environment/Scenes/scripting/ScriptManager.cs b/OpenSim/Region/Environment/Scenes/scripting/ScriptManager.cs new file mode 100644 index 0000000..5d1d188 --- /dev/null +++ b/OpenSim/Region/Environment/Scenes/scripting/ScriptManager.cs | |||
@@ -0,0 +1,99 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://www.openmetaverse.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | * | ||
27 | */ | ||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | |||
32 | namespace OpenSim.Scripting | ||
33 | { | ||
34 | public class ScriptManager | ||
35 | { | ||
36 | List<IScript> scripts = new List<IScript>(); | ||
37 | OpenSim.Region.Environment.Scenes.Scene scene; | ||
38 | Dictionary<string, IScriptCompiler> compilers = new Dictionary<string, IScriptCompiler>(); | ||
39 | |||
40 | private void LoadFromCompiler(Dictionary<string, IScript> compiledscripts) | ||
41 | { | ||
42 | foreach (KeyValuePair<string, IScript> script in compiledscripts) | ||
43 | { | ||
44 | ScriptInfo scriptInfo = new ScriptInfo(scene); // Since each script could potentially corrupt their access with a stray assignment, making a new one for each script. | ||
45 | OpenSim.Framework.Console.MainLog.Instance.Verbose("Loading " + script.Key); | ||
46 | script.Value.Initialise(scriptInfo); | ||
47 | scripts.Add(script.Value); | ||
48 | } | ||
49 | OpenSim.Framework.Console.MainLog.Instance.Verbose("Finished loading " + compiledscripts.Count.ToString() + " script(s)"); | ||
50 | } | ||
51 | |||
52 | public ScriptManager(OpenSim.Region.Environment.Scenes.Scene world) | ||
53 | { | ||
54 | scene = world; | ||
55 | |||
56 | // Default Engines | ||
57 | CSharpScriptEngine csharpCompiler = new CSharpScriptEngine(); | ||
58 | compilers.Add(csharpCompiler.FileExt(),csharpCompiler); | ||
59 | |||
60 | JScriptEngine jscriptCompiler = new JScriptEngine(); | ||
61 | compilers.Add(jscriptCompiler.FileExt(), jscriptCompiler); | ||
62 | |||
63 | JSharpScriptEngine jsharpCompiler = new JSharpScriptEngine(); | ||
64 | compilers.Add(jsharpCompiler.FileExt(), jsharpCompiler); | ||
65 | } | ||
66 | |||
67 | public void Compile(string filename) | ||
68 | { | ||
69 | foreach (KeyValuePair<string, IScriptCompiler> compiler in compilers) | ||
70 | { | ||
71 | if (filename.EndsWith(compiler.Key)) | ||
72 | { | ||
73 | LoadFromCompiler(compiler.Value.compile(filename)); | ||
74 | break; | ||
75 | } | ||
76 | } | ||
77 | } | ||
78 | |||
79 | public void RunScriptCmd(string[] args) | ||
80 | { | ||
81 | switch (args[0]) | ||
82 | { | ||
83 | case "load": | ||
84 | Compile(args[1]); | ||
85 | break; | ||
86 | |||
87 | default: | ||
88 | OpenSim.Framework.Console.MainLog.Instance.Error("Unknown script command"); | ||
89 | break; | ||
90 | } | ||
91 | } | ||
92 | } | ||
93 | |||
94 | interface IScriptCompiler | ||
95 | { | ||
96 | Dictionary<string,IScript> compile(string filename); | ||
97 | string FileExt(); | ||
98 | } | ||
99 | } | ||
diff --git a/OpenSim/Region/Environment/Scenes/scripting/Scripts/FollowRandomAvatar.cs b/OpenSim/Region/Environment/Scenes/scripting/Scripts/FollowRandomAvatar.cs deleted file mode 100644 index 90c79e3..0000000 --- a/OpenSim/Region/Environment/Scenes/scripting/Scripts/FollowRandomAvatar.cs +++ /dev/null | |||
@@ -1,64 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://www.openmetaverse.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | * | ||
27 | */ | ||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | using libsecondlife; | ||
32 | |||
33 | namespace OpenSim.Region.Environment.Scripting | ||
34 | { | ||
35 | public class FollowRandomAvatar : Script | ||
36 | { | ||
37 | public FollowRandomAvatar() | ||
38 | : base(LLUUID.Random()) | ||
39 | { | ||
40 | OnFrame += MyOnFrame; | ||
41 | } | ||
42 | |||
43 | private void MyOnFrame(IScriptContext context) | ||
44 | { | ||
45 | LLVector3 pos = context.Entity.Pos; | ||
46 | |||
47 | IScriptReadonlyEntity avatar; | ||
48 | |||
49 | if (context.TryGetRandomAvatar(out avatar)) | ||
50 | { | ||
51 | LLVector3 avatarPos = avatar.Pos; | ||
52 | |||
53 | float x = pos.X + ((float)avatarPos.X.CompareTo(pos.X)) / 2; | ||
54 | float y = pos.Y + ((float)avatarPos.Y.CompareTo(pos.Y)) / 2; | ||
55 | |||
56 | LLVector3 newPos = new LLVector3(x, y, pos.Z); | ||
57 | |||
58 | context.Entity.Pos = newPos; | ||
59 | } | ||
60 | } | ||
61 | } | ||
62 | |||
63 | |||
64 | } | ||
diff --git a/OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build b/OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build new file mode 100644 index 0000000..f8896fa --- /dev/null +++ b/OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build | |||
@@ -0,0 +1,54 @@ | |||
1 | <?xml version="1.0" ?> | ||
2 | <project name="SimpleApp" 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="exe" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe"> | ||
11 | <resources prefix="SimpleApp" dynamicprefix="true" > | ||
12 | </resources> | ||
13 | <sources failonempty="true"> | ||
14 | <include name="MyWorld.cs" /> | ||
15 | <include name="Program.cs" /> | ||
16 | <include name="Properties/AssemblyInfo.cs" /> | ||
17 | </sources> | ||
18 | <references basedir="${project::get-base-directory()}"> | ||
19 | <lib> | ||
20 | <include name="${project::get-base-directory()}" /> | ||
21 | <include name="${project::get-base-directory()}/${build.dir}" /> | ||
22 | </lib> | ||
23 | <include name="../../../../bin/libsecondlife.dll" /> | ||
24 | <include name="../../../../bin/OpenSim.Framework.dll" /> | ||
25 | <include name="../../../../bin/OpenSim.Framework.Communications.dll" /> | ||
26 | <include name="../../../../bin/OpenSim.Framework.Console.dll" /> | ||
27 | <include name="../../../../bin/OpenSim.Framework.Servers.dll" /> | ||
28 | <include name="../../../../bin/OpenSim.Region.Caches.dll" /> | ||
29 | <include name="../../../../bin/OpenSim.Region.ClientStack.dll" /> | ||
30 | <include name="../../../../bin/OpenSim.Region.Communications.Local.dll" /> | ||
31 | <include name="../../../../bin/OpenSim.Region.Environment.dll" /> | ||
32 | <include name="../../../../bin/OpenSim.Region.GridInterfaces.Local.dll" /> | ||
33 | <include name="System.dll" /> | ||
34 | <include name="System.Data.dll.dll" /> | ||
35 | <include name="System.Xml.dll" /> | ||
36 | <include name="../../../../bin/XMLRPC.dll" /> | ||
37 | </references> | ||
38 | </csc> | ||
39 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../../bin/" /> | ||
40 | <mkdir dir="${project::get-base-directory()}/../../../../bin/"/> | ||
41 | <copy todir="${project::get-base-directory()}/../../../../bin/"> | ||
42 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | ||
43 | <include name="*.dll"/> | ||
44 | <include name="*.exe"/> | ||
45 | </fileset> | ||
46 | </copy> | ||
47 | </target> | ||
48 | <target name="clean"> | ||
49 | <delete dir="${bin.dir}" failonerror="false" /> | ||
50 | <delete dir="${obj.dir}" failonerror="false" /> | ||
51 | </target> | ||
52 | <target name="doc" description="Creates documentation."> | ||
53 | </target> | ||
54 | </project> | ||
diff --git a/OpenSim/Region/GridInterfaces/Local/OpenSim.Region.GridInterfaces.Local.dll.build b/OpenSim/Region/GridInterfaces/Local/OpenSim.Region.GridInterfaces.Local.dll.build new file mode 100644 index 0000000..4770e6d --- /dev/null +++ b/OpenSim/Region/GridInterfaces/Local/OpenSim.Region.GridInterfaces.Local.dll.build | |||
@@ -0,0 +1,45 @@ | |||
1 | <?xml version="1.0" ?> | ||
2 | <project name="OpenSim.Region.GridInterfaces.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.GridInterfaces.Local" dynamicprefix="true" > | ||
12 | </resources> | ||
13 | <sources failonempty="true"> | ||
14 | <include name="AssemblyInfo.cs" /> | ||
15 | <include name="LocalAssetServer.cs" /> | ||
16 | </sources> | ||
17 | <references basedir="${project::get-base-directory()}"> | ||
18 | <lib> | ||
19 | <include name="${project::get-base-directory()}" /> | ||
20 | <include name="${project::get-base-directory()}/${build.dir}" /> | ||
21 | </lib> | ||
22 | <include name="../../../../bin/Db4objects.Db4o.dll" /> | ||
23 | <include name="../../../../bin/libsecondlife.dll" /> | ||
24 | <include name="../../../../bin/OpenSim.Framework.dll" /> | ||
25 | <include name="../../../../bin/OpenSim.Framework.Console.dll" /> | ||
26 | <include name="System.dll" /> | ||
27 | <include name="System.Xml.dll" /> | ||
28 | </references> | ||
29 | </csc> | ||
30 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../../bin/" /> | ||
31 | <mkdir dir="${project::get-base-directory()}/../../../../bin/"/> | ||
32 | <copy todir="${project::get-base-directory()}/../../../../bin/"> | ||
33 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | ||
34 | <include name="*.dll"/> | ||
35 | <include name="*.exe"/> | ||
36 | </fileset> | ||
37 | </copy> | ||
38 | </target> | ||
39 | <target name="clean"> | ||
40 | <delete dir="${bin.dir}" failonerror="false" /> | ||
41 | <delete dir="${obj.dir}" failonerror="false" /> | ||
42 | </target> | ||
43 | <target name="doc" description="Creates documentation."> | ||
44 | </target> | ||
45 | </project> | ||
diff --git a/OpenSim/Region/GridInterfaces/Remote/OpenSim.Region.GridInterfaces.Remote.dll.build b/OpenSim/Region/GridInterfaces/Remote/OpenSim.Region.GridInterfaces.Remote.dll.build new file mode 100644 index 0000000..0bf1b86 --- /dev/null +++ b/OpenSim/Region/GridInterfaces/Remote/OpenSim.Region.GridInterfaces.Remote.dll.build | |||
@@ -0,0 +1,45 @@ | |||
1 | <?xml version="1.0" ?> | ||
2 | <project name="OpenSim.Region.GridInterfaces.Remote" 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.GridInterfaces.Remote" dynamicprefix="true" > | ||
12 | </resources> | ||
13 | <sources failonempty="true"> | ||
14 | <include name="AssemblyInfo.cs" /> | ||
15 | <include name="RemoteAssetServer.cs" /> | ||
16 | </sources> | ||
17 | <references basedir="${project::get-base-directory()}"> | ||
18 | <lib> | ||
19 | <include name="${project::get-base-directory()}" /> | ||
20 | <include name="${project::get-base-directory()}/${build.dir}" /> | ||
21 | </lib> | ||
22 | <include name="../../../../bin/libsecondlife.dll" /> | ||
23 | <include name="../../../../bin/OpenSim.Framework.dll" /> | ||
24 | <include name="../../../../bin/OpenSim.Framework.Console.dll" /> | ||
25 | <include name="System.dll" /> | ||
26 | <include name="System.Xml.dll" /> | ||
27 | <include name="../../../../bin/XMLRPC.dll" /> | ||
28 | </references> | ||
29 | </csc> | ||
30 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../../bin/" /> | ||
31 | <mkdir dir="${project::get-base-directory()}/../../../../bin/"/> | ||
32 | <copy todir="${project::get-base-directory()}/../../../../bin/"> | ||
33 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | ||
34 | <include name="*.dll"/> | ||
35 | <include name="*.exe"/> | ||
36 | </fileset> | ||
37 | </copy> | ||
38 | </target> | ||
39 | <target name="clean"> | ||
40 | <delete dir="${bin.dir}" failonerror="false" /> | ||
41 | <delete dir="${obj.dir}" failonerror="false" /> | ||
42 | </target> | ||
43 | <target name="doc" description="Creates documentation."> | ||
44 | </target> | ||
45 | </project> | ||
diff --git a/OpenSim/Region/Physics/BasicPhysicsPlugin/OpenSim.Region.Physics.BasicPhysicsPlugin.dll.build b/OpenSim/Region/Physics/BasicPhysicsPlugin/OpenSim.Region.Physics.BasicPhysicsPlugin.dll.build new file mode 100644 index 0000000..6cf26ca --- /dev/null +++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/OpenSim.Region.Physics.BasicPhysicsPlugin.dll.build | |||
@@ -0,0 +1,42 @@ | |||
1 | <?xml version="1.0" ?> | ||
2 | <project name="OpenSim.Region.Physics.BasicPhysicsPlugin" 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.Physics.BasicPhysicsPlugin" dynamicprefix="true" > | ||
12 | </resources> | ||
13 | <sources failonempty="true"> | ||
14 | <include name="AssemblyInfo.cs" /> | ||
15 | <include name="BasicPhysicsPlugin.cs" /> | ||
16 | </sources> | ||
17 | <references basedir="${project::get-base-directory()}"> | ||
18 | <lib> | ||
19 | <include name="${project::get-base-directory()}" /> | ||
20 | <include name="${project::get-base-directory()}/${build.dir}" /> | ||
21 | </lib> | ||
22 | <include name="../../../../bin/Axiom.MathLib.dll" /> | ||
23 | <include name="../../../../bin/OpenSim.Region.Physics.Manager.dll" /> | ||
24 | <include name="System.dll" /> | ||
25 | </references> | ||
26 | </csc> | ||
27 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../../bin/Physics/" /> | ||
28 | <mkdir dir="${project::get-base-directory()}/../../../../bin/Physics/"/> | ||
29 | <copy todir="${project::get-base-directory()}/../../../../bin/Physics/"> | ||
30 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | ||
31 | <include name="*.dll"/> | ||
32 | <include name="*.exe"/> | ||
33 | </fileset> | ||
34 | </copy> | ||
35 | </target> | ||
36 | <target name="clean"> | ||
37 | <delete dir="${bin.dir}" failonerror="false" /> | ||
38 | <delete dir="${obj.dir}" failonerror="false" /> | ||
39 | </target> | ||
40 | <target name="doc" description="Creates documentation."> | ||
41 | </target> | ||
42 | </project> | ||
diff --git a/OpenSim/Region/Physics/Manager/OpenSim.Region.Physics.Manager.dll.build b/OpenSim/Region/Physics/Manager/OpenSim.Region.Physics.Manager.dll.build new file mode 100644 index 0000000..4b7ce81 --- /dev/null +++ b/OpenSim/Region/Physics/Manager/OpenSim.Region.Physics.Manager.dll.build | |||
@@ -0,0 +1,47 @@ | |||
1 | <?xml version="1.0" ?> | ||
2 | <project name="OpenSim.Region.Physics.Manager" 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.Physics.Manager" dynamicprefix="true" > | ||
12 | </resources> | ||
13 | <sources failonempty="true"> | ||
14 | <include name="AssemblyInfo.cs" /> | ||
15 | <include name="PhysicsActor.cs" /> | ||
16 | <include name="PhysicsManager.cs" /> | ||
17 | <include name="PhysicsScene.cs" /> | ||
18 | <include name="PhysicsVector.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/Axiom.MathLib.dll" /> | ||
26 | <include name="../../../../bin/OpenSim.Framework.dll" /> | ||
27 | <include name="../../../../bin/OpenSim.Framework.Console.dll" /> | ||
28 | <include name="System.dll" /> | ||
29 | <include name="System.Xml.dll" /> | ||
30 | </references> | ||
31 | </csc> | ||
32 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../../bin/" /> | ||
33 | <mkdir dir="${project::get-base-directory()}/../../../../bin/"/> | ||
34 | <copy todir="${project::get-base-directory()}/../../../../bin/"> | ||
35 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | ||
36 | <include name="*.dll"/> | ||
37 | <include name="*.exe"/> | ||
38 | </fileset> | ||
39 | </copy> | ||
40 | </target> | ||
41 | <target name="clean"> | ||
42 | <delete dir="${bin.dir}" failonerror="false" /> | ||
43 | <delete dir="${obj.dir}" failonerror="false" /> | ||
44 | </target> | ||
45 | <target name="doc" description="Creates documentation."> | ||
46 | </target> | ||
47 | </project> | ||
diff --git a/OpenSim/Region/Physics/OdePlugin/OpenSim.Region.Physics.OdePlugin.dll.build b/OpenSim/Region/Physics/OdePlugin/OpenSim.Region.Physics.OdePlugin.dll.build new file mode 100644 index 0000000..07b9386 --- /dev/null +++ b/OpenSim/Region/Physics/OdePlugin/OpenSim.Region.Physics.OdePlugin.dll.build | |||
@@ -0,0 +1,43 @@ | |||
1 | <?xml version="1.0" ?> | ||
2 | <project name="OpenSim.Region.Physics.OdePlugin" 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.Physics.OdePlugin" dynamicprefix="true" > | ||
12 | </resources> | ||
13 | <sources failonempty="true"> | ||
14 | <include name="AssemblyInfo.cs" /> | ||
15 | <include name="OdePlugin.cs" /> | ||
16 | </sources> | ||
17 | <references basedir="${project::get-base-directory()}"> | ||
18 | <lib> | ||
19 | <include name="${project::get-base-directory()}" /> | ||
20 | <include name="${project::get-base-directory()}/${build.dir}" /> | ||
21 | </lib> | ||
22 | <include name="../../../../bin/Axiom.MathLib.dll" /> | ||
23 | <include name="../../../../bin/Ode.NET.dll" /> | ||
24 | <include name="../../../../bin/OpenSim.Region.Physics.Manager.dll" /> | ||
25 | <include name="System.dll" /> | ||
26 | </references> | ||
27 | </csc> | ||
28 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../../bin/Physics/" /> | ||
29 | <mkdir dir="${project::get-base-directory()}/../../../../bin/Physics/"/> | ||
30 | <copy todir="${project::get-base-directory()}/../../../../bin/Physics/"> | ||
31 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | ||
32 | <include name="*.dll"/> | ||
33 | <include name="*.exe"/> | ||
34 | </fileset> | ||
35 | </copy> | ||
36 | </target> | ||
37 | <target name="clean"> | ||
38 | <delete dir="${bin.dir}" failonerror="false" /> | ||
39 | <delete dir="${obj.dir}" failonerror="false" /> | ||
40 | </target> | ||
41 | <target name="doc" description="Creates documentation."> | ||
42 | </target> | ||
43 | </project> | ||
diff --git a/OpenSim/Region/Physics/PhysXPlugin/OpenSim.Region.Physics.PhysXPlugin.dll.build b/OpenSim/Region/Physics/PhysXPlugin/OpenSim.Region.Physics.PhysXPlugin.dll.build new file mode 100644 index 0000000..c1a9608 --- /dev/null +++ b/OpenSim/Region/Physics/PhysXPlugin/OpenSim.Region.Physics.PhysXPlugin.dll.build | |||
@@ -0,0 +1,43 @@ | |||
1 | <?xml version="1.0" ?> | ||
2 | <project name="OpenSim.Region.Physics.PhysXPlugin" 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.Physics.PhysXPlugin" dynamicprefix="true" > | ||
12 | </resources> | ||
13 | <sources failonempty="true"> | ||
14 | <include name="AssemblyInfo.cs" /> | ||
15 | <include name="PhysXPlugin.cs" /> | ||
16 | </sources> | ||
17 | <references basedir="${project::get-base-directory()}"> | ||
18 | <lib> | ||
19 | <include name="${project::get-base-directory()}" /> | ||
20 | <include name="${project::get-base-directory()}/${build.dir}" /> | ||
21 | </lib> | ||
22 | <include name="../../../../bin/Axiom.MathLib.dll" /> | ||
23 | <include name="../../../../bin/OpenSim.Region.Physics.Manager.dll" /> | ||
24 | <include name="../../../../bin/PhysX_Wrapper_Dotnet.dll" /> | ||
25 | <include name="System.dll" /> | ||
26 | </references> | ||
27 | </csc> | ||
28 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../../bin/Physics/" /> | ||
29 | <mkdir dir="${project::get-base-directory()}/../../../../bin/Physics/"/> | ||
30 | <copy todir="${project::get-base-directory()}/../../../../bin/Physics/"> | ||
31 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | ||
32 | <include name="*.dll"/> | ||
33 | <include name="*.exe"/> | ||
34 | </fileset> | ||
35 | </copy> | ||
36 | </target> | ||
37 | <target name="clean"> | ||
38 | <delete dir="${bin.dir}" failonerror="false" /> | ||
39 | <delete dir="${obj.dir}" failonerror="false" /> | ||
40 | </target> | ||
41 | <target name="doc" description="Creates documentation."> | ||
42 | </target> | ||
43 | </project> | ||
diff --git a/OpenSim/Region/Storage/LocalStorageBerkeleyDB/OpenSim.Region.Storage.LocalStorageBerkeleyDB.dll.build b/OpenSim/Region/Storage/LocalStorageBerkeleyDB/OpenSim.Region.Storage.LocalStorageBerkeleyDB.dll.build new file mode 100644 index 0000000..20f5171 --- /dev/null +++ b/OpenSim/Region/Storage/LocalStorageBerkeleyDB/OpenSim.Region.Storage.LocalStorageBerkeleyDB.dll.build | |||
@@ -0,0 +1,46 @@ | |||
1 | <?xml version="1.0" ?> | ||
2 | <project name="OpenSim.Region.Storage.LocalStorageBerkeleyDB" 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.Storage.LocalStorageBerkeleyDB" dynamicprefix="true" > | ||
12 | </resources> | ||
13 | <sources failonempty="true"> | ||
14 | <include name="BDBLocalStorage.cs" /> | ||
15 | </sources> | ||
16 | <references basedir="${project::get-base-directory()}"> | ||
17 | <lib> | ||
18 | <include name="${project::get-base-directory()}" /> | ||
19 | <include name="${project::get-base-directory()}/${build.dir}" /> | ||
20 | </lib> | ||
21 | <include name="../../../../bin/Kds.Serialization.dll" /> | ||
22 | <include name="../../../../bin/libdb_dotNET43.dll" /> | ||
23 | <include name="../../../../bin/libsecondlife.dll" /> | ||
24 | <include name="../../../../bin/OpenSim.Framework.dll" /> | ||
25 | <include name="../../../../bin/OpenSim.Framework.Console.dll" /> | ||
26 | <include name="System.dll" /> | ||
27 | <include name="System.Data.dll" /> | ||
28 | <include name="System.Xml.dll" /> | ||
29 | </references> | ||
30 | </csc> | ||
31 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../../bin/" /> | ||
32 | <mkdir dir="${project::get-base-directory()}/../../../../bin/"/> | ||
33 | <copy todir="${project::get-base-directory()}/../../../../bin/"> | ||
34 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | ||
35 | <include name="*.dll"/> | ||
36 | <include name="*.exe"/> | ||
37 | </fileset> | ||
38 | </copy> | ||
39 | </target> | ||
40 | <target name="clean"> | ||
41 | <delete dir="${bin.dir}" failonerror="false" /> | ||
42 | <delete dir="${obj.dir}" failonerror="false" /> | ||
43 | </target> | ||
44 | <target name="doc" description="Creates documentation."> | ||
45 | </target> | ||
46 | </project> | ||
diff --git a/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj index 716fd57..147158c 100644 --- a/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj +++ b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj | |||
@@ -93,6 +93,9 @@ | |||
93 | <Compile Include="AssemblyInfo.cs"> | 93 | <Compile Include="AssemblyInfo.cs"> |
94 | <SubType>Code</SubType> | 94 | <SubType>Code</SubType> |
95 | </Compile> | 95 | </Compile> |
96 | <Compile Include="Db4LocalStorage.cs"> | ||
97 | <SubType>Code</SubType> | ||
98 | </Compile> | ||
96 | <Compile Include="MapStorage.cs"> | 99 | <Compile Include="MapStorage.cs"> |
97 | <SubType>Code</SubType> | 100 | <SubType>Code</SubType> |
98 | </Compile> | 101 | </Compile> |
@@ -102,9 +105,6 @@ | |||
102 | <Compile Include="UUIDPrimQuery.cs"> | 105 | <Compile Include="UUIDPrimQuery.cs"> |
103 | <SubType>Code</SubType> | 106 | <SubType>Code</SubType> |
104 | </Compile> | 107 | </Compile> |
105 | <Compile Include="Db4LocalStorage.cs"> | ||
106 | <SubType>Code</SubType> | ||
107 | </Compile> | ||
108 | </ItemGroup> | 108 | </ItemGroup> |
109 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> | 109 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> |
110 | <PropertyGroup> | 110 | <PropertyGroup> |
diff --git a/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build new file mode 100644 index 0000000..fc9f055 --- /dev/null +++ b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build | |||
@@ -0,0 +1,48 @@ | |||
1 | <?xml version="1.0" ?> | ||
2 | <project name="OpenSim.Region.Storage.LocalStorageDb4o" 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.Storage.LocalStorageDb4o" dynamicprefix="true" > | ||
12 | </resources> | ||
13 | <sources failonempty="true"> | ||
14 | <include name="AssemblyInfo.cs" /> | ||
15 | <include name="Db4LocalStorage.cs" /> | ||
16 | <include name="MapStorage.cs" /> | ||
17 | <include name="UUIDParcelQuery.cs" /> | ||
18 | <include name="UUIDPrimQuery.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/Db4objects.Db4o.dll" /> | ||
26 | <include name="../../../../bin/libsecondlife.dll" /> | ||
27 | <include name="../../../../bin/OpenSim.Framework.dll" /> | ||
28 | <include name="../../../../bin/OpenSim.Framework.Console.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/Storage/LocalStorageSQLite/OpenSim.Region.Storage.LocalStorageSQLite.dll.build b/OpenSim/Region/Storage/LocalStorageSQLite/OpenSim.Region.Storage.LocalStorageSQLite.dll.build new file mode 100644 index 0000000..9d12c33 --- /dev/null +++ b/OpenSim/Region/Storage/LocalStorageSQLite/OpenSim.Region.Storage.LocalStorageSQLite.dll.build | |||
@@ -0,0 +1,46 @@ | |||
1 | <?xml version="1.0" ?> | ||
2 | <project name="OpenSim.Region.Storage.LocalStorageSQLite" 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.Storage.LocalStorageSQLite" dynamicprefix="true" > | ||
12 | </resources> | ||
13 | <sources failonempty="true"> | ||
14 | <include name="SQLiteLocalStorage.cs" /> | ||
15 | <include name="Properties/AssemblyInfo.cs" /> | ||
16 | </sources> | ||
17 | <references basedir="${project::get-base-directory()}"> | ||
18 | <lib> | ||
19 | <include name="${project::get-base-directory()}" /> | ||
20 | <include name="${project::get-base-directory()}/${build.dir}" /> | ||
21 | </lib> | ||
22 | <include name="../../../../bin/libsecondlife.dll" /> | ||
23 | <include name="../../../../bin/OpenSim.Framework.dll" /> | ||
24 | <include name="../../../../bin/OpenSim.Framework.Console.dll" /> | ||
25 | <include name="System.dll" /> | ||
26 | <include name="System.Data.dll" /> | ||
27 | <include name="../../../../bin/System.Data.SQLite.dll" /> | ||
28 | <include name="System.Xml.dll" /> | ||
29 | </references> | ||
30 | </csc> | ||
31 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../../bin/" /> | ||
32 | <mkdir dir="${project::get-base-directory()}/../../../../bin/"/> | ||
33 | <copy todir="${project::get-base-directory()}/../../../../bin/"> | ||
34 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | ||
35 | <include name="*.dll"/> | ||
36 | <include name="*.exe"/> | ||
37 | </fileset> | ||
38 | </copy> | ||
39 | </target> | ||
40 | <target name="clean"> | ||
41 | <delete dir="${bin.dir}" failonerror="false" /> | ||
42 | <delete dir="${obj.dir}" failonerror="false" /> | ||
43 | </target> | ||
44 | <target name="doc" description="Creates documentation."> | ||
45 | </target> | ||
46 | </project> | ||
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 @@ | |||
90 | <ItemGroup> | 90 | <ItemGroup> |
91 | </ItemGroup> | 91 | </ItemGroup> |
92 | <ItemGroup> | 92 | <ItemGroup> |
93 | <Compile Include="TerrainFilter.cs"> | 93 | <Compile Include="TerrainEngine.cs"> |
94 | <SubType>Code</SubType> | 94 | <SubType>Code</SubType> |
95 | </Compile> | 95 | </Compile> |
96 | <Compile Include="TerrainEngine.cs"> | 96 | <Compile Include="TerrainFilter.cs"> |
97 | <SubType>Code</SubType> | 97 | <SubType>Code</SubType> |
98 | </Compile> | 98 | </Compile> |
99 | <Compile Include="Properties\AssemblyInfo.cs"> | 99 | <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 @@ | |||
1 | <?xml version="1.0" ?> | ||
2 | <project name="OpenSim.Region.Terrain.BasicTerrain" 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.Terrain.BasicTerrain" dynamicprefix="true" > | ||
12 | </resources> | ||
13 | <sources failonempty="true"> | ||
14 | <include name="TerrainEngine.cs" /> | ||
15 | <include name="TerrainFilter.cs" /> | ||
16 | <include name="Properties/AssemblyInfo.cs" /> | ||
17 | </sources> | ||
18 | <references basedir="${project::get-base-directory()}"> | ||
19 | <lib> | ||
20 | <include name="${project::get-base-directory()}" /> | ||
21 | <include name="${project::get-base-directory()}/${build.dir}" /> | ||
22 | </lib> | ||
23 | <include name="../../../bin/libTerrain-BSD.dll" /> | ||
24 | <include name="Microsoft.JScript.dll" /> | ||
25 | <include name="../../../bin/openjpegnet.dll" /> | ||
26 | <include name="System.dll" /> | ||
27 | <include name="System.Data.dll" /> | ||
28 | <include name="System.Drawing.dll" /> | ||
29 | <include name="System.Xml.dll" /> | ||
30 | </references> | ||
31 | </csc> | ||
32 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" /> | ||
33 | <mkdir dir="${project::get-base-directory()}/../../../bin/"/> | ||
34 | <copy todir="${project::get-base-directory()}/../../../bin/"> | ||
35 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | ||
36 | <include name="*.dll"/> | ||
37 | <include name="*.exe"/> | ||
38 | </fileset> | ||
39 | </copy> | ||
40 | </target> | ||
41 | <target name="clean"> | ||
42 | <delete dir="${bin.dir}" failonerror="false" /> | ||
43 | <delete dir="${obj.dir}" failonerror="false" /> | ||
44 | </target> | ||
45 | <target name="doc" description="Creates documentation."> | ||
46 | </target> | ||
47 | </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 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://www.openmetaverse.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | * | ||
27 | */ | ||
1 | using System; | 28 | using System; |
2 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
3 | using System.Text; | 30 | using System.Text; |
@@ -48,7 +75,7 @@ namespace OpenSim.Region.Terrain | |||
48 | compilerParams.GenerateInMemory = true; | 75 | compilerParams.GenerateInMemory = true; |
49 | compilerParams.IncludeDebugInformation = false; | 76 | compilerParams.IncludeDebugInformation = false; |
50 | compilerParams.ReferencedAssemblies.Add("libTerrain-BSD.dll"); | 77 | compilerParams.ReferencedAssemblies.Add("libTerrain-BSD.dll"); |
51 | compilerParams.ReferencedAssemblies.Add("OpenSim.Region.Terrain.BasicTerrain.dll"); | 78 | compilerParams.ReferencedAssemblies.Add("OpenSim.Terrain.BasicTerrain.dll"); |
52 | compilerParams.ReferencedAssemblies.Add("System.dll"); | 79 | compilerParams.ReferencedAssemblies.Add("System.dll"); |
53 | 80 | ||
54 | compilerResults = compiler.CompileAssemblyFromFile(compilerParams, filename); | 81 | compilerResults = compiler.CompileAssemblyFromFile(compilerParams, filename); |