* Apply cmickeyb's patch from mantis 2068

* llParseString functions throw exception when passed a list of variables 
* Thanks!

2 files changed, 15 insertions, 9 deletions

diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index a407382..be0dddc 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -16,7 +16,7 @@ OpenSim Developers
 * CW
 * Babblefrog
 * Tedd
-* justincc (IBM)
+* justincc
 * Teravus (w3z)
 * Johan Berntsson (3Di)
 * Ckrinke (Charles Krinke)
@@ -61,6 +61,7 @@ Patches
 * Junta Kohime
 * Homer_Horwitz
 * Zha Ewry
+* Mic Bowman
 
 
 LSL Devs
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index f10a854..a32ffe2 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -4526,12 +4526,12 @@ namespace OpenSim.Region.ScriptEngine.Common
                 {
                     int index = str.IndexOf(delimiters[i].ToString());
                     bool found = index != -1;
-                    if (found && String.Empty != (string)delimiters[i])
+                    if (found && String.Empty != delimiters[i].ToString())
                     {
                         if ((cindex > index) || (cindex == -1))
                         {
                             cindex = index;
-                            cdeli = (string)delimiters[i];
+                            cdeli = delimiters[i].ToString();
                         }
                         dfound = dfound || found;
                     }
@@ -4541,9 +4541,14 @@ namespace OpenSim.Region.ScriptEngine.Common
                     if (cindex > 0)
                     {
                         ret.Add(str.Substring(0, cindex));
-                        if (spacers.Contains(cdeli))
+                        // Cannot use spacers.Contains() because spacers may be either type String or LSLString
+                        for (int j = 0; j < spacers.Length; j++)
                         {
-                            ret.Add(cdeli);
+                            if (spacers.Data[j].ToString() == cdeli)
+                            {
+                                ret.Add(cdeli);
+                                break;
+                            }
                         }
                     }
                     if (cindex == 0 && spacers.Contains(cdeli))
@@ -6786,7 +6791,7 @@ namespace OpenSim.Region.ScriptEngine.Common
                     if (active[j])
                     {
                         // scan all of the markers
-                        if ((offset[j] = src.IndexOf((string)separray[j],beginning)) == -1)
+                        if ((offset[j] = src.IndexOf(separray[j].ToString(),beginning)) == -1)
                         {
                             // not present at all
                             active[j] = false;
@@ -6814,7 +6819,7 @@ namespace OpenSim.Region.ScriptEngine.Common
                         if (active[j])
                         {
                             // scan all of the markers
-                            if ((offset[j] = src.IndexOf((string)spcarray[j-seplen], beginning)) == -1)
+                            if ((offset[j] = src.IndexOf(spcarray[j-seplen].ToString(), beginning)) == -1)
                             {
                                 // not present at all
                                 active[j] = false;
@@ -6849,11 +6854,11 @@ namespace OpenSim.Region.ScriptEngine.Common
 
                 if (best < seplen)
                 {
-                    beginning = offset[best] + ((string)separray[best]).Length;
+                    beginning = offset[best] + (separray[best].ToString()).Length;
                 }
                 else
                 {
-                    beginning = offset[best] + ((string)spcarray[best - seplen]).Length;
+                    beginning = offset[best] + (spcarray[best - seplen].ToString()).Length;
                     tokens.Add(spcarray[best - seplen]);
                 }
             }