aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorSean Dague2008-02-08 15:29:53 +0000
committerSean Dague2008-02-08 15:29:53 +0000
commit598c5a95d934f7b3a5e71b476b8f0bed39721f8e (patch)
tree22966aedf476b21ab61e3dbb0b8a7b352914b18d /OpenSim
parentsmall bit of refactoring, (diff)
downloadopensim-SC_OLD-598c5a95d934f7b3a5e71b476b8f0bed39721f8e.zip
opensim-SC_OLD-598c5a95d934f7b3a5e71b476b8f0bed39721f8e.tar.gz
opensim-SC_OLD-598c5a95d934f7b3a5e71b476b8f0bed39721f8e.tar.bz2
opensim-SC_OLD-598c5a95d934f7b3a5e71b476b8f0bed39721f8e.tar.xz
fix the issue found on IRC this morning. The logging call was mistructured
so threw and exception when attempting to log that we missed an asset and were waiting for it.
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetCache.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs
index 84713b9..158a9bd 100644
--- a/OpenSim/Framework/Communications/Cache/AssetCache.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs
@@ -198,7 +198,8 @@ namespace OpenSim.Framework.Communications.Cache
198 } while (--maxPolls > 0); 198 } while (--maxPolls > 0);
199 199
200 m_log.Warn( 200 m_log.Warn(
201 String.Format("[ASSETCACHE]: Asset {0} was not received before the retrieval timeout was reached")); 201 String.Format("[ASSETCACHE]: Asset {0} was not received before the retrieval timeout was reached", assetID.ToString())
202 );
202 203
203 return null; 204 return null;
204 } 205 }