aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
authorUbitUmarov2017-05-25 10:23:52 +0100
committerUbitUmarov2017-05-25 10:23:52 +0100
commit27779953315e160067080b6f17945ab54695d63f (patch)
tree36e66eeaf84fd48382ab89278c7b150723a45235 /OpenSim/Region/Application
parent merge master (diff)
parentadd some checks for valid endpoints (diff)
downloadopensim-SC-27779953315e160067080b6f17945ab54695d63f.zip
opensim-SC-27779953315e160067080b6f17945ab54695d63f.tar.gz
opensim-SC-27779953315e160067080b6f17945ab54695d63f.tar.bz2
opensim-SC-27779953315e160067080b6f17945ab54695d63f.tar.xz
Merge branch 'master' into httptests
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Application/Application.cs2
-rw-r--r--OpenSim/Region/Application/OpenSim.cs9
2 files changed, 9 insertions, 2 deletions
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs
index 4bd2c28..447afb4 100644
--- a/OpenSim/Region/Application/Application.cs
+++ b/OpenSim/Region/Application/Application.cs
@@ -79,7 +79,7 @@ namespace OpenSim
79 else 79 else
80 { 80 {
81 ServicePointManager.DefaultConnectionLimit = 12; 81 ServicePointManager.DefaultConnectionLimit = 12;
82 try { ServicePointManager.DnsRefreshTimeout = 120000; } // just is case crazy some mono decides to have it infinity 82 try { ServicePointManager.DnsRefreshTimeout = 120000; } // just is case some crazy mono decides to have it infinity
83 catch { } 83 catch { }
84 } 84 }
85 85
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 524f2be..5977f40 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -143,7 +143,7 @@ namespace OpenSim
143 //Mono.Unix.Native.Signum signal = signals [index].Signum; 143 //Mono.Unix.Native.Signum signal = signals [index].Signum;
144 MainConsole.Instance.RunCommand("shutdown"); 144 MainConsole.Instance.RunCommand("shutdown");
145 } 145 }
146 }); 146 });
147#endif 147#endif
148 148
149 /// <summary> 149 /// <summary>
@@ -165,6 +165,7 @@ namespace OpenSim
165 { 165 {
166 new Mono.Unix.UnixSignal(Mono.Unix.Native.Signum.SIGTERM) 166 new Mono.Unix.UnixSignal(Mono.Unix.Native.Signum.SIGTERM)
167 }; 167 };
168 signal_thread.IsBackground = true;
168 signal_thread.Start(); 169 signal_thread.Start();
169 } 170 }
170 catch (Exception e) 171 catch (Exception e)
@@ -485,6 +486,12 @@ namespace OpenSim
485 RunCommandScript(m_shutdownCommandsFile); 486 RunCommandScript(m_shutdownCommandsFile);
486 } 487 }
487 488
489 if (m_timedScript != "disabled")
490 {
491 m_scriptTimer.Dispose();
492 m_timedScript = "disabled";
493 }
494
488 base.ShutdownSpecific(); 495 base.ShutdownSpecific();
489 } 496 }
490 497