Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim

This commit is contained in:
Melanie
2012-02-23 01:42:08 +00:00

View File

@@ -4260,10 +4260,7 @@ namespace OpenSim.Region.Framework.Scenes
/// <param name="action"></param>
public void ForEachRootScenePresence(Action<ScenePresence> action)
{
if (m_sceneGraph != null)
{
m_sceneGraph.ForEachAvatar(action);
}
m_sceneGraph.ForEachAvatar(action);
}
/// <summary>
@@ -4272,10 +4269,7 @@ namespace OpenSim.Region.Framework.Scenes
/// <param name="action"></param>
public void ForEachScenePresence(Action<ScenePresence> action)
{
if (m_sceneGraph != null)
{
m_sceneGraph.ForEachScenePresence(action);
}
m_sceneGraph.ForEachScenePresence(action);
}
/// <summary>