OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added -ode parameter 

Updated buildscripts (to fix ODE references)
Fixed up ODE plugin to the point of being able to login and get weird bugs (no real movement code yet)
tourmaline
gareth 2007-03-26 01:08:10 +00:00
parent cafdc8c8ae
commit abd45596a7
20 changed files with 981 additions and 975 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build
View File

@ -7,7 +7,7 @@
<fileset basedir="${project::get-base-directory()}"> <fileset basedir="${project::get-base-directory()}">
</fileset> </fileset>
</copy> </copy>
<csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe"> <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe">
<resources prefix="OpenGridServices.GridServer" dynamicprefix="true" > <resources prefix="OpenGridServices.GridServer" dynamicprefix="true" >
</resources> </resources>
<sources failonempty="true"> <sources failonempty="true">

2
OpenGridServices.ServerConsole/OpenGridServices.ServerConsole.dll.build
View File

@ -7,7 +7,7 @@
<fileset basedir="${project::get-base-directory()}"> <fileset basedir="${project::get-base-directory()}">
</fileset> </fileset>
</copy> </copy>
<csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
<resources prefix="OpenGridServices.ServerConsole" dynamicprefix="true" > <resources prefix="OpenGridServices.ServerConsole" dynamicprefix="true" >
</resources> </resources>
<sources failonempty="true"> <sources failonempty="true">

2
OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build
View File

@ -7,7 +7,7 @@
<fileset basedir="${project::get-base-directory()}"> <fileset basedir="${project::get-base-directory()}">
</fileset> </fileset>
</copy> </copy>
<csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe"> <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe">
<resources prefix="OpenGridServices.UserServer" dynamicprefix="true" > <resources prefix="OpenGridServices.UserServer" dynamicprefix="true" >
</resources> </resources>
<sources failonempty="true"> <sources failonempty="true">

2
OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build
View File

@ -7,7 +7,7 @@
<fileset basedir="${project::get-base-directory()}"> <fileset basedir="${project::get-base-directory()}">
</fileset> </fileset>
</copy> </copy>
<csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
<resources prefix="OpenSim.Config.SimConfigDb4o" dynamicprefix="true" > <resources prefix="OpenSim.Config.SimConfigDb4o" dynamicprefix="true" >
</resources> </resources>
<sources failonempty="true"> <sources failonempty="true">

2
OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build
View File

@ -7,7 +7,7 @@
<fileset basedir="${project::get-base-directory()}"> <fileset basedir="${project::get-base-directory()}">
</fileset> </fileset>
</copy> </copy>
<csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
<resources prefix="OpenSim.Framework.Console" dynamicprefix="true" > <resources prefix="OpenSim.Framework.Console" dynamicprefix="true" >
</resources> </resources>
<sources failonempty="true"> <sources failonempty="true">

2
OpenSim.Framework/OpenSim.Framework.dll.build
View File

@ -7,7 +7,7 @@
<fileset basedir="${project::get-base-directory()}"> <fileset basedir="${project::get-base-directory()}">
</fileset> </fileset>
</copy> </copy>
<csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
<resources prefix="OpenSim.Framework" dynamicprefix="true" > <resources prefix="OpenSim.Framework" dynamicprefix="true" >
</resources> </resources>
<sources failonempty="true"> <sources failonempty="true">

2
OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build
View File

@ -7,7 +7,7 @@
<fileset basedir="${project::get-base-directory()}"> <fileset basedir="${project::get-base-directory()}">
</fileset> </fileset>
</copy> </copy>
<csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
<resources prefix="OpenSim.GridInterfaces.Local" dynamicprefix="true" > <resources prefix="OpenSim.GridInterfaces.Local" dynamicprefix="true" >
</resources> </resources>
<sources failonempty="true"> <sources failonempty="true">

2
OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build
View File

@ -7,7 +7,7 @@
<fileset basedir="${project::get-base-directory()}"> <fileset basedir="${project::get-base-directory()}">
</fileset> </fileset>
</copy> </copy>
<csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
<resources prefix="OpenSim.GridInterfaces.Remote" dynamicprefix="true" > <resources prefix="OpenSim.GridInterfaces.Remote" dynamicprefix="true" >
</resources> </resources>
<sources failonempty="true"> <sources failonempty="true">

2
OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build
View File

@ -7,7 +7,7 @@
<fileset basedir="${project::get-base-directory()}"> <fileset basedir="${project::get-base-directory()}">
</fileset> </fileset>
</copy> </copy>
<csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
<resources prefix="OpenSim.Physics.BasicPhysicsPlugin" dynamicprefix="true" > <resources prefix="OpenSim.Physics.BasicPhysicsPlugin" dynamicprefix="true" >
</resources> </resources>
<sources failonempty="true"> <sources failonempty="true">

2
OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build
View File

@ -7,7 +7,7 @@
<fileset basedir="${project::get-base-directory()}"> <fileset basedir="${project::get-base-directory()}">
</fileset> </fileset>
</copy> </copy>
<csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
<resources prefix="OpenSim.Physics.Manager" dynamicprefix="true" > <resources prefix="OpenSim.Physics.Manager" dynamicprefix="true" >
</resources> </resources>
<sources failonempty="true"> <sources failonempty="true">

1
OpenSim.Physics/OdePlugin/OdePlugin.cs
View File

@ -85,6 +85,7 @@ namespace OpenSim.Physics.OdePlugin
d.WorldSetAutoDisableFlag(world, true); d.WorldSetAutoDisableFlag(world, true);
d.WorldSetContactMaxCorrectingVel(world, 0.1f); d.WorldSetContactMaxCorrectingVel(world, 0.1f);
d.WorldSetContactSurfaceLayer(world, 0.001f); d.WorldSetContactSurfaceLayer(world, 0.001f);
this._heightmap=new double[65536];
} }
public override PhysicsActor AddAvatar(PhysicsVector position) public override PhysicsActor AddAvatar(PhysicsVector position)

2
OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build
View File

@ -7,7 +7,7 @@
<fileset basedir="${project::get-base-directory()}"> <fileset basedir="${project::get-base-directory()}">
</fileset> </fileset>
</copy> </copy>
<csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
<resources prefix="OpenSim.Physics.OdePlugin" dynamicprefix="true" > <resources prefix="OpenSim.Physics.OdePlugin" dynamicprefix="true" >
</resources> </resources>
<sources failonempty="true"> <sources failonempty="true">

2
OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build
View File

@ -7,7 +7,7 @@
<fileset basedir="${project::get-base-directory()}"> <fileset basedir="${project::get-base-directory()}">
</fileset> </fileset>
</copy> </copy>
<csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
<resources prefix="OpenSim.Physics.PhysXPlugin" dynamicprefix="true" > <resources prefix="OpenSim.Physics.PhysXPlugin" dynamicprefix="true" >
</resources> </resources>
<sources failonempty="true"> <sources failonempty="true">

6
OpenSim.RegionServer/OpenSim.RegionServer.dll.build
View File

@ -7,7 +7,7 @@
<fileset basedir="${project::get-base-directory()}"> <fileset basedir="${project::get-base-directory()}">
</fileset> </fileset>
</copy> </copy>
<csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
<resources prefix="OpenSim.RegionServer" dynamicprefix="true" > <resources prefix="OpenSim.RegionServer" dynamicprefix="true" >
</resources> </resources>
<sources failonempty="true"> <sources failonempty="true">
@ -23,10 +23,10 @@
<include name="Assets/AssetCache.cs" /> <include name="Assets/AssetCache.cs" />
<include name="Assets/InventoryCache.cs" /> <include name="Assets/InventoryCache.cs" />
<include name="CAPS/SimHttp.cs" /> <include name="CAPS/SimHttp.cs" />
<include name="types/Mesh.cs" />
<include name="types/Triangle.cs" />
<include name="UserServer/LocalUserProfileManager.cs" /> <include name="UserServer/LocalUserProfileManager.cs" />
<include name="UserServer/LoginServer.cs" /> <include name="UserServer/LoginServer.cs" />
<include name="types/Mesh.cs" />
<include name="types/Triangle.cs" />
<include name="world/Avatar.cs" /> <include name="world/Avatar.cs" />
<include name="world/AvatarAnimations.cs" /> <include name="world/AvatarAnimations.cs" />
<include name="world/Entity.cs" /> <include name="world/Entity.cs" />

2
OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
View File

@ -7,7 +7,7 @@
<fileset basedir="${project::get-base-directory()}"> <fileset basedir="${project::get-base-directory()}">
</fileset> </fileset>
</copy> </copy>
<csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
<resources prefix="OpenSim.Storage.LocalStorageDb4o" dynamicprefix="true" > <resources prefix="OpenSim.Storage.LocalStorageDb4o" dynamicprefix="true" >
</resources> </resources>
<sources failonempty="true"> <sources failonempty="true">

102
OpenSim.build
View File

@ -6,12 +6,6 @@
<property name="obj.dir" value="obj" /> <property name="obj.dir" value="obj" />
<property name="doc.dir" value="doc" /> <property name="doc.dir" value="doc" />
<property name="project.main.dir" value="${project::get-base-directory()}" /> <property name="project.main.dir" value="${project::get-base-directory()}" />
<target name="Debug" description="">
<property name="project.config" value="Debug" />
<property name="build.debug" value="true" />
</target>
<property name="project.config" value="Release" /> <property name="project.config" value="Release" />
<target name="Release" description=""> <target name="Release" description="">
@ -19,6 +13,12 @@
<property name="build.debug" value="false" /> <property name="build.debug" value="false" />
</target> </target>
<target name="Debug" description="">
<property name="project.config" value="Debug" />
<property name="build.debug" value="true" />
</target>
<target name="net-1.1" description="Sets framework to .NET 1.1"> <target name="net-1.1" description="Sets framework to .NET 1.1">
<property name="nant.settings.currentframework" value="net-1.1" /> <property name="nant.settings.currentframework" value="net-1.1" />
</target> </target>
@ -46,39 +46,39 @@
<echo message="Deleting all builds from all configurations" /> <echo message="Deleting all builds from all configurations" />
<delete dir="${bin.dir}" failonerror="false" /> <delete dir="${bin.dir}" failonerror="false" />
<delete dir="${obj.dir}" failonerror="false" /> <delete dir="${obj.dir}" failonerror="false" />
<nant buildfile="OpenGridServices.ServerConsole/OpenGridServices.ServerConsole.dll.build" target="clean" /> <nant buildfile="../opensim/OpenSim.Framework/OpenSim.Framework.dll.build" target="clean" />
<nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="clean" /> <nant buildfile="../opensim/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="clean" />
<nant buildfile="OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build" target="clean" /> <nant buildfile="../opensim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="clean" />
<nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="clean" /> <nant buildfile="../opensim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="clean" />
<nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="clean" /> <nant buildfile="../opensim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="clean" />
<nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="clean" /> <nant buildfile="../opensim/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="clean" />
<nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="clean" /> <nant buildfile="../opensim/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build" target="clean" />
<nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="clean" /> <nant buildfile="../opensim/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="clean" />
<nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="clean" /> <nant buildfile="../opensim/OpenGridServices.ServerConsole/OpenGridServices.ServerConsole.dll.build" target="clean" />
<nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="clean" /> <nant buildfile="../opensim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="clean" />
<nant buildfile="OpenSim/OpenSim.exe.build" target="clean" /> <nant buildfile="../opensim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="clean" />
<nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="clean" /> <nant buildfile="../opensim/OpenSim/OpenSim.exe.build" target="clean" />
<nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="clean" /> <nant buildfile="../opensim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="clean" />
<nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="clean" /> <nant buildfile="../opensim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="clean" />
<nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="clean" /> <nant buildfile="../opensim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="clean" />
</target> </target>
<target name="build" depends="init" description=""> <target name="build" depends="init" description="">
<nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="build" /> <nant buildfile="../opensim/OpenSim.Framework/OpenSim.Framework.dll.build" target="build" />
<nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="build" /> <nant buildfile="../opensim/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="build" />
<nant buildfile="OpenGridServices.ServerConsole/OpenGridServices.ServerConsole.dll.build" target="build" /> <nant buildfile="../opensim/OpenGridServices.ServerConsole/OpenGridServices.ServerConsole.dll.build" target="build" />
<nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="build" /> <nant buildfile="../opensim/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="build" />
<nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="build" /> <nant buildfile="../opensim/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="build" />
<nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="build" /> <nant buildfile="../opensim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="build" />
<nant buildfile="OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build" target="build" /> <nant buildfile="../opensim/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build" target="build" />
<nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="build" /> <nant buildfile="../opensim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="build" />
<nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="build" /> <nant buildfile="../opensim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="build" />
<nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="build" /> <nant buildfile="../opensim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="build" />
<nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="build" /> <nant buildfile="../opensim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="build" />
<nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="build" /> <nant buildfile="../opensim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="build" />
<nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="build" /> <nant buildfile="../opensim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="build" />
<nant buildfile="OpenSim/OpenSim.exe.build" target="build" /> <nant buildfile="../opensim/OpenSim/OpenSim.exe.build" target="build" />
<nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="build" /> <nant buildfile="../opensim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="build" />
</target> </target>
<target name="build-release" depends="Release, init, build" description="Builds in Release mode" /> <target name="build-release" depends="Release, init, build" description="Builds in Release mode" />
@ -89,21 +89,21 @@
<target name="doc" depends="build-release"> <target name="doc" depends="build-release">
<echo message="Generating all documentation from all builds" /> <echo message="Generating all documentation from all builds" />
<nant buildfile="OpenGridServices.ServerConsole/OpenGridServices.ServerConsole.dll.build" target="doc" /> <nant buildfile="../opensim/OpenSim.Framework/OpenSim.Framework.dll.build" target="doc" />
<nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="doc" /> <nant buildfile="../opensim/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="doc" />
<nant buildfile="OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build" target="doc" /> <nant buildfile="../opensim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="doc" />
<nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="doc" /> <nant buildfile="../opensim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="doc" />
<nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="doc" /> <nant buildfile="../opensim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="doc" />
<nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="doc" /> <nant buildfile="../opensim/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="doc" />
<nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="doc" /> <nant buildfile="../opensim/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build" target="doc" />
<nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="doc" /> <nant buildfile="../opensim/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="doc" />
<nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="doc" /> <nant buildfile="../opensim/OpenGridServices.ServerConsole/OpenGridServices.ServerConsole.dll.build" target="doc" />
<nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="doc" /> <nant buildfile="../opensim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="doc" />
<nant buildfile="OpenSim/OpenSim.exe.build" target="doc" /> <nant buildfile="../opensim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="doc" />
<nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="doc" /> <nant buildfile="../opensim/OpenSim/OpenSim.exe.build" target="doc" />
<nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="doc" /> <nant buildfile="../opensim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="doc" />
<nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="doc" /> <nant buildfile="../opensim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="doc" />
<nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="doc" /> <nant buildfile="../opensim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="doc" />
</target> </target>
</project> </project>

2
OpenSim/OpenSim.exe.build
View File

@ -7,7 +7,7 @@
<fileset basedir="${project::get-base-directory()}"> <fileset basedir="${project::get-base-directory()}">
</fileset> </fileset>
</copy> </copy>
<csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe"> <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe">
<resources prefix="OpenSim" dynamicprefix="true" > <resources prefix="OpenSim" dynamicprefix="true" >
</resources> </resources>
<sources failonempty="true"> <sources failonempty="true">

5
OpenSim/RegionServer.cs
View File

@ -39,6 +39,11 @@ namespace OpenSim
sim._physicsEngine = "RealPhysX"; sim._physicsEngine = "RealPhysX";
OpenSim.world.Avatar.PhysicsEngineFlying = true; OpenSim.world.Avatar.PhysicsEngineFlying = true;
} }
if (args[i] == "-ode")
{
sim._physicsEngine = "OpenDynamicsEngine";
OpenSim.world.Avatar.PhysicsEngineFlying = true;
}
} }

18
Prebuild/Prebuild.build
View File

@ -6,12 +6,6 @@
<property name="obj.dir" value="obj" /> <property name="obj.dir" value="obj" />
<property name="doc.dir" value="doc" /> <property name="doc.dir" value="doc" />
<property name="project.main.dir" value="${project::get-base-directory()}" /> <property name="project.main.dir" value="${project::get-base-directory()}" />
<target name="Debug" description="">
<property name="project.config" value="Debug" />
<property name="build.debug" value="true" />
</target>
<property name="project.config" value="Release" /> <property name="project.config" value="Release" />
<target name="Release" description=""> <target name="Release" description="">
@ -19,6 +13,12 @@
<property name="build.debug" value="false" /> <property name="build.debug" value="false" />
</target> </target>
<target name="Debug" description="">
<property name="project.config" value="Debug" />
<property name="build.debug" value="true" />
</target>
<target name="net-1.1" description="Sets framework to .NET 1.1"> <target name="net-1.1" description="Sets framework to .NET 1.1">
<property name="nant.settings.currentframework" value="net-1.1" /> <property name="nant.settings.currentframework" value="net-1.1" />
</target> </target>
@ -46,11 +46,11 @@
<echo message="Deleting all builds from all configurations" /> <echo message="Deleting all builds from all configurations" />
<delete dir="${bin.dir}" failonerror="false" /> <delete dir="${bin.dir}" failonerror="false" />
<delete dir="${obj.dir}" failonerror="false" /> <delete dir="${obj.dir}" failonerror="false" />
<nant buildfile="src/Prebuild.exe.build" target="clean" /> <nant buildfile="../Prebuild/src/Prebuild.exe.build" target="clean" />
</target> </target>
<target name="build" depends="init" description=""> <target name="build" depends="init" description="">
<nant buildfile="src/Prebuild.exe.build" target="build" /> <nant buildfile="../Prebuild/src/Prebuild.exe.build" target="build" />
</target> </target>
<target name="build-release" depends="Release, init, build" description="Builds in Release mode" /> <target name="build-release" depends="Release, init, build" description="Builds in Release mode" />
@ -61,7 +61,7 @@
<target name="doc" depends="build-release"> <target name="doc" depends="build-release">
<echo message="Generating all documentation from all builds" /> <echo message="Generating all documentation from all builds" />
<nant buildfile="src/Prebuild.exe.build" target="doc" /> <nant buildfile="../Prebuild/src/Prebuild.exe.build" target="doc" />
</target> </target>
</project> </project>

2
Prebuild/src/Prebuild.exe.build
View File

@ -7,7 +7,7 @@
<fileset basedir="${project::get-base-directory()}"> <fileset basedir="${project::get-base-directory()}">
</fileset> </fileset>
</copy> </copy>
<csc target="exe" debug="${build.debug}" keyfile="Prebuild.snk" unsafe="False" define="DEBUG;TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe" win32icon="App.ico"> <csc target="exe" debug="${build.debug}" keyfile="Prebuild.snk" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe" win32icon="App.ico">
<resources prefix="Prebuild" dynamicprefix="true" > <resources prefix="Prebuild" dynamicprefix="true" >
<include name="App.ico" /> <include name="App.ico" />
<include name="data/prebuild-1.7.xsd" /> <include name="data/prebuild-1.7.xsd" />