diff options
author | Melanie | 2014-01-28 20:47:36 +0000 |
---|---|---|
committer | Melanie | 2014-01-28 20:47:36 +0000 |
commit | 4ccb15290ea9686070311c8a62c0fd9e6b0787d8 (patch) | |
tree | 5c4f69879983e87f567e11c59d8d8b83d0bd7bb4 /OpenSim/Framework/Util.cs | |
parent | Remove the core module extra profile settings support carried in with the latest (diff) | |
parent | Merge branch 'justincc-master' (diff) | |
download | opensim-SC-4ccb15290ea9686070311c8a62c0fd9e6b0787d8.zip opensim-SC-4ccb15290ea9686070311c8a62c0fd9e6b0787d8.tar.gz opensim-SC-4ccb15290ea9686070311c8a62c0fd9e6b0787d8.tar.bz2 opensim-SC-4ccb15290ea9686070311c8a62c0fd9e6b0787d8.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
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 87a53ff..eefbde5 100644 --- a/OpenSim/Framework/Util.cs +++ b/OpenSim/Framework/Util.cs | |||
@@ -2084,8 +2084,10 @@ namespace OpenSim.Framework | |||
2084 | #region Xml Serialization Utilities | 2084 | #region Xml Serialization Utilities |
2085 | public static bool ReadBoolean(XmlTextReader reader) | 2085 | public static bool ReadBoolean(XmlTextReader reader) |
2086 | { | 2086 | { |
2087 | // AuroraSim uses "int" for some fields that are boolean in OpenSim, e.g. "PassCollisions". Don't fail because of this. | ||
2087 | reader.ReadStartElement(); | 2088 | reader.ReadStartElement(); |
2088 | bool result = Boolean.Parse(reader.ReadContentAsString().ToLower()); | 2089 | string val = reader.ReadContentAsString().ToLower(); |
2090 | bool result = val.Equals("true") || val.Equals("1"); | ||
2089 | reader.ReadEndElement(); | 2091 | reader.ReadEndElement(); |
2090 | 2092 | ||
2091 | return result; | 2093 | return result; |