diff options
| author | Melanie | 2011-11-10 17:35:35 +0000 |
|---|---|---|
| committer | Melanie | 2011-11-10 17:35:35 +0000 |
| commit | a1426739a214d9cd04169bbb7a8855fdfd2ef588 (patch) | |
| tree | 061416a45c8cdceb25273f9f79f078d2ba1ea8e5 /OpenSim/Framework/Servers/HttpServer | |
| parent | Fix the ability to move the seated avatar via LSL (diff) | |
| parent | Add GuduleLapointe to list of contributors (diff) | |
| download | opensim-SC-a1426739a214d9cd04169bbb7a8855fdfd2ef588.zip opensim-SC-a1426739a214d9cd04169bbb7a8855fdfd2ef588.tar.gz opensim-SC-a1426739a214d9cd04169bbb7a8855fdfd2ef588.tar.bz2 opensim-SC-a1426739a214d9cd04169bbb7a8855fdfd2ef588.tar.xz | |
Merge branch 'master' into bigmerge
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer')
| -rw-r--r-- | OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs index d9965b6..2206feb 100644 --- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs +++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs | |||
| @@ -44,7 +44,6 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 44 | private uint m_WorkerThreadCount = 0; | 44 | private uint m_WorkerThreadCount = 0; |
| 45 | private Thread[] m_workerThreads; | 45 | private Thread[] m_workerThreads; |
| 46 | private PollServiceWorkerThread[] m_PollServiceWorkerThreads; | 46 | private PollServiceWorkerThread[] m_PollServiceWorkerThreads; |
| 47 | private Thread m_watcherThread; | ||
| 48 | private bool m_running = true; | 47 | private bool m_running = true; |
| 49 | 48 | ||
| 50 | public PollServiceRequestManager(BaseHttpServer pSrv, uint pWorkerThreadCount, int pTimeout) | 49 | public PollServiceRequestManager(BaseHttpServer pSrv, uint pWorkerThreadCount, int pTimeout) |
| @@ -69,13 +68,12 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 69 | int.MaxValue); | 68 | int.MaxValue); |
| 70 | } | 69 | } |
| 71 | 70 | ||
| 72 | m_watcherThread | 71 | Watchdog.StartThread( |
| 73 | = Watchdog.StartThread( | 72 | this.ThreadStart, |
| 74 | this.ThreadStart, | 73 | "PollServiceWatcherThread", |
| 75 | "PollServiceWatcherThread", | 74 | ThreadPriority.Normal, |
| 76 | ThreadPriority.Normal, | 75 | false, |
| 77 | false, | 76 | 1000 * 60 * 10); |
| 78 | 1000 * 60 * 10); | ||
| 79 | } | 77 | } |
| 80 | 78 | ||
| 81 | internal void ReQueueEvent(PollServiceHttpRequest req) | 79 | internal void ReQueueEvent(PollServiceHttpRequest req) |