diff options
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 9b5d8d9..f83304b 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -2209,11 +2209,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2209 | if (module != null) | 2209 | if (module != null) |
2210 | { | 2210 | { |
2211 | Vector3 pos = new Vector3((float) position.x, (float) position.y, (float) position.z); | 2211 | Vector3 pos = new Vector3((float) position.x, (float) position.y, (float) position.z); |
2212 | module.MoveToTarget(new UUID(npc.m_string), World, pos, false); | 2212 | module.MoveToTarget(new UUID(npc.m_string), World, pos, false, true); |
2213 | } | 2213 | } |
2214 | } | 2214 | } |
2215 | 2215 | ||
2216 | public void osNpcMoveToTarget(LSL_Key npc, LSL_Vector position, int noFly) | 2216 | public void osNpcMoveToTarget(LSL_Key npc, LSL_Vector position, int moveParams) |
2217 | { | 2217 | { |
2218 | CheckThreatLevel(ThreatLevel.High, "osNpcMoveToTarget"); | 2218 | CheckThreatLevel(ThreatLevel.High, "osNpcMoveToTarget"); |
2219 | 2219 | ||
@@ -2221,7 +2221,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2221 | if (module != null) | 2221 | if (module != null) |
2222 | { | 2222 | { |
2223 | Vector3 pos = new Vector3((float)position.x, (float)position.y, (float)position.z); | 2223 | Vector3 pos = new Vector3((float)position.x, (float)position.y, (float)position.z); |
2224 | module.MoveToTarget(new UUID(npc.m_string), World, pos, noFly != 0); | 2224 | module.MoveToTarget( |
2225 | new UUID(npc.m_string), | ||
2226 | World, | ||
2227 | pos, | ||
2228 | (moveParams & ScriptBaseClass.OS_NPC_NO_FLY) != 0, | ||
2229 | (moveParams & ScriptBaseClass.OS_NPC_LAND_AT_TARGET) != 0); | ||
2225 | } | 2230 | } |
2226 | } | 2231 | } |
2227 | 2232 | ||