diff options
| author | Justin Clark-Casey (justincc) | 2012-06-29 00:36:50 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-06-29 00:36:50 +0100 |
| commit | 1a7be7b00eaef0140f2dc13f3e14d8150c393b08 (patch) | |
| tree | 6b7d5c22f254acf23eec2757d403011a43e5431a /OpenSim/Region | |
| parent | If a link points to a non-existing item in FetchInventory caps, then don't tr... (diff) | |
| download | opensim-SC-1a7be7b00eaef0140f2dc13f3e14d8150c393b08.zip opensim-SC-1a7be7b00eaef0140f2dc13f3e14d8150c393b08.tar.gz opensim-SC-1a7be7b00eaef0140f2dc13f3e14d8150c393b08.tar.bz2 opensim-SC-1a7be7b00eaef0140f2dc13f3e14d8150c393b08.tar.xz | |
Fix a regression where we stopped removing avatars from collision event reporting on logout, rather than stopping clearing their collision events.
This occurred in b18c8c8 (Thu May 17 2012).
This was a cause of very occasional race conditions and likely memory leakage as clients came and went from the region.
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs index 54b69a2..f3b0630 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | |||
| @@ -1270,7 +1270,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 1270 | 1270 | ||
| 1271 | public override void UnSubscribeEvents() | 1271 | public override void UnSubscribeEvents() |
| 1272 | { | 1272 | { |
| 1273 | CollisionEventsThisFrame.Clear(); | 1273 | _parent_scene.RemoveCollisionEventReporting(this); |
| 1274 | 1274 | ||
| 1275 | // Don't clear collision event reporting here. This is called directly from scene code and so can lead | 1275 | // Don't clear collision event reporting here. This is called directly from scene code and so can lead |
| 1276 | // to a race condition with the simulate loop | 1276 | // to a race condition with the simulate loop |