ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 09:16:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Justin Clarke Casey
2008-04-28 14:41:46 +00:00
parent 7e3506e296
commit 776b1f341a
5 changed files with 795 additions and 703 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenSim/Region/ClientStack/RegionApplicationBase.cs
View File

@@ -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);