diff options
Diffstat (limited to 'OpenSim.RegionServer')
-rw-r--r-- | OpenSim.RegionServer/OpenSim.RegionServer.dll.build | 163 | ||||
-rw-r--r-- | OpenSim.RegionServer/OpenSimMain.cs | 1 |
2 files changed, 83 insertions, 81 deletions
diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim.RegionServer/OpenSim.RegionServer.dll.build index 7488a3e..cd900f5 100644 --- a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build +++ b/OpenSim.RegionServer/OpenSim.RegionServer.dll.build | |||
@@ -1,81 +1,82 @@ | |||
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;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | 10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" 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="RegionInfo.cs" /> | 21 | <include name="RegionInfo.cs" /> |
22 | <include name="SimClient.cs" /> | 22 | <include name="SimClient.cs" /> |
23 | <include name="SimConsole.cs" /> | 23 | <include name="SimConsole.cs" /> |
24 | <include name="VersionInfo.cs" /> | 24 | <include name="VersionInfo.cs" /> |
25 | <include name="Assets/AssetCache.cs" /> | 25 | <include name="Assets/AssetCache.cs" /> |
26 | <include name="Assets/InventoryCache.cs" /> | 26 | <include name="Assets/InventoryCache.cs" /> |
27 | <include name="CAPS/AdminWebFront.cs" /> | 27 | <include name="CAPS/AdminWebFront.cs" /> |
28 | <include name="types/Mesh.cs" /> | 28 | <include name="types/Mesh.cs" /> |
29 | <include name="types/Triangle.cs" /> | 29 | <include name="types/Triangle.cs" /> |
30 | <include name="world/Avatar.cs" /> | 30 | <include name="world/Avatar.cs" /> |
31 | <include name="world/AvatarAnimations.cs" /> | 31 | <include name="world/AvatarAnimations.cs" /> |
32 | <include name="world/AvatarClient.cs" /> | 32 | <include name="world/AvatarClient.cs" /> |
33 | <include name="world/AvatarUpdate.cs" /> | 33 | <include name="world/AvatarUpdate.cs" /> |
34 | <include name="world/Entity.cs" /> | 34 | <include name="world/Entity.cs" /> |
35 | <include name="world/Primitive.cs" /> | 35 | <include name="world/Primitive.cs" /> |
36 | <include name="world/Primitive2.cs" /> | 36 | <include name="world/Primitive2.cs" /> |
37 | <include name="world/ScriptEngine.cs" /> | 37 | <include name="world/ScriptEngine.cs" /> |
38 | <include name="world/SurfacePatch.cs" /> | 38 | <include name="world/SurfacePatch.cs" /> |
39 | <include name="world/World.cs" /> | 39 | <include name="world/World.cs" /> |
40 | <include name="world/WorldPacketHandlers.cs" /> | 40 | <include name="world/WorldPacketHandlers.cs" /> |
41 | <include name="world/scripting/IScript.cs" /> | 41 | <include name="world/scripting/IScript.cs" /> |
42 | <include name="world/scripting/IScriptContext.cs" /> | 42 | <include name="world/scripting/IScriptContext.cs" /> |
43 | <include name="world/scripting/IScriptEntity.cs" /> | 43 | <include name="world/scripting/IScriptEntity.cs" /> |
44 | <include name="world/scripting/IScriptHandler.cs" /> | 44 | <include name="world/scripting/IScriptHandler.cs" /> |
45 | <include name="world/scripting/Script.cs" /> | 45 | <include name="world/scripting/Script.cs" /> |
46 | <include name="world/scripting/ScriptFactory.cs" /> | 46 | <include name="world/scripting/ScriptFactory.cs" /> |
47 | <include name="world/scripting/Scripts/FollowRandomAvatar.cs" /> | 47 | <include name="world/scripting/Scripts/FollowRandomAvatar.cs" /> |
48 | </sources> | 48 | </sources> |
49 | <references basedir="${project::get-base-directory()}"> | 49 | <references basedir="${project::get-base-directory()}"> |
50 | <lib> | 50 | <lib> |
51 | <include name="${project::get-base-directory()}" /> | 51 | <include name="${project::get-base-directory()}" /> |
52 | <include name="${project::get-base-directory()}/${build.dir}" /> | 52 | <include name="${project::get-base-directory()}/${build.dir}" /> |
53 | </lib> | 53 | </lib> |
54 | <include name="System.dll" /> | 54 | <include name="System.dll" /> |
55 | <include name="System.Xml.dll" /> | 55 | <include name="System.Xml.dll" /> |
56 | <include name="../bin/libsecondlife.dll" /> | 56 | <include name="../bin/libsecondlife.dll" /> |
57 | <include name="../bin/Axiom.MathLib.dll" /> | 57 | <include name="../bin/Axiom.MathLib.dll" /> |
58 | <include name="../bin/Db4objects.Db4o.dll" /> | 58 | <include name="../bin/Db4objects.Db4o.dll" /> |
59 | <include name="../bin/OpenSim.Framework.dll" /> | 59 | <include name="../bin/OpenSim.Terrain.BasicTerrain.dll" /> |
60 | <include name="../bin/OpenSim.Framework.Console.dll" /> | 60 | <include name="../bin/OpenSim.Framework.dll" /> |
61 | <include name="../bin/OpenSim.GenericConfig.Xml.dll" /> | 61 | <include name="../bin/OpenSim.Framework.Console.dll" /> |
62 | <include name="../bin/OpenSim.Physics.Manager.dll" /> | 62 | <include name="../bin/OpenSim.GenericConfig.Xml.dll" /> |
63 | <include name="../bin/OpenSim.Servers.dll" /> | 63 | <include name="../bin/OpenSim.Physics.Manager.dll" /> |
64 | </references> | 64 | <include name="../bin/OpenSim.Servers.dll" /> |
65 | </csc> | 65 | </references> |
66 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> | 66 | </csc> |
67 | <mkdir dir="${project::get-base-directory()}/../bin/"/> | 67 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> |
68 | <copy todir="${project::get-base-directory()}/../bin/"> | 68 | <mkdir dir="${project::get-base-directory()}/../bin/"/> |
69 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 69 | <copy todir="${project::get-base-directory()}/../bin/"> |
70 | <include name="*.dll"/> | 70 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
71 | <include name="*.exe"/> | 71 | <include name="*.dll"/> |
72 | </fileset> | 72 | <include name="*.exe"/> |
73 | </copy> | 73 | </fileset> |
74 | </target> | 74 | </copy> |
75 | <target name="clean"> | 75 | </target> |
76 | <delete dir="${bin.dir}" failonerror="false" /> | 76 | <target name="clean"> |
77 | <delete dir="${obj.dir}" failonerror="false" /> | 77 | <delete dir="${bin.dir}" failonerror="false" /> |
78 | </target> | 78 | <delete dir="${obj.dir}" failonerror="false" /> |
79 | <target name="doc" description="Creates documentation."> | 79 | </target> |
80 | </target> | 80 | <target name="doc" description="Creates documentation."> |
81 | </project> | 81 | </target> |
82 | </project> | ||
diff --git a/OpenSim.RegionServer/OpenSimMain.cs b/OpenSim.RegionServer/OpenSimMain.cs index f4eea11..fab9db4 100644 --- a/OpenSim.RegionServer/OpenSimMain.cs +++ b/OpenSim.RegionServer/OpenSimMain.cs | |||
@@ -39,6 +39,7 @@ using System.Collections.Generic; | |||
39 | using libsecondlife; | 39 | using libsecondlife; |
40 | using libsecondlife.Packets; | 40 | using libsecondlife.Packets; |
41 | using OpenSim.world; | 41 | using OpenSim.world; |
42 | using OpenSim.Terrain; | ||
42 | using OpenSim.Framework.Interfaces; | 43 | using OpenSim.Framework.Interfaces; |
43 | using OpenSim.UserServer; | 44 | using OpenSim.UserServer; |
44 | using OpenSim.Assets; | 45 | using OpenSim.Assets; |