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

Mantis #1843 

Applying DotNetEnine part of this patch. Thank you, nlin!
Corrects ad hoc key list comparison.
0.6.0-stable
Melanie Thielker 2008-09-16 10:26:54 +00:00
parent eee31c6f28
commit f46fc508d1
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
View File

@ -4385,11 +4385,11 @@ namespace OpenSim.Region.ScriptEngine.Common
{ {
for (int i = 0; i < length; i++) for (int i = 0; i < length; i++)
{ {
if (src.Data[i].Equals(test.Data[0])) if (AreEqual(src.Data[i], 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 (!AreEqual(src.Data[i+j], test.Data[j]))
break; break;
if (j == test.Length) if (j == test.Length)
{ {
@ -4404,6 +4404,18 @@ namespace OpenSim.Region.ScriptEngine.Common
} }
private bool AreEqual(object src, object test)
{
if (src.GetType().FullName == "System.String")
{
return src.ToString() == test.ToString();
}
else
{
return src.Equals(test);
}
}
public string llGetObjectName() public string llGetObjectName()
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);