diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Serialization')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs | 12 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | 51 |
2 files changed, 32 insertions, 31 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs index 7f7977e..d151002 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs | |||
@@ -86,9 +86,9 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
86 | 86 | ||
87 | writer.WriteStartElement("CoalescedObject"); | 87 | writer.WriteStartElement("CoalescedObject"); |
88 | 88 | ||
89 | writer.WriteAttributeString("x", size.X.ToString()); | 89 | writer.WriteAttributeString("x", size.X.ToString(Utils.EnUsCulture)); |
90 | writer.WriteAttributeString("y", size.Y.ToString()); | 90 | writer.WriteAttributeString("y", size.Y.ToString(Utils.EnUsCulture)); |
91 | writer.WriteAttributeString("z", size.Z.ToString()); | 91 | writer.WriteAttributeString("z", size.Z.ToString(Utils.EnUsCulture)); |
92 | 92 | ||
93 | // Embed the offsets into the group XML | 93 | // Embed the offsets into the group XML |
94 | for (int i = 0; i < coaObjects.Count; i++) | 94 | for (int i = 0; i < coaObjects.Count; i++) |
@@ -100,9 +100,9 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
100 | // i, obj.Name); | 100 | // i, obj.Name); |
101 | 101 | ||
102 | writer.WriteStartElement("SceneObjectGroup"); | 102 | writer.WriteStartElement("SceneObjectGroup"); |
103 | writer.WriteAttributeString("offsetx", offsets[i].X.ToString()); | 103 | writer.WriteAttributeString("offsetx", offsets[i].X.ToString(Utils.EnUsCulture)); |
104 | writer.WriteAttributeString("offsety", offsets[i].Y.ToString()); | 104 | writer.WriteAttributeString("offsety", offsets[i].Y.ToString(Utils.EnUsCulture)); |
105 | writer.WriteAttributeString("offsetz", offsets[i].Z.ToString()); | 105 | writer.WriteAttributeString("offsetz", offsets[i].Z.ToString(Utils.EnUsCulture)); |
106 | 106 | ||
107 | SceneObjectSerializer.ToOriginalXmlFormat(obj, writer, doScriptStates); | 107 | SceneObjectSerializer.ToOriginalXmlFormat(obj, writer, doScriptStates); |
108 | 108 | ||
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs index b012a08..4ca4434 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | |||
@@ -65,7 +65,8 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
65 | { | 65 | { |
66 | using (XmlReader reader = XmlReader.Create(wrappedReader, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment })) | 66 | using (XmlReader reader = XmlReader.Create(wrappedReader, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment })) |
67 | { | 67 | { |
68 | try { | 68 | try |
69 | { | ||
69 | return FromOriginalXmlFormat(reader); | 70 | return FromOriginalXmlFormat(reader); |
70 | } | 71 | } |
71 | catch (Exception e) | 72 | catch (Exception e) |
@@ -1505,7 +1506,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
1505 | writer.WriteElementString("NextOwnerMask", sop.NextOwnerMask.ToString()); | 1506 | writer.WriteElementString("NextOwnerMask", sop.NextOwnerMask.ToString()); |
1506 | WriteFlags(writer, "Flags", sop.Flags.ToString(), options); | 1507 | WriteFlags(writer, "Flags", sop.Flags.ToString(), options); |
1507 | WriteUUID(writer, "CollisionSound", sop.CollisionSound, options); | 1508 | WriteUUID(writer, "CollisionSound", sop.CollisionSound, options); |
1508 | writer.WriteElementString("CollisionSoundVolume", sop.CollisionSoundVolume.ToString()); | 1509 | writer.WriteElementString("CollisionSoundVolume", sop.CollisionSoundVolume.ToString(Utils.EnUsCulture)); |
1509 | if (sop.MediaUrl != null) | 1510 | if (sop.MediaUrl != null) |
1510 | writer.WriteElementString("MediaUrl", sop.MediaUrl.ToString()); | 1511 | writer.WriteElementString("MediaUrl", sop.MediaUrl.ToString()); |
1511 | WriteVector(writer, "AttachedPos", sop.AttachedPos); | 1512 | WriteVector(writer, "AttachedPos", sop.AttachedPos); |
@@ -1525,7 +1526,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
1525 | writer.WriteElementString("PayPrice3", sop.PayPrice[3].ToString()); | 1526 | writer.WriteElementString("PayPrice3", sop.PayPrice[3].ToString()); |
1526 | writer.WriteElementString("PayPrice4", sop.PayPrice[4].ToString()); | 1527 | writer.WriteElementString("PayPrice4", sop.PayPrice[4].ToString()); |
1527 | 1528 | ||
1528 | writer.WriteElementString("Buoyancy", sop.Buoyancy.ToString()); | 1529 | writer.WriteElementString("Buoyancy", sop.Buoyancy.ToString(Utils.EnUsCulture)); |
1529 | 1530 | ||
1530 | WriteVector(writer, "Force", sop.Force); | 1531 | WriteVector(writer, "Force", sop.Force); |
1531 | WriteVector(writer, "Torque", sop.Torque); | 1532 | WriteVector(writer, "Torque", sop.Torque); |
@@ -1542,22 +1543,22 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
1542 | writer.WriteElementString("RotationAxisLocks", sop.RotationAxisLocks.ToString().ToLower()); | 1543 | writer.WriteElementString("RotationAxisLocks", sop.RotationAxisLocks.ToString().ToLower()); |
1543 | writer.WriteElementString("PhysicsShapeType", sop.PhysicsShapeType.ToString().ToLower()); | 1544 | writer.WriteElementString("PhysicsShapeType", sop.PhysicsShapeType.ToString().ToLower()); |
1544 | if (sop.Density != 1000.0f) | 1545 | if (sop.Density != 1000.0f) |
1545 | writer.WriteElementString("Density", sop.Density.ToString().ToLower()); | 1546 | writer.WriteElementString("Density", sop.Density.ToString(Utils.EnUsCulture)); |
1546 | if (sop.Friction != 0.6f) | 1547 | if (sop.Friction != 0.6f) |
1547 | writer.WriteElementString("Friction", sop.Friction.ToString().ToLower()); | 1548 | writer.WriteElementString("Friction", sop.Friction.ToString(Utils.EnUsCulture)); |
1548 | if (sop.Restitution != 0.5f) | 1549 | if (sop.Restitution != 0.5f) |
1549 | writer.WriteElementString("Bounce", sop.Restitution.ToString().ToLower()); | 1550 | writer.WriteElementString("Bounce", sop.Restitution.ToString(Utils.EnUsCulture)); |
1550 | if (sop.GravityModifier != 1.0f) | 1551 | if (sop.GravityModifier != 1.0f) |
1551 | writer.WriteElementString("GravityModifier", sop.GravityModifier.ToString().ToLower()); | 1552 | writer.WriteElementString("GravityModifier", sop.GravityModifier.ToString(Utils.EnUsCulture)); |
1552 | WriteVector(writer, "CameraEyeOffset", sop.GetCameraEyeOffset()); | 1553 | WriteVector(writer, "CameraEyeOffset", sop.GetCameraEyeOffset()); |
1553 | WriteVector(writer, "CameraAtOffset", sop.GetCameraAtOffset()); | 1554 | WriteVector(writer, "CameraAtOffset", sop.GetCameraAtOffset()); |
1554 | 1555 | ||
1555 | // if (sop.Sound != UUID.Zero) force it till sop crossing does clear it on child prim | 1556 | // if (sop.Sound != UUID.Zero) force it till sop crossing does clear it on child prim |
1556 | { | 1557 | { |
1557 | WriteUUID(writer, "SoundID", sop.Sound, options); | 1558 | WriteUUID(writer, "SoundID", sop.Sound, options); |
1558 | writer.WriteElementString("SoundGain", sop.SoundGain.ToString().ToLower()); | 1559 | writer.WriteElementString("SoundGain", sop.SoundGain.ToString(Utils.EnUsCulture)); |
1559 | writer.WriteElementString("SoundFlags", sop.SoundFlags.ToString().ToLower()); | 1560 | writer.WriteElementString("SoundFlags", sop.SoundFlags.ToString().ToLower()); |
1560 | writer.WriteElementString("SoundRadius", sop.SoundRadius.ToString().ToLower()); | 1561 | writer.WriteElementString("SoundRadius", sop.SoundRadius.ToString(Utils.EnUsCulture)); |
1561 | } | 1562 | } |
1562 | writer.WriteElementString("SoundQueueing", sop.SoundQueueing.ToString().ToLower()); | 1563 | writer.WriteElementString("SoundQueueing", sop.SoundQueueing.ToString().ToLower()); |
1563 | 1564 | ||
@@ -1731,22 +1732,22 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
1731 | // Don't serialize SculptData. It's just a copy of the asset, which can be loaded separately using 'SculptTexture'. | 1732 | // Don't serialize SculptData. It's just a copy of the asset, which can be loaded separately using 'SculptTexture'. |
1732 | 1733 | ||
1733 | writer.WriteElementString("FlexiSoftness", shp.FlexiSoftness.ToString()); | 1734 | writer.WriteElementString("FlexiSoftness", shp.FlexiSoftness.ToString()); |
1734 | writer.WriteElementString("FlexiTension", shp.FlexiTension.ToString()); | 1735 | writer.WriteElementString("FlexiTension", shp.FlexiTension.ToString(Utils.EnUsCulture)); |
1735 | writer.WriteElementString("FlexiDrag", shp.FlexiDrag.ToString()); | 1736 | writer.WriteElementString("FlexiDrag", shp.FlexiDrag.ToString(Utils.EnUsCulture)); |
1736 | writer.WriteElementString("FlexiGravity", shp.FlexiGravity.ToString()); | 1737 | writer.WriteElementString("FlexiGravity", shp.FlexiGravity.ToString(Utils.EnUsCulture)); |
1737 | writer.WriteElementString("FlexiWind", shp.FlexiWind.ToString()); | 1738 | writer.WriteElementString("FlexiWind", shp.FlexiWind.ToString(Utils.EnUsCulture)); |
1738 | writer.WriteElementString("FlexiForceX", shp.FlexiForceX.ToString()); | 1739 | writer.WriteElementString("FlexiForceX", shp.FlexiForceX.ToString(Utils.EnUsCulture)); |
1739 | writer.WriteElementString("FlexiForceY", shp.FlexiForceY.ToString()); | 1740 | writer.WriteElementString("FlexiForceY", shp.FlexiForceY.ToString(Utils.EnUsCulture)); |
1740 | writer.WriteElementString("FlexiForceZ", shp.FlexiForceZ.ToString()); | 1741 | writer.WriteElementString("FlexiForceZ", shp.FlexiForceZ.ToString(Utils.EnUsCulture)); |
1741 | 1742 | ||
1742 | writer.WriteElementString("LightColorR", shp.LightColorR.ToString()); | 1743 | writer.WriteElementString("LightColorR", shp.LightColorR.ToString(Utils.EnUsCulture)); |
1743 | writer.WriteElementString("LightColorG", shp.LightColorG.ToString()); | 1744 | writer.WriteElementString("LightColorG", shp.LightColorG.ToString(Utils.EnUsCulture)); |
1744 | writer.WriteElementString("LightColorB", shp.LightColorB.ToString()); | 1745 | writer.WriteElementString("LightColorB", shp.LightColorB.ToString(Utils.EnUsCulture)); |
1745 | writer.WriteElementString("LightColorA", shp.LightColorA.ToString()); | 1746 | writer.WriteElementString("LightColorA", shp.LightColorA.ToString(Utils.EnUsCulture)); |
1746 | writer.WriteElementString("LightRadius", shp.LightRadius.ToString()); | 1747 | writer.WriteElementString("LightRadius", shp.LightRadius.ToString(Utils.EnUsCulture)); |
1747 | writer.WriteElementString("LightCutoff", shp.LightCutoff.ToString()); | 1748 | writer.WriteElementString("LightCutoff", shp.LightCutoff.ToString(Utils.EnUsCulture)); |
1748 | writer.WriteElementString("LightFalloff", shp.LightFalloff.ToString()); | 1749 | writer.WriteElementString("LightFalloff", shp.LightFalloff.ToString(Utils.EnUsCulture)); |
1749 | writer.WriteElementString("LightIntensity", shp.LightIntensity.ToString()); | 1750 | writer.WriteElementString("LightIntensity", shp.LightIntensity.ToString(Utils.EnUsCulture)); |
1750 | 1751 | ||
1751 | writer.WriteElementString("FlexiEntry", shp.FlexiEntry.ToString().ToLower()); | 1752 | writer.WriteElementString("FlexiEntry", shp.FlexiEntry.ToString().ToLower()); |
1752 | writer.WriteElementString("LightEntry", shp.LightEntry.ToString().ToLower()); | 1753 | writer.WriteElementString("LightEntry", shp.LightEntry.ToString().ToLower()); |