aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authordan miller2007-09-09 13:24:18 +0000
committerdan miller2007-09-09 13:24:18 +0000
commit588ab9f09095710a1e7928f940cd381f8c9ef848 (patch)
treed940161d19e00ac9af73aa6602407ef67c6c07c9
parentA small try/catch wrapper to prevent the CLI errors from nuking the sim. (diff)
downloadopensim-SC-588ab9f09095710a1e7928f940cd381f8c9ef848.zip
opensim-SC-588ab9f09095710a1e7928f940cd381f8c9ef848.tar.gz
opensim-SC-588ab9f09095710a1e7928f940cd381f8c9ef848.tar.bz2
opensim-SC-588ab9f09095710a1e7928f940cd381f8c9ef848.tar.xz
ODE fix: avatar/avatar collision enabled. Needs client update fix to be seen correctly. In the right repository this time..
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdePlugin.cs4
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index 5900c78..3397384 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -132,6 +132,10 @@ namespace OpenSim.Region.Physics.OdePlugin
132 foreach (OdeCharacter chr in _characters) 132 foreach (OdeCharacter chr in _characters)
133 { 133 {
134 d.SpaceCollide2(space, chr.capsule_geom, IntPtr.Zero, nearCallback); 134 d.SpaceCollide2(space, chr.capsule_geom, IntPtr.Zero, nearCallback);
135 foreach (OdeCharacter ch2 in _characters) /// should be a separate space -- lots of avatars will be N**2 slow
136 {
137 d.SpaceCollide2(chr.capsule_geom, ch2.capsule_geom, IntPtr.Zero, nearCallback);
138 }
135 } 139 }
136 } 140 }
137 141