aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorRobert Adams2013-11-06 06:32:11 -0800
committerRobert Adams2013-11-06 06:32:11 -0800
commitf7bd0da026cc7af4ee249e175412ef056ffb8761 (patch)
treed8feb5d26b1789b5689b0a1ddd0722ef622c87d1 /OpenSim/Region
parentMerge branch 'master' into varregion (diff)
parentadd support for particle glow LSL functions (diff)
downloadopensim-SC_OLD-f7bd0da026cc7af4ee249e175412ef056ffb8761.zip
opensim-SC_OLD-f7bd0da026cc7af4ee249e175412ef056ffb8761.tar.gz
opensim-SC_OLD-f7bd0da026cc7af4ee249e175412ef056ffb8761.tar.bz2
opensim-SC_OLD-f7bd0da026cc7af4ee249e175412ef056ffb8761.tar.xz
Merge branch 'master' into varregion
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs28
1 files changed, 27 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 fc6d81f..44a0165 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -6267,6 +6267,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6267 ps.BurstRate = 0.1f; 6267 ps.BurstRate = 0.1f;
6268 ps.PartMaxAge = 10.0f; 6268 ps.PartMaxAge = 10.0f;
6269 ps.BurstPartCount = 1; 6269 ps.BurstPartCount = 1;
6270 ps.BlendFuncSource = ScriptBaseClass.PSYS_PART_BF_SOURCE_ALPHA;
6271 ps.BlendFuncDest = ScriptBaseClass.PSYS_PART_BF_ONE_MINUS_SOURCE_ALPHA;
6272 ps.PartStartGlow = 0.0f;
6273 ps.PartEndGlow = 0.0f;
6274
6270 return ps; 6275 return ps;
6271 } 6276 }
6272 6277
@@ -6301,6 +6306,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6301 LSL_Vector tempv = new LSL_Vector(); 6306 LSL_Vector tempv = new LSL_Vector();
6302 6307
6303 float tempf = 0; 6308 float tempf = 0;
6309 int tmpi = 0;
6304 6310
6305 for (int i = 0; i < rules.Length; i += 2) 6311 for (int i = 0; i < rules.Length; i += 2)
6306 { 6312 {
@@ -6359,7 +6365,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6359 break; 6365 break;
6360 6366
6361 case (int)ScriptBaseClass.PSYS_SRC_PATTERN: 6367 case (int)ScriptBaseClass.PSYS_SRC_PATTERN:
6362 int tmpi = (int)rules.GetLSLIntegerItem(i + 1); 6368 tmpi = (int)rules.GetLSLIntegerItem(i + 1);
6363 prules.Pattern = (Primitive.ParticleSystem.SourcePattern)tmpi; 6369 prules.Pattern = (Primitive.ParticleSystem.SourcePattern)tmpi;
6364 break; 6370 break;
6365 6371
@@ -6379,6 +6385,26 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6379 prules.PartFlags &= 0xFFFFFFFD; // Make sure new angle format is off. 6385 prules.PartFlags &= 0xFFFFFFFD; // Make sure new angle format is off.
6380 break; 6386 break;
6381 6387
6388 case (int)ScriptBaseClass.PSYS_PART_BLEND_FUNC_SOURCE:
6389 tmpi = (int)rules.GetLSLIntegerItem(i + 1);
6390 prules.BlendFuncSource = (byte)tmpi;
6391 break;
6392
6393 case (int)ScriptBaseClass.PSYS_PART_BLEND_FUNC_DEST:
6394 tmpi = (int)rules.GetLSLIntegerItem(i + 1);
6395 prules.BlendFuncDest = (byte)tmpi;
6396 break;
6397
6398 case (int)ScriptBaseClass.PSYS_PART_START_GLOW:
6399 tempf = (float)rules.GetLSLFloatItem(i + 1);
6400 prules.PartStartGlow = (float)tempf;
6401 break;
6402
6403 case (int)ScriptBaseClass.PSYS_PART_END_GLOW:
6404 tempf = (float)rules.GetLSLFloatItem(i + 1);
6405 prules.PartEndGlow = (float)tempf;
6406 break;
6407
6382 case (int)ScriptBaseClass.PSYS_SRC_TEXTURE: 6408 case (int)ScriptBaseClass.PSYS_SRC_TEXTURE:
6383 prules.Texture = ScriptUtils.GetAssetIdFromKeyOrItemName(m_host, rules.GetLSLStringItem(i + 1)); 6409 prules.Texture = ScriptUtils.GetAssetIdFromKeyOrItemName(m_host, rules.GetLSLStringItem(i + 1));
6384 break; 6410 break;