aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie Thielker2008-10-28 10:14:44 +0000
committerMelanie Thielker2008-10-28 10:14:44 +0000
commit8ea4553d39749c9e5a5f1f8d49b9fa192c250d47 (patch)
tree72cfdac31f68e7a94e674230e67cd1b5dfa7bc08
parentsome sorely needed extruder code simplification and refactoring, also some fi... (diff)
downloadopensim-SC-8ea4553d39749c9e5a5f1f8d49b9fa192c250d47.zip
opensim-SC-8ea4553d39749c9e5a5f1f8d49b9fa192c250d47.tar.gz
opensim-SC-8ea4553d39749c9e5a5f1f8d49b9fa192c250d47.tar.bz2
opensim-SC-8ea4553d39749c9e5a5f1f8d49b9fa192c250d47.tar.xz
Mantis #2486
Thank you, nlin, for a patch that fixes serialization of vector and quaternion types for script state.
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs9
1 files changed, 7 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs
index 5836cc1..6e56231 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs
@@ -146,7 +146,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
146 field.FieldType == typeof(Single) || 146 field.FieldType == typeof(Single) ||
147 field.FieldType == typeof(String) || 147 field.FieldType == typeof(String) ||
148 field.FieldType == typeof(Byte) || 148 field.FieldType == typeof(Byte) ||
149 field.FieldType == typeof(short)) 149 field.FieldType == typeof(short) ||
150 field.FieldType == typeof(LSL_Types.Vector3) ||
151 field.FieldType == typeof(LSL_Types.Quaternion))
150 { 152 {
151 vars[field.Name] = field.GetValue(this); 153 vars[field.Name] = field.GetValue(this);
152 } 154 }
@@ -177,7 +179,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
177 m_Fields[var.Key].FieldType == typeof(Single) || 179 m_Fields[var.Key].FieldType == typeof(Single) ||
178 m_Fields[var.Key].FieldType == typeof(String) || 180 m_Fields[var.Key].FieldType == typeof(String) ||
179 m_Fields[var.Key].FieldType == typeof(Byte) || 181 m_Fields[var.Key].FieldType == typeof(Byte) ||
180 m_Fields[var.Key].FieldType == typeof(short)) 182 m_Fields[var.Key].FieldType == typeof(short) ||
183 m_Fields[var.Key].FieldType == typeof(LSL_Types.Vector3) ||
184 m_Fields[var.Key].FieldType == typeof(LSL_Types.Quaternion)
185 )
181 { 186 {
182 m_Fields[var.Key].SetValue(this, var.Value); 187 m_Fields[var.Key].SetValue(this, var.Value);
183 } 188 }