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

* Remove null reference exception in the J2KDecoderModule's J2K repair routine for when the asset we're looking up isn't an image at all. (did someone set the texture on the side of a primitive to some other kind of asset with the script engine?)

0.6.5-rc1
Teravus Ovares 2009-04-13 16:06:53 +00:00
parent 9371df52cb
commit bd7d00db33
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs
View File

@ -223,9 +223,21 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
// Try to do some heuristics error correction! Yeah.
bool sane2Heuristics = true;
if (texture.LayerInfo.Length == 0)
if (texture.Image == null)
sane2Heuristics = false;
if (texture.LayerInfo == null)
sane2Heuristics = false;
if (sane2Heuristics)
{
if (texture.LayerInfo.Length == 0)
sane2Heuristics = false;
}
if (sane2Heuristics)
{
// Last layer start is less then the end of the file and last layer start is greater then 0
@ -292,7 +304,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
}
else
{
m_log.WarnFormat("[J2KDecoderModule]: JPEG2000 texture decoding failed for {0}", AssetId);
m_log.WarnFormat("[J2KDecoderModule]: JPEG2000 texture decoding failed for {0}. Is this a texture? is it J2K?", AssetId);
}
}
texture = null; // dereference and dispose of ManagedImage