diff options
| author | Justin Clark-Casey (justincc) | 2013-10-31 23:45:19 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-10-31 23:45:19 +0000 |
| commit | b7c57294cc9414945b1dd4add11867bfeeb637f3 (patch) | |
| tree | c060efcc6346d4a4e95e779a170e45efb2276a5d | |
| parent | minor: update pCampbot usage/help statement (diff) | |
| parent | add new LSL constants associated with new "ribbon", "glow", and "blend" parti... (diff) | |
| download | opensim-SC-b7c57294cc9414945b1dd4add11867bfeeb637f3.zip opensim-SC-b7c57294cc9414945b1dd4add11867bfeeb637f3.tar.gz opensim-SC-b7c57294cc9414945b1dd4add11867bfeeb637f3.tar.bz2 opensim-SC-b7c57294cc9414945b1dd4add11867bfeeb637f3.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs index 1137ad8..a073862 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs | |||
| @@ -106,6 +106,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
| 106 | public const int PSYS_PART_TARGET_POS_MASK = 64; | 106 | public const int PSYS_PART_TARGET_POS_MASK = 64; |
| 107 | public const int PSYS_PART_TARGET_LINEAR_MASK = 128; | 107 | public const int PSYS_PART_TARGET_LINEAR_MASK = 128; |
| 108 | public const int PSYS_PART_EMISSIVE_MASK = 256; | 108 | public const int PSYS_PART_EMISSIVE_MASK = 256; |
| 109 | public const int PSYS_PART_RIBBON_MASK = 1024; | ||
| 109 | public const int PSYS_PART_FLAGS = 0; | 110 | public const int PSYS_PART_FLAGS = 0; |
| 110 | public const int PSYS_PART_START_COLOR = 1; | 111 | public const int PSYS_PART_START_COLOR = 1; |
| 111 | public const int PSYS_PART_START_ALPHA = 2; | 112 | public const int PSYS_PART_START_ALPHA = 2; |
| @@ -129,6 +130,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
| 129 | public const int PSYS_SRC_OMEGA = 21; | 130 | public const int PSYS_SRC_OMEGA = 21; |
| 130 | public const int PSYS_SRC_ANGLE_BEGIN = 22; | 131 | public const int PSYS_SRC_ANGLE_BEGIN = 22; |
| 131 | public const int PSYS_SRC_ANGLE_END = 23; | 132 | public const int PSYS_SRC_ANGLE_END = 23; |
| 133 | public const int PSYS_PART_BLEND_FUNC_SOURCE = 24; | ||
| 134 | public const int PSYS_PART_BLEND_FUNC_DEST = 25; | ||
| 135 | public const int PSYS_PART_START_GLOW = 26; | ||
| 136 | public const int PSYS_PART_END_GLOW = 27; | ||
| 137 | public const int PSYS_PART_BF_ONE = 0; | ||
| 138 | public const int PSYS_PART_BF_ZERO = 1; | ||
| 139 | public const int PSYS_PART_BF_DEST_COLOR = 2; | ||
| 140 | public const int PSYS_PART_BF_SOURCE_COLOR = 3; | ||
| 141 | public const int PSYS_PART_BF_ONE_MINUS_DEST_COLOR = 4; | ||
| 142 | public const int PSYS_PART_BF_ONE_MINUS_SOURCE_COLOR = 5; | ||
| 143 | public const int PSYS_PART_BF_SOURCE_ALPHA = 7; | ||
| 144 | public const int PSYS_PART_BF_ONE_MINUS_SOURCE_ALPHA = 9; | ||
| 132 | public const int PSYS_SRC_PATTERN_DROP = 1; | 145 | public const int PSYS_SRC_PATTERN_DROP = 1; |
| 133 | public const int PSYS_SRC_PATTERN_EXPLODE = 2; | 146 | public const int PSYS_SRC_PATTERN_EXPLODE = 2; |
| 134 | public const int PSYS_SRC_PATTERN_ANGLE = 4; | 147 | public const int PSYS_SRC_PATTERN_ANGLE = 4; |