ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 17:32:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into diva-textures

Browse Source
This commit is contained in:
Melanie
2009-10-02 19:03:22 +01:00
parent 6def897556 2e1c76f836
commit ce8974539e
28 changed files with 481 additions and 396 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Framework/Serialization/ArchiveConstants.cs
View File

@@ -65,6 +65,11 @@ namespace OpenSim.Framework.Serialization
/// </value>
public const string SETTINGS_PATH = "settings/";
/// <value>
/// Path for region settings.
/// </value>
public const string LANDDATA_PATH = "landdata/";
/// <value>
/// Path for user profiles
/// </value>

3
OpenSim/Framework/Serialization/TarArchiveWriter.cs
View File

@@ -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();
/// <summary>
/// Binary writer for the underlying stream
@@ -71,7 +72,7 @@ namespace OpenSim.Framework.Serialization
/// <param name="data"></param>
public void WriteFile(string filePath, string data)
{
WriteFile(filePath, m_asciiEncoding.GetBytes(data));
WriteFile(filePath, m_utf8Encoding.GetBytes(data));
}
/// <summary>