diff options
author | Justin Clarke Casey | 2008-09-06 00:55:16 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-09-06 00:55:16 +0000 |
commit | 4d86a324f8673484a12e079618ee740aae6965e3 (patch) | |
tree | e556dca12abbff5f1e0b0259e18689847828763a /OpenSim/Region | |
parent | * Fix mantis 2130 - nre occuring sometimes when the regular prim update sweep... (diff) | |
download | opensim-SC-4d86a324f8673484a12e079618ee740aae6965e3.zip opensim-SC-4d86a324f8673484a12e079618ee740aae6965e3.tar.gz opensim-SC-4d86a324f8673484a12e079618ee740aae6965e3.tar.bz2 opensim-SC-4d86a324f8673484a12e079618ee740aae6965e3.tar.xz |
* minor: change hard tabs back to spaces in previous commit
* my excuse is that I hadn't used this monodevelop exe before...
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/InnerScene.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs index 6b002fc..51ee4d0 100644 --- a/OpenSim/Region/Environment/Scenes/InnerScene.cs +++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs | |||
@@ -143,7 +143,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
143 | foreach (EntityBase entity in updateEntities) | 143 | foreach (EntityBase entity in updateEntities) |
144 | { | 144 | { |
145 | if (!entity.IsDeleted) | 145 | if (!entity.IsDeleted) |
146 | entity.Update(); | 146 | entity.Update(); |
147 | } | 147 | } |
148 | } | 148 | } |
149 | 149 | ||
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index 7aa65c1..52b9bc1 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | |||
@@ -960,8 +960,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
960 | 960 | ||
961 | public void FakeDeleteGroup() | 961 | public void FakeDeleteGroup() |
962 | { | 962 | { |
963 | // If there are any updates queued for this object when the 'fake' delete happens, then make sure | 963 | // If there are any updates queued for this object when the 'fake' delete happens, then make sure |
964 | // that they don't happen, otherwise the deleted objects will reappear | 964 | // that they don't happen, otherwise the deleted objects will reappear |
965 | m_isDeleted = true; | 965 | m_isDeleted = true; |
966 | 966 | ||
967 | foreach (SceneObjectPart part in m_parts.Values) | 967 | foreach (SceneObjectPart part in m_parts.Values) |