diff options
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs index cde7c93..55028d0 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | |||
@@ -53,9 +53,6 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
53 | { | 53 | { |
54 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 54 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
55 | 55 | ||
56 | protected static ASCIIEncoding m_asciiEncoding = new ASCIIEncoding(); | ||
57 | protected static UTF8Encoding m_utf8Encoding = new UTF8Encoding(); | ||
58 | |||
59 | protected Scene m_scene; | 56 | protected Scene m_scene; |
60 | protected Stream m_loadStream; | 57 | protected Stream m_loadStream; |
61 | protected Guid m_requestId; | 58 | protected Guid m_requestId; |
@@ -140,7 +137,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
140 | 137 | ||
141 | if (filePath.StartsWith(ArchiveConstants.OBJECTS_PATH)) | 138 | if (filePath.StartsWith(ArchiveConstants.OBJECTS_PATH)) |
142 | { | 139 | { |
143 | serialisedSceneObjects.Add(m_utf8Encoding.GetString(data)); | 140 | serialisedSceneObjects.Add(Encoding.UTF8.GetString(data)); |
144 | } | 141 | } |
145 | else if (filePath.StartsWith(ArchiveConstants.ASSETS_PATH) && !m_skipAssets) | 142 | else if (filePath.StartsWith(ArchiveConstants.ASSETS_PATH) && !m_skipAssets) |
146 | { | 143 | { |
@@ -162,7 +159,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
162 | } | 159 | } |
163 | else if (!m_merge && filePath.StartsWith(ArchiveConstants.LANDDATA_PATH)) | 160 | else if (!m_merge && filePath.StartsWith(ArchiveConstants.LANDDATA_PATH)) |
164 | { | 161 | { |
165 | serialisedParcels.Add(m_utf8Encoding.GetString(data)); | 162 | serialisedParcels.Add(Encoding.UTF8.GetString(data)); |
166 | } | 163 | } |
167 | else if (filePath == ArchiveConstants.CONTROL_FILE_PATH) | 164 | else if (filePath == ArchiveConstants.CONTROL_FILE_PATH) |
168 | { | 165 | { |
@@ -551,7 +548,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
551 | XmlParserContext context = new XmlParserContext(null, nsmgr, null, XmlSpace.None); | 548 | XmlParserContext context = new XmlParserContext(null, nsmgr, null, XmlSpace.None); |
552 | 549 | ||
553 | XmlTextReader xtr | 550 | XmlTextReader xtr |
554 | = new XmlTextReader(m_asciiEncoding.GetString(data), XmlNodeType.Document, context); | 551 | = new XmlTextReader(Encoding.ASCII.GetString(data), XmlNodeType.Document, context); |
555 | 552 | ||
556 | RegionSettings currentRegionSettings = m_scene.RegionInfo.RegionSettings; | 553 | RegionSettings currentRegionSettings = m_scene.RegionInfo.RegionSettings; |
557 | 554 | ||