diff options
Merge branch 'master' into bulletsim
Conflicts:
OpenSim/Region/Framework/Scenes/SceneManager.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs | 5 |
1 files changed, 5 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 3f90788..e82c281 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs | |||
@@ -591,6 +591,11 @@ 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 | public const int OS_NPC_LAND_AT_TARGET = 2; | ||
598 | |||
594 | public const string URL_REQUEST_GRANTED = "URL_REQUEST_GRANTED"; | 599 | public const string URL_REQUEST_GRANTED = "URL_REQUEST_GRANTED"; |
595 | public const string URL_REQUEST_DENIED = "URL_REQUEST_DENIED"; | 600 | public const string URL_REQUEST_DENIED = "URL_REQUEST_DENIED"; |
596 | 601 | ||