ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 09:45:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source 
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
This commit is contained in:
Melanie
2014-01-28 20:47:36 +00:00
parent 1eecb34e62 4675a2fb29
commit 4ccb15290e
16 changed files with 264 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Framework/Util.cs
View File

@@ -2084,8 +2084,10 @@ namespace OpenSim.Framework
#region Xml Serialization Utilities
public static bool ReadBoolean(XmlTextReader reader)
{
// AuroraSim uses "int" for some fields that are boolean in OpenSim, e.g. "PassCollisions". Don't fail because of this.
reader.ReadStartElement();
bool result = Boolean.Parse(reader.ReadContentAsString().ToLower());
string val = reader.ReadContentAsString().ToLower();
bool result = val.Equals("true") || val.Equals("1");
reader.ReadEndElement();
return result;