aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server/Handlers
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Server/Handlers')
-rw-r--r--OpenSim/Server/Handlers/Grid/GridServerConnector.cs2
-rw-r--r--OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs11
2 files changed, 8 insertions, 5 deletions
diff --git a/OpenSim/Server/Handlers/Grid/GridServerConnector.cs b/OpenSim/Server/Handlers/Grid/GridServerConnector.cs
index 7bf2e66..ebdf489 100644
--- a/OpenSim/Server/Handlers/Grid/GridServerConnector.cs
+++ b/OpenSim/Server/Handlers/Grid/GridServerConnector.cs
@@ -45,7 +45,7 @@ namespace OpenSim.Server.Handlers.Grid
45 if (serverConfig == null) 45 if (serverConfig == null)
46 throw new Exception("No section 'Server' in config file"); 46 throw new Exception("No section 'Server' in config file");
47 47
48 string gridService = serverConfig.GetString("GridServiceModule", 48 string gridService = serverConfig.GetString("LocalServiceModule",
49 String.Empty); 49 String.Empty);
50 50
51 if (gridService == String.Empty) 51 if (gridService == String.Empty)
diff --git a/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs b/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs
index e72c2eb..eaeed6f 100644
--- a/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs
@@ -63,6 +63,7 @@ namespace OpenSim.Server.Handlers.Grid
63 StreamReader sr = new StreamReader(requestData); 63 StreamReader sr = new StreamReader(requestData);
64 string body = sr.ReadToEnd(); 64 string body = sr.ReadToEnd();
65 sr.Close(); 65 sr.Close();
66 body = body.Trim();
66 67
67 Dictionary<string, string> request = 68 Dictionary<string, string> request =
68 ServerUtils.ParseQueryString(body); 69 ServerUtils.ParseQueryString(body);
@@ -98,11 +99,11 @@ namespace OpenSim.Server.Handlers.Grid
98 case "get_region_range": 99 case "get_region_range":
99 return GetRegionRange(request); 100 return GetRegionRange(request);
100 101
101 default:
102 m_log.DebugFormat("[GRID HANDLER]: unknown method request {0}", method);
103 return FailureResult();
104 } 102 }
105 103
104 m_log.DebugFormat("[GRID HANDLER XXX]: unknown method {0} request {1}", method.Length, method);
105 return FailureResult();
106
106 } 107 }
107 108
108 #region Method-specific handlers 109 #region Method-specific handlers
@@ -155,11 +156,12 @@ namespace OpenSim.Server.Handlers.Grid
155 156
156 UUID regionID = UUID.Zero; 157 UUID regionID = UUID.Zero;
157 if (request["REGIONID"] != null) 158 if (request["REGIONID"] != null)
158 UUID.TryParse(request["REGIONID"], out scopeID); 159 UUID.TryParse(request["REGIONID"], out regionID);
159 else 160 else
160 m_log.WarnFormat("[GRID HANDLER]: no regionID in request to get neighbours"); 161 m_log.WarnFormat("[GRID HANDLER]: no regionID in request to get neighbours");
161 162
162 List<GridRegion> rinfos = m_GridService.GetNeighbours(scopeID, regionID); 163 List<GridRegion> rinfos = m_GridService.GetNeighbours(scopeID, regionID);
164 //m_log.DebugFormat("[GRID HANDLER]: neighbours for region {0}: {1}", regionID, rinfos.Count);
163 165
164 Dictionary<string, object> result = new Dictionary<string, object>(); 166 Dictionary<string, object> result = new Dictionary<string, object>();
165 int i = 0; 167 int i = 0;
@@ -171,6 +173,7 @@ namespace OpenSim.Server.Handlers.Grid
171 } 173 }
172 174
173 string xmlString = ServerUtils.BuildXmlResponse(result); 175 string xmlString = ServerUtils.BuildXmlResponse(result);
176 //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString);
174 UTF8Encoding encoding = new UTF8Encoding(); 177 UTF8Encoding encoding = new UTF8Encoding();
175 return encoding.GetBytes(xmlString); 178 return encoding.GetBytes(xmlString);
176 179