From 9e545c9984790ddeabba0bf86e229af90da09ad6 Mon Sep 17 00:00:00 2001 From: Melanie Thielker Date: Sat, 6 Sep 2008 14:58:23 +0000 Subject: Mantis #2133 Thank you, Xugu Madison and ChrisDown, for a patch that fixes linux filename extensions from .Xml back to .xml --- OpenSim/Region/Environment/Modules/World/Archiver/ArchiveConstants.cs | 4 ++-- .../Modules/World/Archiver/ArchiveWriteRequestExecution.cs | 2 +- OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs | 2 +- .../Region/Environment/Modules/World/Serialiser/SerialiseObjects.cs | 4 ++-- OpenSim/Region/Environment/Scenes/AvatarAnimations.cs | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) (limited to 'OpenSim/Region/Environment') diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveConstants.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveConstants.cs index 8d74160..b2e006a 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveConstants.cs +++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveConstants.cs @@ -38,7 +38,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver /// /// The location of the archive control file /// - public static readonly string CONTROL_FILE_PATH = "archive.Xml"; + public static readonly string CONTROL_FILE_PATH = "archive.xml"; /// /// Path for the assets held in an archive @@ -48,7 +48,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver /// /// Path for the assets metadata file /// - //public static readonly string ASSETS_METADATA_PATH = "assets.Xml"; + //public static readonly string ASSETS_METADATA_PATH = "assets.xml"; /// /// Path for the prims file diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs index 6276d34..784e137 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs +++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs @@ -105,7 +105,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver string serializedObject = m_serialiser.SaveGroupToXml2(sceneObject); string filename = string.Format( - "{0}{1}_{2:000}-{3:000}-{4:000}__{5}.Xml", + "{0}{1}_{2:000}-{3:000}-{4:000}__{5}.xml", ArchiveConstants.OBJECTS_PATH, sceneObject.Name, Math.Round(position.X), Math.Round(position.Y), Math.Round(position.Z), sceneObject.UUID); diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs b/OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs index b49b2a4..75ae474 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs +++ b/OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs @@ -105,7 +105,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver xtw.WriteEndDocument(); - archive.AddFile("assets.Xml", sw.ToString()); + archive.AddFile("assets.xml", sw.ToString()); } /// diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseObjects.cs b/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseObjects.cs index ffd90bf..1fb78b6 100644 --- a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseObjects.cs +++ b/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseObjects.cs @@ -40,11 +40,11 @@ namespace OpenSim.Region.Environment.Modules.World.Serialiser public string WriteToFile(Scene scene, string dir) { - string targetFileName = dir + "objects.Xml"; + string targetFileName = dir + "objects.xml"; SaveSerialisedToFile(targetFileName, scene); - return "objects.Xml"; + return "objects.xml"; } #endregion diff --git a/OpenSim/Region/Environment/Scenes/AvatarAnimations.cs b/OpenSim/Region/Environment/Scenes/AvatarAnimations.cs index 6bb5525..5417c8d 100644 --- a/OpenSim/Region/Environment/Scenes/AvatarAnimations.cs +++ b/OpenSim/Region/Environment/Scenes/AvatarAnimations.cs @@ -38,7 +38,7 @@ namespace OpenSim.Region.Environment.Scenes public AvatarAnimations() { - using (XmlTextReader reader = new XmlTextReader("data/avataranimations.Xml")) + using (XmlTextReader reader = new XmlTextReader("data/avataranimations.xml")) { XmlDocument doc = new XmlDocument(); doc.Load(reader); -- cgit v1.1