diff options
author | dr scofield (aka dirk husemann) | 2009-10-02 11:10:52 +0200 |
---|---|---|
committer | dr scofield (aka dirk husemann) | 2009-10-02 11:31:30 +0200 |
commit | 2107b67f1b145f7718fdb1450be1a7b8dd1a0bf7 (patch) | |
tree | 74913862b829b7e56994f2c33ca5fe35638baad1 /OpenSim/Framework/Serialization | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-2107b67f1b145f7718fdb1450be1a7b8dd1a0bf7.zip opensim-SC-2107b67f1b145f7718fdb1450be1a7b8dd1a0bf7.tar.gz opensim-SC-2107b67f1b145f7718fdb1450be1a7b8dd1a0bf7.tar.bz2 opensim-SC-2107b67f1b145f7718fdb1450be1a7b8dd1a0bf7.tar.xz |
- cleaning up LandData/ILandObject capitalization issues
- adding LandDataSerializer to OAR mechanics
Diffstat (limited to 'OpenSim/Framework/Serialization')
-rw-r--r-- | OpenSim/Framework/Serialization/ArchiveConstants.cs | 5 | ||||
-rw-r--r-- | OpenSim/Framework/Serialization/TarArchiveWriter.cs | 3 |
2 files changed, 7 insertions, 1 deletions
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 | |||
66 | public const string SETTINGS_PATH = "settings/"; | 66 | public const string SETTINGS_PATH = "settings/"; |
67 | 67 | ||
68 | /// <value> | 68 | /// <value> |
69 | /// Path for region settings. | ||
70 | /// </value> | ||
71 | public const string LANDDATA_PATH = "landdata/"; | ||
72 | |||
73 | /// <value> | ||
69 | /// Path for user profiles | 74 | /// Path for user profiles |
70 | /// </value> | 75 | /// </value> |
71 | public const string USERS_PATH = "userprofiles/"; | 76 | 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 | |||
40 | //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 40 | //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
41 | 41 | ||
42 | protected static ASCIIEncoding m_asciiEncoding = new ASCIIEncoding(); | 42 | protected static ASCIIEncoding m_asciiEncoding = new ASCIIEncoding(); |
43 | protected static UTF8Encoding m_utf8Encoding = new UTF8Encoding(); | ||
43 | 44 | ||
44 | /// <summary> | 45 | /// <summary> |
45 | /// Binary writer for the underlying stream | 46 | /// Binary writer for the underlying stream |
@@ -71,7 +72,7 @@ namespace OpenSim.Framework.Serialization | |||
71 | /// <param name="data"></param> | 72 | /// <param name="data"></param> |
72 | public void WriteFile(string filePath, string data) | 73 | public void WriteFile(string filePath, string data) |
73 | { | 74 | { |
74 | WriteFile(filePath, m_asciiEncoding.GetBytes(data)); | 75 | WriteFile(filePath, m_utf8Encoding.GetBytes(data)); |
75 | } | 76 | } |
76 | 77 | ||
77 | /// <summary> | 78 | /// <summary> |