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 | |
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 '')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs | 13 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Archiver/AssetsDearchiver.cs | 12 |
2 files changed, 12 insertions, 13 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs b/OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs index 2a041dd..4f4a3c3 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs +++ b/OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs | |||
@@ -1,4 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
@@ -40,7 +40,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
40 | /// </summary> | 40 | /// </summary> |
41 | public class AssetsArchiver | 41 | public class AssetsArchiver |
42 | { | 42 | { |
43 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 43 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
44 | 44 | ||
45 | /// <summary> | 45 | /// <summary> |
46 | /// Archive assets | 46 | /// Archive assets |
@@ -99,15 +99,14 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
99 | xtw.WriteElementString("inventory-type", asset.InvType.ToString()); | 99 | xtw.WriteElementString("inventory-type", asset.InvType.ToString()); |
100 | 100 | ||
101 | xtw.WriteEndElement(); | 101 | xtw.WriteEndElement(); |
102 | } | 102 | } |
103 | |||
104 | } | 103 | } |
105 | 104 | ||
106 | xtw.WriteEndElement(); | 105 | xtw.WriteEndElement(); |
107 | 106 | ||
108 | xtw.WriteEndDocument(); | 107 | xtw.WriteEndDocument(); |
109 | 108 | ||
110 | archive.AddFile("assets.xml", sw.ToString()); | 109 | archive.AddFile("assets.xml", sw.ToString()); |
111 | } | 110 | } |
112 | 111 | ||
113 | /// <summary> | 112 | /// <summary> |
@@ -118,7 +117,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
118 | { | 117 | { |
119 | // It appears that gtar, at least, doesn't need the intermediate directory entries in the tar | 118 | // It appears that gtar, at least, doesn't need the intermediate directory entries in the tar |
120 | //archive.AddDir("assets"); | 119 | //archive.AddDir("assets"); |
121 | 120 | ||
122 | foreach (LLUUID uuid in m_assets.Keys) | 121 | foreach (LLUUID uuid in m_assets.Keys) |
123 | { | 122 | { |
124 | AssetBase asset = m_assets[uuid]; | 123 | AssetBase asset = m_assets[uuid]; |
@@ -140,7 +139,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
140 | { | 139 | { |
141 | m_log.DebugFormat("[ARCHIVER]: Could not find asset {0} to archive", uuid); | 140 | m_log.DebugFormat("[ARCHIVER]: Could not find asset {0} to archive", uuid); |
142 | } | 141 | } |
143 | } | 142 | } |
144 | } | 143 | } |
145 | } | 144 | } |
146 | } | 145 | } |
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 | ||