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

Make texture decode errors nonfatal. The texture send is simply dropped

0.6.1-post-fixes
Melanie Thielker 2008-11-17 23:08:37 +00:00
parent 5972eb8848
commit ece27a3631
1 changed files with 34 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureDownloadModule.cs
View File

@ -176,9 +176,11 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload
{ {
ITextureSender sender = null; ITextureSender sender = null;
try // try
{ // {
while (true) while (true)
{
try
{ {
sender = m_queueSenders.Dequeue(); sender = m_queueSenders.Dequeue();
@ -206,15 +208,21 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload
//m_log.InfoFormat("[TEXTURE] Texture sender queue size: {0}", m_queueSenders.Count()); //m_log.InfoFormat("[TEXTURE] Texture sender queue size: {0}", m_queueSenders.Count());
} }
} catch(Exception e)
catch (Exception e)
{ {
// TODO: Let users in the sim and those entering it and possibly an external watchdog know what has happened
m_log.ErrorFormat( m_log.ErrorFormat(
"[TEXTURE]: Texture send thread terminating with exception. PLEASE REBOOT YOUR SIM - TEXTURES WILL NOT BE AVAILABLE UNTIL YOU DO. Exception is {0}", "[TEXTURE]: Texture send thread caught exception. The texture send was aborted. Exception is {0}", e);
e);
} }
} }
// }
// catch (Exception e)
// {
// // TODO: Let users in the sim and those entering it and possibly an external watchdog know what has happened
// m_log.ErrorFormat(
// "[TEXTURE]: Texture send thread terminating with exception. PLEASE REBOOT YOUR SIM - TEXTURES WILL NOT BE AVAILABLE UNTIL YOU DO. Exception is {0}",
// e);
// }
}
/// <summary> /// <summary>
/// Called when the texture has finished sending. /// Called when the texture has finished sending.