diff options
author | Justin Clark-Casey (justincc) | 2014-01-11 01:22:42 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2014-01-11 01:22:42 +0000 |
commit | b5ef585069ede68ee694c06b80f4f96068e9389f (patch) | |
tree | 39007ac09481a886ba16c60de7ce18a24c78d4e8 /OpenSim/Framework/Util.cs | |
parent | Merge branch 'justincc-master' (diff) | |
parent | Allow Boolean nodes in XML to be specified as "0/1". AuroraSim does that. (diff) | |
download | opensim-SC_OLD-b5ef585069ede68ee694c06b80f4f96068e9389f.zip opensim-SC_OLD-b5ef585069ede68ee694c06b80f4f96068e9389f.tar.gz opensim-SC_OLD-b5ef585069ede68ee694c06b80f4f96068e9389f.tar.bz2 opensim-SC_OLD-b5ef585069ede68ee694c06b80f4f96068e9389f.tar.xz |
Merge branch 'justincc-master'
Diffstat (limited to 'OpenSim/Framework/Util.cs')
-rw-r--r-- | OpenSim/Framework/Util.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs index b84673b..cebba46 100644 --- a/OpenSim/Framework/Util.cs +++ b/OpenSim/Framework/Util.cs | |||
@@ -2072,8 +2072,10 @@ namespace OpenSim.Framework | |||
2072 | #region Xml Serialization Utilities | 2072 | #region Xml Serialization Utilities |
2073 | public static bool ReadBoolean(XmlTextReader reader) | 2073 | public static bool ReadBoolean(XmlTextReader reader) |
2074 | { | 2074 | { |
2075 | // AuroraSim uses "int" for some fields that are boolean in OpenSim, e.g. "PassCollisions". Don't fail because of this. | ||
2075 | reader.ReadStartElement(); | 2076 | reader.ReadStartElement(); |
2076 | bool result = Boolean.Parse(reader.ReadContentAsString().ToLower()); | 2077 | string val = reader.ReadContentAsString().ToLower(); |
2078 | bool result = val.Equals("true") || val.Equals("1"); | ||
2077 | reader.ReadEndElement(); | 2079 | reader.ReadEndElement(); |
2078 | 2080 | ||
2079 | return result; | 2081 | return result; |