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

Added check so Util.ReadSettingsFromIniFile doesn't try to set static fields.

0.6.4-rc1
MW 2009-02-28 16:42:13 +00:00
parent 77b70759a6
commit 23a7af4538
1 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
OpenSim/Framework/Util.cs
View File

@ -940,25 +940,28 @@ namespace OpenSim.Framework
FieldInfo[] fieldInfos = settingsType.GetFields(); FieldInfo[] fieldInfos = settingsType.GetFields();
foreach (FieldInfo fieldInfo in fieldInfos) foreach (FieldInfo fieldInfo in fieldInfos)
{ {
if (fieldInfo.FieldType == typeof(System.String)) if (!fieldInfo.IsStatic)
{ {
fieldInfo.SetValue(settingsClass, config.Get(fieldInfo.Name, (string)fieldInfo.GetValue(settingsClass))); if (fieldInfo.FieldType == typeof(System.String))
} {
else if (fieldInfo.FieldType == typeof(System.Boolean)) fieldInfo.SetValue(settingsClass, config.Get(fieldInfo.Name, (string)fieldInfo.GetValue(settingsClass)));
{ }
fieldInfo.SetValue(settingsClass, config.GetBoolean(fieldInfo.Name, (bool)fieldInfo.GetValue(settingsClass))); else if (fieldInfo.FieldType == typeof(System.Boolean))
} {
else if (fieldInfo.FieldType == typeof(System.Int32)) fieldInfo.SetValue(settingsClass, config.GetBoolean(fieldInfo.Name, (bool)fieldInfo.GetValue(settingsClass)));
{ }
fieldInfo.SetValue(settingsClass, config.GetInt(fieldInfo.Name, (int)fieldInfo.GetValue(settingsClass))); else if (fieldInfo.FieldType == typeof(System.Int32))
} {
else if (fieldInfo.FieldType == typeof(System.Single)) fieldInfo.SetValue(settingsClass, config.GetInt(fieldInfo.Name, (int)fieldInfo.GetValue(settingsClass)));
{ }
fieldInfo.SetValue(settingsClass, config.GetFloat(fieldInfo.Name, (float)fieldInfo.GetValue(settingsClass))); else if (fieldInfo.FieldType == typeof(System.Single))
} {
else if (fieldInfo.FieldType == typeof(System.UInt32)) fieldInfo.SetValue(settingsClass, config.GetFloat(fieldInfo.Name, (float)fieldInfo.GetValue(settingsClass)));
{ }
fieldInfo.SetValue(settingsClass, System.Convert.ToUInt32(config.Get(fieldInfo.Name, ((uint)fieldInfo.GetValue(settingsClass)).ToString()))); else if (fieldInfo.FieldType == typeof(System.UInt32))
{
fieldInfo.SetValue(settingsClass, System.Convert.ToUInt32(config.Get(fieldInfo.Name, ((uint)fieldInfo.GetValue(settingsClass)).ToString())));
}
} }
} }