diff options
author | Jeff Ames | 2008-06-10 08:35:46 +0000 |
---|---|---|
committer | Jeff Ames | 2008-06-10 08:35:46 +0000 |
commit | 5910a49da6e16d6e3718fffad73c8a24efcec80d (patch) | |
tree | 5f5852f643a77e72b45ad49af0538bdf0838b760 /OpenSim/Region/Environment/Modules/World/Archiver/AssetsDearchiver.cs | |
parent | * This completes ObjectDuplicateOnRay. (diff) | |
download | opensim-SC_OLD-5910a49da6e16d6e3718fffad73c8a24efcec80d.zip opensim-SC_OLD-5910a49da6e16d6e3718fffad73c8a24efcec80d.tar.gz opensim-SC_OLD-5910a49da6e16d6e3718fffad73c8a24efcec80d.tar.bz2 opensim-SC_OLD-5910a49da6e16d6e3718fffad73c8a24efcec80d.tar.xz |
Update svn properties. Formatting cleanup.
Diffstat (limited to 'OpenSim/Region/Environment/Modules/World/Archiver/AssetsDearchiver.cs')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Archiver/AssetsDearchiver.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsDearchiver.cs b/OpenSim/Region/Environment/Modules/World/Archiver/AssetsDearchiver.cs index 15a92e5..98364d3 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsDearchiver.cs +++ b/OpenSim/Region/Environment/Modules/World/Archiver/AssetsDearchiver.cs | |||
@@ -39,7 +39,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
39 | { | 39 | { |
40 | /// <summary> | 40 | /// <summary> |
41 | /// Dearchives assets | 41 | /// Dearchives assets |
42 | /// </summary> | 42 | /// </summary> |
43 | public class AssetsDearchiver | 43 | public class AssetsDearchiver |
44 | { | 44 | { |
45 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 45 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
@@ -61,7 +61,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
61 | /// </summary> | 61 | /// </summary> |
62 | protected AssetCache m_cache; | 62 | protected AssetCache m_cache; |
63 | 63 | ||
64 | public AssetsDearchiver(AssetCache cache) | 64 | public AssetsDearchiver(AssetCache cache) |
65 | { | 65 | { |
66 | m_cache = cache; | 66 | m_cache = cache; |
67 | } | 67 | } |
@@ -82,7 +82,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
82 | ResolveAssetData(assetFilename, data); | 82 | ResolveAssetData(assetFilename, data); |
83 | } | 83 | } |
84 | } | 84 | } |
85 | 85 | ||
86 | /// <summary> | 86 | /// <summary> |
87 | /// Add asset metadata xml | 87 | /// Add asset metadata xml |
88 | /// </summary> | 88 | /// </summary> |
@@ -92,7 +92,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
92 | m_metadata = new Dictionary<string, AssetMetadata>(); | 92 | m_metadata = new Dictionary<string, AssetMetadata>(); |
93 | 93 | ||
94 | StringReader sr = new StringReader(xml); | 94 | StringReader sr = new StringReader(xml); |
95 | XmlTextReader reader = new XmlTextReader(sr); | 95 | XmlTextReader reader = new XmlTextReader(sr); |
96 | 96 | ||
97 | reader.ReadStartElement("assets"); | 97 | reader.ReadStartElement("assets"); |
98 | reader.Read(); | 98 | reader.Read(); |
@@ -109,7 +109,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
109 | metadata.Name = reader.ReadElementString("name"); | 109 | metadata.Name = reader.ReadElementString("name"); |
110 | metadata.Description = reader.ReadElementString("description"); | 110 | metadata.Description = reader.ReadElementString("description"); |
111 | metadata.AssetType = Convert.ToSByte(reader.ReadElementString("asset-type")); | 111 | metadata.AssetType = Convert.ToSByte(reader.ReadElementString("asset-type")); |
112 | metadata.AssetType = Convert.ToSByte(reader.ReadElementString("inventory-type")); | 112 | metadata.AssetType = Convert.ToSByte(reader.ReadElementString("inventory-type")); |
113 | 113 | ||
114 | m_metadata[filename] = metadata; | 114 | m_metadata[filename] = metadata; |
115 | 115 | ||
@@ -131,7 +131,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
131 | { | 131 | { |
132 | foreach (string filename in m_assetDataAwaitingMetadata.Keys) | 132 | foreach (string filename in m_assetDataAwaitingMetadata.Keys) |
133 | { | 133 | { |
134 | ResolveAssetData(filename, m_assetDataAwaitingMetadata[filename]); | 134 | ResolveAssetData(filename, m_assetDataAwaitingMetadata[filename]); |
135 | } | 135 | } |
136 | } | 136 | } |
137 | 137 | ||