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

XEngine: Fix llGetListEntryType to return the correct type for the LSL types. 

Change serialization to omit types it can't deal with.
0.6.0-stable
Melanie Thielker 2008-09-20 16:24:36 +00:00
parent f8f1bc6199
commit 5a1be7835c
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4002,20 +4002,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return 0; return 0;
} }
if (src.Data[index] is Int32) if (src.Data[index] is LSL_Types.LSLInteger || src.Data[index] is Int32)
return 1; return 1;
if (src.Data[index] is Double) if (src.Data[index] is LSL_Types.LSLFloat || src.Data[index] is Single || src.Data[index] is Double)
return 2; return 2;
if (src.Data[index] is String) if (src.Data[index] is LSL_Types.LSLString || src.Data[index] is String)
{ {
UUID tuuid; UUID tuuid;
if (UUID.TryParse(src.Data[index].ToString(), out tuuid)) if (UUID.TryParse(src.Data[index].ToString(), out tuuid))
{ {
return 3; return 4;
} }
else else
{ {
return 4; return 3;
} }
} }
if (src.Data[index] is LSL_Types.Vector3) if (src.Data[index] is LSL_Types.Vector3)

20
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs
View File

@ -138,7 +138,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
c.Data = data; c.Data = data;
vars[field.Name] = c; vars[field.Name] = c;
} }
else else if(field.FieldType == typeof(LSL_Types.LSLInteger) ||
field.FieldType == typeof(LSL_Types.LSLString) ||
field.FieldType == typeof(LSL_Types.LSLFloat) ||
field.FieldType == typeof(Int32) ||
field.FieldType == typeof(Double) ||
field.FieldType == typeof(Single) ||
field.FieldType == typeof(String) ||
field.FieldType == typeof(Byte) ||
field.FieldType == typeof(Short))
{ {
vars[field.Name] = field.GetValue(this); vars[field.Name] = field.GetValue(this);
} }
@ -161,7 +169,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
Array.Copy(data, 0, v.Data, 0, data.Length); Array.Copy(data, 0, v.Data, 0, data.Length);
m_Fields[var.Key].SetValue(this, v); m_Fields[var.Key].SetValue(this, v);
} }
else else if(field.FieldType == typeof(LSL_Types.LSLInteger) ||
field.FieldType == typeof(LSL_Types.LSLString) ||
field.FieldType == typeof(LSL_Types.LSLFloat) ||
field.FieldType == typeof(Int32) ||
field.FieldType == typeof(Double) ||
field.FieldType == typeof(Single) ||
field.FieldType == typeof(String) ||
field.FieldType == typeof(Byte) ||
field.FieldType == typeof(Short))
{ {
m_Fields[var.Key].SetValue(this, var.Value); m_Fields[var.Key].SetValue(this, var.Value);
} }