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/AssetsArchiver.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/AssetsArchiver.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs index fb78af9..29d7c5e 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs | |||
@@ -32,7 +32,7 @@ using System.Xml; | |||
32 | using log4net; | 32 | using log4net; |
33 | using OpenMetaverse; | 33 | using OpenMetaverse; |
34 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
35 | using OpenSim.Framework.Archive; | 35 | using OpenSim.Framework.Serialization; |
36 | 36 | ||
37 | namespace OpenSim.Region.CoreModules.World.Archiver | 37 | namespace OpenSim.Region.CoreModules.World.Archiver |
38 | { | 38 | { |
@@ -47,7 +47,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
47 | /// Post a message to the log every x assets as a progress bar | 47 | /// Post a message to the log every x assets as a progress bar |
48 | /// </value> | 48 | /// </value> |
49 | private static int LOG_ASSET_LOAD_NOTIFICATION_INTERVAL = 50; | 49 | private static int LOG_ASSET_LOAD_NOTIFICATION_INTERVAL = 50; |
50 | 50 | ||
51 | /// <summary> | 51 | /// <summary> |
52 | /// Archive assets | 52 | /// Archive assets |
53 | /// </summary> | 53 | /// </summary> |
@@ -122,7 +122,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
122 | { | 122 | { |
123 | // It appears that gtar, at least, doesn't need the intermediate directory entries in the tar | 123 | // It appears that gtar, at least, doesn't need the intermediate directory entries in the tar |
124 | //archive.AddDir("assets"); | 124 | //archive.AddDir("assets"); |
125 | 125 | ||
126 | int assetsAdded = 0; | 126 | int assetsAdded = 0; |
127 | 127 | ||
128 | foreach (UUID uuid in m_assets.Keys) | 128 | foreach (UUID uuid in m_assets.Keys) |
@@ -145,13 +145,13 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
145 | archive.WriteFile( | 145 | archive.WriteFile( |
146 | ArchiveConstants.ASSETS_PATH + uuid.ToString() + extension, | 146 | ArchiveConstants.ASSETS_PATH + uuid.ToString() + extension, |
147 | asset.Data); | 147 | asset.Data); |
148 | 148 | ||
149 | assetsAdded++; | 149 | assetsAdded++; |
150 | 150 | ||
151 | if (assetsAdded % LOG_ASSET_LOAD_NOTIFICATION_INTERVAL == 0) | 151 | if (assetsAdded % LOG_ASSET_LOAD_NOTIFICATION_INTERVAL == 0) |
152 | m_log.InfoFormat("[ARCHIVER]: Added {0} assets to archive", assetsAdded); | 152 | m_log.InfoFormat("[ARCHIVER]: Added {0} assets to archive", assetsAdded); |
153 | } | 153 | } |
154 | 154 | ||
155 | if (assetsAdded % LOG_ASSET_LOAD_NOTIFICATION_INTERVAL != 0) | 155 | if (assetsAdded % LOG_ASSET_LOAD_NOTIFICATION_INTERVAL != 0) |
156 | m_log.InfoFormat("[ARCHIVER]: Added {0} assets to archive", assetsAdded); | 156 | m_log.InfoFormat("[ARCHIVER]: Added {0} assets to archive", assetsAdded); |
157 | } | 157 | } |