From 02794e152eeaf8e88f6004b9a10f251e11350294 Mon Sep 17 00:00:00 2001 From: BlueWall Date: Thu, 6 Sep 2012 05:13:10 -0400 Subject: [PATCH] 0006270: Warp3D leaks memory on mono based systems Thanks Hiro Lecker for a patch to reduce memory useage with Warp3D map module --- CONTRIBUTORS.txt | 1 + .../Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 22b29a93c9..f334b3d2fc 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -92,6 +92,7 @@ what it is today. * Flyte Xevious * Garmin Kawaguichi * Gryc Ueusp +* Hiro Lecker * Imaze Rhiano * Intimidated * Jeremy Bongio (IBM) diff --git a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs index 9002a9f330..ed9b1277fb 100644 --- a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs +++ b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs @@ -208,6 +208,9 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap bitmap = ImageUtils.ResizeImage(origBitmap, viewport.Width, viewport.Height); } + GC.Collect(); + m_log.Debug("[WARP 3D IMAGE MODULE]: GC.Collect()"); + return bitmap; } @@ -673,4 +676,4 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap return result; } } -} \ No newline at end of file +}