diff options
| author | Michael Heilmann | 2015-05-19 15:18:45 -0400 |
|---|---|---|
| committer | Michael Heilmann | 2015-05-19 15:18:45 -0400 |
| commit | 140ea04b9d692344d803fc87364fb252561725c3 (patch) | |
| tree | d503b7ae17baca374d704b548fc7da512f512388 /OpenSim/Region/ScriptEngine/Shared/Api/Runtime | |
| parent | Merge pull request #7 from gamucf/moses.metricsPhase2 (diff) | |
| parent | resolve possible nullref when sending appearance packet. Thanks to zadark for... (diff) | |
| download | opensim-SC-140ea04b9d692344d803fc87364fb252561725c3.zip opensim-SC-140ea04b9d692344d803fc87364fb252561725c3.tar.gz opensim-SC-140ea04b9d692344d803fc87364fb252561725c3.tar.bz2 opensim-SC-140ea04b9d692344d803fc87364fb252561725c3.tar.xz | |
Merging Opensim upstream before generating patch
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Runtime')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs | 4 |
1 files changed, 4 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 a96cd16..e37d3af 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs | |||
| @@ -596,6 +596,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
| 596 | public const int OBJECT_PHYSICS = 21; | 596 | public const int OBJECT_PHYSICS = 21; |
| 597 | public const int OBJECT_PHANTOM = 22; | 597 | public const int OBJECT_PHANTOM = 22; |
| 598 | public const int OBJECT_TEMP_ON_REZ = 23; | 598 | public const int OBJECT_TEMP_ON_REZ = 23; |
| 599 | public const int OBJECT_RENDER_WEIGHT = 24; | ||
| 600 | public const int OBJECT_HOVER_HEIGHT = 25; | ||
| 601 | public const int OBJECT_BODY_SHAPE_TYPE = 26; | ||
| 602 | public const int OBJECT_LAST_OWNER_ID = 27; | ||
| 599 | 603 | ||
| 600 | // Pathfinding types | 604 | // Pathfinding types |
| 601 | public const int OPT_OTHER = -1; | 605 | public const int OPT_OTHER = -1; |