diff options
| author | Melanie | 2009-11-23 04:24:58 +0000 |
|---|---|---|
| committer | Melanie | 2009-11-23 04:24:58 +0000 |
| commit | df121a7cd065cc067818f6a39a44ddaaab647fec (patch) | |
| tree | 5cc0e157ff3aefad066c07a1ebea2ae4b1ebdbe4 /OpenSim/Framework/Servers | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | * Adds a modicum of additional checking to the Inventory Service (MySQL only) (diff) | |
| download | opensim-SC-df121a7cd065cc067818f6a39a44ddaaab647fec.zip opensim-SC-df121a7cd065cc067818f6a39a44ddaaab647fec.tar.gz opensim-SC-df121a7cd065cc067818f6a39a44ddaaab647fec.tar.bz2 opensim-SC-df121a7cd065cc067818f6a39a44ddaaab647fec.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Framework/Servers')
| -rw-r--r-- | OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs index cc8bdb6..1cc19c5 100644 --- a/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs +++ b/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs | |||
| @@ -50,7 +50,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 50 | private readonly BaseHttpServer m_server; | 50 | private readonly BaseHttpServer m_server; |
| 51 | private BlockingQueue<PollServiceHttpRequest> m_request; | 51 | private BlockingQueue<PollServiceHttpRequest> m_request; |
| 52 | private bool m_running = true; | 52 | private bool m_running = true; |
| 53 | private int m_timeout = 250; | 53 | private int m_timeout = 250; |
| 54 | 54 | ||
| 55 | public PollServiceWorkerThread(BaseHttpServer pSrv, int pTimeout) | 55 | public PollServiceWorkerThread(BaseHttpServer pSrv, int pTimeout) |
| 56 | { | 56 | { |