diff options
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs')
| -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 89f4706..5cc66b9 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -6736,7 +6736,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 6736 | PSYS_SRC_TARGET_KEY = 20, | 6736 | PSYS_SRC_TARGET_KEY = 20, |
| 6737 | PSYS_SRC_OMEGA = 21, | 6737 | PSYS_SRC_OMEGA = 21, |
| 6738 | PSYS_SRC_ANGLE_BEGIN = 22, | 6738 | PSYS_SRC_ANGLE_BEGIN = 22, |
| 6739 | PSYS_SRC_ANGLE_END = 23 | 6739 | PSYS_SRC_ANGLE_END = 23, |
| 6740 | PSYS_PART_BLEND_FUNC_SOURCE = 24, | ||
| 6741 | PSYS_PART_BLEND_FUNC_DEST = 25, | ||
| 6742 | PSYS_PART_START_GLOW = 26, | ||
| 6743 | PSYS_PART_END_GLOW = 27 | ||
| 6740 | } | 6744 | } |
| 6741 | 6745 | ||
| 6742 | internal Primitive.ParticleSystem.ParticleDataFlags ConvertUINTtoFlags(uint flags) | 6746 | internal Primitive.ParticleSystem.ParticleDataFlags ConvertUINTtoFlags(uint flags) |