Mantis #2147

Thank you, ralphos, for a patch the adapts llSetColor and friends to
a change in the underlying types.
Also, thank you for a much cleaner way of casting types out of
lists, which I will adopt throughout.

2 files changed, 27 insertions, 26 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 0cc8279..bc58a8a 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -1001,9 +1001,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             if (face > -1)
             {
                 texcolor = tex.CreateFace((uint)face).RGBA;
-                texcolor.R = (float)Math.Abs(color.x - 1);
-                texcolor.G = (float)Math.Abs(color.y - 1);
-                texcolor.B = (float)Math.Abs(color.z - 1);
+                texcolor.R = (float)color.x;
+                texcolor.G = (float)color.y;
+                texcolor.B = (float)color.z;
                 tex.FaceTextures[face].RGBA = texcolor;
                 part.UpdateTexture(tex);
                 return;
@@ -1015,15 +1015,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     if (tex.FaceTextures[i] != null)
                     {
                         texcolor = tex.FaceTextures[i].RGBA;
-                        texcolor.R = (float)Math.Abs(color.x - 1);
-                        texcolor.G = (float)Math.Abs(color.y - 1);
-                        texcolor.B = (float)Math.Abs(color.z - 1);
+                        texcolor.R = (float)color.x;
+                        texcolor.G = (float)color.y;
+                        texcolor.B = (float)color.z;
                         tex.FaceTextures[i].RGBA = texcolor;
                     }
                     texcolor = tex.DefaultTexture.RGBA;
-                    texcolor.R = (float)Math.Abs(color.x - 1);
-                    texcolor.G = (float)Math.Abs(color.y - 1);
-                    texcolor.B = (float)Math.Abs(color.z - 1);
+                    texcolor.R = (float)color.x;
+                    texcolor.G = (float)color.y;
+                    texcolor.B = (float)color.z;
                     tex.DefaultTexture.RGBA = texcolor;
                 }
                 part.UpdateTexture(tex);
@@ -5783,11 +5783,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     case (int)ScriptBaseClass.PRIM_POINT_LIGHT:
                         if (remain < 5)
                             return;
-                        LSL_Types.LSLInteger light = new LSL_Types.LSLInteger(rules.Data[idx++].ToString());
-                        LSL_Types.Vector3 lightcolor = new LSL_Types.Vector3(rules.Data[idx++].ToString());
-                        float intensity = (float)Convert.ToDouble(rules.Data[idx++].ToString());
-                        float radius = (float)Convert.ToDouble(rules.Data[idx++].ToString());
-                        float falloff = (float)Convert.ToDouble(rules.Data[idx++].ToString());
+                        bool light = rules.GetLSLIntegerItem(idx++);
+                        LSL_Types.Vector3 lightcolor = rules.GetVector3Item(idx++);
+                        float intensity = (float)rules.GetLSLFloatItem(idx++);
+                        float radius = (float)rules.GetLSLFloatItem(idx++);
+                        float falloff = (float)rules.GetLSLFloatItem(idx++);
 
                         SetPointLight(part, light, lightcolor, intensity, radius, falloff);
 
@@ -5795,8 +5795,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     case (int)ScriptBaseClass.PRIM_GLOW:
                         if (remain < 2)
                             return;
+                    // TODO: LSL constant ALL_SIDES (value -1) is inserted into LSL_Types.list
+                    //       as a raw CLI Int32. When / if this is inserted as an
+                    //       LSL_Types.LSLInteger extract value using LSL_Types.list.GetLSLIntegerItem
+                    //    face = rules.GetLSLIntegerItem(idx++);
                         face = Convert.ToInt32(rules.Data[idx++].ToString());
-                        float glow = (float)Convert.ToDouble(rules.Data[idx++].ToString());
+                        float glow = (float)rules.GetLSLFloatItem(idx++);
 
                         SetGlow(part, face, glow);
 
@@ -5814,14 +5818,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                      case (int)ScriptBaseClass.PRIM_FULLBRIGHT:
                          if (remain < 2)
                              return;
+                   // TODO: LSL constant ALL_SIDES (value -1) is inserted into LSL_Types.list
+                   //       as a raw CLI Int32. When / if this is inserted as an
+                   //       LSL_Types.LSLInteger extract value using LSL_Types.list.GetLSLIntegerItem
+                   //      face = rules.GetLSLIntegerItem(idx++);
                          face = Convert.ToInt32(rules.Data[idx++].ToString());
-                         string bv = rules.Data[idx++].ToString();
-                         bool st;
-                         if (bv.Equals("1"))
-                             st = true;
-                         else
-                             st = false;
-
+                         bool st = rules.GetLSLIntegerItem(idx++);
                          SetFullBright(part, face , st);
                          break;
                      case (int)ScriptBaseClass.PRIM_MATERIAL:
diff --git a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
index 3820dae..4554b0c 100644
--- a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
@@ -472,7 +472,6 @@ namespace OpenSim.Region.ScriptEngine.Shared
               return (LSL_Types.key)m_data[itemIndex];
             }
 
-
             public static list operator +(list a, list b)
             {
                 object[] tmp;
@@ -488,19 +487,19 @@ namespace OpenSim.Region.ScriptEngine.Shared
                 m_data.SetValue(o, Length - 1);
             }
 
-            public static list operator +(list a, string s)
+            public static list operator +(list a, LSLString s)
             {
                 a.ExtendAndAdd(s);
                 return a;
             }
 
-            public static list operator +(list a, int i)
+            public static list operator +(list a, LSLInteger i)
             {
                 a.ExtendAndAdd(i);
                 return a;
             }
 
-            public static list operator +(list a, double d)
+            public static list operator +(list a, LSLFloat d)
             {
                 a.ExtendAndAdd(d);
                 return a;