diff options
| author | Melanie | 2012-09-10 13:53:00 +0100 |
|---|---|---|
| committer | Melanie | 2012-09-10 13:53:00 +0100 |
| commit | 21c476228a1dbeef1f180a16e9ebb47c8b3fa185 (patch) | |
| tree | 5a2fc5d269eb4711fa2ace11d04731e7dc08607b /OpenSim/Framework | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Remove commented code (diff) | |
| download | opensim-SC-21c476228a1dbeef1f180a16e9ebb47c8b3fa185.zip opensim-SC-21c476228a1dbeef1f180a16e9ebb47c8b3fa185.tar.gz opensim-SC-21c476228a1dbeef1f180a16e9ebb47c8b3fa185.tar.bz2 opensim-SC-21c476228a1dbeef1f180a16e9ebb47c8b3fa185.tar.xz | |
Merge branch 'avination' into careminster
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index e45cb89..7384e39 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |||
| @@ -1618,7 +1618,8 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 1618 | m_httpListener2.Start(64); | 1618 | m_httpListener2.Start(64); |
| 1619 | 1619 | ||
| 1620 | // Long Poll Service Manager with 3 worker threads a 25 second timeout for no events | 1620 | // Long Poll Service Manager with 3 worker threads a 25 second timeout for no events |
| 1621 | m_PollServiceManager = new PollServiceRequestManager(this, 3, 25000); | 1621 | // m_PollServiceManager = new PollServiceRequestManager(this, 3, 25000); |
| 1622 | m_PollServiceManager = new PollServiceRequestManager(this, 4, 25000); | ||
| 1622 | HTTPDRunning = true; | 1623 | HTTPDRunning = true; |
| 1623 | 1624 | ||
| 1624 | //HttpListenerContext context; | 1625 | //HttpListenerContext context; |