aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorMelanie2011-10-25 03:17:26 +0100
committerMelanie2011-10-25 03:17:26 +0100
commite058b0822f7aa2bf00a319d36821244219282351 (patch)
tree12a76de933ccc38ab1da5045d46225e58237e7b5 /OpenSim/Region/CoreModules
parentMerge commit '9ab2943abf5f890a53dc8ada48bf63ed15331c07' into bigmerge (diff)
parentChange wording on asset requests. (diff)
downloadopensim-SC-e058b0822f7aa2bf00a319d36821244219282351.zip
opensim-SC-e058b0822f7aa2bf00a319d36821244219282351.tar.gz
opensim-SC-e058b0822f7aa2bf00a319d36821244219282351.tar.bz2
opensim-SC-e058b0822f7aa2bf00a319d36821244219282351.tar.xz
Merge commit 'f16d125027aba098e45dc026f9d507a430bc2b10' into bigmerge
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
index f8f3713..900260d 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
@@ -132,7 +132,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
132 { 132 {
133 m_requestState = RequestState.Running; 133 m_requestState = RequestState.Running;
134 134
135 m_log.DebugFormat("[ARCHIVER]: AssetsRequest executed looking for {0} assets", m_repliesRequired); 135 m_log.DebugFormat("[ARCHIVER]: AssetsRequest executed looking for {0} possible assets", m_repliesRequired);
136 136
137 // We can stop here if there are no assets to fetch 137 // We can stop here if there are no assets to fetch
138 if (m_repliesRequired == 0) 138 if (m_repliesRequired == 0)
@@ -267,7 +267,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
267 m_requestState = RequestState.Completed; 267 m_requestState = RequestState.Completed;
268 268
269 m_log.DebugFormat( 269 m_log.DebugFormat(
270 "[ARCHIVER]: Successfully added {0} assets ({1} assets notified missing)", 270 "[ARCHIVER]: Successfully added {0} assets ({1} assets not found but these may be expected invalid references)",
271 m_foundAssetUuids.Count, m_notFoundAssetUuids.Count); 271 m_foundAssetUuids.Count, m_notFoundAssetUuids.Count);
272 272
273 // We want to stop using the asset cache thread asap 273 // We want to stop using the asset cache thread asap