From 1899a36105cac94931b171eb08a3547c49a42526 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Mon, 13 Jan 2020 18:46:25 +0000 Subject: [PATCH] add another kick to GC after map generation at run time --- OpenSim/Region/Framework/Scenes/Scene.cs | 7 +++++++ bin/assets/TexturesAssetSet/defaultalpha.jp2 | Bin 319 -> 0 bytes 2 files changed, 7 insertions(+) delete mode 100644 bin/assets/TexturesAssetSet/defaultalpha.jp2 diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 0c5007a660..ee870068fe 100755 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs @@ -31,6 +31,7 @@ using System.Diagnostics; using System.Drawing; using System.Drawing.Imaging; using System.IO; +using System.Runtime; using System.Text; using System.Threading; using System.Timers; @@ -6027,6 +6028,12 @@ Environment.Exit(1); { RegenerateMaptile(); + GCSettings.LargeObjectHeapCompactionMode = GCLargeObjectHeapCompactionMode.CompactOnce; + GC.Collect(); + GC.WaitForPendingFinalizers(); + GC.Collect(); + GCSettings.LargeObjectHeapCompactionMode = GCLargeObjectHeapCompactionMode.Default; + // We need to propagate the new image UUID to the grid service // so that all simulators can retrieve it string error = GridService.RegisterRegion(RegionInfo.ScopeID, new GridRegion(RegionInfo)); diff --git a/bin/assets/TexturesAssetSet/defaultalpha.jp2 b/bin/assets/TexturesAssetSet/defaultalpha.jp2 deleted file mode 100644 index af73c1ed013b5f05fcf812c16668de3efb0a47bd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 319 zcmZQzVBpCLP*C9IYUg5LU=T?wsVvAUFj4@r8KAT-kj?;d#WFKeiWnG}fJ`P%24;44 zkQxU5Mle$VNPYq;PX6!zKafEmBnDIn)&Q2r733kw6| z{}={g2L}(20A%z(g+Y~p(YYu!u_QG`A*oWqzaTZwE5OxVp)9qiI5R&_!BEdw&*1+A z29Qq}7_x!p1T%0lGC+)sWe{P+G!v+R388=qQ^Dl(ODsefV%9%uuWvvH|8D{SIEhBC