OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix llParseString* to create LSLStrings. This makes llListFindList work 

on lists created by parsing
0.6.1-post-fixes
Melanie Thielker 2008-11-08 15:31:02 +00:00
parent e93828fe00
commit 5c0fd512e8
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@ -4642,18 +4642,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{ {
for (int i = 0; i < length; i++) for (int i = 0; i < length; i++)
{ {
if (src.Data[i].Equals(test.Data[0])) if (src.Data[i].Equals(test.Data[0]))
{ {
int j; int j;
for (j = 1; j < test.Length; j++) for (j = 1; j < test.Length; j++)
if (!src.Data[i+j].Equals(test.Data[j])) if (!src.Data[i+j].Equals(test.Data[j]))
break; break;
if (j == test.Length) if (j == test.Length)
{ {
index = i; index = i;
break; break;
} }
} }
} }
} }
@ -4939,14 +4939,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{ {
if (cindex > 0) if (cindex > 0)
{ {
ret.Add(str.Substring(0, cindex)); ret.Add(new LSL_String(str.Substring(0, cindex)));
} }
// Cannot use spacers.Contains() because spacers may be either type String or LSLString // Cannot use spacers.Contains() because spacers may be either type String or LSLString
for (int j = 0; j < spacers.Length; j++) for (int j = 0; j < spacers.Length; j++)
{ {
if (spacers.Data[j].ToString() == cdeli) if (spacers.Data[j].ToString() == cdeli)
{ {
ret.Add(cdeli); ret.Add(new LSL_String(cdeli));
break; break;
} }
} }
@ -4955,7 +4955,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
} while (dfound); } while (dfound);
if (str != "") if (str != "")
{ {
ret.Add(str); ret.Add(new LSL_String(str));
} }
return ret; return ret;
} }
@ -7291,14 +7291,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{ {
// no markers were found on this pass // no markers were found on this pass
// so we're pretty much done // so we're pretty much done
tokens.Add(src.Substring(beginning, srclen - beginning)); tokens.Add(new LSL_String(src.Substring(beginning, srclen - beginning)));
break; break;
} }
// Otherwise we just add the newly delimited token // Otherwise we just add the newly delimited token
// and recalculate where the search should continue. // and recalculate where the search should continue.
tokens.Add(src.Substring(beginning,offset[best]-beginning)); tokens.Add(new LSL_String(src.Substring(beginning,offset[best]-beginning)));
if (best < seplen) if (best < seplen)
{ {
@ -7307,7 +7307,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
else else
{ {
beginning = offset[best] + (spcarray[best - seplen].ToString()).Length; beginning = offset[best] + (spcarray[best - seplen].ToString()).Length;
tokens.Add(spcarray[best - seplen]); tokens.Add(new LSL_String(spcarray[best - seplen].ToString()));
} }
} }
@ -7320,7 +7320,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (beginning == srclen) if (beginning == srclen)
{ {
if (srclen != 0) if (srclen != 0)
tokens.Add(""); tokens.Add(new LSL_String(""));
} }
return tokens; return tokens;