diff options
author | Melanie | 2012-09-07 19:49:46 +0100 |
---|---|---|
committer | Melanie | 2012-09-07 19:49:46 +0100 |
commit | 924df14c5e15185e14c144164dd80d9859d5c583 (patch) | |
tree | 110f0e402b879f49943ff2e76598e2241e20057c /OpenSim/Region/CoreModules/World | |
parent | Revert "made setting rotation match Second Life" (diff) | |
parent | Move addin attributes to RegionCombinerModule.addin.xml (diff) | |
download | opensim-SC_OLD-924df14c5e15185e14c144164dd80d9859d5c583.zip opensim-SC_OLD-924df14c5e15185e14c144164dd80d9859d5c583.tar.gz opensim-SC_OLD-924df14c5e15185e14c144164dd80d9859d5c583.tar.bz2 opensim-SC_OLD-924df14c5e15185e14c144164dd80d9859d5c583.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
OpenSim/Framework/Servers/VersionInfo.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/World')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs index 5deaf52..904110e 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs | |||
@@ -51,7 +51,7 @@ using RegionSettings = OpenSim.Framework.RegionSettings; | |||
51 | namespace OpenSim.Region.CoreModules.World.Archiver.Tests | 51 | namespace OpenSim.Region.CoreModules.World.Archiver.Tests |
52 | { | 52 | { |
53 | [TestFixture] | 53 | [TestFixture] |
54 | public class ArchiverTests | 54 | public class ArchiverTests : OpenSimTestCase |
55 | { | 55 | { |
56 | private Guid m_lastRequestId; | 56 | private Guid m_lastRequestId; |
57 | private string m_lastErrorMessage; | 57 | private string m_lastErrorMessage; |
diff --git a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs index 3c48d07..33f6c3f 100644 --- a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs +++ b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs | |||
@@ -222,6 +222,13 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap | |||
222 | bitmap = ImageUtils.ResizeImage(origBitmap, viewport.Width, viewport.Height); | 222 | bitmap = ImageUtils.ResizeImage(origBitmap, viewport.Width, viewport.Height); |
223 | } | 223 | } |
224 | 224 | ||
225 | // XXX: It shouldn't really be necesary to force a GC here as one should occur anyway pretty shortly | ||
226 | // afterwards. It's generally regarded as a bad idea to manually GC. If Warp3D is using lots of memory | ||
227 | // then this may be some issue with the Warp3D code itself, though it's also quite possible that generating | ||
228 | // this map tile simply takes a lot of memory. | ||
229 | GC.Collect(); | ||
230 | m_log.Debug("[WARP 3D IMAGE MODULE]: GC.Collect()"); | ||
231 | |||
225 | return bitmap; | 232 | return bitmap; |
226 | } | 233 | } |
227 | 234 | ||