diff options
author | Aleric Inglewood | 2013-08-04 19:19:11 +0200 |
---|---|---|
committer | teravus | 2013-09-22 21:10:01 -0500 |
commit | 2dc92e7de11086c7649d3ee0f8adc974efce6805 (patch) | |
tree | e69a633127525a5967ddadeef723a99f38e5d4aa /OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | |
parent | minor: Recomment out log message uncommented in previous cbdfe969 (diff) | |
download | opensim-SC_OLD-2dc92e7de11086c7649d3ee0f8adc974efce6805.zip opensim-SC_OLD-2dc92e7de11086c7649d3ee0f8adc974efce6805.tar.gz opensim-SC_OLD-2dc92e7de11086c7649d3ee0f8adc974efce6805.tar.bz2 opensim-SC_OLD-2dc92e7de11086c7649d3ee0f8adc974efce6805.tar.xz |
Preserve attachment point & position when attachment is rezzed in world
Patch taken from
http://opensimulator.org/mantis/view.php?id=4905
originally by Greg C.
Fixed to apply to r/23314 commit
ba9daf849e7c8db48e7c03e7cdedb77776b2052f
(cherry picked from commit 4ff9fbca441110cc2b93edc7286e0e9339e61cbe)
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs index 945745e..3ea936c 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | |||
@@ -365,6 +365,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
365 | m_SOPXmlProcessors.Add("CollisionSound", ProcessCollisionSound); | 365 | m_SOPXmlProcessors.Add("CollisionSound", ProcessCollisionSound); |
366 | m_SOPXmlProcessors.Add("CollisionSoundVolume", ProcessCollisionSoundVolume); | 366 | m_SOPXmlProcessors.Add("CollisionSoundVolume", ProcessCollisionSoundVolume); |
367 | m_SOPXmlProcessors.Add("MediaUrl", ProcessMediaUrl); | 367 | m_SOPXmlProcessors.Add("MediaUrl", ProcessMediaUrl); |
368 | m_SOPXmlProcessors.Add("AttachedPos", ProcessAttachedPos); | ||
368 | m_SOPXmlProcessors.Add("DynAttrs", ProcessDynAttrs); | 369 | m_SOPXmlProcessors.Add("DynAttrs", ProcessDynAttrs); |
369 | m_SOPXmlProcessors.Add("TextureAnimation", ProcessTextureAnimation); | 370 | m_SOPXmlProcessors.Add("TextureAnimation", ProcessTextureAnimation); |
370 | m_SOPXmlProcessors.Add("ParticleSystem", ProcessParticleSystem); | 371 | m_SOPXmlProcessors.Add("ParticleSystem", ProcessParticleSystem); |
@@ -433,6 +434,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
433 | m_ShapeXmlProcessors.Add("ProfileEnd", ProcessShpProfileEnd); | 434 | m_ShapeXmlProcessors.Add("ProfileEnd", ProcessShpProfileEnd); |
434 | m_ShapeXmlProcessors.Add("ProfileHollow", ProcessShpProfileHollow); | 435 | m_ShapeXmlProcessors.Add("ProfileHollow", ProcessShpProfileHollow); |
435 | m_ShapeXmlProcessors.Add("Scale", ProcessShpScale); | 436 | m_ShapeXmlProcessors.Add("Scale", ProcessShpScale); |
437 | m_ShapeXmlProcessors.Add("LastAttachPoint", ProcessShpLastAttach); | ||
436 | m_ShapeXmlProcessors.Add("State", ProcessShpState); | 438 | m_ShapeXmlProcessors.Add("State", ProcessShpState); |
437 | m_ShapeXmlProcessors.Add("ProfileShape", ProcessShpProfileShape); | 439 | m_ShapeXmlProcessors.Add("ProfileShape", ProcessShpProfileShape); |
438 | m_ShapeXmlProcessors.Add("HollowShape", ProcessShpHollowShape); | 440 | m_ShapeXmlProcessors.Add("HollowShape", ProcessShpHollowShape); |
@@ -761,6 +763,11 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
761 | obj.MediaUrl = reader.ReadElementContentAsString("MediaUrl", String.Empty); | 763 | obj.MediaUrl = reader.ReadElementContentAsString("MediaUrl", String.Empty); |
762 | } | 764 | } |
763 | 765 | ||
766 | private static void ProcessAttachedPos(SceneObjectPart obj, XmlTextReader reader) | ||
767 | { | ||
768 | obj.AttachedPos = Util.ReadVector(reader, "AttachedPos"); | ||
769 | } | ||
770 | |||
764 | private static void ProcessDynAttrs(SceneObjectPart obj, XmlTextReader reader) | 771 | private static void ProcessDynAttrs(SceneObjectPart obj, XmlTextReader reader) |
765 | { | 772 | { |
766 | obj.DynAttrs.ReadXml(reader); | 773 | obj.DynAttrs.ReadXml(reader); |
@@ -1043,6 +1050,11 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
1043 | shp.State = (byte)reader.ReadElementContentAsInt("State", String.Empty); | 1050 | shp.State = (byte)reader.ReadElementContentAsInt("State", String.Empty); |
1044 | } | 1051 | } |
1045 | 1052 | ||
1053 | private static void ProcessShpLastAttach(PrimitiveBaseShape shp, XmlTextReader reader) | ||
1054 | { | ||
1055 | shp.LastAttachPoint = (byte)reader.ReadElementContentAsInt("LastAttachPoint", String.Empty); | ||
1056 | } | ||
1057 | |||
1046 | private static void ProcessShpProfileShape(PrimitiveBaseShape shp, XmlTextReader reader) | 1058 | private static void ProcessShpProfileShape(PrimitiveBaseShape shp, XmlTextReader reader) |
1047 | { | 1059 | { |
1048 | shp.ProfileShape = Util.ReadEnum<ProfileShape>(reader, "ProfileShape"); | 1060 | shp.ProfileShape = Util.ReadEnum<ProfileShape>(reader, "ProfileShape"); |
@@ -1289,6 +1301,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
1289 | writer.WriteElementString("CollisionSoundVolume", sop.CollisionSoundVolume.ToString()); | 1301 | writer.WriteElementString("CollisionSoundVolume", sop.CollisionSoundVolume.ToString()); |
1290 | if (sop.MediaUrl != null) | 1302 | if (sop.MediaUrl != null) |
1291 | writer.WriteElementString("MediaUrl", sop.MediaUrl.ToString()); | 1303 | writer.WriteElementString("MediaUrl", sop.MediaUrl.ToString()); |
1304 | WriteVector(writer, "AttachedPos", sop.AttachedPos); | ||
1292 | 1305 | ||
1293 | if (sop.DynAttrs.CountNamespaces > 0) | 1306 | if (sop.DynAttrs.CountNamespaces > 0) |
1294 | { | 1307 | { |
@@ -1471,6 +1484,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
1471 | writer.WriteElementString("ProfileEnd", shp.ProfileEnd.ToString()); | 1484 | writer.WriteElementString("ProfileEnd", shp.ProfileEnd.ToString()); |
1472 | writer.WriteElementString("ProfileHollow", shp.ProfileHollow.ToString()); | 1485 | writer.WriteElementString("ProfileHollow", shp.ProfileHollow.ToString()); |
1473 | writer.WriteElementString("State", shp.State.ToString()); | 1486 | writer.WriteElementString("State", shp.State.ToString()); |
1487 | writer.WriteElementString("LastAttachPoint", shp.LastAttachPoint.ToString()); | ||
1474 | 1488 | ||
1475 | WriteFlags(writer, "ProfileShape", shp.ProfileShape.ToString(), options); | 1489 | WriteFlags(writer, "ProfileShape", shp.ProfileShape.ToString(), options); |
1476 | WriteFlags(writer, "HollowShape", shp.HollowShape.ToString(), options); | 1490 | WriteFlags(writer, "HollowShape", shp.HollowShape.ToString(), options); |