diff options
author | Justin Clark-Casey (justincc) | 2010-06-29 20:28:48 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-06-29 20:28:48 +0100 |
commit | 6f1b351cf49755416aebe86b862b393af8cc27c9 (patch) | |
tree | af3fc89a6914a297cdab762460e34cd56ac42641 | |
parent | This is RC2. *** Changed the MySql driver back to the old one.*** Removed Old... (diff) | |
download | opensim-SC_OLD-6f1b351cf49755416aebe86b862b393af8cc27c9.zip opensim-SC_OLD-6f1b351cf49755416aebe86b862b393af8cc27c9.tar.gz opensim-SC_OLD-6f1b351cf49755416aebe86b862b393af8cc27c9.tar.bz2 opensim-SC_OLD-6f1b351cf49755416aebe86b862b393af8cc27c9.tar.xz |
Revert "don't report the null uuid as a missing asset on saving oars/iars"
This reverts commit 5ce119174e03715bfc61f7864bd3e7182c5d21ea.
This change led to infinite timeout since the expected number of assets no longer matched requests.
Rather than introduce yet fresh bugs with another fix, just revert this since the inaccurate report is just inconvenient
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs index 4d360f6..a1451ce 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs | |||
@@ -134,8 +134,7 @@ 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 | if (kvp.Key != UUID.Zero) | 137 | m_assetService.Get(kvp.Key.ToString(), kvp.Value, PreAssetRequestCallback); |
138 | m_assetService.Get(kvp.Key.ToString(), kvp.Value, PreAssetRequestCallback); | ||
139 | } | 138 | } |
140 | 139 | ||
141 | m_requestCallbackTimer.Enabled = true; | 140 | m_requestCallbackTimer.Enabled = true; |
@@ -270,7 +269,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
270 | } | 269 | } |
271 | catch (Exception e) | 270 | catch (Exception e) |
272 | { | 271 | { |
273 | m_log.ErrorFormat("[ARCHIVER]: AssetRequestCallback failed with {0}{1}", e.Message, e.StackTrace); | 272 | m_log.ErrorFormat("[ARCHIVER]: AssetRequestCallback failed with {0}", e); |
274 | } | 273 | } |
275 | } | 274 | } |
276 | 275 | ||
@@ -286,8 +285,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
286 | catch (Exception e) | 285 | catch (Exception e) |
287 | { | 286 | { |
288 | m_log.ErrorFormat( | 287 | m_log.ErrorFormat( |
289 | "[ARCHIVER]: Terminating archive creation since asset requester callback failed with {0}{1}", | 288 | "[ARCHIVER]: Terminating archive creation since asset requster callback failed with {0}", e); |
290 | e.Message, e.StackTrace); | ||
291 | } | 289 | } |
292 | } | 290 | } |
293 | } | 291 | } |