diff options
Diffstat (limited to 'OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs | 13 |
1 files changed, 6 insertions, 7 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 | } |