aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorBlueWall2013-03-03 09:40:44 -0500
committerBlueWall2013-03-03 09:40:44 -0500
commit66d74e76b19a6586991fdada2661514143d9585b (patch)
tree86bafe3050a374869fbad2612261f8dc504dcd3d /OpenSim/Framework
parentRobust.HG.ini.example updated to get an [Hypergrid] section too. (diff)
downloadopensim-SC_OLD-66d74e76b19a6586991fdada2661514143d9585b.zip
opensim-SC_OLD-66d74e76b19a6586991fdada2661514143d9585b.tar.gz
opensim-SC_OLD-66d74e76b19a6586991fdada2661514143d9585b.tar.bz2
opensim-SC_OLD-66d74e76b19a6586991fdada2661514143d9585b.tar.xz
Add method to remove JsonRpc Handlers from the server
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs6
-rw-r--r--OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs2
2 files changed, 8 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)
diff --git a/OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs
index 71ca3ff..d162bc1 100644
--- a/OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs
@@ -140,6 +140,8 @@ namespace OpenSim.Framework.Servers.HttpServer
140 void RemoveStreamHandler(string httpMethod, string path); 140 void RemoveStreamHandler(string httpMethod, string path);
141 141
142 void RemoveXmlRPCHandler(string method); 142 void RemoveXmlRPCHandler(string method);
143
144 void RemoveJsonRPCHandler(string method);
143 145
144 string GetHTTP404(string host); 146 string GetHTTP404(string host);
145 147