diff options
author | Melanie Thielker | 2008-09-18 18:50:39 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-09-18 18:50:39 +0000 |
commit | 903fbd1f06b990141a90b539a2dbe77ab6be830e (patch) | |
tree | 9e33425216bd3a5631cf561d279ba503565c1e05 /OpenSim/Region/Physics | |
parent | * Updates the SQLite region database to support the same properties that the ... (diff) | |
download | opensim-SC_OLD-903fbd1f06b990141a90b539a2dbe77ab6be830e.zip opensim-SC_OLD-903fbd1f06b990141a90b539a2dbe77ab6be830e.tar.gz opensim-SC_OLD-903fbd1f06b990141a90b539a2dbe77ab6be830e.tar.bz2 opensim-SC_OLD-903fbd1f06b990141a90b539a2dbe77ab6be830e.tar.xz |
XEngine: fix collisions, add event coalescing for collision events.
Fix a nasty concurrency issue that could cause a high event frequency
to start more than one thread pool job for a single script.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs index 21e514b..79c4041 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |||
@@ -2294,14 +2294,12 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
2294 | if (CollisionEventsThisFrame == null) | 2294 | if (CollisionEventsThisFrame == null) |
2295 | return; | 2295 | return; |
2296 | 2296 | ||
2297 | //if (CollisionEventsThisFrame.m_objCollisionList == null) | 2297 | base.SendCollisionUpdate(CollisionEventsThisFrame); |
2298 | // return; | ||
2299 | 2298 | ||
2300 | if (CollisionEventsThisFrame.m_objCollisionList.Count > 0) | 2299 | if(CollisionEventsThisFrame.m_objCollisionList.Count == 0) |
2301 | { | 2300 | CollisionEventsThisFrame = null; |
2302 | base.SendCollisionUpdate(CollisionEventsThisFrame); | 2301 | else |
2303 | CollisionEventsThisFrame = new CollisionEventUpdate(); | 2302 | CollisionEventsThisFrame = new CollisionEventUpdate(); |
2304 | } | ||
2305 | } | 2303 | } |
2306 | 2304 | ||
2307 | public override bool SubscribedEvents() | 2305 | public override bool SubscribedEvents() |