aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/Application.cs1
-rw-r--r--OpenSim/Region/Application/OpenSim.cs2
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs7
3 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs
index c3e7ec2..e451aa8 100644
--- a/OpenSim/Region/Application/Application.cs
+++ b/OpenSim/Region/Application/Application.cs
@@ -124,6 +124,7 @@ namespace OpenSim
124 workerThreads = workerThreadsMax; 124 workerThreads = workerThreadsMax;
125 m_log.InfoFormat("[OPENSIM MAIN]: Limiting worker threads to {0}",workerThreads); 125 m_log.InfoFormat("[OPENSIM MAIN]: Limiting worker threads to {0}",workerThreads);
126 } 126 }
127
127 // Increase the number of IOCP threads available. 128 // Increase the number of IOCP threads available.
128 // Mono defaults to a tragically low number (24 on 6-core / 8GB Fedora 17) 129 // Mono defaults to a tragically low number (24 on 6-core / 8GB Fedora 17)
129 if (iocpThreads < iocpThreadsMin) 130 if (iocpThreads < iocpThreadsMin)
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index a7e7d03..6c22414 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -372,7 +372,7 @@ namespace OpenSim
372 "Unload a module", HandleModules); 372 "Unload a module", HandleModules);
373 } 373 }
374 374
375 public override void ShutdownSpecific() 375 protected override void ShutdownSpecific()
376 { 376 {
377 if (m_shutdownCommandsFile != String.Empty) 377 if (m_shutdownCommandsFile != String.Empty)
378 { 378 {
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 0ed85b8..11cacac 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -246,10 +246,7 @@ namespace OpenSim
246 } 246 }
247 247
248 if (m_console != null) 248 if (m_console != null)
249 {
250 StatsManager.RegisterConsoleCommands(m_console);
251 AddPluginCommands(m_console); 249 AddPluginCommands(m_console);
252 }
253 } 250 }
254 251
255 protected virtual void AddPluginCommands(ICommandConsole console) 252 protected virtual void AddPluginCommands(ICommandConsole console)
@@ -964,7 +961,7 @@ namespace OpenSim
964 /// <summary> 961 /// <summary>
965 /// Performs any last-minute sanity checking and shuts down the region server 962 /// Performs any last-minute sanity checking and shuts down the region server
966 /// </summary> 963 /// </summary>
967 public override void ShutdownSpecific() 964 protected override void ShutdownSpecific()
968 { 965 {
969 if (proxyUrl.Length > 0) 966 if (proxyUrl.Length > 0)
970 { 967 {
@@ -984,6 +981,8 @@ namespace OpenSim
984 { 981 {
985 m_log.Error("[SHUTDOWN]: Ignoring failure during shutdown - ", e); 982 m_log.Error("[SHUTDOWN]: Ignoring failure during shutdown - ", e);
986 } 983 }
984
985 base.ShutdownSpecific();
987 } 986 }
988 987
989 /// <summary> 988 /// <summary>