aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-08-10 22:34:42 +0100
committerJustin Clark-Casey (justincc)2011-08-10 22:34:42 +0100
commitfb92678b83dca1c1f64cc91f3ac887170408a455 (patch)
treeb4a0da757b8045a0c5155a35bb07b309ce3560ba
parentearly code to allow scripts to force npcs not to fly when moving to target (diff)
downloadopensim-SC_OLD-fb92678b83dca1c1f64cc91f3ac887170408a455.zip
opensim-SC_OLD-fb92678b83dca1c1f64cc91f3ac887170408a455.tar.gz
opensim-SC_OLD-fb92678b83dca1c1f64cc91f3ac887170408a455.tar.bz2
opensim-SC_OLD-fb92678b83dca1c1f64cc91f3ac887170408a455.tar.xz
fly and no fly constants for osNpcMoveToTarget()
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs4
2 files changed, 5 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 63c882d..9b5d8d9 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -2220,7 +2220,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2220 INPCModule module = World.RequestModuleInterface<INPCModule>(); 2220 INPCModule module = World.RequestModuleInterface<INPCModule>();
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(new UUID(npc.m_string), World, pos, noFly != 0);
2225 } 2225 }
2226 } 2226 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
index 3f90788..9ed894c 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
@@ -591,6 +591,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
591 public const int STATS_ACTIVE_SCRIPTS = 19; 591 public const int STATS_ACTIVE_SCRIPTS = 19;
592 public const int STATS_SCRIPT_LPS = 20; 592 public const int STATS_SCRIPT_LPS = 20;
593 593
594 // Constants for osNpc* functions
595 public const int OS_NPC_FLY = 0;
596 public const int OS_NPC_NO_FLY = 1;
597
594 public const string URL_REQUEST_GRANTED = "URL_REQUEST_GRANTED"; 598 public const string URL_REQUEST_GRANTED = "URL_REQUEST_GRANTED";
595 public const string URL_REQUEST_DENIED = "URL_REQUEST_DENIED"; 599 public const string URL_REQUEST_DENIED = "URL_REQUEST_DENIED";
596 600