aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorDr Scofield2008-07-28 12:18:48 +0000
committerDr Scofield2008-07-28 12:18:48 +0000
commit03efaff60e2c4204bfac33de22e69377ba28be7c (patch)
tree711c9515a16d241b87857093876ebeafa91ae4cf /OpenSim/Framework
parentAdd Shared/LSL_Types* tests to Bamboo. (diff)
downloadopensim-SC-03efaff60e2c4204bfac33de22e69377ba28be7c.zip
opensim-SC-03efaff60e2c4204bfac33de22e69377ba28be7c.tar.gz
opensim-SC-03efaff60e2c4204bfac33de22e69377ba28be7c.tar.bz2
opensim-SC-03efaff60e2c4204bfac33de22e69377ba28be7c.tar.xz
moving GridInfo application plugin into a common standalone/grid
service, adding a plain REST GET handler returning XML (no LLSD), adding appropriate add handler calls to OpenSimBase and UserServer.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Servers/BaseHttpServer.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs
index 4dc5994..f8b4ccb 100644
--- a/OpenSim/Framework/Servers/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/BaseHttpServer.cs
@@ -88,7 +88,7 @@ namespace OpenSim.Framework.Servers
88 { 88 {
89 if (!m_streamHandlers.ContainsKey(handlerKey)) 89 if (!m_streamHandlers.ContainsKey(handlerKey))
90 { 90 {
91 //m_log.DebugFormat("[BASE HTTP SERVER]: Adding handler key {0}", handlerKey); 91 // m_log.DebugFormat("[BASE HTTP SERVER]: Adding handler key {0}", handlerKey);
92 m_streamHandlers.Add(handlerKey, handler); 92 m_streamHandlers.Add(handlerKey, handler);
93 } 93 }
94 } 94 }
@@ -195,7 +195,7 @@ namespace OpenSim.Framework.Servers
195 string path = request.RawUrl; 195 string path = request.RawUrl;
196 string handlerKey = GetHandlerKey(request.HttpMethod, path); 196 string handlerKey = GetHandlerKey(request.HttpMethod, path);
197 197
198 //m_log.DebugFormat("[BASE HTTP SERVER]: Handling {0} request for {1}", request.HttpMethod, path); 198 // m_log.DebugFormat("[BASE HTTP SERVER]: Handling {0} request for {1}", request.HttpMethod, path);
199 199
200 if (TryGetStreamHandler(handlerKey, out requestHandler)) 200 if (TryGetStreamHandler(handlerKey, out requestHandler))
201 { 201 {