Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2011-04-08 04:16:29 +01:00
73 changed files with 170 additions and 6291 deletions

View File

@@ -1957,7 +1957,7 @@ namespace OpenSim.Region.Framework.Scenes
{
SceneObjectGroupsByLocalPartID[copy.LocalId] = copy;
foreach (SceneObjectPart part in children)
SceneObjectGroupsByLocalPartID[copy.LocalId] = copy;
SceneObjectGroupsByLocalPartID[part.LocalId] = copy;
}
// PROBABLE END OF FIXME