aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-03-05 23:52:52 +0000
committerJustin Clark-Casey (justincc)2013-03-05 23:52:52 +0000
commit5cd38d680a5a6a139d2b61e937213370c5dd3789 (patch)
treed5a1e77b3b76621cb9a822b169a32a13635844cc /OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
parentGet attachment script state before taking sp.AttachmentsSyncLock() to avoid r... (diff)
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-5cd38d680a5a6a139d2b61e937213370c5dd3789.zip
opensim-SC_OLD-5cd38d680a5a6a139d2b61e937213370c5dd3789.tar.gz
opensim-SC_OLD-5cd38d680a5a6a139d2b61e937213370c5dd3789.tar.bz2
opensim-SC_OLD-5cd38d680a5a6a139d2b61e937213370c5dd3789.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs')
-rw-r--r--OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs6
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index 70c531c..58312ab 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -1912,6 +1912,12 @@ namespace OpenSim.Framework.Servers.HttpServer
1912 m_rpcHandlers.Remove(method); 1912 m_rpcHandlers.Remove(method);
1913 } 1913 }
1914 1914
1915 public void RemoveJsonRPCHandler(string method)
1916 {
1917 lock(jsonRpcHandlers)
1918 jsonRpcHandlers.Remove(method);
1919 }
1920
1915 public bool RemoveLLSDHandler(string path, LLSDMethod handler) 1921 public bool RemoveLLSDHandler(string path, LLSDMethod handler)
1916 { 1922 {
1917 lock (m_llsdHandlers) 1923 lock (m_llsdHandlers)