diff options
author | Justin Clark-Casey (justincc) | 2012-09-07 00:46:24 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-09-07 00:46:24 +0100 |
commit | 288baaecaf4933568c53fc052314599d1520bbed (patch) | |
tree | 7ac466d60176cc1549854e5ad8c04454b0d00c75 /OpenSim/Region/CoreModules/World/Warp3DMap | |
parent | Add missing DynamicTexture.cs file from last commit (diff) | |
download | opensim-SC_OLD-288baaecaf4933568c53fc052314599d1520bbed.zip opensim-SC_OLD-288baaecaf4933568c53fc052314599d1520bbed.tar.gz opensim-SC_OLD-288baaecaf4933568c53fc052314599d1520bbed.tar.bz2 opensim-SC_OLD-288baaecaf4933568c53fc052314599d1520bbed.tar.xz |
Add warning chevrons around the GC.Collect added to Warp3DImageModule in commit 5eb2526
Manually calling GC.Collect() really shouldnt' be necessary and is generally regarded as a bad idea.
A GC should occur anyway pretty shortly afterwards.
However, can leave this in development code for now to see if it does actually make a significant difference rather than simply doing a GC a little earlier.
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Warp3DMap')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs index ed9b127..2d762fb 100644 --- a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs +++ b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs | |||
@@ -208,6 +208,10 @@ 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 | // XXX: It shouldn't really be necesary to force a GC here as one should occur anyway pretty shortly | ||
212 | // afterwards. It's generally regarded as a bad idea to manually GC. If Warp3D is using lots of memory | ||
213 | // then this may be some issue with the Warp3D code itself, though it's also quite possible that generating | ||
214 | // this map tile simply takes a lot of memory. | ||
211 | GC.Collect(); | 215 | GC.Collect(); |
212 | m_log.Debug("[WARP 3D IMAGE MODULE]: GC.Collect()"); | 216 | m_log.Debug("[WARP 3D IMAGE MODULE]: GC.Collect()"); |
213 | 217 | ||