Merge commit 'e14cb45b9bc4c78300cb804833cb66c1c2e62187' into bigmerge
commit
27aca49a1f
|
@ -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);
|
||||
}
|
||||
}
|
||||
m_pollHandlers.Remove(path);
|
||||
|
||||
RemoveHTTPHandler(httpMethod, path);
|
||||
}
|
||||
|
@ -1866,12 +1861,7 @@ namespace OpenSim.Framework.Servers.HttpServer
|
|||
public void RemoveXmlRPCHandler(string method)
|
||||
{
|
||||
lock (m_rpcHandlers)
|
||||
{
|
||||
if (m_rpcHandlers.ContainsKey(method))
|
||||
{
|
||||
m_rpcHandlers.Remove(method);
|
||||
}
|
||||
}
|
||||
m_rpcHandlers.Remove(method);
|
||||
}
|
||||
|
||||
public bool RemoveLLSDHandler(string path, LLSDMethod handler)
|
||||
|
|
Loading…
Reference in New Issue