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

Made BaseOpenSimServer.ShutdownSpecific() public. As the OpenSimBase.Shutdown() includes a Environment.Exit(0); which is not always wanted when shutting down, like from a windows service.

0.6.1-post-fixes
MW 2008-12-02 11:40:22 +00:00
parent b62b9af6b0
commit 11169c0e71
6 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -103,7 +103,7 @@ namespace OpenSim.Framework.Servers
/// <summary> /// <summary>
/// Should be overriden and referenced by descendents if they need to perform extra shutdown processing /// Should be overriden and referenced by descendents if they need to perform extra shutdown processing
/// </summary> /// </summary>
protected virtual void ShutdownSpecific() {} public virtual void ShutdownSpecific() {}
/// <summary> /// <summary>
/// Print statistics to the logfile, if they are active /// Print statistics to the logfile, if they are active

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

@ -195,7 +195,7 @@ namespace OpenSim.Grid.GridServer
*/ */
} }
protected override void ShutdownSpecific() public override void ShutdownSpecific()
{ {
foreach (IGridPlugin plugin in m_plugins) plugin.Dispose(); foreach (IGridPlugin plugin in m_plugins) plugin.Dispose();
} }

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

@ -179,7 +179,7 @@ namespace OpenSim.Grid.MessagingServer
m_console.Notice("register - (Re-)registers with user-server. This might be necessary if the userserver crashed/restarted"); m_console.Notice("register - (Re-)registers with user-server. This might be necessary if the userserver crashed/restarted");
} }
protected override void ShutdownSpecific() public override void ShutdownSpecific()
{ {
msgsvc.deregisterWithUserServer(); msgsvc.deregisterWithUserServer();
} }

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

@ -415,7 +415,7 @@ namespace OpenSim.Grid.UserServer
} }
protected override void ShutdownSpecific() public override void ShutdownSpecific()
{ {
m_loginService.OnUserLoggedInAtLocation -= NotifyMessageServersUserLoggedInToLocation; m_loginService.OnUserLoggedInAtLocation -= NotifyMessageServersUserLoggedInToLocation;
} }

1
OpenSim/Grid/UserServer/UserManager.cs
View File

@ -816,6 +816,5 @@ namespace OpenSim.Grid.UserServer
{ {
LogoutUsers(regionID); LogoutUsers(regionID);
} }
} }
} }

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

@ -557,7 +557,7 @@ namespace OpenSim
/// <summary> /// <summary>
/// Performs any last-minute sanity checking and shuts down the region server /// Performs any last-minute sanity checking and shuts down the region server
/// </summary> /// </summary>
protected override void ShutdownSpecific() public override void ShutdownSpecific()
{ {
if (proxyUrl.Length > 0) if (proxyUrl.Length > 0)
{ {