diff options
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs')
-rw-r--r-- | OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index bfbc480..760d63a 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |||
@@ -1830,6 +1830,8 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
1830 | HTTPDRunning = false; | 1830 | HTTPDRunning = false; |
1831 | try | 1831 | try |
1832 | { | 1832 | { |
1833 | // m_PollServiceManager.Stop(); | ||
1834 | |||
1833 | m_httpListener2.ExceptionThrown -= httpServerException; | 1835 | m_httpListener2.ExceptionThrown -= httpServerException; |
1834 | //m_httpListener2.DisconnectHandler = null; | 1836 | //m_httpListener2.DisconnectHandler = null; |
1835 | 1837 | ||