diff options
author | UbitUmarov | 2016-12-04 23:39:15 +0000 |
---|---|---|
committer | UbitUmarov | 2016-12-04 23:39:15 +0000 |
commit | 1680425f4d3ddd1c59d99daee23180d985f24d86 (patch) | |
tree | 56c22c5773ec4663840b1dee0002c9f8dc9d5133 /OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs | |
parent | update httpserver (diff) | |
parent | HG: fix the never ending avatar confirmation when 2 users from same grid made... (diff) | |
download | opensim-SC-1680425f4d3ddd1c59d99daee23180d985f24d86.zip opensim-SC-1680425f4d3ddd1c59d99daee23180d985f24d86.tar.gz opensim-SC-1680425f4d3ddd1c59d99daee23180d985f24d86.tar.bz2 opensim-SC-1680425f4d3ddd1c59d99daee23180d985f24d86.tar.xz |
Merge branch 'master' into httptests
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs')
-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 48afcc0..734d878 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs | |||
@@ -640,6 +640,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
640 | public const int OBJECT_OMEGA = 29; | 640 | public const int OBJECT_OMEGA = 29; |
641 | public const int OBJECT_PRIM_COUNT = 30; | 641 | public const int OBJECT_PRIM_COUNT = 30; |
642 | public const int OBJECT_TOTAL_INVENTORY_COUNT = 31; | 642 | public const int OBJECT_TOTAL_INVENTORY_COUNT = 31; |
643 | public const int OBJECT_REZZER_KEY = 32; | ||
643 | public const int OBJECT_GROUP_TAG = 33; | 644 | public const int OBJECT_GROUP_TAG = 33; |
644 | public const int OBJECT_TEMP_ATTACHED = 34; | 645 | public const int OBJECT_TEMP_ATTACHED = 34; |
645 | 646 | ||