Correction of last commit

afrisby
Tedd Hansen 2007-12-31 19:31:40 +00:00
parent ff4f2f5681
commit a8cb20355c
3 changed files with 102 additions and 97 deletions

View File

@ -439,6 +439,11 @@ namespace OpenSim.Region.ScriptEngine.Common
}
return output;
}
public class String
{
}
}
}
}

View File

@ -47,7 +47,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
dataTypes.Add("void", "void");
dataTypes.Add("integer", "int");
dataTypes.Add("float", "double");
dataTypes.Add("string", "string");
dataTypes.Add("string", "LSL_Types.String");
dataTypes.Add("key", "string");
dataTypes.Add("vector", "LSL_Types.Vector3");
dataTypes.Add("rotation", "LSL_Types.Quaternion");

View File

@ -1709,13 +1709,13 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler
{
return 0;
}
switch (src.Data[index].GetType())
{
case typeof(System.Int32):
if (src.Data[index] is System.Int32)
return 1;
case typeof(System.Double):
if (src.Data[index] is System.Double)
return 2;
case typeof(System.String):
if (src.Data[index] is System.String)
{
LLUUID tuuid;
if (LLUUID.TryParse(src.Data[index].ToString(), out tuuid))
{
@ -1725,15 +1725,15 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler
{
return 4;
}
case typeof(OpenSim.Region.ScriptEngine.Common.LSL_Types.Vector3):
return 5;
case typeof(OpenSim.Region.ScriptEngine.Common.LSL_Types.Quaternion):
return 6;
case typeof(OpenSim.Region.ScriptEngine.Common.LSL_Types.list):
return 7;
default:
return 0;
}
if (src.Data[index] is OpenSim.Region.ScriptEngine.Common.LSL_Types.Vector3)
return 5;
if (src.Data[index] is OpenSim.Region.ScriptEngine.Common.LSL_Types.Quaternion)
return 6;
if (src.Data[index] is OpenSim.Region.ScriptEngine.Common.LSL_Types.list)
return 7;
return 0;
}
public string llList2CSV(LSL_Types.list src)