ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-01 06:06:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Added test GridClient, which allowed me to remove a few bugs out of the new code.

Browse Source
This commit is contained in:
Diva Canto
2009-09-24 13:33:58 -07:00
parent ad753d784c
commit dd3d52ae1f
8 changed files with 161 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Services/Connectors/Grid/GridServiceConnector.cs
View File

@@ -97,9 +97,11 @@ namespace OpenSim.Services.Connectors
sendData["METHOD"] = "register";
string reqString = ServerUtils.BuildQueryString(sendData);
m_log.DebugFormat("[GRID CONNECTOR]: queryString = {0}", reqString);
string reply = SynchronousRestFormsRequester.MakeRequest("POST",
m_ServerURI + "/grid",
ServerUtils.BuildQueryString(sendData));
reqString);
Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
@@ -138,9 +140,10 @@ namespace OpenSim.Services.Connectors
sendData["METHOD"] = "get_neighbours";
string reqString = ServerUtils.BuildQueryString(sendData);
string reply = SynchronousRestFormsRequester.MakeRequest("POST",
m_ServerURI + "/grid",
ServerUtils.BuildQueryString(sendData));
reqString);
Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
@@ -148,6 +151,7 @@ namespace OpenSim.Services.Connectors
if (replyData != null)
{
Dictionary<string, object>.ValueCollection rinfosList = replyData.Values;
m_log.DebugFormat("[GRID CONNECTOR]: get neighbours returned {0} elements", rinfosList.Count);
foreach (object r in rinfosList)
{
if (r is Dictionary<string, object>)
@@ -156,8 +160,8 @@ namespace OpenSim.Services.Connectors
rinfos.Add(rinfo);
}
else
m_log.DebugFormat("[GRID CONNECTOR]: GetNeighbours {0}, {1} received invalid response",
scopeID, regionID);
m_log.DebugFormat("[GRID CONNECTOR]: GetNeighbours {0}, {1} received invalid response type {2}",
scopeID, regionID, r.GetType());
}
}
else

9
OpenSim/Services/Interfaces/IGridService.cs
View File

@@ -277,6 +277,15 @@ namespace OpenSim.Services.Interfaces
public GridRegion(Dictionary<string, object> kvp)
{
if (kvp["uuid"] != null)
RegionID = new UUID((string)kvp["uuid"]);
if (kvp["locX"] != null)
RegionLocX = Convert.ToInt32((string)kvp["locX"]);
if (kvp["locY"] != null)
RegionLocY = Convert.ToInt32((string)kvp["locY"]);
if ((kvp["external_ip_address"] != null) && (kvp["external_port"] != null))
{
int port = 0;