aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-09-16 17:41:01 +0000
committerJustin Clarke Casey2008-09-16 17:41:01 +0000
commit6b0097039ad2f0c57ade46b8446d31a934b7170d (patch)
tree4a16052c2df4c8159618fd457416a309f7c4248f /OpenSim/Region
parent* minor: oops, remove a warning I just inserted myself - naughty boy (diff)
downloadopensim-SC_OLD-6b0097039ad2f0c57ade46b8446d31a934b7170d.zip
opensim-SC_OLD-6b0097039ad2f0c57ade46b8446d31a934b7170d.tar.gz
opensim-SC_OLD-6b0097039ad2f0c57ade46b8446d31a934b7170d.tar.bz2
opensim-SC_OLD-6b0097039ad2f0c57ade46b8446d31a934b7170d.tar.xz
* Apply http://opensimulator.org/mantis/view.php?id=2202
* llGround causes Array out of bounds exception in KanEd#11 script * Thanks Y. Nitta!
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs4
2 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index 44033c1..76b88bc 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -960,8 +960,8 @@ namespace OpenSim.Region.ScriptEngine.Common
960 public double llGround(LSL_Types.Vector3 offset) 960 public double llGround(LSL_Types.Vector3 offset)
961 { 961 {
962 m_host.AddScriptLPS(1); 962 m_host.AddScriptLPS(1);
963 int x = (int)(m_host.AbsolutePosition.X + offset.x); 963 int x = (int)(m_host.OffsetPosition.X + offset.x);
964 int y = (int)(m_host.AbsolutePosition.Y + offset.y); 964 int y = (int)(m_host.OffsetPosition.Y + offset.y);
965 return World.GetLandHeight(x, y); 965 return World.GetLandHeight(x, y);
966 } 966 }
967 967
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index a4fd984..d5fc9a6 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -769,8 +769,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
769 public LSL_Types.LSLFloat llGround(LSL_Types.Vector3 offset) 769 public LSL_Types.LSLFloat llGround(LSL_Types.Vector3 offset)
770 { 770 {
771 m_host.AddScriptLPS(1); 771 m_host.AddScriptLPS(1);
772 int x = (int)(m_host.AbsolutePosition.X + offset.x); 772 int x = (int)(m_host.OffsetPosition.X + offset.x);
773 int y = (int)(m_host.AbsolutePosition.Y + offset.y); 773 int y = (int)(m_host.OffsetPosition.Y + offset.y);
774 return World.GetLandHeight(x, y); 774 return World.GetLandHeight(x, y);
775 } 775 }
776 776