aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid
diff options
context:
space:
mode:
authorMW2007-07-10 20:52:43 +0000
committerMW2007-07-10 20:52:43 +0000
commitf0ecc1de4ccb40ed23b5bc925130bda3ff07c1a6 (patch)
treed7f269f36b7f29e980b9f70ebe273569afb964c6 /OpenSim/Grid
parentFixed the crashing when trying to look at the map in grid mode. Although the ... (diff)
downloadopensim-SC_OLD-f0ecc1de4ccb40ed23b5bc925130bda3ff07c1a6.zip
opensim-SC_OLD-f0ecc1de4ccb40ed23b5bc925130bda3ff07c1a6.tar.gz
opensim-SC_OLD-f0ecc1de4ccb40ed23b5bc925130bda3ff07c1a6.tar.bz2
opensim-SC_OLD-f0ecc1de4ccb40ed23b5bc925130bda3ff07c1a6.tar.xz
preliminary inter region communications (between regions in different instances) now works, so child agents and border crossings (and teleporting) now work.
The .net remoting is still very basic: we need security sinks added. And we really need the OGS 2 protocol as soon as possible.
Diffstat (limited to 'OpenSim/Grid')
-rw-r--r--OpenSim/Grid/GridServer/GridManager.cs6
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
index 6ddb921..1f97f53 100644
--- a/OpenSim/Grid/GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -266,6 +266,7 @@ namespace OpenSim.Grid.GridServer
266 TheSim.regionLocX = Convert.ToUInt32((string)requestData["region_locx"]); 266 TheSim.regionLocX = Convert.ToUInt32((string)requestData["region_locx"]);
267 TheSim.regionLocY = Convert.ToUInt32((string)requestData["region_locy"]); 267 TheSim.regionLocY = Convert.ToUInt32((string)requestData["region_locy"]);
268 TheSim.regionLocZ = 0; 268 TheSim.regionLocZ = 0;
269 TheSim.regionMapTextureID = new LLUUID((string)requestData["map-image-id"]);
269 270
270 TheSim.regionHandle = Helpers.UIntsToLong((TheSim.regionLocX * 256), (TheSim.regionLocY * 256)); 271 TheSim.regionHandle = Helpers.UIntsToLong((TheSim.regionLocX * 256), (TheSim.regionLocY * 256));
271 System.Console.WriteLine("adding region " + TheSim.regionLocX + " , " + TheSim.regionLocY + " , " + TheSim.regionHandle); 272 System.Console.WriteLine("adding region " + TheSim.regionLocX + " , " + TheSim.regionLocY + " , " + TheSim.regionHandle);
@@ -392,16 +393,19 @@ namespace OpenSim.Grid.GridServer
392 } 393 }
393 else if (requestData.ContainsKey("region_handle")) 394 else if (requestData.ContainsKey("region_handle"))
394 { 395 {
396 Console.WriteLine("requesting data for region " + (string)requestData["region_handle"]);
395 simData = getRegion(Convert.ToUInt64((string)requestData["region_handle"])); 397 simData = getRegion(Convert.ToUInt64((string)requestData["region_handle"]));
396 } 398 }
397 399
398 if (simData == null) 400 if (simData == null)
399 { 401 {
400 //Sim does not exist 402 //Sim does not exist
403 Console.WriteLine("region not found");
401 responseData["error"] = "Sim does not exist"; 404 responseData["error"] = "Sim does not exist";
402 } 405 }
403 else 406 else
404 { 407 {
408 Console.WriteLine("found region");
405 responseData["sim_ip"] = simData.serverIP; 409 responseData["sim_ip"] = simData.serverIP;
406 responseData["sim_port"] = simData.serverPort.ToString(); 410 responseData["sim_port"] = simData.serverPort.ToString();
407 responseData["http_port"] = simData.httpPort.ToString(); 411 responseData["http_port"] = simData.httpPort.ToString();
@@ -493,7 +497,7 @@ namespace OpenSim.Grid.GridServer
493 simProfileBlock["region-flags"] = 0; 497 simProfileBlock["region-flags"] = 0;
494 simProfileBlock["water-height"] = 20; 498 simProfileBlock["water-height"] = 20;
495 simProfileBlock["agents"] = 1; 499 simProfileBlock["agents"] = 1;
496 simProfileBlock["map-image-id"] = simProfile.regionMapTextureID.ToString(); 500 simProfileBlock["map-image-id"] = simProfile.regionMapTextureID.ToStringHyphenated();
497 501
498 // For Sugilite compatibility 502 // For Sugilite compatibility
499 simProfileBlock["regionhandle"] = simProfile.regionHandle.ToString(); 503 simProfileBlock["regionhandle"] = simProfile.regionHandle.ToString();