From: Dr Scofield <hud@zurich.ibm.com>

Note: This is the first part of some changes from Dr Scofield to support console-less operation of an OpenSim region server.
The changes are not yet complete.

* refactors OpenSimMain into two classes: OpenSimMain and
  OpenSimMainConsole. OpenSimMainConsole derives from OpenSimMain
  and basically is the "old" OpenSimMain
* drops StartConsole from RegionApplicationBase (was only called
  from the "old" OpenSimMain anyhow)
* reverts the changes to TryGetScene(string, out scene) as that
  seems to work perfectly fine
* adds a check to region-remove to see whether
  m_sceneManger.CurrentScene is non-null before comparing it against
  the region-to-be-removed

1 files changed, 7 insertions, 7 deletions

diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index a6124a9..d3f6f20 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -33,7 +33,7 @@ using log4net;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
-using OpenSim.Framework.Console;
+//using OpenSim.Framework.Console;
 using OpenSim.Framework.Servers;
 using OpenSim.Region.Environment;
 using OpenSim.Region.Environment.Scenes;
@@ -89,13 +89,13 @@ namespace OpenSim.Region.ClientStack
 
         protected abstract void Initialize();
 
-        protected void StartConsole()
-        {
-            m_console = CreateConsole();
-            MainConsole.Instance = m_console;
-        }
+        // protected void StartConsole()
+        // {
+        //     m_console = CreateConsole();
+        //     MainConsole.Instance = m_console;
+        // }
 
-        protected abstract ConsoleBase CreateConsole();
+        // protected abstract ConsoleBase CreateConsole();
         protected abstract PhysicsScene GetPhysicsScene();
         protected abstract StorageManager CreateStorageManager(string connectionstring);