diff options
| author | Robert Adams | 2013-11-04 22:12:57 -0800 |
|---|---|---|
| committer | Robert Adams | 2013-11-04 22:12:57 -0800 |
| commit | c931b16c1fd50d3b955662c8cd6134d7a235c519 (patch) | |
| tree | 8aeca3e6dccf6b177908f3842196f59230777109 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |
| parent | varregion: add plumbing to pass region size from Scene down to the (diff) | |
| parent | If the LSL state_entry() event definition contains any parameters, then gener... (diff) | |
| download | opensim-SC-c931b16c1fd50d3b955662c8cd6134d7a235c519.zip opensim-SC-c931b16c1fd50d3b955662c8cd6134d7a235c519.tar.gz opensim-SC-c931b16c1fd50d3b955662c8cd6134d7a235c519.tar.bz2 opensim-SC-c931b16c1fd50d3b955662c8cd6134d7a235c519.tar.xz | |
Merge branch 'master' into varregion
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 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) |