diff options
author | Justin Clark-Casey (justincc) | 2012-05-15 23:47:42 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-05-15 23:47:42 +0100 |
commit | e644e34545054592ebfd5b4b89c67841fe21e22b (patch) | |
tree | 19f8c6f86b3f139a9e20b3d61d90e63376a4b56e /OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | |
parent | Fix issue where loading OARs could sometimes result in link numbers being reo... (diff) | |
parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC_OLD-e644e34545054592ebfd5b4b89c67841fe21e22b.zip opensim-SC_OLD-e644e34545054592ebfd5b4b89c67841fe21e22b.tar.gz opensim-SC_OLD-e644e34545054592ebfd5b4b89c67841fe21e22b.tar.bz2 opensim-SC_OLD-e644e34545054592ebfd5b4b89c67841fe21e22b.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs index e6b88a3..a11dc49 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | |||
@@ -301,6 +301,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
301 | m_SOPXmlProcessors.Add("Name", ProcessName); | 301 | m_SOPXmlProcessors.Add("Name", ProcessName); |
302 | m_SOPXmlProcessors.Add("Material", ProcessMaterial); | 302 | m_SOPXmlProcessors.Add("Material", ProcessMaterial); |
303 | m_SOPXmlProcessors.Add("PassTouches", ProcessPassTouches); | 303 | m_SOPXmlProcessors.Add("PassTouches", ProcessPassTouches); |
304 | m_SOPXmlProcessors.Add("PassCollisions", ProcessPassCollisions); | ||
304 | m_SOPXmlProcessors.Add("RegionHandle", ProcessRegionHandle); | 305 | m_SOPXmlProcessors.Add("RegionHandle", ProcessRegionHandle); |
305 | m_SOPXmlProcessors.Add("ScriptAccessPin", ProcessScriptAccessPin); | 306 | m_SOPXmlProcessors.Add("ScriptAccessPin", ProcessScriptAccessPin); |
306 | m_SOPXmlProcessors.Add("GroupPosition", ProcessGroupPosition); | 307 | m_SOPXmlProcessors.Add("GroupPosition", ProcessGroupPosition); |
@@ -485,6 +486,11 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
485 | obj.PassTouches = Util.ReadBoolean(reader); | 486 | obj.PassTouches = Util.ReadBoolean(reader); |
486 | } | 487 | } |
487 | 488 | ||
489 | private static void ProcessPassCollisions(SceneObjectPart obj, XmlTextReader reader) | ||
490 | { | ||
491 | obj.PassCollisions = Util.ReadBoolean(reader); | ||
492 | } | ||
493 | |||
488 | private static void ProcessRegionHandle(SceneObjectPart obj, XmlTextReader reader) | 494 | private static void ProcessRegionHandle(SceneObjectPart obj, XmlTextReader reader) |
489 | { | 495 | { |
490 | obj.RegionHandle = (ulong)reader.ReadElementContentAsLong("RegionHandle", String.Empty); | 496 | obj.RegionHandle = (ulong)reader.ReadElementContentAsLong("RegionHandle", String.Empty); |
@@ -1153,6 +1159,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
1153 | writer.WriteElementString("Name", sop.Name); | 1159 | writer.WriteElementString("Name", sop.Name); |
1154 | writer.WriteElementString("Material", sop.Material.ToString()); | 1160 | writer.WriteElementString("Material", sop.Material.ToString()); |
1155 | writer.WriteElementString("PassTouches", sop.PassTouches.ToString().ToLower()); | 1161 | writer.WriteElementString("PassTouches", sop.PassTouches.ToString().ToLower()); |
1162 | writer.WriteElementString("PassCollisions", sop.PassCollisions.ToString().ToLower()); | ||
1156 | writer.WriteElementString("RegionHandle", sop.RegionHandle.ToString()); | 1163 | writer.WriteElementString("RegionHandle", sop.RegionHandle.ToString()); |
1157 | writer.WriteElementString("ScriptAccessPin", sop.ScriptAccessPin.ToString()); | 1164 | writer.WriteElementString("ScriptAccessPin", sop.ScriptAccessPin.ToString()); |
1158 | 1165 | ||