diff options
| author | Teravus Ovares (Dan Olivares) | 2009-11-22 22:05:26 -0500 |
|---|---|---|
| committer | Teravus Ovares (Dan Olivares) | 2009-11-22 22:05:26 -0500 |
| commit | 94cb4b486a7c72841ccbcec403fc7b8c95c1249a (patch) | |
| tree | 176ada6e4259c076ab6942b4c96538d868880281 /OpenSim/Framework/Servers | |
| parent | * Adds a test for if the collision is at the bottom of the capsule on avatar.... (diff) | |
| parent | Formatting cleanup. (diff) | |
| download | opensim-SC_OLD-94cb4b486a7c72841ccbcec403fc7b8c95c1249a.zip opensim-SC_OLD-94cb4b486a7c72841ccbcec403fc7b8c95c1249a.tar.gz opensim-SC_OLD-94cb4b486a7c72841ccbcec403fc7b8c95c1249a.tar.bz2 opensim-SC_OLD-94cb4b486a7c72841ccbcec403fc7b8c95c1249a.tar.xz | |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
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 | { |