diff options
author | Mike Mazur | 2009-03-16 00:12:25 +0000 |
---|---|---|
committer | Mike Mazur | 2009-03-16 00:12:25 +0000 |
commit | f28886e26d32eaf97180d91dcd42fa045990bdd0 (patch) | |
tree | 69f36a36c809c9961758897d43c85413b1d4dd77 /OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | |
parent | This patch improves MXP connect and disconnect functionality. (diff) | |
download | opensim-SC_OLD-f28886e26d32eaf97180d91dcd42fa045990bdd0.zip opensim-SC_OLD-f28886e26d32eaf97180d91dcd42fa045990bdd0.tar.gz opensim-SC_OLD-f28886e26d32eaf97180d91dcd42fa045990bdd0.tar.bz2 opensim-SC_OLD-f28886e26d32eaf97180d91dcd42fa045990bdd0.tar.xz |
Rename OpenSim.Framework.Archive to OpenSim.Framework.Serialization
Update using statements and prebuild.xml. Also trim trailing whitespace.
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs index 69766d4..03e4bce 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | |||
@@ -35,7 +35,7 @@ using System.Text; | |||
35 | using log4net; | 35 | using log4net; |
36 | using OpenMetaverse; | 36 | using OpenMetaverse; |
37 | using OpenSim.Framework; | 37 | using OpenSim.Framework; |
38 | using OpenSim.Framework.Archive; | 38 | using OpenSim.Framework.Serialization; |
39 | using OpenSim.Framework.Communications.Cache; | 39 | using OpenSim.Framework.Communications.Cache; |
40 | using OpenSim.Region.CoreModules.World.Terrain; | 40 | using OpenSim.Region.CoreModules.World.Terrain; |
41 | using OpenSim.Region.Framework.Interfaces; | 41 | using OpenSim.Region.Framework.Interfaces; |
@@ -52,14 +52,14 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
52 | 52 | ||
53 | private static ASCIIEncoding m_asciiEncoding = new ASCIIEncoding(); | 53 | private static ASCIIEncoding m_asciiEncoding = new ASCIIEncoding(); |
54 | 54 | ||
55 | private Scene m_scene; | 55 | private Scene m_scene; |
56 | private Stream m_loadStream; | 56 | private Stream m_loadStream; |
57 | private string m_errorMessage; | 57 | private string m_errorMessage; |
58 | 58 | ||
59 | /// <value> | 59 | /// <value> |
60 | /// Should the archive being loaded be merged with what is already on the region? | 60 | /// Should the archive being loaded be merged with what is already on the region? |
61 | /// </value> | 61 | /// </value> |
62 | private bool m_merge; | 62 | private bool m_merge; |
63 | 63 | ||
64 | /// <summary> | 64 | /// <summary> |
65 | /// Used to cache lookups for valid uuids. | 65 | /// Used to cache lookups for valid uuids. |
@@ -109,7 +109,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
109 | { | 109 | { |
110 | //m_log.DebugFormat( | 110 | //m_log.DebugFormat( |
111 | // "[ARCHIVER]: Successfully read {0} ({1} bytes)}", filePath, data.Length); | 111 | // "[ARCHIVER]: Successfully read {0} ({1} bytes)}", filePath, data.Length); |
112 | 112 | ||
113 | if (TarArchiveReader.TarEntryType.TYPE_DIRECTORY == entryType) | 113 | if (TarArchiveReader.TarEntryType.TYPE_DIRECTORY == entryType) |
114 | { | 114 | { |
115 | m_log.WarnFormat( | 115 | m_log.WarnFormat( |