aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World/Archiver
diff options
context:
space:
mode:
authorJeff Ames2010-01-04 06:10:45 +0900
committerJeff Ames2010-01-04 06:17:30 +0900
commit70d5b1c34cf2eb6621f383169fdee03966850762 (patch)
tree18bf786a4c0897cb24fa9ceef5f53d5ce345a78f /OpenSim/Region/CoreModules/World/Archiver
parentAdd virtual method StateChange to ScriptBaseClass (diff)
downloadopensim-SC_OLD-70d5b1c34cf2eb6621f383169fdee03966850762.zip
opensim-SC_OLD-70d5b1c34cf2eb6621f383169fdee03966850762.tar.gz
opensim-SC_OLD-70d5b1c34cf2eb6621f383169fdee03966850762.tar.bz2
opensim-SC_OLD-70d5b1c34cf2eb6621f383169fdee03966850762.tar.xz
Formatting cleanup. Add copyright headers.
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Archiver')
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs2
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs2
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs4
3 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
index af72968..52add23 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
@@ -104,7 +104,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
104 List<string> serialisedParcels = new List<string>(); 104 List<string> serialisedParcels = new List<string>();
105 string filePath = "NONE"; 105 string filePath = "NONE";
106 106
107 TarArchiveReader archive = new TarArchiveReader(m_loadStream); 107 TarArchiveReader archive = new TarArchiveReader(m_loadStream);
108 byte[] data; 108 byte[] data;
109 TarArchiveReader.TarEntryType entryType; 109 TarArchiveReader.TarEntryType entryType;
110 110
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs
index 75c4557..9fc6ec4 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs
@@ -91,7 +91,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
91 91
92 m_log.InfoFormat("[ARCHIVER]: Finished writing out OAR for {0}", m_scene.RegionInfo.RegionName); 92 m_log.InfoFormat("[ARCHIVER]: Finished writing out OAR for {0}", m_scene.RegionInfo.RegionName);
93 93
94 m_scene.EventManager.TriggerOarFileSaved(m_requestId, String.Empty); 94 m_scene.EventManager.TriggerOarFileSaved(m_requestId, String.Empty);
95 } 95 }
96 96
97 protected internal void Save(ICollection<UUID> assetsFoundUuids, ICollection<UUID> assetsNotFoundUuids) 97 protected internal void Save(ICollection<UUID> assetsFoundUuids, ICollection<UUID> assetsNotFoundUuids)
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
index 27763bb..fc8d4e1 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
50 /// <value> 50 /// <value>
51 /// The file used to load and save an opensimulator archive if no filename has been specified 51 /// The file used to load and save an opensimulator archive if no filename has been specified
52 /// </value> 52 /// </value>
53 protected const string DEFAULT_OAR_BACKUP_FILENAME = "region.oar"; 53 protected const string DEFAULT_OAR_BACKUP_FILENAME = "region.oar";
54 54
55 public string Name 55 public string Name
56 { 56 {
@@ -111,7 +111,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
111 { 111 {
112 DearchiveRegion(DEFAULT_OAR_BACKUP_FILENAME, mergeOar, Guid.Empty); 112 DearchiveRegion(DEFAULT_OAR_BACKUP_FILENAME, mergeOar, Guid.Empty);
113 } 113 }
114 } 114 }
115 115
116 /// <summary> 116 /// <summary>
117 /// Save a region to a file, including all the assets needed to restore it. 117 /// Save a region to a file, including all the assets needed to restore it.