diff options
| author | Melanie | 2019-07-27 12:10:28 +0100 |
|---|---|---|
| committer | Melanie | 2019-07-27 12:10:28 +0100 |
| commit | d6723dab37d86af22c712e2705af34fd2c82b174 (patch) | |
| tree | 041be46cdcc778660fe3083794dabd2a2805283f /OpenSim/Server | |
| parent | When using FSAssets, the HGAssetService would still use AssetService. (diff) | |
| parent | mantis 8563: do not modify collection inside a loop on it a foreach on it (diff) | |
| download | opensim-SC-d6723dab37d86af22c712e2705af34fd2c82b174.zip opensim-SC-d6723dab37d86af22c712e2705af34fd2c82b174.tar.gz opensim-SC-d6723dab37d86af22c712e2705af34fd2c82b174.tar.bz2 opensim-SC-d6723dab37d86af22c712e2705af34fd2c82b174.tar.xz | |
Merge branch 'master' of brain.opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Server')
| -rw-r--r-- | OpenSim/Server/Base/ServicesServerBase.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs index 900327a..422a8bc 100644 --- a/OpenSim/Server/Base/ServicesServerBase.cs +++ b/OpenSim/Server/Base/ServicesServerBase.cs | |||
| @@ -250,6 +250,8 @@ namespace OpenSim.Server.Base | |||
| 250 | } | 250 | } |
| 251 | } | 251 | } |
| 252 | 252 | ||
| 253 | MainServer.Stop(); | ||
| 254 | |||
| 253 | MemoryWatchdog.Enabled = false; | 255 | MemoryWatchdog.Enabled = false; |
| 254 | Watchdog.Enabled = false; | 256 | Watchdog.Enabled = false; |
| 255 | WorkManager.Stop(); | 257 | WorkManager.Stop(); |