OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Fix build break by eliminating remaining IScenePermissions references - must remember to nant clean 

* Hook all server startups into base opensim server startup method
0.6.0-stable
Justin Clarke Casey 2008-06-01 01:34:46 +00:00
parent 0392b4fdc3
commit 15d41c2fc2
12 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/Servers/BaseOpenSimServer.cs
View File

@ -73,7 +73,7 @@ namespace OpenSim.Framework.Servers
/// <summary>
/// Performs initialisation of the scene, such as loading configuration from disk.
/// </summary>
public virtual void StartUp()
public virtual void Startup()
{
EnhanceVersionInformation();

4
OpenSim/Grid/AssetServer/Main.cs
View File

@ -85,8 +85,10 @@ namespace OpenSim.Grid.AssetServer
MainConsole.Instance = m_console;
}
public void Startup()
public override void Startup()
{
base.Startup();
m_config = new AssetConfig("ASSET SERVER", (Path.Combine(Util.configDir(), "AssetServer_Config.xml")));
m_log.Info("[ASSET]: Setting up asset DB");

4
OpenSim/Grid/GridServer/GridServerBase.cs
View File

@ -74,9 +74,9 @@ namespace OpenSim.Grid.GridServer
}
}
public void Startup()
public override void Startup()
{
m_log.Info("[GRID]: Starting...");
base.Startup();
Config();

5
OpenSim/Grid/InventoryServer/Main.cs
View File

@ -64,9 +64,10 @@ namespace OpenSim.Grid.InventoryServer
MainConsole.Instance = m_console;
}
public void Startup()
public override void Startup()
{
m_log.Info("Initialising inventory manager...");
base.Startup();
m_config = new InventoryConfig(LogName, (Path.Combine(Util.configDir(), "InventoryServer_Config.xml")));
m_inventoryService = new GridInventoryService();

4
OpenSim/Grid/MessagingServer/Main.cs
View File

@ -79,8 +79,10 @@ namespace OpenSim.Grid.MessagingServer
}
}
public void Startup()
public override void Startup()
{
base.Startup();
Cfg = new MessageServerConfig("MESSAGING SERVER", (Path.Combine(Util.configDir(), "MessagingServer_Config.xml")));
m_log.Info("[REGION]: Starting HTTP process");

4
OpenSim/Grid/UserServer/Main.cs
View File

@ -84,8 +84,10 @@ namespace OpenSim.Grid.UserServer
}
}
public void Startup()
public override void Startup()
{
base.Startup();
Cfg = new UserConfig("USER SERVER", (Path.Combine(Util.configDir(), "UserServer_Config.xml")));
m_stats = StatsManager.StartCollectingUserStats();

4
OpenSim/Region/Application/Application.cs
View File

@ -83,12 +83,12 @@ namespace OpenSim
if (background)
{
OpenSimBase sim = new OpenSimBackground(configSource);
sim.StartUp();
sim.Startup();
}
else
{
OpenSimBase sim = new OpenSim(configSource);
sim.StartUp();
sim.Startup();
while (true)
{

4
OpenSim/Region/Application/OpenSim.cs
View File

@ -80,7 +80,7 @@ namespace OpenSim
/// <summary>
/// Performs initialisation of the scene, such as loading configuration from disk.
/// </summary>
public override void StartUp()
public override void Startup()
{
m_log.Info("====================================================================");
m_log.Info("========================= STARTING OPENSIM =========================");
@ -90,7 +90,7 @@ namespace OpenSim
m_console = CreateConsole();
MainConsole.Instance = m_console;
base.StartUp();
base.Startup();
//Run Startup Commands
if (m_startupCommandsFile != String.Empty)

4
OpenSim/Region/Application/OpenSimBackground.cs
View File

@ -48,7 +48,7 @@ namespace OpenSim
/// <summary>
/// Performs initialisation of the scene, such as loading configuration from disk.
/// </summary>
public override void StartUp()
public override void Startup()
{
//
// Called from app startup (OpenSim.Application)
@ -58,7 +58,7 @@ namespace OpenSim
m_log.Info("====================================================================");
m_log.InfoFormat("[OPENSIM MAIN]: Running in background {0} mode", m_sandbox ? "sandbox" : "grid");
base.StartUp();
base.Startup();
// We are done with startup
m_log.InfoFormat("[OPENSIM MAIN]: Startup complete, serving {0} region{1}",

4
OpenSim/Region/Application/OpenSimBase.cs
View File

@ -330,9 +330,9 @@ namespace OpenSim
/// <summary>
/// Performs initialisation of the scene, such as loading configuration from disk.
/// </summary>
public override void StartUp()
public override void Startup()
{
base.StartUp();
base.Startup();
m_stats = StatsManager.StartCollectingSimExtraStats();

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

@ -73,9 +73,9 @@ namespace OpenSim.Region.ClientStack
get { return m_sceneManager; }
}
public override void StartUp()
public override void Startup()
{
base.StartUp();
base.Startup();
LLClientView.TerrainManager = new TerrainManager(new SecondLife());

4
OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
View File

@ -39,7 +39,7 @@ using OpenSim.Region.Environment.Scenes;
namespace OpenSim.Region.Environment.Modules.World.Permissions
{
public class PermissionsModule : IRegionModule, IScenePermissions, ICommandableModule
public class PermissionsModule : IRegionModule, ICommandableModule
{
protected Scene m_scene;
private readonly Commander m_commander = new Commander("Permissions");
@ -138,8 +138,6 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
m_bypassPermissions = !myConfig.GetBoolean("serverside_object_permissions", true);
m_scene.RegisterModuleInterface<IScenePermissions>(this);
//Register functions with Scene External Checks!
m_scene.ExternalChecks.addBypassPermissions(BypassPermissions); //FULLY IMPLEMENTED
m_scene.ExternalChecks.addSetBypassPermissions(SetBypassPermissions); //FULLY IMPLEMENTED