Merge branch 'master' into careminster

This commit is contained in:
Melanie
2011-12-24 02:21:35 +00:00
4 changed files with 6 additions and 11 deletions

View File

@@ -1746,16 +1746,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
grp.ScheduleGroupForFullUpdate();
}
if (destination != null && !CrossPrimGroupIntoNewRegion(destination, grp, silent))
{
grp.RootPart.GroupPosition = oldGroupPosition;
grp.ScheduleGroupForFullUpdate();
}
}