aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
diff options
context:
space:
mode:
authorMelanie2012-01-12 23:22:55 +0000
committerMelanie2012-01-12 23:22:55 +0000
commitcf166d3f1e7f18819623473b9c323489f23b82cd (patch)
treed4a68d9d5efe9c175b0e0cbf5fd75f5e3f8fe18f /OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
parentMerge branch 'master' into careminster (diff)
parentAdd api level test for removing an owned npc (diff)
downloadopensim-SC-cf166d3f1e7f18819623473b9c323489f23b82cd.zip
opensim-SC-cf166d3f1e7f18819623473b9c323489f23b82cd.tar.gz
opensim-SC-cf166d3f1e7f18819623473b9c323489f23b82cd.tar.bz2
opensim-SC-cf166d3f1e7f18819623473b9c323489f23b82cd.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs3
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
index 3c258d8..32226f9 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
@@ -609,6 +609,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
609 609
610 public const int OS_NPC_SIT_NOW = 0; 610 public const int OS_NPC_SIT_NOW = 0;
611 611
612 public const int OS_NPC_CREATOR_OWNED = 0x1;
613 public const int OS_NPC_NOT_OWNED = 0x2;
614
612 public const string URL_REQUEST_GRANTED = "URL_REQUEST_GRANTED"; 615 public const string URL_REQUEST_GRANTED = "URL_REQUEST_GRANTED";
613 public const string URL_REQUEST_DENIED = "URL_REQUEST_DENIED"; 616 public const string URL_REQUEST_DENIED = "URL_REQUEST_DENIED";
614 617