diff options
author | Teravus Ovares | 2007-12-26 17:16:47 +0000 |
---|---|---|
committer | Teravus Ovares | 2007-12-26 17:16:47 +0000 |
commit | f852b6455550569d002d0b1c527249f3f7894326 (patch) | |
tree | 95abccc4ae8529dc8c1b2aa283ac44e952f7dda7 /OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |
parent | * Patch by Melanie to fix CreateSelected (diff) | |
download | opensim-SC_OLD-f852b6455550569d002d0b1c527249f3f7894326.zip opensim-SC_OLD-f852b6455550569d002d0b1c527249f3f7894326.tar.gz opensim-SC_OLD-f852b6455550569d002d0b1c527249f3f7894326.tar.bz2 opensim-SC_OLD-f852b6455550569d002d0b1c527249f3f7894326.tar.xz |
* This update includes a wide range of changes to the ODEPlugin for avatar movement, including:
** - avatar can navigate stairs better now
** - avatar can land without shooting into the air
** - excessive collisions with the ground are tempered somewhat and should only shoot the avatar up 20m instead of 200m
** - Try Catched a TextureDownloadModule.cs array out of bounds error with a report that causes it not to crash the sim, however it reports a few important items for tracking it down.
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin/ODEPrim.cs')
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs index 32a9fc7..35328b8 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |||
@@ -375,14 +375,6 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
375 | { | 375 | { |
376 | string primScenAvatarIn = _parent_scene.whichspaceamIin(_position); | 376 | string primScenAvatarIn = _parent_scene.whichspaceamIin(_position); |
377 | int[] arrayitem = _parent_scene.calculateSpaceArrayItemFromPos(_position); | 377 | int[] arrayitem = _parent_scene.calculateSpaceArrayItemFromPos(_position); |
378 | if (primScenAvatarIn == "0") | ||
379 | { | ||
380 | MainLog.Instance.Verbose("Physics", "Prim " + m_primName + " in space with no prim: " + primScenAvatarIn + ". Expected to be at: " + m_targetSpace.ToString() + " . Arr:': " + arrayitem[0].ToString() + "," + arrayitem[1].ToString()); | ||
381 | } | ||
382 | else | ||
383 | { | ||
384 | MainLog.Instance.Verbose("Physics", "Prim " + m_primName + " in Prim space with prim: " + primScenAvatarIn + ". Expected to be at: " + m_targetSpace.ToString() + ". Arr:" + arrayitem[0].ToString() + "," + arrayitem[1].ToString()); | ||
385 | } | ||
386 | m_targetSpace = _parent_scene.recalculateSpaceForGeom(prim_geom, _position, m_targetSpace); | 378 | m_targetSpace = _parent_scene.recalculateSpaceForGeom(prim_geom, _position, m_targetSpace); |
387 | d.GeomSetPosition(prim_geom, _position.X, _position.Y, _position.Z); | 379 | d.GeomSetPosition(prim_geom, _position.X, _position.Y, _position.Z); |
388 | d.SpaceAdd(m_targetSpace, prim_geom); | 380 | d.SpaceAdd(m_targetSpace, prim_geom); |