diff options
author | Melanie | 2011-04-17 18:48:53 +0100 |
---|---|---|
committer | Melanie | 2011-04-17 18:48:53 +0100 |
commit | 474910c9d624b53c010232ddb32b4002f58f1de0 (patch) | |
tree | 45ddab37c6afa0b095ffa0503640b9fe235bc400 /OpenSim/Region/ScriptEngine | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
parent | More descriptive debug msg for ServiceOSDRequest failures. (diff) | |
download | opensim-SC-474910c9d624b53c010232ddb32b4002f58f1de0.zip opensim-SC-474910c9d624b53c010232ddb32b4002f58f1de0.tar.gz opensim-SC-474910c9d624b53c010232ddb32b4002f58f1de0.tar.bz2 opensim-SC-474910c9d624b53c010232ddb32b4002f58f1de0.tar.xz |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-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; |