some clean up of sculpt map caching code

remove a redundant debug message
This commit is contained in:
Dahlia Trimble
2009-05-29 08:57:10 +00:00
parent 05cbf0b502
commit 179724b4fc
2 changed files with 5 additions and 6 deletions

View File

@@ -184,9 +184,6 @@ namespace OpenSim.Region.Physics.Meshing
if (primShape.SculptEntry)
{
//if (primShape.SculptData.Length == 0)
// return null;
if (cacheSculptMaps && primShape.SculptTexture != null)
{
decodedSculptFileName = System.IO.Path.Combine(decodedScultMapPath, "smap_" + primShape.SculptTexture.ToString());
@@ -196,8 +193,6 @@ namespace OpenSim.Region.Physics.Meshing
{
idata = Image.FromFile(decodedSculptFileName);
}
else if (primShape.SculptData.Length == 0)
return null;
}
catch (Exception e)
{
@@ -210,6 +205,9 @@ namespace OpenSim.Region.Physics.Meshing
if (idata == null)
{
if (primShape.SculptData.Length == 0)
return null;
try
{
ManagedImage managedImage; // we never use this