aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorDiva Canto2010-03-07 10:01:43 -0800
committerDiva Canto2010-03-07 10:01:43 -0800
commit26673af974f9d03b4fee22e29c5243a4f6c7b0c8 (patch)
treebb647ca99cf3ed02b9aef75a7561f200e20587e9 /OpenSim
parentRemoved obsolete configs. (diff)
parentSmall consistency change (diff)
downloadopensim-SC_OLD-26673af974f9d03b4fee22e29c5243a4f6c7b0c8.zip
opensim-SC_OLD-26673af974f9d03b4fee22e29c5243a4f6c7b0c8.tar.gz
opensim-SC_OLD-26673af974f9d03b4fee22e29c5243a4f6c7b0c8.tar.bz2
opensim-SC_OLD-26673af974f9d03b4fee22e29c5243a4f6c7b0c8.tar.xz
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 6f68305..59db81e 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -5900,7 +5900,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5900 5900
5901 for (int i = 0; i < rules.Length; i += 2) 5901 for (int i = 0; i < rules.Length; i += 2)
5902 { 5902 {
5903 switch (Convert.ToInt32(rules.Data[i])) 5903 switch (rules.GetLSLIntegerItem(i))
5904 { 5904 {
5905 case (int)ScriptBaseClass.PSYS_PART_FLAGS: 5905 case (int)ScriptBaseClass.PSYS_PART_FLAGS:
5906 prules.PartDataFlags = (Primitive.ParticleSystem.ParticleDataFlags)(uint)rules.GetLSLIntegerItem(i + 1); 5906 prules.PartDataFlags = (Primitive.ParticleSystem.ParticleDataFlags)(uint)rules.GetLSLIntegerItem(i + 1);
@@ -9871,4 +9871,4 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9871 } 9871 }
9872 } 9872 }
9873 } 9873 }
9874} \ No newline at end of file 9874}