aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim.RegionServer
diff options
context:
space:
mode:
authorgareth2007-04-03 20:39:28 +0000
committergareth2007-04-03 20:39:28 +0000
commit5e81e7ed9d8d1b5be0d5390cab10975bb3b93516 (patch)
tree674e1df234ac56ccbe92007ea04a3d6711861d65 /OpenSim.RegionServer
parent* lovely. svn doesn't delete the files from disk on svn delete, so they show ... (diff)
downloadopensim-SC_OLD-5e81e7ed9d8d1b5be0d5390cab10975bb3b93516.zip
opensim-SC_OLD-5e81e7ed9d8d1b5be0d5390cab10975bb3b93516.tar.gz
opensim-SC_OLD-5e81e7ed9d8d1b5be0d5390cab10975bb3b93516.tar.bz2
opensim-SC_OLD-5e81e7ed9d8d1b5be0d5390cab10975bb3b93516.tar.xz
Finished initial sim<>Grid login (kinda)
Can login but no config data sent/updated yet
Diffstat (limited to '')
-rw-r--r--OpenSim.RegionServer/OpenSim.RegionServer.dll.build154
-rw-r--r--OpenSim.RegionServer/OpenSimMain.cs3
2 files changed, 79 insertions, 78 deletions
diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
index 4a08551..9a1a8eb 100644
--- a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
+++ b/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
@@ -1,77 +1,77 @@
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/Entity.cs" /> 32 <include name="world/Entity.cs" />
33 <include name="world/Primitive.cs" /> 33 <include name="world/Primitive.cs" />
34 <include name="world/ScriptEngine.cs" /> 34 <include name="world/ScriptEngine.cs" />
35 <include name="world/SurfacePatch.cs" /> 35 <include name="world/SurfacePatch.cs" />
36 <include name="world/World.cs" /> 36 <include name="world/World.cs" />
37 <include name="world/scripting/IScript.cs" /> 37 <include name="world/scripting/IScript.cs" />
38 <include name="world/scripting/IScriptContext.cs" /> 38 <include name="world/scripting/IScriptContext.cs" />
39 <include name="world/scripting/IScriptEntity.cs" /> 39 <include name="world/scripting/IScriptEntity.cs" />
40 <include name="world/scripting/IScriptHandler.cs" /> 40 <include name="world/scripting/IScriptHandler.cs" />
41 <include name="world/scripting/Script.cs" /> 41 <include name="world/scripting/Script.cs" />
42 <include name="world/scripting/ScriptFactory.cs" /> 42 <include name="world/scripting/ScriptFactory.cs" />
43 <include name="world/scripting/Scripts/FollowRandomAvatar.cs" /> 43 <include name="world/scripting/Scripts/FollowRandomAvatar.cs" />
44 </sources> 44 </sources>
45 <references basedir="${project::get-base-directory()}"> 45 <references basedir="${project::get-base-directory()}">
46 <lib> 46 <lib>
47 <include name="${project::get-base-directory()}" /> 47 <include name="${project::get-base-directory()}" />
48 <include name="${project::get-base-directory()}/${build.dir}" /> 48 <include name="${project::get-base-directory()}/${build.dir}" />
49 </lib> 49 </lib>
50 <include name="System.dll" /> 50 <include name="System.dll" />
51 <include name="System.Xml.dll" /> 51 <include name="System.Xml.dll" />
52 <include name="../bin/libsecondlife.dll" /> 52 <include name="../bin/libsecondlife.dll" />
53 <include name="../bin/Axiom.MathLib.dll" /> 53 <include name="../bin/Axiom.MathLib.dll" />
54 <include name="../bin/Db4objects.Db4o.dll" /> 54 <include name="../bin/Db4objects.Db4o.dll" />
55 <include name="../bin/OpenSim.Framework.dll" /> 55 <include name="../bin/OpenSim.Framework.dll" />
56 <include name="../bin/OpenSim.Framework.Console.dll" /> 56 <include name="../bin/OpenSim.Framework.Console.dll" />
57 <include name="../bin/OpenSim.GenericConfig.Xml.dll" /> 57 <include name="../bin/OpenSim.GenericConfig.Xml.dll" />
58 <include name="../bin/OpenSim.Physics.Manager.dll" /> 58 <include name="../bin/OpenSim.Physics.Manager.dll" />
59 <include name="../bin/OpenSim.Servers.dll" /> 59 <include name="../bin/OpenSim.Servers.dll" />
60 </references> 60 </references>
61 </csc> 61 </csc>
62 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> 62 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
63 <mkdir dir="${project::get-base-directory()}/../bin/"/> 63 <mkdir dir="${project::get-base-directory()}/../bin/"/>
64 <copy todir="${project::get-base-directory()}/../bin/"> 64 <copy todir="${project::get-base-directory()}/../bin/">
65 <fileset basedir="${project::get-base-directory()}/${build.dir}/" > 65 <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
66 <include name="*.dll"/> 66 <include name="*.dll"/>
67 <include name="*.exe"/> 67 <include name="*.exe"/>
68 </fileset> 68 </fileset>
69 </copy> 69 </copy>
70 </target> 70 </target>
71 <target name="clean"> 71 <target name="clean">
72 <delete dir="${bin.dir}" failonerror="false" /> 72 <delete dir="${bin.dir}" failonerror="false" />
73 <delete dir="${obj.dir}" failonerror="false" /> 73 <delete dir="${obj.dir}" failonerror="false" />
74 </target> 74 </target>
75 <target name="doc" description="Creates documentation."> 75 <target name="doc" description="Creates documentation.">
76 </target> 76 </target>
77</project> 77</project>
diff --git a/OpenSim.RegionServer/OpenSimMain.cs b/OpenSim.RegionServer/OpenSimMain.cs
index 316bcd9..5db654e 100644
--- a/OpenSim.RegionServer/OpenSimMain.cs
+++ b/OpenSim.RegionServer/OpenSimMain.cs
@@ -54,7 +54,8 @@ namespace OpenSim
54 54
55 public class OpenSimMain : OpenSimNetworkHandler, conscmd_callback 55 public class OpenSimMain : OpenSimNetworkHandler, conscmd_callback
56 { 56 {
57 //private SimConfig Cfg; 57
58 //private SimConfig Cfg;
58 private IGenericConfig localConfig; 59 private IGenericConfig localConfig;
59 //private IGenericConfig remoteConfig; 60 //private IGenericConfig remoteConfig;
60 private PhysicsManager physManager; 61 private PhysicsManager physManager;