diff options
| author | Justin Clarke Casey | 2008-09-06 00:44:50 +0000 |
|---|---|---|
| committer | Justin Clarke Casey | 2008-09-06 00:44:50 +0000 |
| commit | 01878b886cdf2133a1bea37f683a427301f89f44 (patch) | |
| tree | cde0c7b516a85ff8f02eba64980e985359f6017a /OpenSim/Region/Environment/Scenes/InnerScene.cs | |
| parent | * Blind fix what looks like a bug in the new land MSSQL code (diff) | |
| download | opensim-SC-01878b886cdf2133a1bea37f683a427301f89f44.zip opensim-SC-01878b886cdf2133a1bea37f683a427301f89f44.tar.gz opensim-SC-01878b886cdf2133a1bea37f683a427301f89f44.tar.bz2 opensim-SC-01878b886cdf2133a1bea37f683a427301f89f44.tar.xz | |
* Fix mantis 2130 - nre occuring sometimes when the regular prim update sweep occurs
* Fold m_deleted and m_isDeleted together (ugh!)
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/InnerScene.cs')
| -rw-r--r-- | OpenSim/Region/Environment/Scenes/InnerScene.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs index 3fa1825d..6b002fc 100644 --- a/OpenSim/Region/Environment/Scenes/InnerScene.cs +++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs | |||
| @@ -142,7 +142,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
| 142 | 142 | ||
| 143 | foreach (EntityBase entity in updateEntities) | 143 | foreach (EntityBase entity in updateEntities) |
| 144 | { | 144 | { |
| 145 | entity.Update(); | 145 | if (!entity.IsDeleted) |
| 146 | entity.Update(); | ||
| 146 | } | 147 | } |
| 147 | } | 148 | } |
| 148 | 149 | ||