Merge commit 'e14cb45b9bc4c78300cb804833cb66c1c2e62187' into bigmerge

avinationmerge
Melanie 2011-10-25 03:26:51 +01:00
commit 27aca49a1f
1 changed files with 2 additions and 12 deletions

View File

@ -1837,12 +1837,7 @@ namespace OpenSim.Framework.Servers.HttpServer
public void RemovePollServiceHTTPHandler(string httpMethod, string path)
{
lock (m_pollHandlers)
{
if (m_pollHandlers.ContainsKey(path))
{
m_pollHandlers.Remove(path);
}
}
RemoveHTTPHandler(httpMethod, path);
}
@ -1866,13 +1861,8 @@ namespace OpenSim.Framework.Servers.HttpServer
public void RemoveXmlRPCHandler(string method)
{
lock (m_rpcHandlers)
{
if (m_rpcHandlers.ContainsKey(method))
{
m_rpcHandlers.Remove(method);
}
}
}
public bool RemoveLLSDHandler(string path, LLSDMethod handler)
{