From abd45596a7c5bf8533de7492fd97e536f9c04e91 Mon Sep 17 00:00:00 2001
From: gareth
Date: Mon, 26 Mar 2007 01:08:10 +0000
Subject: 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)

---
 OpenSim/OpenSim.exe.build | 94 +++++++++++++++++++++++------------------------
 OpenSim/RegionServer.cs   |  7 +++-
 2 files changed, 53 insertions(+), 48 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/OpenSim.exe.build b/OpenSim/OpenSim.exe.build
index 7d69d90..fc516df 100644
--- a/OpenSim/OpenSim.exe.build
+++ b/OpenSim/OpenSim.exe.build
@@ -1,47 +1,47 @@
-<?xml version="1.0" ?>
-<project name="OpenSim" default="build">
-    <target name="build">
-        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
-        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
-        <copy todir="${project::get-base-directory()}/${build.dir}">
-            <fileset basedir="${project::get-base-directory()}">
-            </fileset>
-        </copy>
-        <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe">
-            <resources prefix="OpenSim" dynamicprefix="true" >
-            </resources>
-            <sources failonempty="true">
-                <include name="RegionServer.cs" />
-            </sources>
-            <references basedir="${project::get-base-directory()}">
-                <lib>
-                    <include name="${project::get-base-directory()}" />
-                    <include name="${project::get-base-directory()}/${build.dir}" />
-                </lib>
-                <include name="System.dll" />
-                <include name="System.Xml.dll" />
-                <include name="../bin/libsecondlife.dll" />
-                <include name="../bin/Axiom.MathLib.dll" />
-                <include name="../bin/Db4objects.Db4o.dll" />
-                <include name="../OpenSim.Framework/${build.dir}/OpenSim.Framework.dll" />
-                <include name="../OpenSim.Framework.Console/${build.dir}/OpenSim.Framework.Console.dll" />
-                <include name="../OpenSim.Physics/Manager/${build.dir}/OpenSim.Physics.Manager.dll" />
-                <include name="../OpenSim.RegionServer/${build.dir}/OpenSim.RegionServer.dll" />
-            </references>
-        </csc>
-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
-        <mkdir dir="${project::get-base-directory()}/../bin/"/>
-        <copy todir="${project::get-base-directory()}/../bin/">
-            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
-                <include name="*.dll"/>
-                <include name="*.exe"/>
-            </fileset>
-        </copy>
-    </target>
-    <target name="clean">
-        <delete dir="${bin.dir}" failonerror="false" />
-        <delete dir="${obj.dir}" failonerror="false" />
-    </target>
-    <target name="doc" description="Creates documentation.">
-    </target>
-</project>
+<?xml version="1.0" ?>
+<project name="OpenSim" default="build">
+    <target name="build">
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <copy todir="${project::get-base-directory()}/${build.dir}">
+            <fileset basedir="${project::get-base-directory()}">
+            </fileset>
+        </copy>
+        <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>
+            <sources failonempty="true">
+                <include name="RegionServer.cs" />
+            </sources>
+            <references basedir="${project::get-base-directory()}">
+                <lib>
+                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
+                </lib>
+                <include name="System.dll" />
+                <include name="System.Xml.dll" />
+                <include name="../bin/libsecondlife.dll" />
+                <include name="../bin/Axiom.MathLib.dll" />
+                <include name="../bin/Db4objects.Db4o.dll" />
+                <include name="../OpenSim.Framework/${build.dir}/OpenSim.Framework.dll" />
+                <include name="../OpenSim.Framework.Console/${build.dir}/OpenSim.Framework.Console.dll" />
+                <include name="../OpenSim.Physics/Manager/${build.dir}/OpenSim.Physics.Manager.dll" />
+                <include name="../OpenSim.RegionServer/${build.dir}/OpenSim.RegionServer.dll" />
+            </references>
+        </csc>
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
+        <mkdir dir="${project::get-base-directory()}/../bin/"/>
+        <copy todir="${project::get-base-directory()}/../bin/">
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+                <include name="*.dll"/>
+                <include name="*.exe"/>
+            </fileset>
+        </copy>
+    </target>
+    <target name="clean">
+        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
+    </target>
+    <target name="doc" description="Creates documentation.">
+    </target>
+</project>
diff --git a/OpenSim/RegionServer.cs b/OpenSim/RegionServer.cs
index 6fabe3f..725a7cf 100644
--- a/OpenSim/RegionServer.cs
+++ b/OpenSim/RegionServer.cs
@@ -39,7 +39,12 @@ namespace OpenSim
                     sim._physicsEngine = "RealPhysX";
                     OpenSim.world.Avatar.PhysicsEngineFlying = true;
                 }
-            }
+                if (args[i] == "-ode")
+		{
+		    sim._physicsEngine = "OpenDynamicsEngine";
+		    OpenSim.world.Avatar.PhysicsEngineFlying = true;
+		}
+	    }
 
 
             OpenSimRoot.Instance.GridServers = new Grid();
-- 
cgit v1.1