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

3
OpenSim/Framework/Util.cs
View File

@ -939,6 +939,8 @@ namespace OpenSim.Framework
FieldInfo[] fieldInfos = settingsType.GetFields(); FieldInfo[] fieldInfos = settingsType.GetFields();
foreach (FieldInfo fieldInfo in fieldInfos) foreach (FieldInfo fieldInfo in fieldInfos)
{
if (!fieldInfo.IsStatic)
{ {
if (fieldInfo.FieldType == typeof(System.String)) if (fieldInfo.FieldType == typeof(System.String))
{ {
@ -961,6 +963,7 @@ namespace OpenSim.Framework
fieldInfo.SetValue(settingsClass, System.Convert.ToUInt32(config.Get(fieldInfo.Name, ((uint)fieldInfo.GetValue(settingsClass)).ToString()))); fieldInfo.SetValue(settingsClass, System.Convert.ToUInt32(config.Get(fieldInfo.Name, ((uint)fieldInfo.GetValue(settingsClass)).ToString())));
} }
} }
}
PropertyInfo[] propertyInfos = settingsType.GetProperties(); PropertyInfo[] propertyInfos = settingsType.GetProperties();
foreach (PropertyInfo propInfo in propertyInfos) foreach (PropertyInfo propInfo in propertyInfos)