diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequest.cs | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequest.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequest.cs index 1cc8877..6c341c6 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequest.cs +++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequest.cs | |||
@@ -80,16 +80,16 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
80 | { | 80 | { |
81 | // XXX: Not a great way to iterate through face textures, but there's no | 81 | // XXX: Not a great way to iterate through face textures, but there's no |
82 | // other way to tell how many faces there actually are | 82 | // other way to tell how many faces there actually are |
83 | //int i = 0; | 83 | //int i = 0; |
84 | foreach (LLObject.TextureEntryFace texture in part.Shape.Textures.FaceTextures) | 84 | foreach (LLObject.TextureEntryFace texture in part.Shape.Textures.FaceTextures) |
85 | { | 85 | { |
86 | if (texture != null) | 86 | if (texture != null) |
87 | { | 87 | { |
88 | //m_log.DebugFormat("[ARCHIVER]: Got face {0}", i++); | 88 | //m_log.DebugFormat("[ARCHIVER]: Got face {0}", i++); |
89 | textureUuids[texture.TextureID] = 1; | 89 | textureUuids[texture.TextureID] = 1; |
90 | } | 90 | } |
91 | } | 91 | } |
92 | 92 | ||
93 | foreach (TaskInventoryItem tit in part.TaskInventory.Values) | 93 | foreach (TaskInventoryItem tit in part.TaskInventory.Values) |
94 | { | 94 | { |
95 | if (tit.Type == (int)InventoryType.Texture) | 95 | if (tit.Type == (int)InventoryType.Texture) |
@@ -123,7 +123,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
123 | TarArchiveWriter archive = new TarArchiveWriter(); | 123 | TarArchiveWriter archive = new TarArchiveWriter(); |
124 | 124 | ||
125 | archive.AddFile(ArchiveConstants.PRIMS_PATH, m_serializedEntities); | 125 | archive.AddFile(ArchiveConstants.PRIMS_PATH, m_serializedEntities); |
126 | 126 | ||
127 | // It appears that gtar, at least, doesn't need the intermediate directory entries in the tar | 127 | // It appears that gtar, at least, doesn't need the intermediate directory entries in the tar |
128 | //archive.AddDir("assets"); | 128 | //archive.AddDir("assets"); |
129 | 129 | ||
@@ -132,7 +132,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
132 | if (assets[uuid] != null) | 132 | if (assets[uuid] != null) |
133 | { | 133 | { |
134 | archive.AddFile( | 134 | archive.AddFile( |
135 | ArchiveConstants.TEXTURES_PATH + uuid.ToString() + ArchiveConstants.TEXTURE_EXTENSION, | 135 | ArchiveConstants.TEXTURES_PATH + uuid.ToString() + ArchiveConstants.TEXTURE_EXTENSION, |
136 | assets[uuid].Data); | 136 | assets[uuid].Data); |
137 | } | 137 | } |
138 | else | 138 | else |
@@ -142,7 +142,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
142 | } | 142 | } |
143 | 143 | ||
144 | archive.WriteTar(m_savePath); | 144 | archive.WriteTar(m_savePath); |
145 | 145 | ||
146 | m_log.InfoFormat("[ARCHIVER]: Wrote out OpenSimulator archive {0}", m_savePath); | 146 | m_log.InfoFormat("[ARCHIVER]: Wrote out OpenSimulator archive {0}", m_savePath); |
147 | } | 147 | } |
148 | 148 | ||
@@ -232,11 +232,11 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
232 | newThread.Start(); | 232 | newThread.Start(); |
233 | } | 233 | } |
234 | } | 234 | } |
235 | 235 | ||
236 | /// <summary> | 236 | /// <summary> |
237 | /// Perform the callback on the original requester of the assets | 237 | /// Perform the callback on the original requester of the assets |
238 | /// </summary> | 238 | /// </summary> |
239 | protected void PerformAssetsRequestCallback() | 239 | protected void PerformAssetsRequestCallback() |
240 | { | 240 | { |
241 | m_assetsRequestCallback(m_assets); | 241 | m_assetsRequestCallback(m_assets); |
242 | } | 242 | } |