diff options
author | Justin Clark-Casey (justincc) | 2011-08-12 01:52:12 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-08-12 01:52:12 +0100 |
commit | 16ac5413ddb57ac347addebc82d425364a083637 (patch) | |
tree | d2e61cfbb772a25bd8816f3194a03cd9f0354354 /OpenSim/Region/ScriptEngine/Shared | |
parent | rename osNpcStopMoveTo() to osNpcStopMoveToTarget() (diff) | |
download | opensim-SC_OLD-16ac5413ddb57ac347addebc82d425364a083637.zip opensim-SC_OLD-16ac5413ddb57ac347addebc82d425364a083637.tar.gz opensim-SC_OLD-16ac5413ddb57ac347addebc82d425364a083637.tar.bz2 opensim-SC_OLD-16ac5413ddb57ac347addebc82d425364a083637.tar.xz |
rename position parameter in osNpcMoveToTarget to target
Diffstat (limited to '')
3 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 07473e5..2e28907 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -2259,7 +2259,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2259 | } | 2259 | } |
2260 | } | 2260 | } |
2261 | 2261 | ||
2262 | public void osNpcMoveToTarget(LSL_Key npc, LSL_Vector position, int options) | 2262 | public void osNpcMoveToTarget(LSL_Key npc, LSL_Vector target, int options) |
2263 | { | 2263 | { |
2264 | CheckThreatLevel(ThreatLevel.High, "osNpcMoveToTarget"); | 2264 | CheckThreatLevel(ThreatLevel.High, "osNpcMoveToTarget"); |
2265 | 2265 | ||
@@ -2270,7 +2270,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2270 | if (!UUID.TryParse(npc.m_string, out npcId)) | 2270 | if (!UUID.TryParse(npc.m_string, out npcId)) |
2271 | return; | 2271 | return; |
2272 | 2272 | ||
2273 | Vector3 pos = new Vector3((float)position.x, (float)position.y, (float)position.z); | 2273 | Vector3 pos = new Vector3((float)target.x, (float)target.y, (float)target.z); |
2274 | module.MoveToTarget( | 2274 | module.MoveToTarget( |
2275 | new UUID(npc.m_string), | 2275 | new UUID(npc.m_string), |
2276 | World, | 2276 | World, |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs index 2ba68ff..1f3454f 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | |||
@@ -173,7 +173,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
173 | void osNpcLoadAppearance(key npc, string notecardNameOrUuid); | 173 | void osNpcLoadAppearance(key npc, string notecardNameOrUuid); |
174 | vector osNpcGetPos(key npc); | 174 | vector osNpcGetPos(key npc); |
175 | void osNpcMoveTo(key npc, vector position); | 175 | void osNpcMoveTo(key npc, vector position); |
176 | void osNpcMoveToTarget(key npc, vector position, int options); | 176 | void osNpcMoveToTarget(key npc, vector target, int options); |
177 | rotation osNpcGetRot(key npc); | 177 | rotation osNpcGetRot(key npc); |
178 | void osNpcSetRot(LSL_Key npc, rotation rot); | 178 | void osNpcSetRot(LSL_Key npc, rotation rot); |
179 | void osNpcStopMoveToTarget(LSL_Key npc); | 179 | void osNpcStopMoveToTarget(LSL_Key npc); |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs index 140501c..13cf7fa 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | |||
@@ -503,9 +503,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
503 | m_OSSL_Functions.osNpcMoveTo(npc, position); | 503 | m_OSSL_Functions.osNpcMoveTo(npc, position); |
504 | } | 504 | } |
505 | 505 | ||
506 | public void osNpcMoveToTarget(key npc, vector position, int options) | 506 | public void osNpcMoveToTarget(key npc, vector target, int options) |
507 | { | 507 | { |
508 | m_OSSL_Functions.osNpcMoveToTarget(npc, position, options); | 508 | m_OSSL_Functions.osNpcMoveToTarget(npc, target, options); |
509 | } | 509 | } |
510 | 510 | ||
511 | public rotation osNpcGetRot(key npc) | 511 | public rotation osNpcGetRot(key npc) |