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.
Again not really a bug fix per se, but its not going to change stablebility.0.6.0-stable
parent
66737b9c0c
commit
58f3fa71c2
|
@ -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
|
||||||
|
|
|
@ -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();
|
||||||
}
|
}
|
||||||
|
|
|
@ -174,7 +174,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();
|
||||||
}
|
}
|
||||||
|
|
|
@ -393,7 +393,7 @@ namespace OpenSim.Grid.UserServer
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void ShutdownSpecific()
|
public override void ShutdownSpecific()
|
||||||
{
|
{
|
||||||
m_loginService.OnUserLoggedInAtLocation -= NotifyMessageServersUserLoggedInToLocation;
|
m_loginService.OnUserLoggedInAtLocation -= NotifyMessageServersUserLoggedInToLocation;
|
||||||
}
|
}
|
||||||
|
|
|
@ -542,7 +542,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)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue