OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "don't report the null uuid as a missing asset on saving oars/iars" 

This reverts commit 5ce119174e.

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
0.7-release
Justin Clark-Casey (justincc) 2010-06-29 20:28:48 +01:00
parent dcb9da8495
commit 6f1b351cf4
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
View File

@ -134,8 +134,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
foreach (KeyValuePair<UUID, AssetType> kvp in m_uuids) foreach (KeyValuePair<UUID, AssetType> kvp in m_uuids)
{ {
if (kvp.Key != UUID.Zero) m_assetService.Get(kvp.Key.ToString(), kvp.Value, PreAssetRequestCallback);
m_assetService.Get(kvp.Key.ToString(), kvp.Value, PreAssetRequestCallback);
} }
m_requestCallbackTimer.Enabled = true; m_requestCallbackTimer.Enabled = true;
@ -270,7 +269,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
} }
catch (Exception e) catch (Exception e)
{ {
m_log.ErrorFormat("[ARCHIVER]: AssetRequestCallback failed with {0}{1}", e.Message, e.StackTrace); m_log.ErrorFormat("[ARCHIVER]: AssetRequestCallback failed with {0}", e);
} }
} }
@ -286,8 +285,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
catch (Exception e) catch (Exception e)
{ {
m_log.ErrorFormat( m_log.ErrorFormat(
"[ARCHIVER]: Terminating archive creation since asset requester callback failed with {0}{1}", "[ARCHIVER]: Terminating archive creation since asset requster callback failed with {0}", e);
e.Message, e.StackTrace);
} }
} }
} }