Merge branch 'master' into vehicles

This commit is contained in:
Melanie
2009-10-01 14:08:15 +01:00
307 changed files with 3296 additions and 5638 deletions

View File

@@ -845,7 +845,7 @@ namespace OpenSim.Region.Framework.Scenes
ScenePresence sp;
lock (ScenePresences)
{
{
ScenePresences.TryGetValue(agentID, out sp);
}
@@ -1134,6 +1134,23 @@ namespace OpenSim.Region.Framework.Scenes
}
}
protected internal void ForEachSOG(Action<SceneObjectGroup> action)
{
List<SceneObjectGroup> objlist = new List<SceneObjectGroup>(SceneObjectGroupsByFullID.Values);
foreach (SceneObjectGroup obj in objlist)
{
try
{
action(obj);
}
catch (Exception e)
{
// Catch it and move on. This includes situations where splist has inconsistent info
m_log.WarnFormat("[SCENE]: Problem processing action in ForEachSOG: ", e.Message);
}
}
}
#endregion
#region Client Event handlers