aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Servers/HttpServer/Interfaces/IOSHttpResponse.cs2
-rw-r--r--OpenSim/Framework/Servers/ServerBase.cs5
2 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/Interfaces/IOSHttpResponse.cs b/OpenSim/Framework/Servers/HttpServer/Interfaces/IOSHttpResponse.cs
index d26b68a..aba15b0 100644
--- a/OpenSim/Framework/Servers/HttpServer/Interfaces/IOSHttpResponse.cs
+++ b/OpenSim/Framework/Servers/HttpServer/Interfaces/IOSHttpResponse.cs
@@ -118,8 +118,6 @@ namespace OpenSim.Framework.Servers.HttpServer
118 /// </summary> 118 /// </summary>
119 string StatusDescription { get; set; } 119 string StatusDescription { get; set; }
120 120
121// bool ReuseContext { get; set; }
122
123 /// <summary> 121 /// <summary>
124 /// Add a header field and content to the response. 122 /// Add a header field and content to the response.
125 /// </summary> 123 /// </summary>
diff --git a/OpenSim/Framework/Servers/ServerBase.cs b/OpenSim/Framework/Servers/ServerBase.cs
index 3c2dce8..ff3c80d 100644
--- a/OpenSim/Framework/Servers/ServerBase.cs
+++ b/OpenSim/Framework/Servers/ServerBase.cs
@@ -31,6 +31,7 @@ using System.Diagnostics;
31using System.IO; 31using System.IO;
32using System.Linq; 32using System.Linq;
33using System.Reflection; 33using System.Reflection;
34using System.Runtime;
34using System.Text; 35using System.Text;
35using System.Text.RegularExpressions; 36using System.Text.RegularExpressions;
36using System.Threading; 37using System.Threading;
@@ -508,7 +509,11 @@ namespace OpenSim.Framework.Servers
508 private void HandleForceGc(string module, string[] args) 509 private void HandleForceGc(string module, string[] args)
509 { 510 {
510 Notice("Manually invoking runtime garbage collection"); 511 Notice("Manually invoking runtime garbage collection");
512 GCSettings.LargeObjectHeapCompactionMode = GCLargeObjectHeapCompactionMode.CompactOnce;
511 GC.Collect(); 513 GC.Collect();
514 GC.WaitForPendingFinalizers();
515 GC.Collect();
516 GCSettings.LargeObjectHeapCompactionMode = GCLargeObjectHeapCompactionMode.Default;
512 } 517 }
513 518
514 public virtual void HandleShow(string module, string[] cmd) 519 public virtual void HandleShow(string module, string[] cmd)