aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMelanie Thielker2008-08-27 19:12:17 +0000
committerMelanie Thielker2008-08-27 19:12:17 +0000
commit1a3f83c94bf17dac1d2635efe02875536083c000 (patch)
treec119304572163150719e17007253d60b7f6be984 /OpenSim/Region
parentMantis #2058 (diff)
downloadopensim-SC_OLD-1a3f83c94bf17dac1d2635efe02875536083c000.zip
opensim-SC_OLD-1a3f83c94bf17dac1d2635efe02875536083c000.tar.gz
opensim-SC_OLD-1a3f83c94bf17dac1d2635efe02875536083c000.tar.bz2
opensim-SC_OLD-1a3f83c94bf17dac1d2635efe02875536083c000.tar.xz
Erm - make the distanc factor really work....
(wipes egg off face)
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs2
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index 74ba4fa..9fdf3ce 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -1658,7 +1658,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1658 { 1658 {
1659 // Capped movemment if distance > 10m (http://wiki.secondlife.com/wiki/LlSetPos) 1659 // Capped movemment if distance > 10m (http://wiki.secondlife.com/wiki/LlSetPos)
1660 LSL_Types.Vector3 currentPos = llGetLocalPos(); 1660 LSL_Types.Vector3 currentPos = llGetLocalPos();
1661 if (llVecDist(currentPos, targetPos) > 10) 1661 if (llVecDist(currentPos, targetPos) > 10.0f * m_distanceFactor)
1662 { 1662 {
1663 targetPos = currentPos + m_distanceFactor * 10.0f * llVecNorm(targetPos - currentPos); 1663 targetPos = currentPos + m_distanceFactor * 10.0f * llVecNorm(targetPos - currentPos);
1664 } 1664 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 46f6d8b..ccbbeb9 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -1494,7 +1494,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1494 { 1494 {
1495 // Capped movemment if distance > 10m (http://wiki.secondlife.com/wiki/LlSetPos) 1495 // Capped movemment if distance > 10m (http://wiki.secondlife.com/wiki/LlSetPos)
1496 LSL_Types.Vector3 currentPos = llGetLocalPos(); 1496 LSL_Types.Vector3 currentPos = llGetLocalPos();
1497 if (llVecDist(currentPos, targetPos) > 10) 1497 if (llVecDist(currentPos, targetPos) > 10.0f * m_ScriptDistanceFactor)
1498 { 1498 {
1499 targetPos = currentPos + m_ScriptDistanceFactor * 10 * llVecNorm(targetPos - currentPos); 1499 targetPos = currentPos + m_ScriptDistanceFactor * 10 * llVecNorm(targetPos - currentPos);
1500 } 1500 }