Merge branch 'master' into careminster

2026-08-06 01:06:30 +08:00 · 2012-02-24 09:56:06 +00:00
parent daf58575f8 bafef292f4
commit 37068d17c5
17 changed files with 122 additions and 53 deletions
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
@@ -65,6 +65,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                        String.Format("PollServiceWorkerThread{0}", i),
                        ThreadPriority.Normal,
                        false,
+                        true,
                        int.MaxValue);
            }

@@ -73,6 +74,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                "PollServiceWatcherThread",
                ThreadPriority.Normal,
                false,
+                true,
                1000 * 60 * 10);
        }