diff options
| author | Melanie | 2012-07-23 18:54:12 +0100 |
|---|---|---|
| committer | Melanie | 2012-07-23 18:54:12 +0100 |
| commit | fb8e92c90b8bde44831a06d4a7adae64f181b5aa (patch) | |
| tree | fdbb76f70f8016e685b616b51a90f7b1ef21427b /OpenSim/Region/ScriptEngine/Shared/Api/Runtime | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Update BulletSim DLLs and SOs (diff) | |
| download | opensim-SC_OLD-fb8e92c90b8bde44831a06d4a7adae64f181b5aa.zip opensim-SC_OLD-fb8e92c90b8bde44831a06d4a7adae64f181b5aa.tar.gz opensim-SC_OLD-fb8e92c90b8bde44831a06d4a7adae64f181b5aa.tar.bz2 opensim-SC_OLD-fb8e92c90b8bde44831a06d4a7adae64f181b5aa.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Helpers.cs
prebuild.xml
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Runtime')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs | 1 |
1 files changed, 1 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 a08cc42..5669917 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs | |||
| @@ -56,6 +56,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
| 56 | public const int ACTIVE = 2; | 56 | public const int ACTIVE = 2; |
| 57 | public const int PASSIVE = 4; | 57 | public const int PASSIVE = 4; |
| 58 | public const int SCRIPTED = 8; | 58 | public const int SCRIPTED = 8; |
| 59 | public const int OS_NPC = 0x01000000; | ||
| 59 | 60 | ||
| 60 | public const int CONTROL_FWD = 1; | 61 | public const int CONTROL_FWD = 1; |
| 61 | public const int CONTROL_BACK = 2; | 62 | public const int CONTROL_BACK = 2; |