Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2011-04-17 18:48:53 +01:00
74 changed files with 1426 additions and 1079 deletions

View File

@@ -8052,7 +8052,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
// This BBox is in sim coordinates, with the offset being
// a contained point.
Vector3[] offsets = World.GetCombinedBoundingBox(new List<SceneObjectGroup> { part.ParentGroup },
Vector3[] offsets = Scene.GetCombinedBoundingBox(new List<SceneObjectGroup> { part.ParentGroup },
out minX, out maxX, out minY, out maxY, out minZ, out maxZ);
minX -= offsets[0].X;