aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie Thielker2008-09-20 18:17:04 +0000
committerMelanie Thielker2008-09-20 18:17:04 +0000
commite7064c0b198039fc3102d0d3cd330634efe5d134 (patch)
treea8d7a33f577e857acd31350265228bad3ddbc63e
parent- Consistency fix: Like llGetNumberOfNotecardLines, llGetNotecardLine returns... (diff)
downloadopensim-SC_OLD-e7064c0b198039fc3102d0d3cd330634efe5d134.zip
opensim-SC_OLD-e7064c0b198039fc3102d0d3cd330634efe5d134.tar.gz
opensim-SC_OLD-e7064c0b198039fc3102d0d3cd330634efe5d134.tar.bz2
opensim-SC_OLD-e7064c0b198039fc3102d0d3cd330634efe5d134.tar.xz
Fix up some ScriptBase details
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs19
1 files changed, 9 insertions, 10 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs
index 25f654e..ba2ec87 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs
@@ -159,7 +159,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
159 { 159 {
160 foreach (KeyValuePair<string, object> var in vars) 160 foreach (KeyValuePair<string, object> var in vars)
161 { 161 {
162 FieldInfo field = (FieldInfo)var.Value;
163 if (m_Fields.ContainsKey(var.Key)) 162 if (m_Fields.ContainsKey(var.Key))
164 { 163 {
165 if (m_Fields[var.Key].FieldType == typeof(LSL_Types.list)) 164 if (m_Fields[var.Key].FieldType == typeof(LSL_Types.list))
@@ -170,15 +169,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
170 Array.Copy(data, 0, v.Data, 0, data.Length); 169 Array.Copy(data, 0, v.Data, 0, data.Length);
171 m_Fields[var.Key].SetValue(this, v); 170 m_Fields[var.Key].SetValue(this, v);
172 } 171 }
173 else if(field.FieldType == typeof(LSL_Types.LSLInteger) || 172 else if(m_Fields[var.Key].FieldType == typeof(LSL_Types.LSLInteger) ||
174 field.FieldType == typeof(LSL_Types.LSLString) || 173 m_Fields[var.Key].FieldType == typeof(LSL_Types.LSLString) ||
175 field.FieldType == typeof(LSL_Types.LSLFloat) || 174 m_Fields[var.Key].FieldType == typeof(LSL_Types.LSLFloat) ||
176 field.FieldType == typeof(Int32) || 175 m_Fields[var.Key].FieldType == typeof(Int32) ||
177 field.FieldType == typeof(Double) || 176 m_Fields[var.Key].FieldType == typeof(Double) ||
178 field.FieldType == typeof(Single) || 177 m_Fields[var.Key].FieldType == typeof(Single) ||
179 field.FieldType == typeof(String) || 178 m_Fields[var.Key].FieldType == typeof(String) ||
180 field.FieldType == typeof(Byte) || 179 m_Fields[var.Key].FieldType == typeof(Byte) ||
181 field.FieldType == typeof(short)) 180 m_Fields[var.Key].FieldType == typeof(short))
182 { 181 {
183 m_Fields[var.Key].SetValue(this, var.Value); 182 m_Fields[var.Key].SetValue(this, var.Value);
184 } 183 }