diff options
author | BlueWall | 2012-09-06 05:13:10 -0400 |
---|---|---|
committer | BlueWall | 2012-09-06 05:18:08 -0400 |
commit | 5eb2526e889cd49d1c77e6e057f847cfd990268f (patch) | |
tree | 8ba0561f7296539dbce40ffd6a115d733b8d0cda | |
parent | Enables cast from int to float for MOD* functions; (diff) | |
download | opensim-SC-5eb2526e889cd49d1c77e6e057f847cfd990268f.zip opensim-SC-5eb2526e889cd49d1c77e6e057f847cfd990268f.tar.gz opensim-SC-5eb2526e889cd49d1c77e6e057f847cfd990268f.tar.bz2 opensim-SC-5eb2526e889cd49d1c77e6e057f847cfd990268f.tar.xz |
0006270: Warp3D leaks memory on mono based systems
Thanks Hiro Lecker for a patch to reduce memory useage with Warp3D map module
-rw-r--r-- | CONTRIBUTORS.txt | 1 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 22b29a9..f334b3d 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt | |||
@@ -92,6 +92,7 @@ what it is today. | |||
92 | * Flyte Xevious | 92 | * Flyte Xevious |
93 | * Garmin Kawaguichi | 93 | * Garmin Kawaguichi |
94 | * Gryc Ueusp | 94 | * Gryc Ueusp |
95 | * Hiro Lecker | ||
95 | * Imaze Rhiano | 96 | * Imaze Rhiano |
96 | * Intimidated | 97 | * Intimidated |
97 | * Jeremy Bongio (IBM) | 98 | * Jeremy Bongio (IBM) |
diff --git a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs index 9002a9f..ed9b127 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 | |||
208 | bitmap = ImageUtils.ResizeImage(origBitmap, viewport.Width, viewport.Height); | 208 | bitmap = ImageUtils.ResizeImage(origBitmap, viewport.Width, viewport.Height); |
209 | } | 209 | } |
210 | 210 | ||
211 | GC.Collect(); | ||
212 | m_log.Debug("[WARP 3D IMAGE MODULE]: GC.Collect()"); | ||
213 | |||
211 | return bitmap; | 214 | return bitmap; |
212 | } | 215 | } |
213 | 216 | ||
@@ -673,4 +676,4 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap | |||
673 | return result; | 676 | return result; |
674 | } | 677 | } |
675 | } | 678 | } |
676 | } \ No newline at end of file | 679 | } |