diff options
author | UbitUmarov | 2017-05-25 10:23:52 +0100 |
---|---|---|
committer | UbitUmarov | 2017-05-25 10:23:52 +0100 |
commit | 27779953315e160067080b6f17945ab54695d63f (patch) | |
tree | 36e66eeaf84fd48382ab89278c7b150723a45235 /OpenSim/Server/ServerMain.cs | |
parent | merge master (diff) | |
parent | add some checks for valid endpoints (diff) | |
download | opensim-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 'OpenSim/Server/ServerMain.cs')
-rw-r--r-- | OpenSim/Server/ServerMain.cs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Server/ServerMain.cs b/OpenSim/Server/ServerMain.cs index a331b39..5c99ab7 100644 --- a/OpenSim/Server/ServerMain.cs +++ b/OpenSim/Server/ServerMain.cs | |||
@@ -33,6 +33,7 @@ using System.Net; | |||
33 | using System.Net.Security; | 33 | using System.Net.Security; |
34 | using System.Security.Cryptography.X509Certificates; | 34 | using System.Security.Cryptography.X509Certificates; |
35 | using System.Collections.Generic; | 35 | using System.Collections.Generic; |
36 | using OpenSim.Framework; | ||
36 | using OpenSim.Framework.Servers; | 37 | using OpenSim.Framework.Servers; |
37 | using OpenSim.Framework.Servers.HttpServer; | 38 | using OpenSim.Framework.Servers.HttpServer; |
38 | using OpenSim.Server.Base; | 39 | using OpenSim.Server.Base; |
@@ -188,6 +189,11 @@ namespace OpenSim.Server | |||
188 | 189 | ||
189 | int res = m_Server.Run(); | 190 | int res = m_Server.Run(); |
190 | 191 | ||
192 | if(m_Server != null) | ||
193 | m_Server.Shutdown(); | ||
194 | |||
195 | Util.StopThreadPool(); | ||
196 | |||
191 | Environment.Exit(res); | 197 | Environment.Exit(res); |
192 | 198 | ||
193 | return 0; | 199 | return 0; |