diff options
| author | Melanie | 2012-02-24 09:56:06 +0000 |
|---|---|---|
| committer | Melanie | 2012-02-24 09:56:06 +0000 |
| commit | 37068d17c5a6a4679f75af12cbbcfc3c78790e33 (patch) | |
| tree | 42454c2fd6072b0baebb4f3d7632476de3ad18e9 /OpenSim/Framework/Servers/HttpServer | |
| parent | Partially apply the core banlines fix (diff) | |
| parent | Take watchdog alarm calling back outside the m_threads lock. (diff) | |
| download | opensim-SC_OLD-37068d17c5a6a4679f75af12cbbcfc3c78790e33.zip opensim-SC_OLD-37068d17c5a6a4679f75af12cbbcfc3c78790e33.tar.gz opensim-SC_OLD-37068d17c5a6a4679f75af12cbbcfc3c78790e33.tar.bz2 opensim-SC_OLD-37068d17c5a6a4679f75af12cbbcfc3c78790e33.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer')
| -rw-r--r-- | OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs index 2206feb..0062d4e 100644 --- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs +++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs | |||
| @@ -65,6 +65,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 65 | String.Format("PollServiceWorkerThread{0}", i), | 65 | String.Format("PollServiceWorkerThread{0}", i), |
| 66 | ThreadPriority.Normal, | 66 | ThreadPriority.Normal, |
| 67 | false, | 67 | false, |
| 68 | true, | ||
| 68 | int.MaxValue); | 69 | int.MaxValue); |
| 69 | } | 70 | } |
| 70 | 71 | ||
| @@ -73,6 +74,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 73 | "PollServiceWatcherThread", | 74 | "PollServiceWatcherThread", |
| 74 | ThreadPriority.Normal, | 75 | ThreadPriority.Normal, |
| 75 | false, | 76 | false, |
| 77 | true, | ||
| 76 | 1000 * 60 * 10); | 78 | 1000 * 60 * 10); |
| 77 | } | 79 | } |
| 78 | 80 | ||