diff options
| author | Melanie | 2012-02-23 01:42:08 +0000 |
|---|---|---|
| committer | Melanie | 2012-02-23 01:42:08 +0000 |
| commit | 9ed4245d9edde3c93e592a00fdc9330e82de33bd (patch) | |
| tree | 46d1fdc63ffd17790dc59117bb190f0ead4a2092 | |
| parent | Add a position parameter to region crossing of objects. This avoids the (diff) | |
| parent | Remove two spurious m_sceneGraph != null checks in Scene.cs. It's set in con... (diff) | |
| download | opensim-SC-9ed4245d9edde3c93e592a00fdc9330e82de33bd.zip opensim-SC-9ed4245d9edde3c93e592a00fdc9330e82de33bd.tar.gz opensim-SC-9ed4245d9edde3c93e592a00fdc9330e82de33bd.tar.bz2 opensim-SC-9ed4245d9edde3c93e592a00fdc9330e82de33bd.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
| -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 7b79732..6187803 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -4260,10 +4260,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 4260 | /// <param name="action"></param> | 4260 | /// <param name="action"></param> |
| 4261 | public void ForEachRootScenePresence(Action<ScenePresence> action) | 4261 | public void ForEachRootScenePresence(Action<ScenePresence> action) |
| 4262 | { | 4262 | { |
| 4263 | if (m_sceneGraph != null) | 4263 | m_sceneGraph.ForEachAvatar(action); |
| 4264 | { | ||
| 4265 | m_sceneGraph.ForEachAvatar(action); | ||
| 4266 | } | ||
| 4267 | } | 4264 | } |
| 4268 | 4265 | ||
| 4269 | /// <summary> | 4266 | /// <summary> |
| @@ -4272,10 +4269,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 4272 | /// <param name="action"></param> | 4269 | /// <param name="action"></param> |
| 4273 | public void ForEachScenePresence(Action<ScenePresence> action) | 4270 | public void ForEachScenePresence(Action<ScenePresence> action) |
| 4274 | { | 4271 | { |
| 4275 | if (m_sceneGraph != null) | 4272 | m_sceneGraph.ForEachScenePresence(action); |
| 4276 | { | ||
| 4277 | m_sceneGraph.ForEachScenePresence(action); | ||
| 4278 | } | ||
| 4279 | } | 4273 | } |
| 4280 | 4274 | ||
| 4281 | /// <summary> | 4275 | /// <summary> |