aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim.RegionServer
diff options
context:
space:
mode:
authorMW2007-04-02 12:56:35 +0000
committerMW2007-04-02 12:56:35 +0000
commit23ecc07caa19dce34bf56c6c3fac3e54cd2cdcff (patch)
treeace7dfc8b928c07ddb1f73b5a7b2c6de8a36687e /OpenSim.RegionServer
parentminor bug (diff)
downloadopensim-SC-23ecc07caa19dce34bf56c6c3fac3e54cd2cdcff.zip
opensim-SC-23ecc07caa19dce34bf56c6c3fac3e54cd2cdcff.tar.gz
opensim-SC-23ecc07caa19dce34bf56c6c3fac3e54cd2cdcff.tar.bz2
opensim-SC-23ecc07caa19dce34bf56c6c3fac3e54cd2cdcff.tar.xz
Added OpenSim.GenericConfig.Xml project, so we can swap to a more generic configuration method, so that it is easier to load configuration data from a ogs server
Diffstat (limited to 'OpenSim.RegionServer')
-rw-r--r--OpenSim.RegionServer/OpenSim.RegionServer.dll.build138
-rw-r--r--OpenSim.RegionServer/OpenSimMain.cs1
2 files changed, 70 insertions, 69 deletions
diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
index 2bb8fa9..6f86970 100644
--- a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
+++ b/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
@@ -1,69 +1,69 @@
1<?xml version="1.0" ?> 1<?xml version="1.0" ?>
2<project name="OpenSim.RegionServer" default="build"> 2<project name="OpenSim.RegionServer" 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.RegionServer" dynamicprefix="true" > 11 <resources prefix="OpenSim.RegionServer" dynamicprefix="true" >
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="AgentAssetUpload.cs" /> 14 <include name="AgentAssetUpload.cs" />
15 <include name="ConsoleCmds.cs" /> 15 <include name="ConsoleCmds.cs" />
16 <include name="Grid.cs" /> 16 <include name="Grid.cs" />
17 <include name="OpenSimMain.cs" /> 17 <include name="OpenSimMain.cs" />
18 <include name="OpenSimNetworkHandler.cs" /> 18 <include name="OpenSimNetworkHandler.cs" />
19 <include name="PacketServer.cs" /> 19 <include name="PacketServer.cs" />
20 <include name="QueItem.cs" /> 20 <include name="QueItem.cs" />
21 <include name="SimClient.cs" /> 21 <include name="SimClient.cs" />
22 <include name="SimConsole.cs" /> 22 <include name="SimConsole.cs" />
23 <include name="VersionInfo.cs" /> 23 <include name="VersionInfo.cs" />
24 <include name="Assets/AssetCache.cs" /> 24 <include name="Assets/AssetCache.cs" />
25 <include name="Assets/InventoryCache.cs" /> 25 <include name="Assets/InventoryCache.cs" />
26 <include name="CAPS/AdminWebFront.cs" /> 26 <include name="CAPS/AdminWebFront.cs" />
27 <include name="types/Mesh.cs" /> 27 <include name="types/Mesh.cs" />
28 <include name="types/Triangle.cs" /> 28 <include name="types/Triangle.cs" />
29 <include name="world/Avatar.cs" /> 29 <include name="world/Avatar.cs" />
30 <include name="world/AvatarAnimations.cs" /> 30 <include name="world/AvatarAnimations.cs" />
31 <include name="world/Entity.cs" /> 31 <include name="world/Entity.cs" />
32 <include name="world/Primitive.cs" /> 32 <include name="world/Primitive.cs" />
33 <include name="world/ScriptEngine.cs" /> 33 <include name="world/ScriptEngine.cs" />
34 <include name="world/SurfacePatch.cs" /> 34 <include name="world/SurfacePatch.cs" />
35 <include name="world/World.cs" /> 35 <include name="world/World.cs" />
36 <include name="world/scripting/IScript.cs" /> 36 <include name="world/scripting/IScript.cs" />
37 </sources> 37 </sources>
38 <references basedir="${project::get-base-directory()}"> 38 <references basedir="${project::get-base-directory()}">
39 <lib> 39 <lib>
40 <include name="${project::get-base-directory()}" /> 40 <include name="${project::get-base-directory()}" />
41 <include name="${project::get-base-directory()}/${build.dir}" /> 41 <include name="${project::get-base-directory()}/${build.dir}" />
42 </lib> 42 </lib>
43 <include name="System.dll" /> 43 <include name="System.dll" />
44 <include name="System.Xml.dll" /> 44 <include name="System.Xml.dll" />
45 <include name="../bin/libsecondlife.dll" /> 45 <include name="../bin/libsecondlife.dll" />
46 <include name="../bin/Axiom.MathLib.dll" /> 46 <include name="../bin/Axiom.MathLib.dll" />
47 <include name="../bin/Db4objects.Db4o.dll" /> 47 <include name="../bin/Db4objects.Db4o.dll" />
48 <include name="../bin/OpenSim.Framework.dll" /> 48 <include name="../bin/OpenSim.Framework.dll" />
49 <include name="../bin/OpenSim.Framework.Console.dll" /> 49 <include name="../bin/OpenSim.Framework.Console.dll" />
50 <include name="../bin/OpenSim.Physics.Manager.dll" /> 50 <include name="../bin/OpenSim.Physics.Manager.dll" />
51 <include name="../bin/OpenSim.Servers.dll" /> 51 <include name="../bin/OpenSim.Servers.dll" />
52 </references> 52 </references>
53 </csc> 53 </csc>
54 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> 54 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
55 <mkdir dir="${project::get-base-directory()}/../bin/"/> 55 <mkdir dir="${project::get-base-directory()}/../bin/"/>
56 <copy todir="${project::get-base-directory()}/../bin/"> 56 <copy todir="${project::get-base-directory()}/../bin/">
57 <fileset basedir="${project::get-base-directory()}/${build.dir}/" > 57 <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
58 <include name="*.dll"/> 58 <include name="*.dll"/>
59 <include name="*.exe"/> 59 <include name="*.exe"/>
60 </fileset> 60 </fileset>
61 </copy> 61 </copy>
62 </target> 62 </target>
63 <target name="clean"> 63 <target name="clean">
64 <delete dir="${bin.dir}" failonerror="false" /> 64 <delete dir="${bin.dir}" failonerror="false" />
65 <delete dir="${obj.dir}" failonerror="false" /> 65 <delete dir="${obj.dir}" failonerror="false" />
66 </target> 66 </target>
67 <target name="doc" description="Creates documentation."> 67 <target name="doc" description="Creates documentation.">
68 </target> 68 </target>
69</project> 69</project>
diff --git a/OpenSim.RegionServer/OpenSimMain.cs b/OpenSim.RegionServer/OpenSimMain.cs
index 41476ac..c0fe95b 100644
--- a/OpenSim.RegionServer/OpenSimMain.cs
+++ b/OpenSim.RegionServer/OpenSimMain.cs
@@ -94,6 +94,7 @@ namespace OpenSim
94 94
95 public virtual void StartUp() 95 public virtual void StartUp()
96 { 96 {
97
97 GridServers = new Grid(); 98 GridServers = new Grid();
98 if (m_sandbox) 99 if (m_sandbox)
99 { 100 {
generated by cgit v1.1 at 2024-12-17 11:12:14 +0000