diff options
author | Justin Clark-Casey (justincc) | 2012-02-22 00:55:16 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-02-22 00:55:16 +0000 |
commit | 5d312671855bf5fda2ae5960fdcd19f1d9f1d1cb (patch) | |
tree | 2d15e5b8689219f4e49a7fb762db9a234855066a | |
parent | Restore the taskItem null check that I accidentally blatted in 5397a6d (diff) | |
download | opensim-SC_OLD-5d312671855bf5fda2ae5960fdcd19f1d9f1d1cb.zip opensim-SC_OLD-5d312671855bf5fda2ae5960fdcd19f1d9f1d1cb.tar.gz opensim-SC_OLD-5d312671855bf5fda2ae5960fdcd19f1d9f1d1cb.tar.bz2 opensim-SC_OLD-5d312671855bf5fda2ae5960fdcd19f1d9f1d1cb.tar.xz |
Remove two spurious m_sceneGraph != null checks in Scene.cs. It's set in constructor and never subsequent set to null.
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index e7f835c..ec32701 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -4257,10 +4257,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
4257 | /// <param name="action"></param> | 4257 | /// <param name="action"></param> |
4258 | public void ForEachRootScenePresence(Action<ScenePresence> action) | 4258 | public void ForEachRootScenePresence(Action<ScenePresence> action) |
4259 | { | 4259 | { |
4260 | if (m_sceneGraph != null) | 4260 | m_sceneGraph.ForEachAvatar(action); |
4261 | { | ||
4262 | m_sceneGraph.ForEachAvatar(action); | ||
4263 | } | ||
4264 | } | 4261 | } |
4265 | 4262 | ||
4266 | /// <summary> | 4263 | /// <summary> |
@@ -4269,10 +4266,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
4269 | /// <param name="action"></param> | 4266 | /// <param name="action"></param> |
4270 | public void ForEachScenePresence(Action<ScenePresence> action) | 4267 | public void ForEachScenePresence(Action<ScenePresence> action) |
4271 | { | 4268 | { |
4272 | if (m_sceneGraph != null) | 4269 | m_sceneGraph.ForEachScenePresence(action); |
4273 | { | ||
4274 | m_sceneGraph.ForEachScenePresence(action); | ||
4275 | } | ||
4276 | } | 4270 | } |
4277 | 4271 | ||
4278 | /// <summary> | 4272 | /// <summary> |