Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-03-18 20:09:04 +00:00
46 changed files with 3429 additions and 3243 deletions

View File

@@ -1370,8 +1370,8 @@ namespace OpenSim.Region.Framework.Scenes
{
// part.Inventory.RemoveScriptInstances();
ScenePresence[] avatars = Scene.GetScenePresences();
for (int i = 0; i < avatars.Length; i++)
List<ScenePresence> avatars = Scene.GetScenePresences();
for (int i = 0; i < avatars.Count; i++)
{
if (avatars[i].ParentID == LocalId)
{