diff options
| author | Justin Clark-Casey (justincc) | 2011-11-21 19:48:31 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2011-11-21 19:48:31 +0000 |
| commit | 225b925f4ec6a0b7dfec27589d0aea40ce0a8e54 (patch) | |
| tree | 773c691bfeb6fdf34ef4f73b03e78ffaf8b88f5d /OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | |
| parent | Reduce complexity of OdeScene.Simulate() by fully removing bad characters at ... (diff) | |
| download | opensim-SC_OLD-225b925f4ec6a0b7dfec27589d0aea40ce0a8e54.zip opensim-SC_OLD-225b925f4ec6a0b7dfec27589d0aea40ce0a8e54.tar.gz opensim-SC_OLD-225b925f4ec6a0b7dfec27589d0aea40ce0a8e54.tar.bz2 opensim-SC_OLD-225b925f4ec6a0b7dfec27589d0aea40ce0a8e54.tar.xz | |
Comment out calls to OdeScene.waitForSpaceUnlock() since that method does nothing right now
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin/ODECharacter.cs')
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs index c838587..af67407 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | |||
| @@ -557,7 +557,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 557 | //CAPSULE_LENGTH = -5; | 557 | //CAPSULE_LENGTH = -5; |
| 558 | //CAPSULE_RADIUS = -5; | 558 | //CAPSULE_RADIUS = -5; |
| 559 | int dAMotorEuler = 1; | 559 | int dAMotorEuler = 1; |
| 560 | _parent_scene.waitForSpaceUnlock(_parent_scene.space); | 560 | // _parent_scene.waitForSpaceUnlock(_parent_scene.space); |
| 561 | if (CAPSULE_LENGTH <= 0) | 561 | if (CAPSULE_LENGTH <= 0) |
| 562 | { | 562 | { |
| 563 | m_log.Warn("[ODE CHARACTER]: The capsule size you specified in opensim.ini is invalid! Setting it to the smallest possible size!"); | 563 | m_log.Warn("[ODE CHARACTER]: The capsule size you specified in opensim.ini is invalid! Setting it to the smallest possible size!"); |
| @@ -1155,7 +1155,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 1155 | } | 1155 | } |
| 1156 | 1156 | ||
| 1157 | //kill the Geometry | 1157 | //kill the Geometry |
| 1158 | _parent_scene.waitForSpaceUnlock(_parent_scene.space); | 1158 | // _parent_scene.waitForSpaceUnlock(_parent_scene.space); |
| 1159 | 1159 | ||
| 1160 | if (Body != IntPtr.Zero) | 1160 | if (Body != IntPtr.Zero) |
| 1161 | { | 1161 | { |