aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
authorJohn Hurliman2009-10-21 16:24:17 -0700
committerJohn Hurliman2009-10-21 16:24:17 -0700
commit2b39ff0a39229f1cea513b12e6d093e31c40d0b2 (patch)
tree9b5637ecf48129b025fafec5eeed19c852e13716 /OpenSim/Region/ScriptEngine
parent* FireQueueEmpty now checks if a measurable amount of time has passed, and if... (diff)
parentFix llParticleSystem to accept LSL variables and LSL constants in place (diff)
downloadopensim-SC_OLD-2b39ff0a39229f1cea513b12e6d093e31c40d0b2.zip
opensim-SC_OLD-2b39ff0a39229f1cea513b12e6d093e31c40d0b2.tar.gz
opensim-SC_OLD-2b39ff0a39229f1cea513b12e6d093e31c40d0b2.tar.bz2
opensim-SC_OLD-2b39ff0a39229f1cea513b12e6d093e31c40d0b2.tar.xz
Merged master into prioritization
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs14
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 57b14f7..a94b4e4 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -4660,7 +4660,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4660 { 4660 {
4661 index = src.Length + index; 4661 index = src.Length + index;
4662 } 4662 }
4663 if (index >= src.Length) 4663 if (index >= src.Length || index < 0)
4664 { 4664 {
4665 return 0; 4665 return 0;
4666 } 4666 }
@@ -4685,7 +4685,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4685 { 4685 {
4686 index = src.Length + index; 4686 index = src.Length + index;
4687 } 4687 }
4688 if (index >= src.Length) 4688 if (index >= src.Length || index < 0)
4689 { 4689 {
4690 return 0.0; 4690 return 0.0;
4691 } 4691 }
@@ -4712,7 +4712,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4712 { 4712 {
4713 index = src.Length + index; 4713 index = src.Length + index;
4714 } 4714 }
4715 if (index >= src.Length) 4715 if (index >= src.Length || index < 0)
4716 { 4716 {
4717 return String.Empty; 4717 return String.Empty;
4718 } 4718 }
@@ -4726,7 +4726,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4726 { 4726 {
4727 index = src.Length + index; 4727 index = src.Length + index;
4728 } 4728 }
4729 if (index >= src.Length) 4729 if (index >= src.Length || index < 0)
4730 { 4730 {
4731 return ""; 4731 return "";
4732 } 4732 }
@@ -4740,7 +4740,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4740 { 4740 {
4741 index = src.Length + index; 4741 index = src.Length + index;
4742 } 4742 }
4743 if (index >= src.Length) 4743 if (index >= src.Length || index < 0)
4744 { 4744 {
4745 return new LSL_Vector(0, 0, 0); 4745 return new LSL_Vector(0, 0, 0);
4746 } 4746 }
@@ -4761,7 +4761,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4761 { 4761 {
4762 index = src.Length + index; 4762 index = src.Length + index;
4763 } 4763 }
4764 if (index >= src.Length) 4764 if (index >= src.Length || index < 0)
4765 { 4765 {
4766 return new LSL_Rotation(0, 0, 0, 1); 4766 return new LSL_Rotation(0, 0, 0, 1);
4767 } 4767 }
@@ -5844,7 +5844,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5844 5844
5845 for (int i = 0; i < rules.Length; i += 2) 5845 for (int i = 0; i < rules.Length; i += 2)
5846 { 5846 {
5847 switch ((int)rules.Data[i]) 5847 switch (Convert.ToInt32(rules.Data[i]))
5848 { 5848 {
5849 case (int)ScriptBaseClass.PSYS_PART_FLAGS: 5849 case (int)ScriptBaseClass.PSYS_PART_FLAGS:
5850 prules.PartDataFlags = (Primitive.ParticleSystem.ParticleDataFlags)(uint)rules.GetLSLIntegerItem(i + 1); 5850 prules.PartDataFlags = (Primitive.ParticleSystem.ParticleDataFlags)(uint)rules.GetLSLIntegerItem(i + 1);