aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim.Framework
diff options
context:
space:
mode:
authorMW2007-04-11 09:45:48 +0000
committerMW2007-04-11 09:45:48 +0000
commitffd7a6b8c22cd21e355f77fea20b145424e3d912 (patch)
tree94deb515b2b7cb5233fc8fc8d9d531e1a789b7c7 /OpenSim.Framework
parent(no commit message) (diff)
downloadopensim-SC-ffd7a6b8c22cd21e355f77fea20b145424e3d912.zip
opensim-SC-ffd7a6b8c22cd21e355f77fea20b145424e3d912.tar.gz
opensim-SC-ffd7a6b8c22cd21e355f77fea20b145424e3d912.tar.bz2
opensim-SC-ffd7a6b8c22cd21e355f77fea20b145424e3d912.tar.xz
Changed so that a bin\ScriptEngines\ directory will be searched for scripting Engines.
Added the work in progress JVM scripting engine.
Diffstat (limited to '')
-rw-r--r--OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build84
-rw-r--r--OpenSim.Framework/OpenSim.Framework.csproj9
-rw-r--r--OpenSim.Framework/OpenSim.Framework.dll.build137
-rw-r--r--OpenSim.Framework/UserProfileManager.cs2
4 files changed, 121 insertions, 111 deletions
diff --git a/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build b/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build
index a3019ee..fa90bb6 100644
--- a/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build
+++ b/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build
@@ -1,42 +1,42 @@
1<?xml version="1.0" ?> 1<?xml version="1.0" ?>
2<project name="OpenSim.Framework.Console" default="build"> 2<project name="OpenSim.Framework.Console" default="build">
3 <target name="build"> 3 <target name="build">
4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> 4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
5 <mkdir dir="${project::get-base-directory()}/${build.dir}" /> 5 <mkdir dir="${project::get-base-directory()}/${build.dir}" />
6 <copy todir="${project::get-base-directory()}/${build.dir}"> 6 <copy todir="${project::get-base-directory()}/${build.dir}">
7 <fileset basedir="${project::get-base-directory()}"> 7 <fileset basedir="${project::get-base-directory()}">
8 </fileset> 8 </fileset>
9 </copy> 9 </copy>
10 <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> 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.Framework.Console" dynamicprefix="true" > 11 <resources prefix="OpenSim.Framework.Console" dynamicprefix="true" >
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="AssemblyInfo.cs" /> 14 <include name="AssemblyInfo.cs" />
15 <include name="ConsoleBase.cs" /> 15 <include name="ConsoleBase.cs" />
16 <include name="ConsoleCallbacksBase.cs" /> 16 <include name="ConsoleCallbacksBase.cs" />
17 <include name="MainConsole.cs" /> 17 <include name="MainConsole.cs" />
18 </sources> 18 </sources>
19 <references basedir="${project::get-base-directory()}"> 19 <references basedir="${project::get-base-directory()}">
20 <lib> 20 <lib>
21 <include name="${project::get-base-directory()}" /> 21 <include name="${project::get-base-directory()}" />
22 <include name="${project::get-base-directory()}/${build.dir}" /> 22 <include name="${project::get-base-directory()}/${build.dir}" />
23 </lib> 23 </lib>
24 <include name="System.dll" /> 24 <include name="System.dll" />
25 </references> 25 </references>
26 </csc> 26 </csc>
27 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> 27 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
28 <mkdir dir="${project::get-base-directory()}/../bin/"/> 28 <mkdir dir="${project::get-base-directory()}/../bin/"/>
29 <copy todir="${project::get-base-directory()}/../bin/"> 29 <copy todir="${project::get-base-directory()}/../bin/">
30 <fileset basedir="${project::get-base-directory()}/${build.dir}/" > 30 <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
31 <include name="*.dll"/> 31 <include name="*.dll"/>
32 <include name="*.exe"/> 32 <include name="*.exe"/>
33 </fileset> 33 </fileset>
34 </copy> 34 </copy>
35 </target> 35 </target>
36 <target name="clean"> 36 <target name="clean">
37 <delete dir="${bin.dir}" failonerror="false" /> 37 <delete dir="${bin.dir}" failonerror="false" />
38 <delete dir="${obj.dir}" failonerror="false" /> 38 <delete dir="${obj.dir}" failonerror="false" />
39 </target> 39 </target>
40 <target name="doc" description="Creates documentation."> 40 <target name="doc" description="Creates documentation.">
41 </target> 41 </target>
42</project> 42</project>
diff --git a/OpenSim.Framework/OpenSim.Framework.csproj b/OpenSim.Framework/OpenSim.Framework.csproj
index 4ce5af0..68b7ef0 100644
--- a/OpenSim.Framework/OpenSim.Framework.csproj
+++ b/OpenSim.Framework/OpenSim.Framework.csproj
@@ -111,6 +111,12 @@
111 <Compile Include="ILocalStorage.cs"> 111 <Compile Include="ILocalStorage.cs">
112 <SubType>Code</SubType> 112 <SubType>Code</SubType>
113 </Compile> 113 </Compile>
114 <Compile Include="IScriptAPI.cs">
115 <SubType>Code</SubType>
116 </Compile>
117 <Compile Include="IScriptEngine.cs">
118 <SubType>Code</SubType>
119 </Compile>
114 <Compile Include="IUserConfig.cs"> 120 <Compile Include="IUserConfig.cs">
115 <SubType>Code</SubType> 121 <SubType>Code</SubType>
116 </Compile> 122 </Compile>
@@ -129,6 +135,9 @@
129 <Compile Include="NeighbourInfo.cs"> 135 <Compile Include="NeighbourInfo.cs">
130 <SubType>Code</SubType> 136 <SubType>Code</SubType>
131 </Compile> 137 </Compile>
138 <Compile Include="OSVector3.cs">
139 <SubType>Code</SubType>
140 </Compile>
132 <Compile Include="PrimData.cs"> 141 <Compile Include="PrimData.cs">
133 <SubType>Code</SubType> 142 <SubType>Code</SubType>
134 </Compile> 143 </Compile>
diff --git a/OpenSim.Framework/OpenSim.Framework.dll.build b/OpenSim.Framework/OpenSim.Framework.dll.build
index b351625..fb7fbd4 100644
--- a/OpenSim.Framework/OpenSim.Framework.dll.build
+++ b/OpenSim.Framework/OpenSim.Framework.dll.build
@@ -1,67 +1,70 @@
1<?xml version="1.0" ?> 1<?xml version="1.0" ?>
2<project name="OpenSim.Framework" default="build"> 2<project name="OpenSim.Framework" default="build">
3 <target name="build"> 3 <target name="build">
4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> 4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
5 <mkdir dir="${project::get-base-directory()}/${build.dir}" /> 5 <mkdir dir="${project::get-base-directory()}/${build.dir}" />
6 <copy todir="${project::get-base-directory()}/${build.dir}"> 6 <copy todir="${project::get-base-directory()}/${build.dir}">
7 <fileset basedir="${project::get-base-directory()}"> 7 <fileset basedir="${project::get-base-directory()}">
8 </fileset> 8 </fileset>
9 </copy> 9 </copy>
10 <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> 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.Framework" dynamicprefix="true" > 11 <resources prefix="OpenSim.Framework" dynamicprefix="true" >
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="AgentCiruitData.cs" /> 14 <include name="AgentCiruitData.cs" />
15 <include name="AgentInventory.cs" /> 15 <include name="AgentInventory.cs" />
16 <include name="AssetBase.cs" /> 16 <include name="AssetBase.cs" />
17 <include name="BlockingQueue.cs" /> 17 <include name="BlockingQueue.cs" />
18 <include name="HeightMapGenHills.cs" /> 18 <include name="HeightMapGenHills.cs" />
19 <include name="IAssetServer.cs" /> 19 <include name="IAssetServer.cs" />
20 <include name="IConfig.cs" /> 20 <include name="IConfig.cs" />
21 <include name="IGenericConfig.cs" /> 21 <include name="IGenericConfig.cs" />
22 <include name="IGridConfig.cs" /> 22 <include name="IGridConfig.cs" />
23 <include name="IGridServer.cs" /> 23 <include name="IGridServer.cs" />
24 <include name="ILocalStorage.cs" /> 24 <include name="ILocalStorage.cs" />
25 <include name="IUserConfig.cs" /> 25 <include name="IScriptAPI.cs" />
26 <include name="IUserServer.cs" /> 26 <include name="IScriptEngine.cs" />
27 <include name="LocalGridBase.cs" /> 27 <include name="IUserConfig.cs" />
28 <include name="Login.cs" /> 28 <include name="IUserServer.cs" />
29 <include name="LoginService.cs" /> 29 <include name="LocalGridBase.cs" />
30 <include name="NeighbourInfo.cs" /> 30 <include name="Login.cs" />
31 <include name="PrimData.cs" /> 31 <include name="LoginService.cs" />
32 <include name="RemoteGridBase.cs" /> 32 <include name="NeighbourInfo.cs" />
33 <include name="SimProfile.cs" /> 33 <include name="OSVector3.cs" />
34 <include name="SimProfileBase.cs" /> 34 <include name="PrimData.cs" />
35 <include name="UserProfile.cs" /> 35 <include name="RemoteGridBase.cs" />
36 <include name="UserProfileManager.cs" /> 36 <include name="SimProfile.cs" />
37 <include name="UserProfileManagerBase.cs" /> 37 <include name="SimProfileBase.cs" />
38 <include name="Util.cs" /> 38 <include name="UserProfile.cs" />
39 <include name="Properties/AssemblyInfo.cs" /> 39 <include name="UserProfileManager.cs" />
40 </sources> 40 <include name="UserProfileManagerBase.cs" />
41 <references basedir="${project::get-base-directory()}"> 41 <include name="Util.cs" />
42 <lib> 42 <include name="Properties/AssemblyInfo.cs" />
43 <include name="${project::get-base-directory()}" /> 43 </sources>
44 <include name="${project::get-base-directory()}/${build.dir}" /> 44 <references basedir="${project::get-base-directory()}">
45 </lib> 45 <lib>
46 <include name="System.dll" /> 46 <include name="${project::get-base-directory()}" />
47 <include name="System.Xml.dll" /> 47 <include name="${project::get-base-directory()}/${build.dir}" />
48 <include name="../bin/libsecondlife.dll" /> 48 </lib>
49 <include name="../bin/Db4objects.Db4o.dll" /> 49 <include name="System.dll" />
50 </references> 50 <include name="System.Xml.dll" />
51 </csc> 51 <include name="../bin/libsecondlife.dll" />
52 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> 52 <include name="../bin/Db4objects.Db4o.dll" />
53 <mkdir dir="${project::get-base-directory()}/../bin/"/> 53 </references>
54 <copy todir="${project::get-base-directory()}/../bin/"> 54 </csc>
55 <fileset basedir="${project::get-base-directory()}/${build.dir}/" > 55 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
56 <include name="*.dll"/> 56 <mkdir dir="${project::get-base-directory()}/../bin/"/>
57 <include name="*.exe"/> 57 <copy todir="${project::get-base-directory()}/../bin/">
58 </fileset> 58 <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
59 </copy> 59 <include name="*.dll"/>
60 </target> 60 <include name="*.exe"/>
61 <target name="clean"> 61 </fileset>
62 <delete dir="${bin.dir}" failonerror="false" /> 62 </copy>
63 <delete dir="${obj.dir}" failonerror="false" /> 63 </target>
64 </target> 64 <target name="clean">
65 <target name="doc" description="Creates documentation."> 65 <delete dir="${bin.dir}" failonerror="false" />
66 </target> 66 <delete dir="${obj.dir}" failonerror="false" />
67</project> 67 </target>
68 <target name="doc" description="Creates documentation.">
69 </target>
70</project>
diff --git a/OpenSim.Framework/UserProfileManager.cs b/OpenSim.Framework/UserProfileManager.cs
index 3f0d665..bf11910 100644
--- a/OpenSim.Framework/UserProfileManager.cs
+++ b/OpenSim.Framework/UserProfileManager.cs
@@ -185,8 +185,6 @@ namespace OpenSim.Framework.User
185 response.Value = responseData; 185 response.Value = responseData;
186 // TheUser.SendDataToSim(SimInfo); 186 // TheUser.SendDataToSim(SimInfo);
187 187
188
189
190 } 188 }
191 catch (Exception E) 189 catch (Exception E)
192 { 190 {
generated by cgit v1.1 at 2024-12-18 23:32:00 +0000