ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-08 10:15:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update svn properties. Formatting cleanup.

Browse Source
This commit is contained in:
Jeff Ames
2008-06-10 08:35:46 +00:00
parent 8a93358405
commit 5910a49da6
9 changed files with 63 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs
View File

@@ -1,4 +1,4 @@
/*
/*
* Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders.
*
@@ -40,7 +40,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
/// </summary>
public class AssetsArchiver
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
/// <summary>
/// Archive assets
@@ -99,15 +99,14 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
xtw.WriteElementString("inventory-type", asset.InvType.ToString());
xtw.WriteEndElement();
}
}
}
xtw.WriteEndElement();
xtw.WriteEndDocument();
archive.AddFile("assets.xml", sw.ToString());
archive.AddFile("assets.xml", sw.ToString());
}
/// <summary>
@@ -118,7 +117,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
{
// It appears that gtar, at least, doesn't need the intermediate directory entries in the tar
//archive.AddDir("assets");
foreach (LLUUID uuid in m_assets.Keys)
{
AssetBase asset = m_assets[uuid];
@@ -140,7 +139,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
{
m_log.DebugFormat("[ARCHIVER]: Could not find asset {0} to archive", uuid);
}
}
}
}
}
}

12
OpenSim/Region/Environment/Modules/World/Archiver/AssetsDearchiver.cs
View File

@@ -39,7 +39,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
{
/// <summary>
/// Dearchives assets
/// </summary>
/// </summary>
public class AssetsDearchiver
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -61,7 +61,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
/// </summary>
protected AssetCache m_cache;
public AssetsDearchiver(AssetCache cache)
public AssetsDearchiver(AssetCache cache)
{
m_cache = cache;
}
@@ -82,7 +82,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
ResolveAssetData(assetFilename, data);
}
}
/// <summary>
/// Add asset metadata xml
/// </summary>
@@ -92,7 +92,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
m_metadata = new Dictionary<string, AssetMetadata>();
StringReader sr = new StringReader(xml);
XmlTextReader reader = new XmlTextReader(sr);
XmlTextReader reader = new XmlTextReader(sr);
reader.ReadStartElement("assets");
reader.Read();
@@ -109,7 +109,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
metadata.Name = reader.ReadElementString("name");
metadata.Description = reader.ReadElementString("description");
metadata.AssetType = Convert.ToSByte(reader.ReadElementString("asset-type"));
metadata.AssetType = Convert.ToSByte(reader.ReadElementString("inventory-type"));
metadata.AssetType = Convert.ToSByte(reader.ReadElementString("inventory-type"));
m_metadata[filename] = metadata;
@@ -131,7 +131,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
{
foreach (string filename in m_assetDataAwaitingMetadata.Keys)
{
ResolveAssetData(filename, m_assetDataAwaitingMetadata[filename]);
ResolveAssetData(filename, m_assetDataAwaitingMetadata[filename]);
}
}