diff options
| author | Melanie | 2011-04-17 18:42:06 +0200 |
|---|---|---|
| committer | Melanie | 2011-04-17 18:42:06 +0200 |
| commit | c02e0e930d078ab5e2d4070df65c3d74f5812cbc (patch) | |
| tree | abb12e192cf0675b675d874eb86b65aa4fd177d7 /OpenSim/Region/ScriptEngine/Shared | |
| parent | Fix the cert validation handler so that it will not block other parts of (diff) | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| download | opensim-SC-c02e0e930d078ab5e2d4070df65c3d74f5812cbc.zip opensim-SC-c02e0e930d078ab5e2d4070df65c3d74f5812cbc.tar.gz opensim-SC-c02e0e930d078ab5e2d4070df65c3d74f5812cbc.tar.bz2 opensim-SC-c02e0e930d078ab5e2d4070df65c3d74f5812cbc.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index cda8adb..f4aefac 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -8052,7 +8052,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 8052 | 8052 | ||
| 8053 | // This BBox is in sim coordinates, with the offset being | 8053 | // This BBox is in sim coordinates, with the offset being |
| 8054 | // a contained point. | 8054 | // a contained point. |
| 8055 | Vector3[] offsets = World.GetCombinedBoundingBox(new List<SceneObjectGroup> { part.ParentGroup }, | 8055 | Vector3[] offsets = Scene.GetCombinedBoundingBox(new List<SceneObjectGroup> { part.ParentGroup }, |
| 8056 | out minX, out maxX, out minY, out maxY, out minZ, out maxZ); | 8056 | out minX, out maxX, out minY, out maxY, out minZ, out maxZ); |
| 8057 | 8057 | ||
| 8058 | minX -= offsets[0].X; | 8058 | minX -= offsets[0].X; |