aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
authorMelanie2012-05-07 12:07:47 +0100
committerMelanie2012-05-07 12:07:47 +0100
commitdf7abbb367ecac2fb09e1af10d3ec2a792ea2ed2 (patch)
tree3e36b8757455c88c3c1f20c14b635e662350aab9 /OpenSim/Region/ScriptEngine
parentMerge branch 'avination' into careminster (diff)
parentadd a null check for Primitive.Sculpt in PrimitiveBaseShape constructor for O... (diff)
downloadopensim-SC-df7abbb367ecac2fb09e1af10d3ec2a792ea2ed2.zip
opensim-SC-df7abbb367ecac2fb09e1af10d3ec2a792ea2ed2.tar.gz
opensim-SC-df7abbb367ecac2fb09e1af10d3ec2a792ea2ed2.tar.bz2
opensim-SC-df7abbb367ecac2fb09e1af10d3ec2a792ea2ed2.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs5
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs1
2 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 60568a8..0688916 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -2479,7 +2479,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2479 return; 2479 return;
2480 2480
2481 Vector3 pos = new Vector3((float) position.x, (float) position.y, (float) position.z); 2481 Vector3 pos = new Vector3((float) position.x, (float) position.y, (float) position.z);
2482 module.MoveToTarget(npcId, World, pos, false, true); 2482 module.MoveToTarget(npcId, World, pos, false, true, false);
2483 } 2483 }
2484 } 2484 }
2485 2485
@@ -2504,7 +2504,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2504 World, 2504 World,
2505 pos, 2505 pos,
2506 (options & ScriptBaseClass.OS_NPC_NO_FLY) != 0, 2506 (options & ScriptBaseClass.OS_NPC_NO_FLY) != 0,
2507 (options & ScriptBaseClass.OS_NPC_LAND_AT_TARGET) != 0); 2507 (options & ScriptBaseClass.OS_NPC_LAND_AT_TARGET) != 0,
2508 (options & ScriptBaseClass.OS_NPC_RUNNING) != 0);
2508 } 2509 }
2509 } 2510 }
2510 2511
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
index 23b4336..9d830c8 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
@@ -639,6 +639,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
639 public const int OS_NPC_FLY = 0; 639 public const int OS_NPC_FLY = 0;
640 public const int OS_NPC_NO_FLY = 1; 640 public const int OS_NPC_NO_FLY = 1;
641 public const int OS_NPC_LAND_AT_TARGET = 2; 641 public const int OS_NPC_LAND_AT_TARGET = 2;
642 public const int OS_NPC_RUNNING = 4;
642 643
643 public const int OS_NPC_SIT_NOW = 0; 644 public const int OS_NPC_SIT_NOW = 0;
644 645