aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authordan miller2007-09-01 21:30:51 +0000
committerdan miller2007-09-01 21:30:51 +0000
commit825a2208c6225651c91d18152ddccf0b2c441f9c (patch)
tree8e516c443a6d0aa7bcb2a6282157088d84454f7c
parentonce more, without the debug statements (ODE multi-region fixes, various debu... (diff)
downloadopensim-SC_OLD-825a2208c6225651c91d18152ddccf0b2c441f9c.zip
opensim-SC_OLD-825a2208c6225651c91d18152ddccf0b2c441f9c.tar.gz
opensim-SC_OLD-825a2208c6225651c91d18152ddccf0b2c441f9c.tar.bz2
opensim-SC_OLD-825a2208c6225651c91d18152ddccf0b2c441f9c.tar.xz
ODE bugfix: multiple avatars now supported properly
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdePlugin.cs2
-rw-r--r--bin/OpenSim.ini2
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index 18e78d7..5900c78 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -131,7 +131,7 @@ namespace OpenSim.Region.Physics.OdePlugin
131 { 131 {
132 foreach (OdeCharacter chr in _characters) 132 foreach (OdeCharacter chr in _characters)
133 { 133 {
134 d.SpaceCollide2(space, _characters[_characters.Count - 1].capsule_geom, IntPtr.Zero, nearCallback); 134 d.SpaceCollide2(space, chr.capsule_geom, IntPtr.Zero, nearCallback);
135 } 135 }
136 } 136 }
137 137
diff --git a/bin/OpenSim.ini b/bin/OpenSim.ini
index f65523c..725f508 100644
--- a/bin/OpenSim.ini
+++ b/bin/OpenSim.ini
@@ -1,6 +1,6 @@
1[Startup] 1[Startup]
2gridmode = false 2gridmode = false
3physics = basicphysics 3physics = OpenDynamicsEngine
4; Prim Storage 4; Prim Storage
5; if you would like to use sqlite uncomment the following line (and 5; if you would like to use sqlite uncomment the following line (and
6; comment the NullStorage line) 6; comment the NullStorage line)