aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
authorMelanie2011-10-25 02:27:35 +0100
committerMelanie2011-10-25 02:27:35 +0100
commit5c09cffe55f347f587fc63581b556968130aca7d (patch)
tree06962666c7abcf310200dce540699be682b2a987 /OpenSim/Region/ScriptEngine
parentMerge commit 'de161585c0960a93911f446f0179441ba5470245' into bigmerge (diff)
parentrename OS_NPC_SIT_IMMEDIATE to OS_NPC_SIT_NOW since it's shorter and more und... (diff)
downloadopensim-SC_OLD-5c09cffe55f347f587fc63581b556968130aca7d.zip
opensim-SC_OLD-5c09cffe55f347f587fc63581b556968130aca7d.tar.gz
opensim-SC_OLD-5c09cffe55f347f587fc63581b556968130aca7d.tar.bz2
opensim-SC_OLD-5c09cffe55f347f587fc63581b556968130aca7d.tar.xz
Merge commit '79c13cd99728f09a5175dff1750dcb9d7790fcdc' into bigmerge
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
index be51650..3af9911 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
@@ -603,7 +603,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
603 public const int OS_NPC_NO_FLY = 1; 603 public const int OS_NPC_NO_FLY = 1;
604 public const int OS_NPC_LAND_AT_TARGET = 2; 604 public const int OS_NPC_LAND_AT_TARGET = 2;
605 605
606 public const int OS_NPC_SIT_IMMEDIATE = 0; 606 public const int OS_NPC_SIT_NOW = 0;
607 607
608 public const string URL_REQUEST_GRANTED = "URL_REQUEST_GRANTED"; 608 public const string URL_REQUEST_GRANTED = "URL_REQUEST_GRANTED";
609 public const string URL_REQUEST_DENIED = "URL_REQUEST_DENIED"; 609 public const string URL_REQUEST_DENIED = "URL_REQUEST_DENIED";