aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/RegionApplicationBase.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-04-28 14:41:46 +0000
committerJustin Clarke Casey2008-04-28 14:41:46 +0000
commit776b1f341aea5005a94bc3e03159619b3e9ce502 (patch)
tree629c2fa3812039867d44d522bf2bd50980d600b5 /OpenSim/Region/ClientStack/RegionApplicationBase.cs
parent* Fixed 'Welcome to Krynn' default that I missed and got stuck in by a patch. (diff)
downloadopensim-SC_OLD-776b1f341aea5005a94bc3e03159619b3e9ce502.zip
opensim-SC_OLD-776b1f341aea5005a94bc3e03159619b3e9ce502.tar.gz
opensim-SC_OLD-776b1f341aea5005a94bc3e03159619b3e9ce502.tar.bz2
opensim-SC_OLD-776b1f341aea5005a94bc3e03159619b3e9ce502.tar.xz
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
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ClientStack/RegionApplicationBase.cs14
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;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Framework.Communications; 34using OpenSim.Framework.Communications;
35using OpenSim.Framework.Communications.Cache; 35using OpenSim.Framework.Communications.Cache;
36using OpenSim.Framework.Console; 36//using OpenSim.Framework.Console;
37using OpenSim.Framework.Servers; 37using OpenSim.Framework.Servers;
38using OpenSim.Region.Environment; 38using OpenSim.Region.Environment;
39using OpenSim.Region.Environment.Scenes; 39using OpenSim.Region.Environment.Scenes;
@@ -89,13 +89,13 @@ namespace OpenSim.Region.ClientStack
89 89
90 protected abstract void Initialize(); 90 protected abstract void Initialize();
91 91
92 protected void StartConsole() 92 // protected void StartConsole()
93 { 93 // {
94 m_console = CreateConsole(); 94 // m_console = CreateConsole();
95 MainConsole.Instance = m_console; 95 // MainConsole.Instance = m_console;
96 } 96 // }
97 97
98 protected abstract ConsoleBase CreateConsole(); 98 // protected abstract ConsoleBase CreateConsole();
99 protected abstract PhysicsScene GetPhysicsScene(); 99 protected abstract PhysicsScene GetPhysicsScene();
100 protected abstract StorageManager CreateStorageManager(string connectionstring); 100 protected abstract StorageManager CreateStorageManager(string connectionstring);
101 101