aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authordahlia2013-10-31 17:49:01 -0700
committerdahlia2013-10-31 17:49:01 -0700
commitcc73ef4eb9a51badeffa3c45de6431bd1ca30c2d (patch)
tree07cb0988ac52fabf2fa9fc55d7bf574a6fff01e4 /OpenSim
parentminor: change "bot" pCampBot help cateogry to "Bots" (diff)
downloadopensim-SC_OLD-cc73ef4eb9a51badeffa3c45de6431bd1ca30c2d.zip
opensim-SC_OLD-cc73ef4eb9a51badeffa3c45de6431bd1ca30c2d.tar.gz
opensim-SC_OLD-cc73ef4eb9a51badeffa3c45de6431bd1ca30c2d.tar.bz2
opensim-SC_OLD-cc73ef4eb9a51badeffa3c45de6431bd1ca30c2d.tar.xz
add new particle system blending rule enumerations
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs6
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)