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

* Eliminate occurences of "Got a texture uuid ... with no sender object to handle it..." by properly dealing with the situation where a client still has queued texture requests when it logs out

0.6.0-stable
Justin Clarke Casey 2008-05-16 18:10:04 +00:00
parent 244c776487
commit 63ddbfb979
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/Communications/Cache/AssetCache.cs
View File

@ -453,7 +453,7 @@ namespace OpenSim.Framework.Communications.Cache
// See IAssetReceiver // See IAssetReceiver
public void AssetNotFound(LLUUID assetID, bool IsTexture) public void AssetNotFound(LLUUID assetID, bool IsTexture)
{ {
m_log.WarnFormat("[ASSET CACHE]: AssetNotFound for {0}", assetID); //m_log.WarnFormat("[ASSET CACHE]: AssetNotFound for {0}", assetID);
if (IsTexture) if (IsTexture)
{ {

18
OpenSim/Region/Environment/Modules/Agent/TextureDownload/UserTextureDownloadService.cs
View File

@ -47,6 +47,12 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload
private static readonly ILog m_log private static readonly ILog m_log
= LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
/// <summary>
/// True if the service has been closed, probably because a user with texture requests still queued
/// logged out.
/// </summary>
private bool closed;
/// <summary> /// <summary>
/// We will allow the client to request the same texture n times before dropping further requests /// We will allow the client to request the same texture n times before dropping further requests
/// ///
@ -170,10 +176,13 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload
{ {
//m_log.DebugFormat("[USER TEXTURE DOWNLOAD SERVICE]: Calling TextureCallback with {0}, texture == null is {1}", textureID, (texture == null ? true : false)); //m_log.DebugFormat("[USER TEXTURE DOWNLOAD SERVICE]: Calling TextureCallback with {0}, texture == null is {1}", textureID, (texture == null ? true : false));
// There may still be texture requests pending for a logged out client
if (closed)
return;
lock (m_textureSenders) lock (m_textureSenders)
{ {
TextureSender.TextureSender textureSender; TextureSender.TextureSender textureSender;
if (m_textureSenders.TryGetValue(textureID, out textureSender)) if (m_textureSenders.TryGetValue(textureID, out textureSender))
{ {
// XXX It may be perfectly valid for a texture to have no data... but if we pass // XXX It may be perfectly valid for a texture to have no data... but if we pass
@ -211,7 +220,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload
else else
{ {
m_log.WarnFormat( m_log.WarnFormat(
"Got a texture uuid {0} with no sender object to handle it, this shouldn't happen", "[USER TEXTURE DOWNLOAD SERVICE]: Got a texture uuid {0} with no sender object to handle it, this shouldn't happen",
textureID); textureID);
} }
} }
@ -237,6 +246,8 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload
/// </summary> /// </summary>
internal void Close() internal void Close()
{ {
closed = true;
lock (m_textureSenders) lock (m_textureSenders)
{ {
foreach (TextureSender.TextureSender textureSender in m_textureSenders.Values) foreach (TextureSender.TextureSender textureSender in m_textureSenders.Values)
@ -246,6 +257,9 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload
m_textureSenders.Clear(); m_textureSenders.Clear();
} }
// XXX: It might be possible to also remove pending texture requests from the asset cache queues,
// though this might also be more trouble than it's worth.
} }
} }
} }