ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-08 02:05:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
This commit is contained in:
Melanie
2012-05-19 13:34:44 +01:00
parent b4cd8b491b 3f2a727b6d
commit ebd9d2618b
15 changed files with 385 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
View File

@@ -1261,14 +1261,20 @@ namespace OpenSim.Region.Physics.OdePlugin
{
m_requestedUpdateFrequency = ms;
m_eventsubscription = ms;
CollisionEventsThisFrame.Clear();
// Don't clear collision event reporting here. This is called directly from scene code and so can lead
// to a race condition with the simulate loop
_parent_scene.AddCollisionEventReporting(this);
}
public override void UnSubscribeEvents()
{
CollisionEventsThisFrame.Clear();
_parent_scene.RemoveCollisionEventReporting(this);
// Don't clear collision event reporting here. This is called directly from scene code and so can lead
// to a race condition with the simulate loop
m_requestedUpdateFrequency = 0;
m_eventsubscription = 0;
}