mirror of
https://github.com/opensim/opensim.git
synced 2026-08-06 09:16:28 +08:00
Actually call Close() for shared region modules when the simulator is being shutdown.
Adds regression test for this case.
This commit is contained in:
@@ -56,6 +56,11 @@ namespace OpenSim.Framework.Servers
|
||||
{
|
||||
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
|
||||
|
||||
/// <summary>
|
||||
/// Used by tests to suppress Environment.Exit(0) so that post-run operations are possible.
|
||||
/// </summary>
|
||||
public bool SuppressExit { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// This will control a periodic log printout of the current 'show stats' (if they are active) for this
|
||||
/// server.
|
||||
@@ -109,7 +114,8 @@ namespace OpenSim.Framework.Servers
|
||||
|
||||
base.ShutdownSpecific();
|
||||
|
||||
Environment.Exit(0);
|
||||
if (!SuppressExit)
|
||||
Environment.Exit(0);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
||||
Reference in New Issue
Block a user