From 2107b67f1b145f7718fdb1450be1a7b8dd1a0bf7 Mon Sep 17 00:00:00 2001 From: dr scofield (aka dirk husemann) Date: Fri, 2 Oct 2009 11:10:52 +0200 Subject: - cleaning up LandData/ILandObject capitalization issues - adding LandDataSerializer to OAR mechanics --- OpenSim/Framework/Serialization/ArchiveConstants.cs | 5 +++++ OpenSim/Framework/Serialization/TarArchiveWriter.cs | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'OpenSim/Framework') diff --git a/OpenSim/Framework/Serialization/ArchiveConstants.cs b/OpenSim/Framework/Serialization/ArchiveConstants.cs index f6dedec..1cd80db 100644 --- a/OpenSim/Framework/Serialization/ArchiveConstants.cs +++ b/OpenSim/Framework/Serialization/ArchiveConstants.cs @@ -66,6 +66,11 @@ namespace OpenSim.Framework.Serialization public const string SETTINGS_PATH = "settings/"; /// + /// Path for region settings. + /// + public const string LANDDATA_PATH = "landdata/"; + + /// /// Path for user profiles /// public const string USERS_PATH = "userprofiles/"; diff --git a/OpenSim/Framework/Serialization/TarArchiveWriter.cs b/OpenSim/Framework/Serialization/TarArchiveWriter.cs index 7040870..20d0f7e 100644 --- a/OpenSim/Framework/Serialization/TarArchiveWriter.cs +++ b/OpenSim/Framework/Serialization/TarArchiveWriter.cs @@ -40,6 +40,7 @@ namespace OpenSim.Framework.Serialization //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); protected static ASCIIEncoding m_asciiEncoding = new ASCIIEncoding(); + protected static UTF8Encoding m_utf8Encoding = new UTF8Encoding(); /// /// Binary writer for the underlying stream @@ -71,7 +72,7 @@ namespace OpenSim.Framework.Serialization /// public void WriteFile(string filePath, string data) { - WriteFile(filePath, m_asciiEncoding.GetBytes(data)); + WriteFile(filePath, m_utf8Encoding.GetBytes(data)); } /// -- cgit v1.1