Clean up the region initialization GridServer messages a bit.
parent
c545cc8cd9
commit
c34b5e9071
|
@ -421,7 +421,8 @@ namespace OpenSim.Grid.GridServer
|
||||||
}
|
}
|
||||||
else if (requestData.ContainsKey("region_handle"))
|
else if (requestData.ContainsKey("region_handle"))
|
||||||
{
|
{
|
||||||
Console.WriteLine("requesting data for region " + (string) requestData["region_handle"]);
|
//CFK: The if/else below this makes this message redundant.
|
||||||
|
//CFK: Console.WriteLine("requesting data for region " + (string) requestData["region_handle"]);
|
||||||
simData = getRegion(Convert.ToUInt64((string) requestData["region_handle"]));
|
simData = getRegion(Convert.ToUInt64((string) requestData["region_handle"]));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -433,7 +434,8 @@ namespace OpenSim.Grid.GridServer
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
Console.WriteLine("found region");
|
MainLog.Instance.Verbose("DATA", "found " + (string)simData.regionName + " regionHandle = " +
|
||||||
|
(string)requestData["region_handle"]);
|
||||||
responseData["sim_ip"] = Util.GetHostFromDNS(simData.serverIP).ToString();
|
responseData["sim_ip"] = Util.GetHostFromDNS(simData.serverIP).ToString();
|
||||||
responseData["sim_port"] = simData.serverPort.ToString();
|
responseData["sim_port"] = simData.serverPort.ToString();
|
||||||
responseData["http_port"] = simData.httpPort.ToString();
|
responseData["http_port"] = simData.httpPort.ToString();
|
||||||
|
@ -511,7 +513,7 @@ namespace OpenSim.Grid.GridServer
|
||||||
simProfileList.Add(simProfileBlock);
|
simProfileList.Add(simProfileBlock);
|
||||||
}
|
}
|
||||||
MainLog.Instance.Verbose("MAP", "Fast map " + simProfileList.Count.ToString() +
|
MainLog.Instance.Verbose("MAP", "Fast map " + simProfileList.Count.ToString() +
|
||||||
" @ (" + xmin + "," + ymin + ")..(" + xmax + "," + ymax + ")" );
|
" regions @ (" + xmin + "," + ymin + ")..(" + xmax + "," + ymax + ")" );
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -546,7 +548,7 @@ namespace OpenSim.Grid.GridServer
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
MainLog.Instance.Verbose("MAP", "Std map " + simProfileList.Count.ToString() +
|
MainLog.Instance.Verbose("MAP", "Std map " + simProfileList.Count.ToString() +
|
||||||
" @ (" + xmin + "," + ymin + ")..(" + xmax + "," + ymax + ")");
|
" regions @ (" + xmin + "," + ymin + ")..(" + xmax + "," + ymax + ")");
|
||||||
}
|
}
|
||||||
|
|
||||||
responseData["sim-profiles"] = simProfileList;
|
responseData["sim-profiles"] = simProfileList;
|
||||||
|
|
Loading…
Reference in New Issue