diff options
author | Justin Clark-Casey (justincc) | 2010-06-25 21:48:19 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-06-25 21:48:19 +0100 |
commit | a4a808818f32b937a4228e9311e3e3b413a1b1d7 (patch) | |
tree | 86b5352af3843a87689a2c7c3b94a34acbdf1bec /OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs | |
parent | minor: fix spelling mistake interupt -> interrupt in migrations (diff) | |
download | opensim-SC_OLD-a4a808818f32b937a4228e9311e3e3b413a1b1d7.zip opensim-SC_OLD-a4a808818f32b937a4228e9311e3e3b413a1b1d7.tar.gz opensim-SC_OLD-a4a808818f32b937a4228e9311e3e3b413a1b1d7.tar.bz2 opensim-SC_OLD-a4a808818f32b937a4228e9311e3e3b413a1b1d7.tar.xz |
don't report the null uuid as a missing asset on saving oars/iars
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs index a1451ce..4d360f6 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs | |||
@@ -134,7 +134,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
134 | 134 | ||
135 | foreach (KeyValuePair<UUID, AssetType> kvp in m_uuids) | 135 | foreach (KeyValuePair<UUID, AssetType> kvp in m_uuids) |
136 | { | 136 | { |
137 | m_assetService.Get(kvp.Key.ToString(), kvp.Value, PreAssetRequestCallback); | 137 | if (kvp.Key != UUID.Zero) |
138 | m_assetService.Get(kvp.Key.ToString(), kvp.Value, PreAssetRequestCallback); | ||
138 | } | 139 | } |
139 | 140 | ||
140 | m_requestCallbackTimer.Enabled = true; | 141 | m_requestCallbackTimer.Enabled = true; |
@@ -269,7 +270,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
269 | } | 270 | } |
270 | catch (Exception e) | 271 | catch (Exception e) |
271 | { | 272 | { |
272 | m_log.ErrorFormat("[ARCHIVER]: AssetRequestCallback failed with {0}", e); | 273 | m_log.ErrorFormat("[ARCHIVER]: AssetRequestCallback failed with {0}{1}", e.Message, e.StackTrace); |
273 | } | 274 | } |
274 | } | 275 | } |
275 | 276 | ||
@@ -285,7 +286,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
285 | catch (Exception e) | 286 | catch (Exception e) |
286 | { | 287 | { |
287 | m_log.ErrorFormat( | 288 | m_log.ErrorFormat( |
288 | "[ARCHIVER]: Terminating archive creation since asset requster callback failed with {0}", e); | 289 | "[ARCHIVER]: Terminating archive creation since asset requester callback failed with {0}{1}", |
290 | e.Message, e.StackTrace); | ||
289 | } | 291 | } |
290 | } | 292 | } |
291 | } | 293 | } |