Merge branch 'master' into careminster-presence-refactor

Integrate the next large patch.
Don't use this version, it has a ghost avatar issue. Next push
will fix it.
This commit is contained in:
Melanie
2010-09-17 03:49:30 +01:00
36 changed files with 1052 additions and 1293 deletions

View File

@@ -780,10 +780,7 @@ namespace OpenSim.Region.Framework.Scenes
rootPart.Name = item.Name;
rootPart.Description = item.Description;
List<SceneObjectPart> partList = null;
lock (group.Children)
partList = new List<SceneObjectPart>(group.Children.Values);
SceneObjectPart[] partList = group.Parts;
group.SetGroup(m_part.GroupID, null);