aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid
diff options
context:
space:
mode:
authorMike Mazur2009-03-12 06:04:17 +0000
committerMike Mazur2009-03-12 06:04:17 +0000
commit7b2977d625d46718fe39051c778c477022153cc1 (patch)
tree58c39648c77751cf2b728e0a784e244e7e043735 /OpenSim/Grid
parentMoving TarArchive to OpenSim.Framework.Archive (diff)
downloadopensim-SC_OLD-7b2977d625d46718fe39051c778c477022153cc1.zip
opensim-SC_OLD-7b2977d625d46718fe39051c778c477022153cc1.tar.gz
opensim-SC_OLD-7b2977d625d46718fe39051c778c477022153cc1.tar.bz2
opensim-SC_OLD-7b2977d625d46718fe39051c778c477022153cc1.tar.xz
Move ArchiveConstants to OpenSim.Framework.Archive
- move a couple constants from InventoryArchiveConstants to ArchiveConstants, now only one of these is needed - change InventoryArchiveConstants references to ArchiveConstants - remove InventoryArchive AssetInventoryServer plugin dependency on OpenSim.Region.CodeModules - trim trailing whitespace
Diffstat (limited to 'OpenSim/Grid')
-rw-r--r--OpenSim/Grid/AssetInventoryServer/Plugins/InventoryArchivePlugin.cs5
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/InventoryArchivePlugin.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/InventoryArchivePlugin.cs
index ceded03..cd02a64 100644
--- a/OpenSim/Grid/AssetInventoryServer/Plugins/InventoryArchivePlugin.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Plugins/InventoryArchivePlugin.cs
@@ -35,7 +35,6 @@ using OpenMetaverse;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Framework.Archive; 36using OpenSim.Framework.Archive;
37using OpenSim.Framework.Servers; 37using OpenSim.Framework.Servers;
38using OpenSim.Region.CoreModules.Avatar.Inventory.Archiver;
39using log4net; 38using log4net;
40 39
41namespace OpenSim.Grid.AssetInventoryServer.Plugins 40namespace OpenSim.Grid.AssetInventoryServer.Plugins
@@ -146,7 +145,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins
146 MemoryStream ms = new MemoryStream(); 145 MemoryStream ms = new MemoryStream();
147 GZipStream gzs = new GZipStream(ms, CompressionMode.Compress, true); 146 GZipStream gzs = new GZipStream(ms, CompressionMode.Compress, true);
148 TarArchiveWriter archive = new TarArchiveWriter(gzs); 147 TarArchiveWriter archive = new TarArchiveWriter(gzs);
149 WriteInventoryFolderToArchive(archive, rootFolder, InventoryArchiveConstants.INVENTORY_PATH); 148 WriteInventoryFolderToArchive(archive, rootFolder, ArchiveConstants.INVENTORY_PATH);
150 149
151 archive.Close(); 150 archive.Close();
152 151
@@ -181,7 +180,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins
181 180
182 private static void WriteInventoryFolderToArchive(TarArchiveWriter archive, InventoryFolderWithChildren folder, string path) 181 private static void WriteInventoryFolderToArchive(TarArchiveWriter archive, InventoryFolderWithChildren folder, string path)
183 { 182 {
184 path += string.Format("{0}{1}{2}/", folder.Name, InventoryArchiveConstants.INVENTORY_NODE_NAME_COMPONENT_SEPARATOR, folder.ID); 183 path += string.Format("{0}{1}{2}/", folder.Name, ArchiveConstants.INVENTORY_NODE_NAME_COMPONENT_SEPARATOR, folder.ID);
185 archive.WriteDir(path); 184 archive.WriteDir(path);
186 185
187 foreach (InventoryNodeBase inventoryNode in folder.Children.Values) 186 foreach (InventoryNodeBase inventoryNode in folder.Children.Values)