aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJohn Hurliman2009-10-18 02:53:36 -0700
committerJohn Hurliman2009-10-18 02:53:36 -0700
commit2f2eeb6731f4b692dafd17afa88019c24e361a36 (patch)
tree6ac15d1c8ddeb111351f312c0d731caca9cfd624
parent* Big performance increase in loading prims from the region database with MySQL (diff)
downloadopensim-SC_OLD-2f2eeb6731f4b692dafd17afa88019c24e361a36.zip
opensim-SC_OLD-2f2eeb6731f4b692dafd17afa88019c24e361a36.tar.gz
opensim-SC_OLD-2f2eeb6731f4b692dafd17afa88019c24e361a36.tar.bz2
opensim-SC_OLD-2f2eeb6731f4b692dafd17afa88019c24e361a36.tar.xz
Zero out PrimitiveBaseShape.SculptData after the JPEG2000 data has been decoded to allow garbage collection on it
-rw-r--r--OpenSim/Region/Physics/Meshing/Meshmerizer.cs3
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index 1ea08e2..f609e73 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -289,6 +289,9 @@ namespace OpenSim.Region.Physics.Meshing
289 ManagedImage managedImage; // we never use this 289 ManagedImage managedImage; // we never use this
290 OpenJPEG.DecodeToImage(primShape.SculptData, out managedImage, out idata); 290 OpenJPEG.DecodeToImage(primShape.SculptData, out managedImage, out idata);
291 291
292 // Remove the reference to the encoded JPEG2000 data so it can be GCed
293 primShape.SculptData = Utils.EmptyBytes;
294
292 if (cacheSculptMaps) 295 if (cacheSculptMaps)
293 { 296 {
294 try { idata.Save(decodedSculptFileName, ImageFormat.MemoryBmp); } 297 try { idata.Save(decodedSculptFileName, ImageFormat.MemoryBmp); }