diff options
author | UbitUmarov | 2015-09-02 19:54:53 +0100 |
---|---|---|
committer | UbitUmarov | 2015-09-02 19:54:53 +0100 |
commit | a11edceb00b5b86f825bd957bdac9edb91f893dd (patch) | |
tree | c192eae26f3aadf365a66f32fc6d9ade2f0a0c61 /OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | |
parent | bad merge? (diff) | |
download | opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.zip opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.gz opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.bz2 opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.xz |
seems to compile ( tests comented out)
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | 48 |
1 files changed, 14 insertions, 34 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs index dc5de58..c8a01a0 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | |||
@@ -307,21 +307,13 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
307 | } | 307 | } |
308 | } | 308 | } |
309 | 309 | ||
310 | <<<<<<< HEAD | ||
311 | |||
312 | ======= | ||
313 | >>>>>>> avn/ubitvar | ||
314 | /// <summary> | 310 | /// <summary> |
315 | /// Modifies a SceneObjectGroup. | 311 | /// Modifies a SceneObjectGroup. |
316 | /// </summary> | 312 | /// </summary> |
317 | /// <param name="sog">The object</param> | 313 | /// <param name="sog">The object</param> |
318 | /// <returns>Whether the object was actually modified</returns> | 314 | /// <returns>Whether the object was actually modified</returns> |
319 | public delegate bool SceneObjectModifier(SceneObjectGroup sog); | 315 | public delegate bool SceneObjectModifier(SceneObjectGroup sog); |
320 | <<<<<<< HEAD | ||
321 | |||
322 | ======= | ||
323 | 316 | ||
324 | >>>>>>> avn/ubitvar | ||
325 | /// <summary> | 317 | /// <summary> |
326 | /// Modifies an object by deserializing it; applying 'modifier' to each SceneObjectGroup; and reserializing. | 318 | /// Modifies an object by deserializing it; applying 'modifier' to each SceneObjectGroup; and reserializing. |
327 | /// </summary> | 319 | /// </summary> |
@@ -335,11 +327,6 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
335 | CoalescedSceneObjects coa = null; | 327 | CoalescedSceneObjects coa = null; |
336 | 328 | ||
337 | string xmlData = ExternalRepresentationUtils.SanitizeXml(Utils.BytesToString(data)); | 329 | string xmlData = ExternalRepresentationUtils.SanitizeXml(Utils.BytesToString(data)); |
338 | <<<<<<< HEAD | ||
339 | |||
340 | ======= | ||
341 | |||
342 | >>>>>>> avn/ubitvar | ||
343 | if (CoalescedSceneObjectsSerializer.TryFromXml(xmlData, out coa)) | 330 | if (CoalescedSceneObjectsSerializer.TryFromXml(xmlData, out coa)) |
344 | { | 331 | { |
345 | // m_log.DebugFormat("[SERIALIZER]: Loaded coalescence {0} has {1} objects", assetId, coa.Count); | 332 | // m_log.DebugFormat("[SERIALIZER]: Loaded coalescence {0} has {1} objects", assetId, coa.Count); |
@@ -384,10 +371,6 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
384 | 371 | ||
385 | return data; | 372 | return data; |
386 | } | 373 | } |
387 | <<<<<<< HEAD | ||
388 | |||
389 | ======= | ||
390 | >>>>>>> avn/ubitvar | ||
391 | 374 | ||
392 | #region manual serialization | 375 | #region manual serialization |
393 | 376 | ||
@@ -739,44 +722,42 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
739 | obj.GravityModifier = reader.ReadElementContentAsFloat("GravityModifier", String.Empty); | 722 | obj.GravityModifier = reader.ReadElementContentAsFloat("GravityModifier", String.Empty); |
740 | } | 723 | } |
741 | 724 | ||
742 | <<<<<<< HEAD | 725 | private static void ProcessCameraEyeOffset(SceneObjectPart obj, XmlReader reader) |
743 | private static void ProcessShape(SceneObjectPart obj, XmlReader reader) | ||
744 | ======= | ||
745 | private static void ProcessCameraEyeOffset(SceneObjectPart obj, XmlTextReader reader) | ||
746 | { | 726 | { |
747 | obj.SetCameraEyeOffset(Util.ReadVector(reader, "CameraEyeOffset")); | 727 | obj.SetCameraEyeOffset(Util.ReadVector(reader, "CameraEyeOffset")); |
748 | } | 728 | } |
749 | 729 | ||
750 | private static void ProcessCameraAtOffset(SceneObjectPart obj, XmlTextReader reader) | 730 | private static void ProcessCameraAtOffset(SceneObjectPart obj, XmlReader reader) |
751 | { | 731 | { |
752 | obj.SetCameraAtOffset(Util.ReadVector(reader, "CameraAtOffset")); | 732 | obj.SetCameraAtOffset(Util.ReadVector(reader, "CameraAtOffset")); |
753 | } | 733 | } |
754 | 734 | ||
755 | private static void ProcessSoundID(SceneObjectPart obj, XmlTextReader reader) | 735 | private static void ProcessSoundID(SceneObjectPart obj, XmlReader reader) |
756 | { | 736 | { |
757 | obj.Sound = Util.ReadUUID(reader, "SoundID"); | 737 | obj.Sound = Util.ReadUUID(reader, "SoundID"); |
758 | } | 738 | } |
759 | 739 | ||
760 | private static void ProcessSoundGain(SceneObjectPart obj, XmlTextReader reader) | 740 | private static void ProcessSoundGain(SceneObjectPart obj, XmlReader reader) |
761 | { | 741 | { |
762 | obj.SoundGain = reader.ReadElementContentAsDouble("SoundGain", String.Empty); | 742 | obj.SoundGain = reader.ReadElementContentAsDouble("SoundGain", String.Empty); |
763 | } | 743 | } |
764 | 744 | ||
765 | private static void ProcessSoundFlags(SceneObjectPart obj, XmlTextReader reader) | 745 | private static void ProcessSoundFlags(SceneObjectPart obj, XmlReader reader) |
766 | { | 746 | { |
767 | obj.SoundFlags = (byte)reader.ReadElementContentAsInt("SoundFlags", String.Empty); | 747 | obj.SoundFlags = (byte)reader.ReadElementContentAsInt("SoundFlags", String.Empty); |
768 | } | 748 | } |
769 | 749 | ||
770 | private static void ProcessSoundRadius(SceneObjectPart obj, XmlTextReader reader) | 750 | private static void ProcessSoundRadius(SceneObjectPart obj, XmlReader reader) |
771 | { | 751 | { |
772 | obj.SoundRadius = reader.ReadElementContentAsDouble("SoundRadius", String.Empty); | 752 | obj.SoundRadius = reader.ReadElementContentAsDouble("SoundRadius", String.Empty); |
773 | } | 753 | } |
774 | 754 | ||
775 | private static void ProcessSoundQueueing(SceneObjectPart obj, XmlTextReader reader) | 755 | private static void ProcessSoundQueueing(SceneObjectPart obj, XmlReader reader) |
776 | { | 756 | { |
777 | obj.SoundQueueing = Util.ReadBoolean(reader); | 757 | obj.SoundQueueing = Util.ReadBoolean(reader); |
778 | } | 758 | } |
779 | private static void ProcessVehicle(SceneObjectPart obj, XmlTextReader reader) | 759 | |
760 | private static void ProcessVehicle(SceneObjectPart obj, XmlReader reader) | ||
780 | { | 761 | { |
781 | SOPVehicle vehicle = SOPVehicle.FromXml2(reader); | 762 | SOPVehicle vehicle = SOPVehicle.FromXml2(reader); |
782 | 763 | ||
@@ -793,8 +774,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
793 | } | 774 | } |
794 | } | 775 | } |
795 | 776 | ||
796 | private static void ProcessShape(SceneObjectPart obj, XmlTextReader reader) | 777 | private static void ProcessShape(SceneObjectPart obj, XmlReader reader) |
797 | >>>>>>> avn/ubitvar | ||
798 | { | 778 | { |
799 | List<string> errorNodeNames; | 779 | List<string> errorNodeNames; |
800 | obj.Shape = ReadShape(reader, "Shape", out errorNodeNames, obj); | 780 | obj.Shape = ReadShape(reader, "Shape", out errorNodeNames, obj); |
@@ -968,21 +948,21 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
968 | obj.PayPrice[4] = (int)reader.ReadElementContentAsInt("PayPrice4", String.Empty); | 948 | obj.PayPrice[4] = (int)reader.ReadElementContentAsInt("PayPrice4", String.Empty); |
969 | } | 949 | } |
970 | 950 | ||
971 | private static void ProcessBuoyancy(SceneObjectPart obj, XmlTextReader reader) | 951 | private static void ProcessBuoyancy(SceneObjectPart obj, XmlReader reader) |
972 | { | 952 | { |
973 | obj.Buoyancy = (float)reader.ReadElementContentAsFloat("Buoyancy", String.Empty); | 953 | obj.Buoyancy = (float)reader.ReadElementContentAsFloat("Buoyancy", String.Empty); |
974 | } | 954 | } |
975 | 955 | ||
976 | private static void ProcessForce(SceneObjectPart obj, XmlTextReader reader) | 956 | private static void ProcessForce(SceneObjectPart obj, XmlReader reader) |
977 | { | 957 | { |
978 | obj.Force = Util.ReadVector(reader, "Force"); | 958 | obj.Force = Util.ReadVector(reader, "Force"); |
979 | } | 959 | } |
980 | private static void ProcessTorque(SceneObjectPart obj, XmlTextReader reader) | 960 | private static void ProcessTorque(SceneObjectPart obj, XmlReader reader) |
981 | { | 961 | { |
982 | obj.Torque = Util.ReadVector(reader, "Torque"); | 962 | obj.Torque = Util.ReadVector(reader, "Torque"); |
983 | } | 963 | } |
984 | 964 | ||
985 | private static void ProcessVolumeDetectActive(SceneObjectPart obj, XmlTextReader reader) | 965 | private static void ProcessVolumeDetectActive(SceneObjectPart obj, XmlReader reader) |
986 | { | 966 | { |
987 | obj.VolumeDetectActive = Util.ReadBoolean(reader); | 967 | obj.VolumeDetectActive = Util.ReadBoolean(reader); |
988 | } | 968 | } |