aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
diff options
context:
space:
mode:
authorMelanie2013-06-07 23:43:45 +0100
committerMelanie2013-06-07 23:43:45 +0100
commit7c0bfca7a03584dd65c5659f177b434ee94ddc9d (patch)
tree82ceefae330b2c2b80a20db68abd79ae2439b034 /OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
parentminor: add dr0berts to contributors list (diff)
downloadopensim-SC_OLD-7c0bfca7a03584dd65c5659f177b434ee94ddc9d.zip
opensim-SC_OLD-7c0bfca7a03584dd65c5659f177b434ee94ddc9d.tar.gz
opensim-SC_OLD-7c0bfca7a03584dd65c5659f177b434ee94ddc9d.tar.bz2
opensim-SC_OLD-7c0bfca7a03584dd65c5659f177b434ee94ddc9d.tar.xz
Adding Avination's PollService to round out the HTTP inventory changes
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs')
-rw-r--r--OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs3
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index 96a030b..eb7c578 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -1805,7 +1805,6 @@ namespace OpenSim.Framework.Servers.HttpServer
1805 1805
1806 // Long Poll Service Manager with 3 worker threads a 25 second timeout for no events 1806 // Long Poll Service Manager with 3 worker threads a 25 second timeout for no events
1807 m_PollServiceManager = new PollServiceRequestManager(this, 3, 25000); 1807 m_PollServiceManager = new PollServiceRequestManager(this, 3, 25000);
1808 m_PollServiceManager.Start();
1809 HTTPDRunning = true; 1808 HTTPDRunning = true;
1810 1809
1811 //HttpListenerContext context; 1810 //HttpListenerContext context;
@@ -1856,7 +1855,7 @@ namespace OpenSim.Framework.Servers.HttpServer
1856 HTTPDRunning = false; 1855 HTTPDRunning = false;
1857 try 1856 try
1858 { 1857 {
1859 m_PollServiceManager.Stop(); 1858// m_PollServiceManager.Stop();
1860 1859
1861 m_httpListener2.ExceptionThrown -= httpServerException; 1860 m_httpListener2.ExceptionThrown -= httpServerException;
1862 //m_httpListener2.DisconnectHandler = null; 1861 //m_httpListener2.DisconnectHandler = null;