aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
diff options
context:
space:
mode:
authorMelanie2011-10-25 03:26:44 +0100
committerMelanie2011-10-25 03:26:44 +0100
commitc8dfef15834b793dcffd3951ca4a86d68e5c9b45 (patch)
tree9e3df381662bfe781ad479c145d9e8e839c42a2b /OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
parentMerge commit '79d5bc9beb445ca07cff9ecbd91d89b2a57e14da' into bigmerge (diff)
parentFix bugs in EventQueueGetModule.ClientClosed() and BaseHttpServer.RemovePollS... (diff)
downloadopensim-SC-c8dfef15834b793dcffd3951ca4a86d68e5c9b45.zip
opensim-SC-c8dfef15834b793dcffd3951ca4a86d68e5c9b45.tar.gz
opensim-SC-c8dfef15834b793dcffd3951ca4a86d68e5c9b45.tar.bz2
opensim-SC-c8dfef15834b793dcffd3951ca4a86d68e5c9b45.tar.xz
Merge commit '9ec672c70b28b8c1d6d81bab7744fcf7bf9b83c7' into bigmerge
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs')
-rw-r--r--OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index a6bdc2d..33dec8d 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -1838,9 +1838,9 @@ namespace OpenSim.Framework.Servers.HttpServer
1838 { 1838 {
1839 lock (m_pollHandlers) 1839 lock (m_pollHandlers)
1840 { 1840 {
1841 if (m_pollHandlers.ContainsKey(httpMethod)) 1841 if (m_pollHandlers.ContainsKey(path))
1842 { 1842 {
1843 m_pollHandlers.Remove(httpMethod); 1843 m_pollHandlers.Remove(path);
1844 } 1844 }
1845 } 1845 }
1846 1846