From e0a3e01850ea066ef10bfe59ffa81b8ac425442a Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 23 Nov 2012 04:27:04 +0000
Subject: Make "force gc" console command available across all servers

---
 OpenSim/Framework/Servers/BaseOpenSimServer.cs | 11 -----------
 OpenSim/Framework/Servers/ServerBase.cs        | 12 ++++++++++++
 2 files changed, 12 insertions(+), 11 deletions(-)

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index d8b4737..3f66ab5 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -112,17 +112,6 @@ namespace OpenSim.Framework.Servers
                     "threads show",
                     "Show thread status.  Synonym for \"show threads\"",
                     (string module, string[] args) => Notice(GetThreadsReport()));
-
-            m_console.Commands.AddCommand("General", false, "force gc",
-                    "force gc",
-                    "Manually invoke runtime garbage collection.  For debugging purposes",
-                    HandleForceGc);
-        }
-
-        private void HandleForceGc(string module, string[] args)
-        {
-            MainConsole.Instance.Output("Manually invoking runtime garbage collection");
-            GC.Collect();
         }
         
         /// <summary>
diff --git a/OpenSim/Framework/Servers/ServerBase.cs b/OpenSim/Framework/Servers/ServerBase.cs
index 431dc9e..b8bc27e 100644
--- a/OpenSim/Framework/Servers/ServerBase.cs
+++ b/OpenSim/Framework/Servers/ServerBase.cs
@@ -209,6 +209,18 @@ namespace OpenSim.Framework.Servers
                 "General", false, "command-script",
                 "command-script <script>",
                 "Run a command script from file", HandleScript);
+
+            m_console.Commands.AddCommand(
+                "General", false, "force gc",
+                "force gc",
+                "Manually invoke runtime garbage collection.  For debugging purposes",
+                HandleForceGc);
+        }
+
+        private void HandleForceGc(string module, string[] args)
+        {
+            Notice("Manually invoking runtime garbage collection");
+            GC.Collect();
         }
 
         public virtual void HandleShow(string module, string[] cmd)
-- 
cgit v1.1