aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim.RegionServer
diff options
context:
space:
mode:
authorgareth2007-05-16 17:51:28 +0000
committergareth2007-05-16 17:51:28 +0000
commit3a28e39816533267155cb0b72ca0820ce6f2c898 (patch)
tree196f170d91ca18f4e263fcdc125ebab200708cde /OpenSim.RegionServer
parentClarified that one should use makerel.sh (diff)
downloadopensim-SC_OLD-3a28e39816533267155cb0b72ca0820ce6f2c898.zip
opensim-SC_OLD-3a28e39816533267155cb0b72ca0820ce6f2c898.tar.gz
opensim-SC_OLD-3a28e39816533267155cb0b72ca0820ce6f2c898.tar.bz2
opensim-SC_OLD-3a28e39816533267155cb0b72ca0820ce6f2c898.tar.xz
FIXED THE BUILD!
Diffstat (limited to 'OpenSim.RegionServer')
-rw-r--r--OpenSim.RegionServer/OpenSim.RegionServer.dll.build175
-rw-r--r--OpenSim.RegionServer/world/World.cs4
2 files changed, 90 insertions, 89 deletions
diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
index cff8711..bf28ec1 100644
--- a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
+++ b/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
@@ -1,87 +1,88 @@
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="AuthenticateSessionsBase.cs" /> 15 <include name="AuthenticateSessionsBase.cs" />
16 <include name="AuthenticateSessionsLocal.cs" /> 16 <include name="AuthenticateSessionsLocal.cs" />
17 <include name="Grid.cs" /> 17 <include name="AuthenticateSessionsRemote.cs" />
18 <include name="OpenSimMain.cs" /> 18 <include name="Grid.cs" />
19 <include name="OpenSimNetworkHandler.cs" /> 19 <include name="OpenSimMain.cs" />
20 <include name="PacketServer.cs" /> 20 <include name="OpenSimNetworkHandler.cs" />
21 <include name="RegionInfo.cs" /> 21 <include name="PacketServer.cs" />
22 <include name="RegionInfoBase.cs" /> 22 <include name="RegionInfo.cs" />
23 <include name="SimClient.cs" /> 23 <include name="RegionInfoBase.cs" />
24 <include name="SimClient.Grid.cs" /> 24 <include name="SimClient.Grid.cs" />
25 <include name="SimClient.PacketHandlers.cs" /> 25 <include name="SimClient.PacketHandlers.cs" />
26 <include name="SimClient.ProcessPackets.cs" /> 26 <include name="SimClient.ProcessPackets.cs" />
27 <include name="SimClientBase.cs" /> 27 <include name="SimClient.cs" />
28 <include name="UDPServer.cs" /> 28 <include name="SimClientBase.cs" />
29 <include name="VersionInfo.cs" /> 29 <include name="UDPServer.cs" />
30 <include name="Assets/AssetCache.cs" /> 30 <include name="VersionInfo.cs" />
31 <include name="Assets/InventoryCache.cs" /> 31 <include name="Assets/AssetCache.cs" />
32 <include name="CAPS/AdminWebFront.cs" /> 32 <include name="Assets/InventoryCache.cs" />
33 <include name="types/Mesh.cs" /> 33 <include name="CAPS/AdminWebFront.cs" />
34 <include name="types/Triangle.cs" /> 34 <include name="types/Mesh.cs" />
35 <include name="world/Avatar.Client.cs" /> 35 <include name="types/Triangle.cs" />
36 <include name="world/Avatar.cs" /> 36 <include name="world/Avatar.Client.cs" />
37 <include name="world/Avatar.Update.cs" /> 37 <include name="world/Avatar.Update.cs" />
38 <include name="world/AvatarAnimations.cs" /> 38 <include name="world/Avatar.cs" />
39 <include name="world/Entity.cs" /> 39 <include name="world/AvatarAnimations.cs" />
40 <include name="world/Primitive.cs" /> 40 <include name="world/Entity.cs" />
41 <include name="world/Primitive2.cs" /> 41 <include name="world/Primitive.cs" />
42 <include name="world/SceneObject.cs" /> 42 <include name="world/Primitive2.cs" />
43 <include name="world/World.cs" /> 43 <include name="world/SceneObject.cs" />
44 <include name="world/World.PacketHandlers.cs" /> 44 <include name="world/World.PacketHandlers.cs" />
45 <include name="world/World.Scripting.cs" /> 45 <include name="world/World.Scripting.cs" />
46 <include name="world/scripting/IScriptContext.cs" /> 46 <include name="world/World.cs" />
47 <include name="world/scripting/IScriptEntity.cs" /> 47 <include name="world/scripting/IScriptContext.cs" />
48 <include name="world/scripting/IScriptHandler.cs" /> 48 <include name="world/scripting/IScriptEntity.cs" />
49 <include name="world/scripting/Script.cs" /> 49 <include name="world/scripting/IScriptHandler.cs" />
50 <include name="world/scripting/ScriptFactory.cs" /> 50 <include name="world/scripting/Script.cs" />
51 <include name="world/scripting/Scripts/FollowRandomAvatar.cs" /> 51 <include name="world/scripting/ScriptFactory.cs" />
52 </sources> 52 <include name="world/scripting/Scripts/FollowRandomAvatar.cs" />
53 <references basedir="${project::get-base-directory()}"> 53 </sources>
54 <lib> 54 <references basedir="${project::get-base-directory()}">
55 <include name="${project::get-base-directory()}" /> 55 <lib>
56 <include name="${project::get-base-directory()}/${build.dir}" /> 56 <include name="${project::get-base-directory()}" />
57 </lib> 57 <include name="${project::get-base-directory()}/${build.dir}" />
58 <include name="System.dll" /> 58 </lib>
59 <include name="System.Xml.dll" /> 59 <include name="System.dll" />
60 <include name="../bin/libsecondlife.dll" /> 60 <include name="System.Xml.dll" />
61 <include name="../bin/Axiom.MathLib.dll" /> 61 <include name="../bin/libsecondlife.dll" />
62 <include name="../bin/Db4objects.Db4o.dll" /> 62 <include name="../bin/Axiom.MathLib.dll" />
63 <include name="../bin/OpenSim.Terrain.BasicTerrain.dll" /> 63 <include name="../bin/Db4objects.Db4o.dll" />
64 <include name="../bin/OpenSim.Framework.dll" /> 64 <include name="../bin/OpenSim.Terrain.BasicTerrain.dll" />
65 <include name="../bin/OpenSim.Framework.Console.dll" /> 65 <include name="../bin/OpenSim.Framework.dll" />
66 <include name="../bin/OpenSim.GenericConfig.Xml.dll" /> 66 <include name="../bin/OpenSim.Framework.Console.dll" />
67 <include name="../bin/OpenSim.Physics.Manager.dll" /> 67 <include name="../bin/OpenSim.GenericConfig.Xml.dll" />
68 <include name="../bin/OpenSim.Servers.dll" /> 68 <include name="../bin/OpenSim.Physics.Manager.dll" />
69 <include name="../bin/XMLRPC.dll" /> 69 <include name="../bin/OpenSim.Servers.dll" />
70 </references> 70 <include name="../bin/XMLRPC.dll" />
71 </csc> 71 </references>
72 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> 72 </csc>
73 <mkdir dir="${project::get-base-directory()}/../bin/"/> 73 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
74 <copy todir="${project::get-base-directory()}/../bin/"> 74 <mkdir dir="${project::get-base-directory()}/../bin/"/>
75 <fileset basedir="${project::get-base-directory()}/${build.dir}/" > 75 <copy todir="${project::get-base-directory()}/../bin/">
76 <include name="*.dll"/> 76 <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
77 <include name="*.exe"/> 77 <include name="*.dll"/>
78 </fileset> 78 <include name="*.exe"/>
79 </copy> 79 </fileset>
80 </target> 80 </copy>
81 <target name="clean"> 81 </target>
82 <delete dir="${bin.dir}" failonerror="false" /> 82 <target name="clean">
83 <delete dir="${obj.dir}" failonerror="false" /> 83 <delete dir="${bin.dir}" failonerror="false" />
84 </target> 84 <delete dir="${obj.dir}" failonerror="false" />
85 <target name="doc" description="Creates documentation."> 85 </target>
86 </target> 86 <target name="doc" description="Creates documentation.">
87</project> 87 </target>
88</project>
diff --git a/OpenSim.RegionServer/world/World.cs b/OpenSim.RegionServer/world/World.cs
index 4dfe0e9..d7a57b8 100644
--- a/OpenSim.RegionServer/world/World.cs
+++ b/OpenSim.RegionServer/world/World.cs
@@ -671,7 +671,7 @@ namespace OpenSim.world
671 671
672 public void SetDefaultScripts() 672 public void SetDefaultScripts()
673 { 673 {
674 try 674 /*try
675 { 675 {
676 this.m_scripts.Add("FollowRandomAvatar", delegate() 676 this.m_scripts.Add("FollowRandomAvatar", delegate()
677 { 677 {
@@ -681,7 +681,7 @@ namespace OpenSim.world
681 catch (Exception e) 681 catch (Exception e)
682 { 682 {
683 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"World.cs: SetDefaultScripts() - Failed with exception " + e.ToString()); 683 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"World.cs: SetDefaultScripts() - Failed with exception " + e.ToString());
684 } 684 }*/
685 } 685 }
686 686
687 } 687 }
generated by cgit v1.1 at 2024-11-15 15:15:44 +0000