aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
diff options
context:
space:
mode:
authorTeravus Ovares2009-01-31 16:49:32 +0000
committerTeravus Ovares2009-01-31 16:49:32 +0000
commit85c0c0557e317b252bcbdf98439a9ec33db17d0c (patch)
tree25ac91fd11315e88b914c7f5a6fab5751a49075d /OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
parentOops. Forgot a try-catch on the last commit. (diff)
downloadopensim-SC_OLD-85c0c0557e317b252bcbdf98439a9ec33db17d0c.zip
opensim-SC_OLD-85c0c0557e317b252bcbdf98439a9ec33db17d0c.tar.gz
opensim-SC_OLD-85c0c0557e317b252bcbdf98439a9ec33db17d0c.tar.bz2
opensim-SC_OLD-85c0c0557e317b252bcbdf98439a9ec33db17d0c.tar.xz
* Tweaks some locks when modifying an ODECharacter. This actually allows a user to log-in while the physics scene and the scripts are starting up. This also seems to smooth out the jerks on teleport/connect/disconnect a little bit.
* If you log-in while the simulator is starting up, you won't be able to move and the sim stats will say 0 FPS, and 0 Physics Frames and you may see only terrain. Once the sim finishes starting up, it'll all resume as normal.
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin/OdePlugin.cs')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdePlugin.cs3
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index e45bcda..3adabcf 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -1174,6 +1174,9 @@ namespace OpenSim.Region.Physics.OdePlugin
1174 if (chr == null) 1174 if (chr == null)
1175 continue; 1175 continue;
1176 1176
1177 if (chr.Shell == IntPtr.Zero || chr.Body == IntPtr.Zero)
1178 continue;
1179
1177 chr.IsColliding = false; 1180 chr.IsColliding = false;
1178 chr.CollidingGround = false; 1181 chr.CollidingGround = false;
1179 chr.CollidingObj = false; 1182 chr.CollidingObj = false;