diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rwxr-xr-x | OpenSim/Region/Framework/Scenes/Scene.cs | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index ec74297..058b6f6 100755 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -418,17 +418,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
418 | private float terrainMS; | 418 | private float terrainMS; |
419 | private float landMS; | 419 | private float landMS; |
420 | 420 | ||
421 | // A temporary configuration flag to enable using FireAndForget to process | ||
422 | // collisions from the physics engine. There is a problem with collisions | ||
423 | // stopping sometimes and MB's suspicion is some race condition passing | ||
424 | // collisions from the physics engine callback to the script engine. | ||
425 | // This causes the collision events to be passed with a FireAndForget | ||
426 | // call which should eliminate that linkage. Testers can turn this on | ||
427 | // and see if collisions stop. If they don't, the problem is somewhere else. | ||
428 | // This feature defaults to 'off' so, by default, the simulator operation | ||
429 | // is not changed. | ||
430 | public bool ShouldUseFireAndForgetForCollisions = false; | ||
431 | |||
432 | /// <summary> | 421 | /// <summary> |
433 | /// Tick at which the last frame was processed. | 422 | /// Tick at which the last frame was processed. |
434 | /// </summary> | 423 | /// </summary> |
@@ -1147,10 +1136,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
1147 | m_update_terrain = startupConfig.GetInt("UpdateTerrainEveryNFrames", m_update_terrain); | 1136 | m_update_terrain = startupConfig.GetInt("UpdateTerrainEveryNFrames", m_update_terrain); |
1148 | m_update_temp_cleaning = startupConfig.GetInt("UpdateTempCleaningEveryNSeconds", m_update_temp_cleaning); | 1137 | m_update_temp_cleaning = startupConfig.GetInt("UpdateTempCleaningEveryNSeconds", m_update_temp_cleaning); |
1149 | 1138 | ||
1150 | if (startupConfig.Contains("ShouldUseFireAndForgetForCollisions")) | ||
1151 | { | ||
1152 | ShouldUseFireAndForgetForCollisions = startupConfig.GetBoolean("ShouldUseFireAndForgetForCollisions", false); | ||
1153 | } | ||
1154 | } | 1139 | } |
1155 | 1140 | ||
1156 | 1141 | ||