aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared
diff options
context:
space:
mode:
authordahlia2012-05-06 23:54:50 -0700
committerdahlia2012-05-06 23:54:50 -0700
commitb697d0e895dc7670e160188501da88a780455500 (patch)
tree339f65c98f7bab3c32c567fae4da37a9ad613674 /OpenSim/Region/ScriptEngine/Shared
parentStop llSetPos from sending one update per child prim (diff)
downloadopensim-SC_OLD-b697d0e895dc7670e160188501da88a780455500.zip
opensim-SC_OLD-b697d0e895dc7670e160188501da88a780455500.tar.gz
opensim-SC_OLD-b697d0e895dc7670e160188501da88a780455500.tar.bz2
opensim-SC_OLD-b697d0e895dc7670e160188501da88a780455500.tar.xz
add OS_NPC_RUNNING option to osNpcMoveToTarget() to allow running speed for moving NPCs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs3
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs1
2 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 0d4ea19..3659687 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -2474,7 +2474,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2474 World, 2474 World,
2475 pos, 2475 pos,
2476 (options & ScriptBaseClass.OS_NPC_NO_FLY) != 0, 2476 (options & ScriptBaseClass.OS_NPC_NO_FLY) != 0,
2477 (options & ScriptBaseClass.OS_NPC_LAND_AT_TARGET) != 0); 2477 (options & ScriptBaseClass.OS_NPC_LAND_AT_TARGET) != 0,
2478 (options & ScriptBaseClass.OS_NPC_RUNNING) != 0);
2478 } 2479 }
2479 } 2480 }
2480 2481
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
index fd7c41e..2a28542 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
@@ -626,6 +626,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
626 public const int OS_NPC_FLY = 0; 626 public const int OS_NPC_FLY = 0;
627 public const int OS_NPC_NO_FLY = 1; 627 public const int OS_NPC_NO_FLY = 1;
628 public const int OS_NPC_LAND_AT_TARGET = 2; 628 public const int OS_NPC_LAND_AT_TARGET = 2;
629 public const int OS_NPC_RUNNING = 4;
629 630
630 public const int OS_NPC_SIT_NOW = 0; 631 public const int OS_NPC_SIT_NOW = 0;
631 632