diff options
| author | Justin Clarke Casey | 2008-09-06 01:10:47 +0000 |
|---|---|---|
| committer | Justin Clarke Casey | 2008-09-06 01:10:47 +0000 |
| commit | 03581c17e61dc7be91a364f40e5f2bcd0abb2fc7 (patch) | |
| tree | adc1db11218ae924efc0d8c6ac500b8aefc2dabe /OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | |
| parent | reformatted some of unit test standards to allow them to work when OpenSim is... (diff) | |
| download | opensim-SC_OLD-03581c17e61dc7be91a364f40e5f2bcd0abb2fc7.zip opensim-SC_OLD-03581c17e61dc7be91a364f40e5f2bcd0abb2fc7.tar.gz opensim-SC_OLD-03581c17e61dc7be91a364f40e5f2bcd0abb2fc7.tar.bz2 opensim-SC_OLD-03581c17e61dc7be91a364f40e5f2bcd0abb2fc7.tar.xz | |
* refactor: Make SOG itself responsible for checking whether it's already been deleted on an update request from the regular sweep
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs')
| -rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index 52b9bc1..b04e882 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | |||
| @@ -1478,6 +1478,13 @@ namespace OpenSim.Region.Environment.Scenes | |||
| 1478 | /// </summary> | 1478 | /// </summary> |
| 1479 | public override void Update() | 1479 | public override void Update() |
| 1480 | { | 1480 | { |
| 1481 | // Check that the group was not deleted before the scheduled update | ||
| 1482 | // FIXME: This is merely a temporary measure to reduce the incidence of failure when | ||
| 1483 | // an object has been deleted from a scene before update was processed. | ||
| 1484 | // A more fundamental overhaul of the update mechanism is required to eliminate all | ||
| 1485 | // the race conditions. | ||
| 1486 | if (m_isDeleted) | ||
| 1487 | return; | ||
| 1481 | 1488 | ||
| 1482 | lock (m_parts) | 1489 | lock (m_parts) |
| 1483 | { | 1490 | { |