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

preliminary inter region communications (between regions in different instances) now works, so child agents and border crossings (and teleporting) now work.

Browse Source 
The .net remoting is still very basic: we need security sinks added.
And we really need the OGS 2 protocol as soon as possible.
This commit is contained in:
MW
2007-07-10 20:52:43 +00:00
parent ebdc64730a
commit f0ecc1de4c
5 changed files with 97 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Grid/GridServer/GridManager.cs
View File

@@ -266,6 +266,7 @@ namespace OpenSim.Grid.GridServer
TheSim.regionLocX = Convert.ToUInt32((string)requestData["region_locx"]);
TheSim.regionLocY = Convert.ToUInt32((string)requestData["region_locy"]);
TheSim.regionLocZ = 0;
TheSim.regionMapTextureID = new LLUUID((string)requestData["map-image-id"]);
TheSim.regionHandle = Helpers.UIntsToLong((TheSim.regionLocX * 256), (TheSim.regionLocY * 256));
System.Console.WriteLine("adding region " + TheSim.regionLocX + " , " + TheSim.regionLocY + " , " + TheSim.regionHandle);
@@ -392,16 +393,19 @@ namespace OpenSim.Grid.GridServer
}
else if (requestData.ContainsKey("region_handle"))
{
Console.WriteLine("requesting data for region " + (string)requestData["region_handle"]);
simData = getRegion(Convert.ToUInt64((string)requestData["region_handle"]));
}
if (simData == null)
{
//Sim does not exist
Console.WriteLine("region not found");
responseData["error"] = "Sim does not exist";
}
else
{
Console.WriteLine("found region");
responseData["sim_ip"] = simData.serverIP;
responseData["sim_port"] = simData.serverPort.ToString();
responseData["http_port"] = simData.httpPort.ToString();
@@ -493,7 +497,7 @@ namespace OpenSim.Grid.GridServer
simProfileBlock["region-flags"] = 0;
simProfileBlock["water-height"] = 20;
simProfileBlock["agents"] = 1;
simProfileBlock["map-image-id"] = simProfile.regionMapTextureID.ToString();
simProfileBlock["map-image-id"] = simProfile.regionMapTextureID.ToStringHyphenated();
// For Sugilite compatibility
simProfileBlock["regionhandle"] = simProfile.regionHandle.ToString();