aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
diff options
context:
space:
mode:
authorMelanie2011-12-08 03:24:25 +0000
committerMelanie2011-12-08 03:24:25 +0000
commit50aa89dae66246395e9aac4d7d31f010e55473e8 (patch)
treeb2d23662cc5a51e13f582728bf7064077f9edc32 /OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
parentFix intersim object give messages (diff)
parentRemove unused SceneManager.TryGetAvatarsScene() (diff)
downloadopensim-SC_OLD-50aa89dae66246395e9aac4d7d31f010e55473e8.zip
opensim-SC_OLD-50aa89dae66246395e9aac4d7d31f010e55473e8.tar.gz
opensim-SC_OLD-50aa89dae66246395e9aac4d7d31f010e55473e8.tar.bz2
opensim-SC_OLD-50aa89dae66246395e9aac4d7d31f010e55473e8.tar.xz
Merge commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmerge
Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs')
-rw-r--r--OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs12
1 files changed, 3 insertions, 9 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index 04739fe..2c0d8f0 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -227,21 +227,17 @@ namespace OpenSim.Framework.Servers.HttpServer
227 return new List<string>(m_HTTPHandlers.Keys); 227 return new List<string>(m_HTTPHandlers.Keys);
228 } 228 }
229 229
230 public bool AddPollServiceHTTPHandler(string methodName, GenericHTTPMethod handler, PollServiceEventArgs args) 230 public bool AddPollServiceHTTPHandler(string methodName, PollServiceEventArgs args)
231 { 231 {
232 bool pollHandlerResult = false;
233 lock (m_pollHandlers) 232 lock (m_pollHandlers)
234 { 233 {
235 if (!m_pollHandlers.ContainsKey(methodName)) 234 if (!m_pollHandlers.ContainsKey(methodName))
236 { 235 {
237 m_pollHandlers.Add(methodName,args); 236 m_pollHandlers.Add(methodName, args);
238 pollHandlerResult = true; 237 return true;
239 } 238 }
240 } 239 }
241 240
242 if (pollHandlerResult)
243 return AddHTTPHandler(methodName, handler);
244
245 return false; 241 return false;
246 } 242 }
247 243
@@ -1871,8 +1867,6 @@ namespace OpenSim.Framework.Servers.HttpServer
1871 { 1867 {
1872 lock (m_pollHandlers) 1868 lock (m_pollHandlers)
1873 m_pollHandlers.Remove(path); 1869 m_pollHandlers.Remove(path);
1874
1875 RemoveHTTPHandler(httpMethod, path);
1876 } 1870 }
1877 1871
1878 public bool RemoveAgentHandler(string agent, IHttpAgentHandler handler) 1872 public bool RemoveAgentHandler(string agent, IHttpAgentHandler handler)