diff options
Merge branch 'master' into varregion
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 61017b8..fc6d81f 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -6237,7 +6237,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
6237 | PSYS_SRC_TARGET_KEY = 20, | 6237 | PSYS_SRC_TARGET_KEY = 20, |
6238 | PSYS_SRC_OMEGA = 21, | 6238 | PSYS_SRC_OMEGA = 21, |
6239 | PSYS_SRC_ANGLE_BEGIN = 22, | 6239 | PSYS_SRC_ANGLE_BEGIN = 22, |
6240 | PSYS_SRC_ANGLE_END = 23 | 6240 | PSYS_SRC_ANGLE_END = 23, |
6241 | PSYS_PART_BLEND_FUNC_SOURCE = 24, | ||
6242 | PSYS_PART_BLEND_FUNC_DEST = 25, | ||
6243 | PSYS_PART_START_GLOW = 26, | ||
6244 | PSYS_PART_END_GLOW = 27 | ||
6241 | } | 6245 | } |
6242 | 6246 | ||
6243 | internal Primitive.ParticleSystem.ParticleDataFlags ConvertUINTtoFlags(uint flags) | 6247 | internal Primitive.ParticleSystem.ParticleDataFlags ConvertUINTtoFlags(uint flags) |