diff options
author | Dahlia Trimble | 2009-05-29 08:57:10 +0000 |
---|---|---|
committer | Dahlia Trimble | 2009-05-29 08:57:10 +0000 |
commit | 179724b4fcc063adb67556bcb5997b2de663e348 (patch) | |
tree | eaecc9fef8441cd16dcd5109e6beaf22753a2ecc /OpenSim/Region/Physics/Meshing/Meshmerizer.cs | |
parent | reinstate a hopefully more robust experimental decoded sculpt map caching scheme (diff) | |
download | opensim-SC-179724b4fcc063adb67556bcb5997b2de663e348.zip opensim-SC-179724b4fcc063adb67556bcb5997b2de663e348.tar.gz opensim-SC-179724b4fcc063adb67556bcb5997b2de663e348.tar.bz2 opensim-SC-179724b4fcc063adb67556bcb5997b2de663e348.tar.xz |
some clean up of sculpt map caching code
remove a redundant debug message
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/Meshing/Meshmerizer.cs | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs index f3e79c9..feeaf71 100644 --- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs +++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs | |||
@@ -184,9 +184,6 @@ namespace OpenSim.Region.Physics.Meshing | |||
184 | 184 | ||
185 | if (primShape.SculptEntry) | 185 | if (primShape.SculptEntry) |
186 | { | 186 | { |
187 | //if (primShape.SculptData.Length == 0) | ||
188 | // return null; | ||
189 | |||
190 | if (cacheSculptMaps && primShape.SculptTexture != null) | 187 | if (cacheSculptMaps && primShape.SculptTexture != null) |
191 | { | 188 | { |
192 | decodedSculptFileName = System.IO.Path.Combine(decodedScultMapPath, "smap_" + primShape.SculptTexture.ToString()); | 189 | decodedSculptFileName = System.IO.Path.Combine(decodedScultMapPath, "smap_" + primShape.SculptTexture.ToString()); |
@@ -196,8 +193,6 @@ namespace OpenSim.Region.Physics.Meshing | |||
196 | { | 193 | { |
197 | idata = Image.FromFile(decodedSculptFileName); | 194 | idata = Image.FromFile(decodedSculptFileName); |
198 | } | 195 | } |
199 | else if (primShape.SculptData.Length == 0) | ||
200 | return null; | ||
201 | } | 196 | } |
202 | catch (Exception e) | 197 | catch (Exception e) |
203 | { | 198 | { |
@@ -210,6 +205,9 @@ namespace OpenSim.Region.Physics.Meshing | |||
210 | 205 | ||
211 | if (idata == null) | 206 | if (idata == null) |
212 | { | 207 | { |
208 | if (primShape.SculptData.Length == 0) | ||
209 | return null; | ||
210 | |||
213 | try | 211 | try |
214 | { | 212 | { |
215 | ManagedImage managedImage; // we never use this | 213 | ManagedImage managedImage; // we never use this |