diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/World')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs | 3 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Serialiser/SerialiseObjects.cs | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs index c052bda..2012ea8 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs | |||
@@ -39,6 +39,7 @@ using OpenSim.Framework.Serialization; | |||
39 | using OpenSim.Region.CoreModules.World.Serialiser; | 39 | using OpenSim.Region.CoreModules.World.Serialiser; |
40 | using OpenSim.Region.CoreModules.World.Terrain; | 40 | using OpenSim.Region.CoreModules.World.Terrain; |
41 | using OpenSim.Region.Framework.Scenes; | 41 | using OpenSim.Region.Framework.Scenes; |
42 | using OpenSim.Region.Framework.Scenes.Serialization; | ||
42 | using OpenSim.Tests.Common; | 43 | using OpenSim.Tests.Common; |
43 | using OpenSim.Tests.Common.Setup; | 44 | using OpenSim.Tests.Common.Setup; |
44 | 45 | ||
@@ -242,7 +243,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests | |||
242 | part1Name, | 243 | part1Name, |
243 | Math.Round(groupPosition.X), Math.Round(groupPosition.Y), Math.Round(groupPosition.Z), | 244 | Math.Round(groupPosition.X), Math.Round(groupPosition.Y), Math.Round(groupPosition.Z), |
244 | part1.UUID); | 245 | part1.UUID); |
245 | tar.WriteFile(ArchiveConstants.OBJECTS_PATH + object1FileName, object1.ToXmlString2()); | 246 | tar.WriteFile(ArchiveConstants.OBJECTS_PATH + object1FileName, SceneObjectSerializer.ToXml2Format(object1)); |
246 | 247 | ||
247 | tar.Close(); | 248 | tar.Close(); |
248 | 249 | ||
diff --git a/OpenSim/Region/CoreModules/World/Serialiser/SerialiseObjects.cs b/OpenSim/Region/CoreModules/World/Serialiser/SerialiseObjects.cs index ed6448f..af2e350 100644 --- a/OpenSim/Region/CoreModules/World/Serialiser/SerialiseObjects.cs +++ b/OpenSim/Region/CoreModules/World/Serialiser/SerialiseObjects.cs | |||
@@ -31,6 +31,7 @@ using System.IO.Compression; | |||
31 | using System.Text; | 31 | using System.Text; |
32 | using System.Xml; | 32 | using System.Xml; |
33 | using OpenSim.Region.Framework.Scenes; | 33 | using OpenSim.Region.Framework.Scenes; |
34 | using OpenSim.Region.Framework.Scenes.Serialization; | ||
34 | 35 | ||
35 | namespace OpenSim.Region.CoreModules.World.Serialiser | 36 | namespace OpenSim.Region.CoreModules.World.Serialiser |
36 | { | 37 | { |
@@ -86,7 +87,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser | |||
86 | { | 87 | { |
87 | if (ent is SceneObjectGroup) | 88 | if (ent is SceneObjectGroup) |
88 | { | 89 | { |
89 | EntityXml.Add(((SceneObjectGroup) ent).ToXmlString2()); | 90 | EntityXml.Add(SceneObjectSerializer.ToXml2Format((SceneObjectGroup)ent)); |
90 | } | 91 | } |
91 | } | 92 | } |
92 | EntityXml.Sort(); | 93 | EntityXml.Sort(); |