diff options
author | Diva Canto | 2012-09-07 08:10:03 -0700 |
---|---|---|
committer | Diva Canto | 2012-09-07 08:10:03 -0700 |
commit | 2b506cffb16729837fc2ec41a28fef8feaf6428d (patch) | |
tree | 009a47a191a87525a0817edd1f8fdde9b2058b31 /OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs | |
parent | Moved the new vars in Robust.HG.ini to the proper section. (diff) | |
parent | Move addin information to RegionCombinerModule.addin.xml (diff) | |
download | opensim-SC_OLD-2b506cffb16729837fc2ec41a28fef8feaf6428d.zip opensim-SC_OLD-2b506cffb16729837fc2ec41a28fef8feaf6428d.tar.gz opensim-SC_OLD-2b506cffb16729837fc2ec41a28fef8feaf6428d.tar.bz2 opensim-SC_OLD-2b506cffb16729837fc2ec41a28fef8feaf6428d.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-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 | ||