diff options
| author | Justin Clark-Casey (justincc) | 2013-11-01 02:05:12 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-11-01 02:05:12 +0000 |
| commit | db32e5d30425c4cb45c780df66c3015dc967f840 (patch) | |
| tree | 2d7429bc31843d6cf9924a95a1f1c47f2e04d483 /OpenSim | |
| parent | For individual bots, seed random number generator with a random number from B... (diff) | |
| parent | add new particle system blending rule enumerations (diff) | |
| download | opensim-SC_OLD-db32e5d30425c4cb45c780df66c3015dc967f840.zip opensim-SC_OLD-db32e5d30425c4cb45c780df66c3015dc967f840.tar.gz opensim-SC_OLD-db32e5d30425c4cb45c780df66c3015dc967f840.tar.bz2 opensim-SC_OLD-db32e5d30425c4cb45c780df66c3015dc967f840.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim')
| -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 8650b91..e6ff75f 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -6240,7 +6240,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 6240 | PSYS_SRC_TARGET_KEY = 20, | 6240 | PSYS_SRC_TARGET_KEY = 20, |
| 6241 | PSYS_SRC_OMEGA = 21, | 6241 | PSYS_SRC_OMEGA = 21, |
| 6242 | PSYS_SRC_ANGLE_BEGIN = 22, | 6242 | PSYS_SRC_ANGLE_BEGIN = 22, |
| 6243 | PSYS_SRC_ANGLE_END = 23 | 6243 | PSYS_SRC_ANGLE_END = 23, |
| 6244 | PSYS_PART_BLEND_FUNC_SOURCE = 24, | ||
| 6245 | PSYS_PART_BLEND_FUNC_DEST = 25, | ||
| 6246 | PSYS_PART_START_GLOW = 26, | ||
| 6247 | PSYS_PART_END_GLOW = 27 | ||
| 6244 | } | 6248 | } |
| 6245 | 6249 | ||
| 6246 | internal Primitive.ParticleSystem.ParticleDataFlags ConvertUINTtoFlags(uint flags) | 6250 | internal Primitive.ParticleSystem.ParticleDataFlags ConvertUINTtoFlags(uint flags) |