aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2017-05-24 02:19:25 +0100
committerUbitUmarov2017-05-24 02:19:25 +0100
commit8989e8ef3ac68fbf93090b4eeb999081d215d945 (patch)
treeb4ce3ccb16aa61621aaa49e6d6842e9da9a07f7e
parent dont log timeouts on stopped threads (diff)
downloadopensim-SC-8989e8ef3ac68fbf93090b4eeb999081d215d945.zip
opensim-SC-8989e8ef3ac68fbf93090b4eeb999081d215d945.tar.gz
opensim-SC-8989e8ef3ac68fbf93090b4eeb999081d215d945.tar.bz2
opensim-SC-8989e8ef3ac68fbf93090b4eeb999081d215d945.tar.xz
give up on the code to stop AsyncCommandManager. It fails with many scripts running, and its only done deep on exit code. It is a backgroud thread should not block exit and never did
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Application/Application.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs4
2 files changed, 4 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/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
index eb6455a..5f57f39 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
@@ -188,9 +188,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
188 cmdHandlerThreadCycleSleepms = 100; 188 cmdHandlerThreadCycleSleepms = 100;
189 } 189 }
190 190
191/*
191 ~AsyncCommandManager() 192 ~AsyncCommandManager()
192 { 193 {
193 // Shut down thread 194 // Shut down thread
195
194 try 196 try
195 { 197 {
196 lock (staticLock) 198 lock (staticLock)
@@ -213,7 +215,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
213 { 215 {
214 } 216 }
215 } 217 }
216 218*/
217 /// <summary> 219 /// <summary>
218 /// Main loop for the manager thread 220 /// Main loop for the manager thread
219 /// </summary> 221 /// </summary>